Implement async transition

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -514,6 +514,8 @@
  DECBD6E81BE56E1900CF4905 /* ASButtonNode.h in Headers */ = {isa = PBXBuildFile; fileRef = DECBD6E51BE56E1900CF4905 /* ASButtonNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
  DECBD6E91BE56E1900CF4905 /* ASButtonNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = DECBD6E61BE56E1900CF4905 /* ASButtonNode.mm */; };
  DECBD6EA1BE56E1900CF4905 /* ASButtonNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = DECBD6E61BE56E1900CF4905 /* ASButtonNode.mm */; };
+ E52405B31C8FEF03004DC8E7 /* ASDisplayNodeLayoutContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = E52405B21C8FEF03004DC8E7 /* ASDisplayNodeLayoutContext.mm */; };
+ E52405B51C8FEF16004DC8E7 /* ASDisplayNodeLayoutContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E52405B41C8FEF16004DC8E7 /* ASDisplayNodeLayoutContext.h */; };
  E5711A2B1C840C81009619D4 /* ASIndexedNodeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E5711A2A1C840C81009619D4 /* ASIndexedNodeContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
  E5711A2C1C840C81009619D4 /* ASIndexedNodeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E5711A2A1C840C81009619D4 /* ASIndexedNodeContext.h */; };
  E5711A2E1C840C96009619D4 /* ASIndexedNodeContext.m in Sources */ = {isa = PBXBuildFile; fileRef = E5711A2D1C840C96009619D4 /* ASIndexedNodeContext.m */; };
@@ -845,6 +847,8 @@
  DEC146B51C37A16A004A0EE7 /* ASCollectionInternal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASCollectionInternal.m; path = Details/ASCollectionInternal.m; sourceTree = "<group>"; };
  DECBD6E51BE56E1900CF4905 /* ASButtonNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASButtonNode.h; sourceTree = "<group>"; };
  DECBD6E61BE56E1900CF4905 /* ASButtonNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASButtonNode.mm; sourceTree = "<group>"; };
+ E52405B21C8FEF03004DC8E7 /* ASDisplayNodeLayoutContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASDisplayNodeLayoutContext.mm; sourceTree = "<group>"; };
+ E52405B41C8FEF16004DC8E7 /* ASDisplayNodeLayoutContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASDisplayNodeLayoutContext.h; sourceTree = "<group>"; };
  E5711A2A1C840C81009619D4 /* ASIndexedNodeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIndexedNodeContext.h; sourceTree = "<group>"; };
  E5711A2D1C840C96009619D4 /* ASIndexedNodeContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIndexedNodeContext.m; sourceTree = "<group>"; };
  EFA731F0396842FF8AB635EE /* libPods-AsyncDisplayKitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AsyncDisplayKitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1192,6 +1196,8 @@
  058D0A0A195D050800B7D73C /* ASDisplayNode+DebugTiming.mm */,
  058D0A0B195D050800B7D73C /* ASDisplayNode+UIViewBridge.mm */,
  DE6EA3211C14000600183B10 /* ASDisplayNode+FrameworkPrivate.h */,
+ E52405B41C8FEF16004DC8E7 /* ASDisplayNodeLayoutContext.h */,
+ E52405B21C8FEF03004DC8E7 /* ASDisplayNodeLayoutContext.mm */,
  058D0A0C195D050800B7D73C /* ASDisplayNodeInternal.h */,
  058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */,
  058D0A0E195D050800B7D73C /* ASImageNode+CGExtras.m */,
@@ -1453,6 +1459,7 @@
  055B9FA81A1C154B00035D6D /* ASNetworkImageNode.h in Headers */,
  ACF6ED2B1B17843500DA7C62 /* ASOverlayLayoutSpec.h in Headers */,
  055F1A3819ABD413004DAFF1 /* ASRangeController.h in Headers */,
+ E52405B51C8FEF16004DC8E7 /* ASDisplayNodeLayoutContext.h in Headers */,
  ACF6ED2D1B17843500DA7C62 /* ASRatioLayoutSpec.h in Headers */,
  AC47D9451B3BB41900AAEE9D /* ASRelativeSize.h in Headers */,
  291B63FB1AA53A7A000A71B3 /* ASScrollDirection.h in Headers */,
@@ -1675,6 +1682,7 @@
  058D09B9195D04C000B7D73C /* Frameworks */,
  058D09BA195D04C000B7D73C /* Resources */,
  3B9D88CDF51B429C8409E4B6 /* Copy Pods Resources */,
+ B130AB1AC0A1E5162E211C19 /* Embed Pods Frameworks */,
  );
  buildRules = (
  );
@@ -1804,6 +1812,21 @@
  shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-resources.sh\"\n";
  showEnvVarsInLog = 0;
  };
+ B130AB1AC0A1E5162E211C19 /* Embed Pods Frameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Embed Pods Frameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-frameworks.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1885,6 +1908,7 @@
  ACF6ED2C1B17843500DA7C62 /* ASOverlayLayoutSpec.mm in Sources */,
  0442850F1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm in Sources */,
  257754921BED28F300737CA5 /* ASEqualityHashHelpers.mm in Sources */,
