merge range managed and none range managed for didExitHierarchy

wsdwsd0829 · Feb 5, 2018 · f807efa · f807efa
1 parent 6f2ba8e
commit f807efa
Show file tree

Hide file tree

Showing 22 changed files with 947 additions and 30 deletions.
diff --git a/Source/ASDisplayNode.mm b/Source/ASDisplayNode.mm
@@ -2787,38 +2787,34 @@ - (void)didExitHierarchy
   ASDisplayNodeAssert(!_flags.isEnteringHierarchy, @"ASDisplayNode inconsistency. __enterHierarchy and __exitHierarchy are mutually exclusive");
   ASDisplayNodeAssertLockUnownedByCurrentThread(__instanceLock__);
 
-  if (![self supportsRangeManagedInterfaceState]) {
-    // TODO: Consider merging this codepath with the below, so both range-managed and standalone
-    // nodes wait before firing their exit-visibility handlers. This is more important than it used
-    // to be, as UIViewController transitions now do rehosting at both start & end of animation.
-    self.interfaceState = ASInterfaceStateNone;
-  } else {
-    // This case is important when tearing down hierarchies.  We must deliver a visibileStateDidChange:NO callback, as part our API guarantee that this method can be used for
-    // things like data analytics about user content viewing.  We cannot call the method in the dealloc as any incidental retain operations in client code would fail.
-    // Additionally, it may be that a Standard UIView which is containing us is moving between hierarchies, and we should not send the call if we will be re-added in the
-    // same runloop.  Strategy: strong reference (might be the last!), wait one runloop, and confirm we are still outside the hierarchy (both layer-backed and view-backed).
-    // TODO: This approach could be optimized by only performing the dispatch for root elements + recursively apply the interface state change. This would require a closer
-    // integration with _ASDisplayLayer to ensure that the superlayer pointer has been cleared by this stage (to check if we are root or not), or a different delegate call.
-
-    if (ASInterfaceStateIncludesVisible(_pendingInterfaceState)) {
-      void(^exitVisibleInterfaceState)(void) = ^{
-        // This block intentionally retains self.
-        __instanceLock__.lock();
-        unsigned isStillInHierarchy = _flags.isInHierarchy;
-        BOOL isVisible = ASInterfaceStateIncludesVisible(_pendingInterfaceState);
-        ASInterfaceState newState = (_pendingInterfaceState & ~ASInterfaceStateVisible);
-        __instanceLock__.unlock();
-
-        if (!isStillInHierarchy && isVisible) {
-          self.interfaceState = newState;
-        };
-      };
+  // This case is important when tearing down hierarchies.  We must deliver a visibileStateDidChange:NO callback, as part our API guarantee that this method can be used for
+  // things like data analytics about user content viewing.  We cannot call the method in the dealloc as any incidental retain operations in client code would fail.
+  // Additionally, it may be that a Standard UIView which is containing us is moving between hierarchies, and we should not send the call if we will be re-added in the
+  // same runloop.  Strategy: strong reference (might be the last!), wait one runloop, and confirm we are still outside the hierarchy (both layer-backed and view-backed).
+  // TODO: This approach could be optimized by only performing the dispatch for root elements + recursively apply the interface state change. This would require a closer
+  // integration with _ASDisplayLayer to ensure that the superlayer pointer has been cleared by this stage (to check if we are root or not), or a different delegate call.
+
+  if (ASInterfaceStateIncludesVisible(_pendingInterfaceState)) {
+    void(^exitVisibleInterfaceState)(void) = ^{
+      // This block intentionally retains self.
+      __instanceLock__.lock();
+      unsigned isStillInHierarchy = _flags.isInHierarchy;
+      BOOL isVisible = ASInterfaceStateIncludesVisible(_pendingInterfaceState);
+      ASInterfaceState newState = (_pendingInterfaceState & ~ASInterfaceStateVisible);
+      __instanceLock__.unlock();
 
-      if ([[ASCATransactionQueue sharedQueue] disabled]) {
-        dispatch_async(dispatch_get_main_queue(), exitVisibleInterfaceState);
-      } else {
-        exitVisibleInterfaceState();
+      if (!isStillInHierarchy && isVisible) {
+        if (![self supportsRangeManagedInterfaceState]) {
+          newState = ASInterfaceStateNone;
+        }
+        self.interfaceState = newState;
       }
+    };
+
+    if ([[ASCATransactionQueue sharedQueue] disabled]) {
+      dispatch_async(dispatch_get_main_queue(), exitVisibleInterfaceState);
+    } else {
+      exitVisibleInterfaceState();
     }
   }
 }

diff --git a/examples/ASViewController/Sample.xcworkspace/contents.xcworkspacedata b/examples/ASViewController/Sample.xcworkspace/contents.xcworkspacedata
diff --git a/examples_extra/InterfaceCoalesceTest/Default-568h@2x.png b/examples_extra/InterfaceCoalesceTest/Default-568h@2x.png
diff --git a/examples_extra/InterfaceCoalesceTest/Default-667h@2x.png b/examples_extra/InterfaceCoalesceTest/Default-667h@2x.png
diff --git a/examples_extra/InterfaceCoalesceTest/Default-736h@3x.png b/examples_extra/InterfaceCoalesceTest/Default-736h@3x.png
diff --git a/examples_extra/InterfaceCoalesceTest/Podfile b/examples_extra/InterfaceCoalesceTest/Podfile
@@ -0,0 +1,6 @@
+source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '8.0'
+target 'Sample' do
+    pod 'Texture/Yoga', :path => '../..'
+end
+