Unified squashed result of google merge.

AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme

@@ -47,9 +47,6 @@
                ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
             </BuildableReference>
             <SkippedTests>
-               <Test
-                  Identifier = "ASCALayerTests">
-               </Test>
                <Test
                   Identifier = "ASTextNodePerformanceTests">
                </Test>

CONTRIBUTING.md

@@ -89,7 +89,6 @@ Copy and paste this to the top of your new file(s):
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//  
 ```
 
 If you’ve modified an existing file, change the header to:
@@ -226,10 +225,7 @@ static void someFunction() {
   - There is mostly no sense using nullability annotations outside of interface declarations.
 ```objc
 // Properties
-// Never include: `atomic`, `readwrite`, `strong`, `assign`.
-// Only specify nullability if it isn't assumed from NS_ASSUME.
-// (nullability, atomicity, storage class, writability, custom getter, custom setter)
-@property (nullable, copy) NSNumber *status
+@property(nonatomic, strong, nullable) NSNumber *status
 
 // Methods
 - (nullable NSNumber *)doSomethingWithString:(nullable NSString *)str;

Podfile

@@ -1,8 +1,15 @@
 platform :ios, '9.0'
 
-target :'AsyncDisplayKitTests' do
+target :'AsyncDisplayKit' do 
   platform :ios, '10.0'
   use_frameworks!
-  pod 'OCMock', '~>3.6'
-  pod 'iOSSnapshotTestCase/Core', '~> 6.2'
+
+  pod 'Yoga'
+  pod 'IGListKit', '~>3.4'
+
+  target :'AsyncDisplayKitTests' do
+    pod 'JGMethodSwizzler'
+    pod 'OCMock', '=3.4.1'
+    pod 'iOSSnapshotTestCase/Core', '~>6.2'
+  end
 end

Podfile.lock

@@ -1,20 +1,36 @@
 PODS:
+  - IGListKit (3.4.0):
+    - IGListKit/Default (= 3.4.0)
+  - IGListKit/Default (3.4.0):
+    - IGListKit/Diffing
+  - IGListKit/Diffing (3.4.0)
   - iOSSnapshotTestCase/Core (6.2.0)
-  - OCMock (3.6)
+  - JGMethodSwizzler (2.0.1)
+  - OCMock (3.4.1)
+  - Yoga (1.14.0)
 
 DEPENDENCIES:
+  - IGListKit (~> 3.4)
   - iOSSnapshotTestCase/Core (~> 6.2)
-  - OCMock (~> 3.6)
+  - JGMethodSwizzler
+  - OCMock (= 3.4.1)
+  - Yoga
 
 SPEC REPOS:
   trunk:
+    - IGListKit
     - iOSSnapshotTestCase
+    - JGMethodSwizzler
     - OCMock
+    - Yoga
 
 SPEC CHECKSUMS:
+  IGListKit: 7a5d788e9fb746bcd402baa8e8b24bc3bd2a5a07
   iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6
-  OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
+  JGMethodSwizzler: e0ea5c1c6c55304ec4ef3f54e441400c6735c899
+  OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
+  Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
 
-PODFILE CHECKSUM: 1b4ea0e8ab7d94a46b1964a2354686c2e599c8c2
+PODFILE CHECKSUM: a94ede4b4176c5971b7727c82520f4a166351fcd
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1

Source/ASButtonNode+Yoga.mm