+ E52405B31C8FEF03004DC8E7 /* ASDisplayNodeLayoutContext.mm in Sources */,
  257754AB1BEE44CD00737CA5 /* ASTextKitEntityAttribute.m in Sources */,
  055F1A3919ABD413004DAFF1 /* ASRangeController.mm in Sources */,
  044285091BAA63FE00D16268 /* ASBatchFetching.m in Sources */,

AsyncDisplayKit/ASCellNode.m

@@ -127,20 +127,38 @@ - (void)setNeedsLayout
  [self didRelayoutFromOldSize:oldSize toNewSize:self.calculatedSize];
 }
 
-- (ASLayout *)transitionLayoutWithAnimation:(BOOL)animated
+- (void)transitionLayoutWithAnimation:(BOOL)animated
+ shouldMeasureAsync:(BOOL)shouldMeasureAsync
+ measurementCompletion:(void(^)())completion
 {
  CGSize oldSize = self.calculatedSize;
- ASLayout *layout = [super transitionLayoutWithAnimation:animated];
- [self didRelayoutFromOldSize:oldSize toNewSize:layout.size];
- return layout;
+ [super transitionLayoutWithAnimation:animated
+ shouldMeasureAsync:shouldMeasureAsync
+ measurementCompletion:^{
+ [self didRelayoutFromOldSize:oldSize toNewSize:self.calculatedSize];
+ if (completion) {
+ completion();
+ }
+ }
+ ];
 }
 
-- (ASLayout *)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize animated:(BOOL)animated
+- (void)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize
+ animated:(BOOL)animated
+ shouldMeasureAsync:(BOOL)shouldMeasureAsync
+ measurementCompletion:(void(^)())completion
 {
  CGSize oldSize = self.calculatedSize;
- ASLayout *layout = [super transitionLayoutWithSizeRange:constrainedSize animated:animated];
- [self didRelayoutFromOldSize:oldSize toNewSize:layout.size];
- return layout;
+ [super transitionLayoutWithSizeRange:constrainedSize
+ animated:animated
+ shouldMeasureAsync:shouldMeasureAsync
+ measurementCompletion:^{
+ [self didRelayoutFromOldSize:oldSize toNewSize:self.calculatedSize];
+ if (completion) {
+ completion();
+ }
+ }
+ ];
 }
 
 - (void)didRelayoutFromOldSize:(CGSize)oldSize toNewSize:(CGSize)newSize

AsyncDisplayKit/ASDisplayNode+Beta.h

@@ -57,18 +57,38 @@ ASDISPLAYNODE_EXTERN_C_END
 - (void)didCompleteLayoutTransition:(id<ASContextTransitioning>)context;
 
 /**
- * @abstract Transitions the current layout with a new constrained size.
+ * @abstract Transitions the current layout with a new constrained size. Must be called on main thread.
  *
- * @discussion Animation is optional, but will still proceed through your `animateLayoutTransition` implementation with `isAnimated == NO`.
- * If the passed constrainedSize is the the same as the node's current constrained size, this method is noop.
+ * @param animated Animation is optional, but will still proceed through your `animateLayoutTransition` implementation with `isAnimated == NO`.
+ *
+ * @param shouldMeasureAsync Measure the layout asynchronously.
+ *
+ * @param measurementCompletion Optional completion block called only if a new layout is calculated.
+ * It is called on main, right after the measurement and before -animateLayoutTransition:.
+ *
+ * @discussion If the passed constrainedSize is the the same as the node's current constrained size, this method is noop.
+ *
+ * @see animateLayoutTransition:
  */
-- (ASLayout *)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize animated:(BOOL)animated;
+- (void)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize
+ animated:(BOOL)animated
+ shouldMeasureAsync:(BOOL)shouldMeasureAsync
+ measurementCompletion:(void(^)())completion;
 
 /**
- * @abstract Invalidates the current layout and begins a relayout of the node with the current `constrainedSize`.
+ * @abstract Invalidates the current layout and begins a relayout of the node with the current `constrainedSize`. Must be called on main thread.
+ *
+ * @param animated Animation is optional, but will still proceed through your `animateLayoutTransition` implementation with `isAnimated == NO`.
+ *
+ * @param shouldMeasureAsync Measure the layout asynchronously.
+ *
+ * @param measurementCompletion Optional completion block called only if a new layout is calculated.
+ * It is called right after the measurement and before -animateLayoutTransition:.
  *
- * @discussion Animation is optional, but will still proceed through your `animateLayoutTransition` implementation with `isAnimated == NO`.
+ * @see animateLayoutTransition:
  */
-- (ASLayout *)transitionLayoutWithAnimation:(BOOL)animated;
+- (void)transitionLayoutWithAnimation:(BOOL)animated
+ shouldMeasureAsync:(BOOL)shouldMeasureAsync
+ measurementCompletion:(void(^)())completion;
 
 @end