Delay

Author: t0maboro

ios/RNSScreen.mm

@@ -938,8 +938,15 @@ - (BOOL)isTransparentModal
 
 - (void)invalidateImpl
 {
-  _controller = nil;
-  [_sheetsScrollView removeObserver:self forKeyPath:@"bounds" context:nil];
+  // We want to run after container updates are performed (transitions etc.)
+  __weak auto weakSelf = self;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    auto strongSelf = weakSelf;
+    if (strongSelf) {
+      strongSelf->_controller = nil;
+      [strongSelf->_sheetsScrollView removeObserver:self forKeyPath:@"bounds" context:nil];
+    }
+  });
 }
 
 #ifndef RCT_NEW_ARCH_ENABLED

ios/RNSScreenStack.mm

@@ -1426,7 +1426,7 @@ - (void)mountingTransactionDidMount:(const facebook::react::MountingTransaction
 #ifdef RCT_NEW_ARCH_ENABLED
           [screenRef invalidateImpl];
 #else
-                    [screenRef invalidate];
+          [screenRef invalidate];
 #endif
         }
         strongSelf->_toBeDeletedScreens.clear();