@@ -33,13 +33,13 @@ @implementation ASButtonNode (Yoga)
 
 - (void)updateYogaLayoutIfNeeded
 {
+  if (!self.yoga) return;
   NSMutableArray<ASDisplayNode *> *children = [[NSMutableArray alloc] initWithCapacity:2];
   {
     ASLockScopeSelf();
 
     // Build up yoga children for button node  again
     unowned ASLayoutElementStyle *style = [self _locked_style];
-    [style yogaNodeCreateIfNeeded];
 
     // Setup stack layout values
     style.flexDirection = _laysOutHorizontally ? ASStackLayoutDirectionHorizontal : ASStackLayoutDirectionVertical;
@@ -50,12 +50,10 @@ - (void)updateYogaLayoutIfNeeded
 
     // Setup new yoga children
     if (_imageNode.image != nil) {
-      [_imageNode.style yogaNodeCreateIfNeeded];
       [children addObject:_imageNode];
     }
 
     if (_titleNode.attributedText.length > 0) {
-      [_titleNode.style yogaNodeCreateIfNeeded];
       if (_imageAlignment == ASButtonNodeImageAlignmentBeginning) {
         [children addObject:_titleNode];
       } else {
@@ -80,7 +78,6 @@ - (void)updateYogaLayoutIfNeeded
 
     // Add background node
     if (_backgroundImageNode.image) {
-      [_backgroundImageNode.style yogaNodeCreateIfNeeded];
       [children insertObject:_backgroundImageNode atIndex:0];
 
       _backgroundImageNode.style.positionType = YGPositionTypeAbsolute;

Source/ASButtonNode.mm

@@ -9,6 +9,7 @@
 
 #import <AsyncDisplayKit/ASButtonNode+Private.h>
 #import <AsyncDisplayKit/ASButtonNode+Yoga.h>
+#import <AsyncDisplayKit/ASTextNode2.h>
 #import <AsyncDisplayKit/ASStackLayoutSpec.h>
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>

Source/ASCellNode.mm

@@ -24,6 +24,8 @@
 #import <AsyncDisplayKit/ASInsetLayoutSpec.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 
+using namespace AS;
+
 #pragma mark -
 #pragma mark ASCellNode
 
@@ -34,6 +36,7 @@ @interface ASCellNode ()
   ASDisplayNode *_viewControllerNode;
   UIViewController *_viewController;
   UICollectionViewLayoutAttributes *_layoutAttributes;
+  __weak id<ASCellNodeInteractionDelegate> _interactionDelegate;
   BOOL _suspendInteractionDelegate;
   BOOL _selected;
   BOOL _highlighted;
@@ -43,7 +46,6 @@ @interface ASCellNode ()
 @end
 
 @implementation ASCellNode
-@synthesize interactionDelegate = _interactionDelegate;
 
 - (instancetype)init
 {
@@ -111,17 +113,17 @@ - (void)layout
 
 - (void)_rootNodeDidInvalidateSize
 {
-  if (_interactionDelegate != nil) {
-    [_interactionDelegate nodeDidInvalidateSize:self];
+  if (auto interactionDelegate = self.interactionDelegate) {
+    [interactionDelegate nodeDidInvalidateSize:self];
   } else {
     [super _rootNodeDidInvalidateSize];
   }
 }
 
 - (void)_layoutTransitionMeasurementDidFinish
 {
-  if (_interactionDelegate != nil) {
-    [_interactionDelegate nodeDidInvalidateSize:self];
+  if (auto interactionDelegate = self.interactionDelegate) {
+    [interactionDelegate nodeDidInvalidateSize:self];
   } else {
     [super _layoutTransitionMeasurementDidFinish];
   }
@@ -205,6 +207,18 @@ - (UIViewController *)viewController
   return self.collectionElement.owningNode;
 }
 
+- (id<ASCellNodeInteractionDelegate>)interactionDelegate
+{
+  MutexLocker l(__instanceLock__);
+  return _interactionDelegate;
+}
+
+- (void)setInteractionDelegate:(id<ASCellNodeInteractionDelegate>)interactionDelegate
+{
+  MutexLocker l(__instanceLock__);
+  _interactionDelegate = interactionDelegate;
+}
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
 

Source/ASCollectionNode+Beta.h

@@ -56,6 +56,21 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, readonly, getter=isSynchronized) BOOL synchronized;
 
+/**
+ * When bounds change in non-scrollable direction, we remeasure all cells against the new bounds. If
+ * this property is YES (the default, for historical reasons,) this remeasurement takes place within
+ * the setBounds: call on the collection view's layer. Otherwise, the remeasurement occurs inside of
+ * the collection view's layoutSubviews call.
+ * 
+ * Setting this to NO can avoid duplicated work for example during rotation, where collection view content
+ * is reloaded or updated in the time between the setBounds: and the layout pass. Having it be YES
+ * we may remeasure nodes that will be immediately discarded and replaced.
+ * 
+ * Leaving this as YES will retain historical behavior on which existing application-side collection view
+ * machinery may depend.
+ */
+@property (nonatomic) BOOL remeasuresBeforeLayoutPassOnBoundsChange;
+
 /**
  *  Schedules a block to be performed (on the main thread) as soon as the completion block is called
  *  on performBatchUpdates:.
@@ -64,6 +79,47 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)onDidFinishSynchronizing:(void (^)(void))didFinishSynchronizing;
 
+/**
+ * Whether to immediately apply layouts that are generated in the background (if nodes aren't
+ * loaded).
+ *
+ * This feature is considered experimental; please report any issues you encounter.
+ *
+ * Defaults to NO. The default may change to YES in the future.
+ */
+@property(nonatomic) BOOL immediatelyApplyComputedLayouts;
+
+/**
+ * The maximum number of elements to insert in each chunk of a collection view update.
+ *
+ * 0 means all items will be inserted in one chunk. Default is 0.
+ */
+@property (nonatomic) NSUInteger updateBatchSize;
+
+/**
+ * Whether cell nodes should be temporarily stored in, and pulled from, a global cache
+ * during updates. The nodeModel will be used as the key. This is useful to reduce the
+ * cost of operations such as reloading content due to iPad rotation, or moving content
+ * from one collection node to another, or calling reloadData. Default is NO.
+ */
+@property (nonatomic) BOOL useNodeCache;
+
+/**
+ * A way to override the default ASCellLayoutModeNone behavior of forcing all initial updates to be
+ * synchronous. Defaults to NO, will eventually flip to YES.
+ */
+@property(nonatomic) BOOL allowAsyncUpdatesForInitialContent;
+
+/**
+ * Whether to defer each layout pass to the next run loop. Useful when, for example, the collection
+ * node is fully obscured by another view and you want to break up large layout operations such as
+ * rotations into multiple run loop iterations.
+ *
+ * Defaults to NO.
+ */
+@property (nonatomic) BOOL shouldDelayLayout;
+
+
 - (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout layoutFacilitator:(nullable id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator;
 
 - (instancetype)initWithLayoutDelegate:(id<ASCollectionLayoutDelegate>)layoutDelegate layoutFacilitator:(nullable id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator;

Source/ASCollectionNode.h

@@ -774,6 +774,10 @@ NS_ASSUME_NONNULL_BEGIN
  * @param indexPath The index path of the item.
  *
  * @return A constrained size range for layout for the item at this index path.
+ *
+ * NOTE: In Yoga2, the min size is ignored and always assumed to be zero. Set the min-width or
+ * min-height property of your content, or simply choose whatever size you prefer regardless of the
+ * cell node's measured dimensions.
  */
 - (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode constrainedSizeForItemAtIndexPath:(NSIndexPath *)indexPath;