react-native-navigation 8.8.2-snapshot.2429 → 8.8.2-snapshot.2438

package/ios/RNNComponentViewController.mm

@@ -155,6 +155,11 @@
                                     isFocused:searchController.searchBar.isFirstResponder];
 }
 
+- (void)destroyReactView {
+    [self.reactView removeFromSuperview];
+    self.reactView = nil;
+}
+
 - (void)screenPopped {
     [_eventEmitter sendScreenPoppedEvent:self.layoutInfo.componentId];
 }

package/ios/RNNStackController.mm

@@ -42,7 +42,82 @@
 
 - (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 {

package/ios/StackControllerDelegate.mm

@@ -56,6 +56,7 @@
     if (_presentedViewController &&
         ![navigationController.viewControllers containsObject:_presentedViewController]) {
         [_presentedViewController screenPopped];
+        [_presentedViewController destroyReactView];
         _isPopping = NO;
     }
 

package/ios/TopBarPresenter.mm

@@ -160,9 +160,21 @@
     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 @@
                    cornerRadius:cornerRadius];
     }
 
-    [self setBackIndicatorImage:icon withColor:color];
+    if (icon) {
+        [self setBackIndicatorImage:icon withColor:color];
+    }
 
     title = title ? title : (previousNavigationItem.title ? previousNavigationItem.title : @"");
 

package/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.8.2-snapshot.2429",
+  "version": "8.8.2-snapshot.2438",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,