Merge branch 'wix:master' into master

OneAboveAll1964 · web-flow · commit ccd0ecbdb2d3 · 2026-04-30T13:26:32.000+03:00
diff --git a/android/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/LayoutDirectionApplier.kt b/android/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/LayoutDirectionApplier.kt
@@ -10,7 +10,10 @@ class LayoutDirectionApplier {
         val currentContext = root.view?.context ?: return
 
         if (options.layout.direction.hasValue()) {
-            root.activity.window.decorView.layoutDirection = options.layout.direction.get()
+            val direction = options.layout.direction.get()
+            root.activity?.window?.decorView?.let { decor ->
+                decor.layoutDirection = direction
+            }
             I18nUtil.instance.allowRTL(currentContext, options.layout.direction.isRtl)
             I18nUtil.instance.forceRTL(currentContext, options.layout.direction.isRtl)
         }
diff --git a/android/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/Presenter.java b/android/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/Presenter.java
@@ -137,6 +137,7 @@ private void applyNavigationBarVisibility(NavigationBarOptions options) {
     }
 
     private void setNavigationBarBackgroundColor(NavigationBarOptions navigationBar) {
+        if (activity == null) return;
         int defaultColor = SystemUiUtils.getDefaultNavBarColor();
         if (navigationBar.backgroundColor.canApplyValue()) {
             int color = navigationBar.backgroundColor.get(defaultColor);
diff --git a/ios/RNNComponentViewController.mm b/ios/RNNComponentViewController.mm
@@ -155,6 +155,11 @@ - (void)updateSearchResultsForSearchController:(UISearchController *)searchContr
                                     isFocused:searchController.searchBar.isFirstResponder];
 }
 
+- (void)destroyReactView {
+    [self.reactView removeFromSuperview];
+    self.reactView = nil;
+}
+
 - (void)screenPopped {
     [_eventEmitter sendScreenPoppedEvent:self.layoutInfo.componentId];
 }
diff --git a/ios/RNNStackController.mm b/ios/RNNStackController.mm
@@ -42,7 +42,82 @@ - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewControlle
 
 - (UIViewController *)popViewControllerAnimated:(BOOL)animated {
     [self prepareForPop];
-    return [super popViewControllerAnimated:animated];
+    UIViewController *previousTop = self.topViewController;
+    UIView *snapshot = [self snapshotTopView:animated];
+
+    UIViewController *poppedVC = [super popViewControllerAnimated:animated];
+    if (!poppedVC) {
+        [snapshot removeFromSuperview];
+        return nil;
+    }
+
+    id<UIViewControllerTransitionCoordinator> coordinator = self.transitionCoordinator;
+    if (coordinator && coordinator.isInteractive) {
+        // Interactive pop (swipe-back): remove snapshot overlay — UIKit shows the live
+        // view during the gesture. Skip early teardown so the React view stays alive
+        // if the gesture is cancelled. The delegate's didShowViewController handles
+        // cleanup once the animation finishes.
+        [snapshot removeFromSuperview];
+    } else {
+        [self teardownPoppedControllers:@[ poppedVC ] previousTop:previousTop];
+    }
+    return poppedVC;
+}
+
+- (NSArray<UIViewController *> *)popToViewController:(UIViewController *)viewController
+                                             animated:(BOOL)animated {
+    UIViewController *previousTop = self.topViewController;
+    UIView *snapshot = [self snapshotTopView:animated];
+
+    NSArray<UIViewController *> *poppedVCs =
+        [super popToViewController:viewController animated:animated];
+    if (poppedVCs.count > 0) {
+        [self teardownPoppedControllers:poppedVCs previousTop:previousTop];
+    } else {
+        [snapshot removeFromSuperview];
+    }
+    return poppedVCs;
+}
+
+- (NSArray<UIViewController *> *)popToRootViewControllerAnimated:(BOOL)animated {
+    UIViewController *previousTop = self.topViewController;
+    UIView *snapshot = [self snapshotTopView:animated];
+
+    NSArray<UIViewController *> *poppedVCs =
+        [super popToRootViewControllerAnimated:animated];
+    if (poppedVCs.count > 0) {
+        [self teardownPoppedControllers:poppedVCs previousTop:previousTop];
+    } else {
+        [snapshot removeFromSuperview];
+    }
+    return poppedVCs;
+}
+
+#pragma mark - React view teardown
+
+- (UIView *)snapshotTopView:(BOOL)animated {
+    if (!animated) return nil;
+    UIViewController *topVC = self.topViewController;
+    if (!topVC.isViewLoaded || !topVC.view.window) return nil;
+
+    UIView *snapshot = [topVC.view snapshotViewAfterScreenUpdates:NO];
+    if (snapshot) {
+        snapshot.frame = topVC.view.bounds;
+        snapshot.autoresizingMask =
+            UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+        [topVC.view addSubview:snapshot];
+    }
+    return snapshot;
+}
+
+- (void)teardownPoppedControllers:(NSArray<UIViewController *> *)poppedVCs
+                      previousTop:(UIViewController *)previousTop {
+    for (UIViewController *vc in poppedVCs) {
+        if (vc == previousTop && [vc isKindOfClass:[RNNComponentViewController class]]) {
+            [[(RNNComponentViewController *)vc reactView] componentDidDisappear];
+        }
+        [vc destroyReactView];
+    }
 }
 
 - (BOOL)navigationBar:(UINavigationBar *)navigationBar shouldPopItem:(UINavigationItem *)item {
diff --git a/ios/StackControllerDelegate.mm b/ios/StackControllerDelegate.mm
@@ -56,6 +56,7 @@ - (void)navigationController:(UINavigationController *)navigationController
     if (_presentedViewController &&
         ![navigationController.viewControllers containsObject:_presentedViewController]) {
         [_presentedViewController screenPopped];
+        [_presentedViewController destroyReactView];
         _isPopping = NO;
     }
 
diff --git a/ios/TopBarPresenter.mm b/ios/TopBarPresenter.mm
@@ -160,9 +160,21 @@ - (void)setBackButtonOptions:(RNNBackButtonOptions *)backButtonOptions {
     NSNumber *fontSize = [backButtonOptions.fontSize withDefault:nil];
 
     UIViewController *previousViewControllerInStack = self.previousViewControllerInStack;
-    UIBarButtonItem *backItem = [[RNNUIBarBackButtonItem alloc] initWithOptions:backButtonOptions];
     UINavigationItem *previousNavigationItem = previousViewControllerInStack.navigationItem;
 
+    BOOL hasCustomization = icon || color || title || fontFamily || fontSize ||
+                            backButtonOptions.displayMode.hasValue ||
+                            backButtonOptions.sfSymbol.hasValue ||
+                            backButtonOptions.iconBackground.hasValue ||
+                            backButtonOptions.enableMenu.hasValue ||
+                            ![backButtonOptions.showTitle withDefault:YES];
+
+    if (!hasCustomization) {
+        return;
+    }
+
+    UIBarButtonItem *backItem = [[RNNUIBarBackButtonItem alloc] initWithOptions:backButtonOptions];
+
     if (@available(iOS 13.0, *)) {
         UIImage *sfSymbol = [UIImage systemImageNamed:[backButtonOptions.sfSymbol withDefault:nil]];
         if (backButtonOptions.sfSymbol.hasValue) {
@@ -195,7 +207,9 @@ - (void)setBackButtonOptions:(RNNBackButtonOptions *)backButtonOptions {
                    cornerRadius:cornerRadius];
     }
 
-    [self setBackIndicatorImage:icon withColor:color];
+    if (icon) {
+        [self setBackIndicatorImage:icon withColor:color];
+    }
 
     title = title ? title : (previousNavigationItem.title ? previousNavigationItem.title : @"");
 
diff --git a/ios/UIViewController+LayoutProtocol.h b/ios/UIViewController+LayoutProtocol.h
@@ -18,6 +18,8 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (void)destroy;
 
+- (void)destroyReactView;
+
 - (void)mergeOptions:(RNNNavigationOptions *)options;
 
 - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child;
diff --git a/playground/e2e/Stack.test.js b/playground/e2e/Stack.test.js
@@ -183,6 +183,15 @@ describe('Stack', () => {
     await expect(elementByLabel('pop promise resolved with: ChildId')).toBeVisible();
   });
 
+  it.e2e('pop and re-push same component should not have stale unmount', async () => {
+    await elementById(TestIDs.PUSH_UNMOUNT_RACE_BTN).tap();
+    await sleep(800);
+    await expect(elementByLabel('loaded')).toBeVisible();
+    await elementById(TestIDs.POP_AND_REPUSH_BTN).tap();
+    await sleep(1000);
+    await expect(elementByLabel('loaded')).toBeVisible();
+  });
+
   it('pop from root screen should do nothing', async () => {
     await elementById(TestIDs.POP_BTN).tap();
     await expect(elementById(TestIDs.STACK_SCREEN_HEADER)).toBeVisible();
diff --git a/playground/ios/NavigationTests/RNNStackPresenterTest.mm b/playground/ios/NavigationTests/RNNStackPresenterTest.mm
@@ -73,9 +73,8 @@ - (void)testApplyOptions_shouldSetBackButtonOnBoundViewController_withHideTitle
 
 - (void)testApplyOptions_shouldSetBackButtonOnBoundViewController_withDefaultValues {
     [self.uut applyOptions:self.options];
-    XCTAssertTrue(
-        [self.boundViewController.viewControllers.firstObject.navigationItem.backBarButtonItem.title
-            isEqualToString:@""]);
+    XCTAssertNil(
+        self.boundViewController.viewControllers.firstObject.navigationItem.backBarButtonItem);
 }
 
 - (void)testSetBackButtonIcon_withColor_shouldSetColor {
diff --git a/playground/src/screens/Screens.ts b/playground/src/screens/Screens.ts
@@ -122,6 +122,7 @@ const Screens = {
   },
   SystemUiOptions: SystemUiOptions,
   StatusBarFirstTab,
+  UnmountRace: 'UnmountRace',
   KeyboardScreen: 'KeyboardScreen',
   TopBarBackground: 'TopBarBackground',
   Toast: 'Toast',
diff --git a/playground/src/screens/StackScreen.tsx b/playground/src/screens/StackScreen.tsx
@@ -21,6 +21,7 @@ const {
   SET_STACK_ROOT_WITH_ID_BTN,
   STACK_COMMANDS_BTN,
   SET_ROOT_NAVIGATION_TAB,
+  PUSH_UNMOUNT_RACE_BTN,
   POP_BTN,
 } = testIDs;
 
@@ -83,6 +84,11 @@ export default class StackScreen extends React.Component<NavigationProps> {
           testID={STACK_COMMANDS_BTN}
           onPress={this.pushStackCommands}
         />
+        <Button
+          label="Push Unmount Race"
+          testID={PUSH_UNMOUNT_RACE_BTN}
+          onPress={this.pushUnmountRace}
+        />
         <Button label="Pop" testID={POP_BTN} onPress={this.pop} />
       </Root>
     );
@@ -166,5 +172,13 @@ export default class StackScreen extends React.Component<NavigationProps> {
 
   pushStackCommands = () => Navigation.push(this, component(Screens.StackCommands));
 
+  pushUnmountRace = () =>
+    Navigation.push(this, {
+      component: {
+        name: Screens.UnmountRace,
+        passProps: { stackComponentId: this.props.componentId },
+      },
+    });
+
   pop = () => Navigation.pop(this);
 }
diff --git a/playground/src/screens/UnmountRaceScreen.tsx b/playground/src/screens/UnmountRaceScreen.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { Text, View, StyleSheet } from 'react-native';
+import { NavigationProps } from 'react-native-navigation';
+import Root from '../components/Root';
+import Button from '../components/Button';
+import Navigation from '../services/Navigation';
+import Screens from './Screens';
+import testIDs from '../testIDs';
+
+let sharedData: string | null = null;
+
+interface Props extends NavigationProps {
+  stackComponentId?: string;
+}
+
+export default class UnmountRaceScreen extends React.Component<Props, { data: string }> {
+  static options() {
+    return {
+      topBar: {
+        title: {
+          text: 'Unmount Race',
+        },
+      },
+    };
+  }
+
+  state = { data: 'loading' };
+  private checkTimer: ReturnType<typeof setTimeout> | null = null;
+
+  componentDidMount() {
+    sharedData = 'loaded';
+    this.checkTimer = setTimeout(() => {
+      this.setState({ data: sharedData ?? 'stale_unmount' });
+    }, 600);
+  }
+
+  componentWillUnmount() {
+    if (this.checkTimer) {
+      clearTimeout(this.checkTimer);
+    }
+    sharedData = null;
+  }
+
+  render() {
+    return (
+      <Root componentId={this.props.componentId}>
+        <View style={styles.container}>
+          <Text testID={testIDs.UNMOUNT_RACE_DATA} style={styles.text}>
+            {this.state.data}
+          </Text>
+        </View>
+        <Button
+          label="Pop and Re-push"
+          testID={testIDs.POP_AND_REPUSH_BTN}
+          onPress={this.popAndRepush}
+        />
+        <Button label="Pop" testID={testIDs.POP_BTN} onPress={this.pop} />
+      </Root>
+    );
+  }
+
+  popAndRepush = () => {
+    const stackId = this.props.stackComponentId;
+    if (!stackId) return;
+    Navigation.pop(this.props.componentId);
+    Navigation.push(stackId, {
+      component: {
+        name: Screens.UnmountRace,
+        passProps: { stackComponentId: stackId },
+      },
+    });
+  };
+
+  pop = () => Navigation.pop(this);
+}
+
+const styles = StyleSheet.create({
+  container: { padding: 20, alignItems: 'center' },
+  text: { fontSize: 24 },
+});
diff --git a/playground/src/screens/index.tsx b/playground/src/screens/index.tsx
@@ -117,6 +117,7 @@ function registerScreens() {
     () => require('./SideMenuRightScreen').default
   );
   Navigation.registerComponent(Screens.Stack, () => require('./StackScreen').default);
+  Navigation.registerComponent(Screens.UnmountRace, () => require('./UnmountRaceScreen').default);
   Navigation.registerComponent(Screens.SystemUiOptions, () => require('./SystemUiOptions').default);
   Navigation.registerComponent(
     Screens.StatusBarFirstTab,
diff --git a/playground/src/testIDs.ts b/playground/src/testIDs.ts
@@ -222,6 +222,10 @@ const testIDs = {
   TOGGLE_PLACEMENT_BTN: 'TOGGLE_PLACEMENT_BTN',
   MOUNTED_SCREENS_TEXT: 'MOUNTED_SCREENS_TEXT',
 
+  PUSH_UNMOUNT_RACE_BTN: 'PUSH_UNMOUNT_RACE_BTN',
+  UNMOUNT_RACE_DATA: 'UNMOUNT_RACE_DATA',
+  POP_AND_REPUSH_BTN: 'POP_AND_REPUSH_BTN',
+
   GOTO_TOPBAR_TITLE_TEST: 'GOTO_TOPBAR_TITLE_TEST',
   TOPBAR_TITLE_TEXT: 'TOPBAR_TITLE_TEXT',
   TOPBAR_TITLE_AVATAR: 'TOPBAR_TITLE_AVATAR',

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ private void applyNavigationBarVisibility(NavigationBarOptions options) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`private void setNavigationBarBackgroundColor(NavigationBarOptions navigationBar) {`
	`140`	`+ if (activity == null) return;`
`140`	`141`	`int defaultColor = SystemUiUtils.getDefaultNavBarColor();`
`141`	`142`	`if (navigationBar.backgroundColor.canApplyValue()) {`
`142`	`143`	`int color = navigationBar.backgroundColor.get(defaultColor);`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,11 @@ - (void)updateSearchResultsForSearchController:(UISearchController *)searchContr`
`155`	`155`	`isFocused:searchController.searchBar.isFirstResponder];`
`156`	`156`	`}`
`157`	`157`
	`158`	`+- (void)destroyReactView {`
	`159`	`+ [self.reactView removeFromSuperview];`
	`160`	`+ self.reactView = nil;`
	`161`	`+}`
	`162`	`+`
`158`	`163`	`- (void)screenPopped {`
`159`	`164`	`[_eventEmitter sendScreenPoppedEvent:self.layoutInfo.componentId];`
`160`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ - (void)navigationController:(UINavigationController *)navigationController`
`56`	`56`	`if (_presentedViewController &&`
`57`	`57`	`![navigationController.viewControllers containsObject:_presentedViewController]) {`
`58`	`58`	`[_presentedViewController screenPopped];`
	`59`	`+ [_presentedViewController destroyReactView];`
`59`	`60`	`_isPopping = NO;`
`60`	`61`	`}`
`61`	`62`