react-native-screens 3.12.0 → 3.13.0

package/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt

@@ -163,8 +163,10 @@ object ScreenWindowTraits {
         val screenForNavBarColor = findScreenForTrait(screen, WindowTraits.NAVIGATION_BAR_COLOR)
         val color = screenForNavBarColor?.navigationBarColor ?: window.navigationBarColor
 
-        WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightNavigationBars =
-            isColorLight(color)
+        UiThreadUtil.runOnUiThread {
+            WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightNavigationBars =
+                isColorLight(color)
+        }
         window.navigationBarColor = color
     }
 

package/ios/RNSScreenStack.m

@@ -142,6 +142,10 @@
     // that can handle it when dismissing a modal, the same for orientation
     [RNSScreenWindowTraits updateWindowTraits];
     [_presentedModals removeObject:presentationController.presentedViewController];
+    // we double check if there are no new controllers pending to be presented since someone could
+    // have tried to push another one during the transition
+    _updatingModals = NO;
+    [self updateContainer];
     if (self.onFinishTransitioning) {
       // instead of directly triggering onFinishTransitioning this time we enqueue the event on the
       // main queue. We do that because onDismiss event is also enqueued and we want for the transition
@@ -362,6 +366,14 @@
         BOOL shouldAnimate = lastModal && [next isKindOfClass:[RNSScreen class]] &&
             ((RNSScreenView *)next.view).stackAnimation != RNSScreenStackAnimationNone;
 
+        // if you want to present another modal quick enough after dismissing the previous one,
+        // it will result in wrong changeRootController, see repro in
+        // https://github.com/software-mansion/react-native-screens/issues/1299 We call `updateContainer` again in
+        // `presentationControllerDidDismiss` to cover this case and present new controller
+        if (previous.beingDismissed) {
+          return;
+        }
+
         [previous presentViewController:next
                                animated:shouldAnimate
                              completion:^{

package/ios/RNSScreenStackComponentView.mm

@@ -106,6 +106,10 @@ using namespace facebook::react;
 {
   [super didMoveToWindow];
   if (!_invalidated) {
+    // We check whether the view has been invalidated before running side-effects in didMoveToWindow
+    // This is needed because when LayoutAnimations are used it is possible for view to be re-attached
+    // to a window despite the fact it has been removed from the React Native view hierarchy.
+    // See https://github.com/software-mansion/react-native-screens/pull/700
     [self maybeAddToParentAndUpdateContainer];
   }
 }
@@ -253,18 +257,10 @@ using namespace facebook::react;
   _controller.view.frame = self.bounds;
 }
 
-- (void)invalidate
-{
-  _invalidated = YES;
-  [_controller willMoveToParentViewController:nil];
-  [_controller removeFromParentViewController];
-}
-
 - (void)dismissOnReload
 {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self invalidate];
-  });
+  auto screenController = (RNSScreenController *)_controller.viewControllers.lastObject;
+  [screenController resetViewToScreen];
 }
 
 #pragma mark methods connected to transitioning
@@ -280,6 +276,10 @@ using namespace facebook::react;
 {
   [super prepareForRecycle];
   _reactSubviews = [NSMutableArray new];
+  [self dismissOnReload];
+  _invalidated = YES;
+  [_controller willMoveToParentViewController:nil];
+  [_controller removeFromParentViewController];
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "check-types": "tsc --noEmit",
@@ -58,7 +58,6 @@
   "homepage": "https://github.com/software-mansion/react-native-screens#readme",
   "dependencies": {
     "react-freeze": "^1.0.0",
-    "react-native-gradle-plugin": "^0.0.3",
     "warn-once": "^0.1.0"
   },
   "peerDependencies": {
@@ -100,7 +99,7 @@
     "react-dom": "^16.13.1",
     "react-native": "^0.63.2",
     "react-native-reanimated": "^2.2.0",
-    "react-native-safe-area-context": "^3.1.9",
+    "react-native-safe-area-context": "^4.0.1-rc.5",
     "react-native-windows": "^0.64.8",
     "react-navigation": "^4.4.3",
     "react-navigation-stack": "^2.9.0",