react-native-navigation 8.8.2 → 8.8.3-snapshot.2513

package/android/src/test/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsViewControllerTest.java

@@ -40,7 +40,6 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@Ignore("New architecture - WIP")
 public class TopTabsViewControllerTest extends BaseTest {
     private static final int SIZE = 2;
 

package/android/src/test/java/com/reactnativenavigation/viewcontrollers/viewcontroller/ViewControllerTest.java

@@ -40,7 +40,6 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.withSettings;
 
-@Ignore("New architecture - WIP")
 public class ViewControllerTest extends BaseTest {
 
     private ViewController uut;

package/android/src/test/java/com/reactnativenavigation/views/TitleAndButtonsContainerTest.kt

@@ -30,7 +30,6 @@ import kotlin.test.assertFalse
 private const val UUT_WIDTH = 1000
 private const val UUT_HEIGHT = 100
 
-@Ignore("New architecture - failed to fix")
 class TitleAndButtonsContainerTest : BaseTest() {
     lateinit var uut: TitleAndButtonsContainer
     private lateinit var activity: Activity

package/android/src/test/java/com/reactnativenavigation/views/TitleSubTitleLayoutTest.kt

@@ -12,7 +12,6 @@ import org.junit.Test
 private const val UUT_WIDTH = 1000
 private const val UUT_HEIGHT = 100
 
-@Ignore("New architecture - WIP")
 class TitleSubTitleLayoutTest : BaseTest() {
     private val testId = "mock-testId"
 

package/ios/BottomTabPresenter.h

@@ -2,6 +2,8 @@
 #import "RNNTabBarItemCreator.h"
 @interface BottomTabPresenter : RNNBasePresenter
 
+@property(nonatomic, strong, readonly) RNNTabBarItemCreator *tabCreator;
+
 - (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions
                             tabCreator:(RNNTabBarItemCreator *)tabCreator;
 

package/ios/BottomTabPresenter.mm

@@ -3,9 +3,7 @@
 #import "UIViewController+LayoutProtocol.h"
 #import "UIViewController+RNNOptions.h"
 
-@implementation BottomTabPresenter {
-    RNNTabBarItemCreator *_tabCreator;
-}
+@implementation BottomTabPresenter
 
 - (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions
                             tabCreator:(RNNTabBarItemCreator *)tabCreator {

package/ios/BottomTabsAfterInitialTabAttacher.mm

@@ -9,6 +9,10 @@
       for (UIViewController *viewController in bottomTabsController.deselectedViewControllers) {
         dispatch_async(dispatch_get_main_queue(), ^{
           UIWindow *preloadWindow = [[UIWindow alloc] initWithFrame:CGRectZero];
+          // Clip the preload window so the deselected tab's full-screen reactView,
+          // which is briefly hosted here while it renders, can't draw outside the
+          // zero-frame window and flicker over the already-visible selected tab.
+          preloadWindow.clipsToBounds = YES;
           preloadWindow.hidden = NO;
 
           dispatch_group_t ready = dispatch_group_create();

package/ios/BottomTabsTogetherAttacher.mm

@@ -7,6 +7,10 @@
     dispatch_group_t ready = dispatch_group_create();
     
     UIWindow *preloadWindow = [[UIWindow alloc] initWithFrame:CGRectZero];
+    // Clip the preload window so the full-screen reactViews hosted here while
+    // they render can't draw outside the zero-frame window. Today the splash
+    // screen masks this, but without clipping it's a latent flicker.
+    preloadWindow.clipsToBounds = YES;
     preloadWindow.hidden = NO;
     
     NSMapTable *reactViewToParent = [NSMapTable strongToStrongObjectsMapTable];

package/ios/RNNAppDelegate.mm

@@ -4,7 +4,6 @@
 #import <react/featureflags/ReactNativeFeatureFlagsDefaults.h>
 
 #import "RCTAppSetupUtils.h"
-#import <React/CoreModulesPlugins.h>
 #if __has_include(<React/RCTCxxBridgeDelegate.h>)
 #import <React/RCTCxxBridgeDelegate.h>
 #endif
@@ -56,12 +55,17 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 - (BOOL)application:(UIApplication *)application
 didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     
+// RN 0.77 & RN0.78
 #if !RNN_RN_VERSION_79_OR_NEWER
-    [self _setUpFeatureFlags];
+#if __has_include(<ReactAppDependencyProvider/RCTAppDependencyProvider.h>)
+    self.dependencyProvider = [RCTAppDependencyProvider new];
+#endif
+    // RN 0.77
     #if !RNN_RN_VERSION_78
+        [self _setUpFeatureFlags];
         self.rootViewFactory = [self createRCTRootViewFactory];
-    #else
-        self.reactNativeFactory = [[RCTReactNativeFactory alloc] init];
+    #else // RN0.78
+        self.reactNativeFactory = [[RCTReactNativeFactory alloc] initWithDelegate:self];
         self.reactNativeFactory.rootViewFactory = [self createRCTRootViewFactory];
     #endif
     
@@ -119,6 +123,13 @@ didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     return [[RCTRootViewFactory alloc] initWithConfiguration:configuration andTurboModuleManagerDelegate:self];
 }
 
+#pragma mark - RCTTurboModuleManagerDelegate
+
+- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
+{
+    return RCTAppSetupDefaultModuleFromClass(moduleClass, self.dependencyProvider);
+}
+
 #pragma mark - Feature Flags
 class RCTAppDelegateBridgelessFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults {
 public:

package/ios/RNNBackButtonOptions.h

@@ -18,6 +18,7 @@
 @property(nonatomic, strong) Text *identifier;
 @property(nonatomic, strong) Bool *popStackOnPress;
 @property(nonatomic, strong) RNNIconBackgroundOptions *iconBackground;
+@property(nonatomic, strong) Bool *hideSharedBackground;
 
 - (BOOL)hasValue;
 

package/ios/RNNBackButtonOptions.mm

@@ -20,6 +20,7 @@
     self.displayMode = [TextParser parse:dict key:@"displayMode"];
     self.popStackOnPress = [BoolParser parse:dict key:@"popStackOnPress"];
     self.iconBackground = [[RNNIconBackgroundOptions alloc] initWithDict:dict[@"iconBackground"] enabled:nil];
+    self.hideSharedBackground = [BoolParser parse:dict key:@"hideSharedBackground"];
 
     return self;
 }
@@ -54,6 +55,8 @@
         self.popStackOnPress = options.popStackOnPress;
     if (options.sfSymbol.hasValue)
         self.sfSymbol = options.sfSymbol;
+    if (options.hideSharedBackground.hasValue)
+        self.hideSharedBackground = options.hideSharedBackground;
 }
 
 - (BOOL)hasValue {

package/ios/RNNBottomTabOptions.h

@@ -25,6 +25,7 @@
 @property(nonatomic, strong) Bool *selectTabOnPress;
 @property(nonatomic, strong) Text *sfSymbol;
 @property(nonatomic, strong) Text *sfSelectedSymbol;
+@property(nonatomic, strong) Text *role;
 
 - (BOOL)hasValue;
 

package/ios/RNNBottomTabOptions.mm

@@ -31,6 +31,7 @@
     self.selectTabOnPress = [BoolParser parse:dict key:@"selectTabOnPress"];
     self.sfSymbol = [TextParser parse:dict key:@"sfSymbol"];
     self.sfSelectedSymbol = [TextParser parse:dict key:@"sfSelectedSymbol"];
+    self.role = [TextParser parse:dict key:@"role"];
 
     return self;
 }
@@ -76,6 +77,8 @@
         self.sfSymbol = options.sfSymbol;
     if (options.sfSelectedSymbol.hasValue)
         self.sfSelectedSymbol = options.sfSelectedSymbol;
+    if (options.role.hasValue)
+        self.role = options.role;
 }
 
 - (BOOL)hasValue {
@@ -85,7 +88,7 @@
            self.iconColor.hasValue || self.selectedIconColor.hasValue ||
            self.selectedTextColor.hasValue || self.iconInsets.hasValue || self.textColor.hasValue ||
            self.visible.hasValue || self.selectTabOnPress.hasValue || self.sfSymbol.hasValue ||
-           self.sfSelectedSymbol.hasValue;
+           self.sfSelectedSymbol.hasValue || self.role.hasValue;
 }
 
 @end

package/ios/RNNBottomTabsController.mm

@@ -1,4 +1,5 @@
 #import "RNNBottomTabsController.h"
+#import "RNNTabBarItemCreator.h"
 #import "UITabBarController+RNNOptions.h"
 #import "UITabBarController+RNNUtils.h"
 
@@ -7,6 +8,8 @@
 @property(nonatomic, strong) RNNDotIndicatorPresenter *dotIndicatorPresenter;
 @property(nonatomic, strong) UILongPressGestureRecognizer *longPressRecognizer;
 
+- (void)rnn_cycleAllTabsThenRestoreInitialSelection;
+
 @end
 
 @implementation RNNBottomTabsController {
@@ -16,6 +19,8 @@
     BOOL _tabBarNeedsRestore;
     RNNNavigationOptions *_options;
     BOOL _didFinishSetup;
+    BOOL _rnnDidApplyInitialTabBarSelectionFix;
+    BOOL _rnnSuppressTabSelectionEvents;
 }
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
@@ -49,12 +54,7 @@
                       eventEmitter:eventEmitter
               childViewControllers:childViewControllers];
 
-    if (@available(iOS 26.0, *)) {
-        UITabBarAppearance *appearance = [UITabBarAppearance new];
-        [appearance configureWithDefaultBackground];
-        self.tabBar.standardAppearance = appearance;
-        self.tabBar.scrollEdgeAppearance = [appearance copy];
-    } else if (@available(iOS 13.0, *)) {
+    if (@available(iOS 13.0, *)) {
         UITabBarAppearance *appearance = [UITabBarAppearance new];
         [appearance configureWithOpaqueBackground];
         appearance.backgroundEffect = nil;
@@ -90,11 +90,44 @@
     }
 }
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    // iOS 26: first layout can misplace tab item titles; cycling selection (then restoring) forces a
+    // correct layout without user interaction. Defer so all tab children are in the hierarchy.
+    if (@available(iOS 26.0, *)) {
+        if (!_rnnDidApplyInitialTabBarSelectionFix) {
+            _rnnDidApplyInitialTabBarSelectionFix = YES;
+            __weak RNNBottomTabsController *weakSelf = self;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [weakSelf rnn_cycleAllTabsThenRestoreInitialSelection];
+            });
+        }
+    }
+}
+
+- (void)rnn_cycleAllTabsThenRestoreInitialSelection {
+    NSUInteger count = self.childViewControllers.count;
+    if (count <= 1) {
+        return;
+    }
+
+    NSUInteger initial = _currentTabIndex;
+    if (initial >= count) {
+        initial = 0;
+    }
+
+    _rnnSuppressTabSelectionEvents = YES;
+    [UIView performWithoutAnimation:^{
+        for (NSUInteger i = 0; i < count; i++) {
+            [self setSelectedIndex:i];
+        }
+        [self setSelectedIndex:initial];
+    }];
+    _rnnSuppressTabSelectionEvents = NO;
 }
 
 - (void)createTabBarItems:(NSArray<UIViewController *> *)childViewControllers {
+    _bottomTabPresenter.tabCreator.searchRoleUsed = NO;
     for (UIViewController *child in childViewControllers) {
         [_bottomTabPresenter applyOptions:child.resolveOptions child:child];
     }
@@ -200,6 +233,9 @@
 
 - (void)tabBarController:(UITabBarController *)tabBarController
     didSelectViewController:(UIViewController *)viewController {
+    if (_rnnSuppressTabSelectionEvents) {
+        return;
+    }
     [self.eventEmitter sendBottomTabSelected:@(tabBarController.selectedIndex)
                                   unselected:@(_previousTabIndex)];
 }
@@ -216,6 +252,10 @@
     NSUInteger _index = [tabBarController.viewControllers indexOfObject:viewController];
     BOOL isMoreTab = ![tabBarController.viewControllers containsObject:viewController];
 
+    if (_rnnSuppressTabSelectionEvents) {
+        return YES;
+    }
+
     [self.eventEmitter sendBottomTabPressed:@(_index)];
 
     if ([[viewController resolveOptions].bottomTab.selectTabOnPress withDefault:YES] || isMoreTab) {

package/ios/RNNButtonOptions.h

@@ -23,6 +23,7 @@
 @property(nonatomic, strong) RNNComponentOptions *component;
 @property(nonatomic, strong) RNNIconBackgroundOptions *iconBackground;
 @property(nonatomic, strong) Bool *disableIconTint;
+@property(nonatomic, strong) Bool *hideSharedBackground;
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions;
 

package/ios/RNNButtonOptions.mm

@@ -25,6 +25,7 @@
                                                                  enabled:self.enabled];
     self.systemItem = [TextParser parse:dict key:@"systemItem"];
     self.disableIconTint = [BoolParser parse:dict key:@"disableIconTint"];
+    self.hideSharedBackground = [BoolParser parse:dict key:@"hideSharedBackground"];
 
     return self;
 }
@@ -49,6 +50,7 @@
     newOptions.iconBackground = self.iconBackground.copy;
     newOptions.systemItem = self.systemItem.copy;
     newOptions.disableIconTint = self.disableIconTint.copy;
+    newOptions.hideSharedBackground = self.hideSharedBackground.copy;
     return newOptions;
 }
 
@@ -88,6 +90,8 @@
         self.systemItem = options.systemItem;
     if (options.disableIconTint.hasValue)
         self.disableIconTint = options.disableIconTint;
+    if (options.hideSharedBackground.hasValue)
+        self.hideSharedBackground = options.hideSharedBackground;
 }
 
 - (BOOL)shouldCreateCustomView {

package/ios/RNNComponentOptions.mm

@@ -9,7 +9,7 @@
     self.name = [TextParser parse:dict key:@"name"];
     self.componentId = [TextParser parse:dict key:@"componentId"];
     self.alignment = [TextParser parse:dict key:@"alignment"];
-	self.waitForRender = [Bool withValue:[[BoolParser parse:dict key:@"waitForRender"] withDefault:[RNNUtils getDefaultWaitForRender]]];
+    self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
 
     return self;
 }

package/ios/RNNComponentPresenter.mm

@@ -1,9 +1,83 @@
 #import "RNNComponentPresenter.h"
 #import "RNNComponentViewController.h"
+#import "RNNScrollEdgeEffectOptions.h"
 #import "TopBarTitlePresenter.h"
 #import "UITabBarController+RNNOptions.h"
 #import "UIViewController+RNNOptions.h"
 
+static NSNumber *RNNScrollEdgeEffectStyleFromString(NSString *value) {
+    if ([value isEqualToString:@"hard"])
+        return @(2);
+    if ([value isEqualToString:@"soft"])
+        return @(1);
+    return @(0); // automatic
+}
+
+static RNNScrollEdgeOptions *RNNScrollEdgeOptionsForKey(RNNScrollEdgeEffectOptions *options,
+                                                       NSString *edgeKey) {
+    if ([edgeKey isEqualToString:@"topEdgeEffect"])
+        return options.top;
+    if ([edgeKey isEqualToString:@"bottomEdgeEffect"])
+        return options.bottom;
+    if ([edgeKey isEqualToString:@"leftEdgeEffect"])
+        return options.left;
+    if ([edgeKey isEqualToString:@"rightEdgeEffect"])
+        return options.right;
+    return nil;
+}
+
+static BOOL RNNScrollEdgeEffectHasAnyValue(RNNScrollEdgeEffectOptions *options) {
+    if (!options)
+        return NO;
+    if (options.hidden.hasValue || options.style.hasValue)
+        return YES;
+    NSArray<RNNScrollEdgeOptions *> *edges =
+        @[ options.top ?: [RNNScrollEdgeOptions new], options.bottom ?: [RNNScrollEdgeOptions new],
+           options.left ?: [RNNScrollEdgeOptions new], options.right ?: [RNNScrollEdgeOptions new] ];
+    for (RNNScrollEdgeOptions *edge in edges) {
+        if (edge.hidden.hasValue || edge.style.hasValue)
+            return YES;
+    }
+    return NO;
+}
+
+static void RNNApplyScrollEdgeEffectToScrollView(UIScrollView *scrollView,
+                                                 RNNScrollEdgeEffectOptions *options) {
+    if (![scrollView respondsToSelector:NSSelectorFromString(@"topEdgeEffect")])
+        return;
+    NSArray<NSString *> *edgeKeys =
+        @[ @"topEdgeEffect", @"bottomEdgeEffect", @"leftEdgeEffect", @"rightEdgeEffect" ];
+    for (NSString *key in edgeKeys) {
+        id effect = [scrollView valueForKey:key];
+        if (!effect)
+            continue;
+        RNNScrollEdgeOptions *perEdge = RNNScrollEdgeOptionsForKey(options, key);
+
+        Bool *hidden = (perEdge.hidden.hasValue) ? perEdge.hidden : options.hidden;
+        Text *style = (perEdge.style.hasValue) ? perEdge.style : options.style;
+
+        if (hidden.hasValue &&
+            [effect respondsToSelector:NSSelectorFromString(@"setHidden:")]) {
+            [effect setValue:@([hidden withDefault:NO]) forKey:@"hidden"];
+        }
+        if (style.hasValue &&
+            [effect respondsToSelector:NSSelectorFromString(@"setStyle:")]) {
+            [effect setValue:RNNScrollEdgeEffectStyleFromString(style.get) forKey:@"style"];
+        }
+    }
+}
+
+static void RNNApplyScrollEdgeEffectToView(UIView *view, RNNScrollEdgeEffectOptions *options) {
+    if (!RNNScrollEdgeEffectHasAnyValue(options))
+        return;
+    if ([view isKindOfClass:[UIScrollView class]]) {
+        RNNApplyScrollEdgeEffectToScrollView((UIScrollView *)view, options);
+    }
+    for (UIView *subview in view.subviews) {
+        RNNApplyScrollEdgeEffectToView(subview, options);
+    }
+}
+
 @implementation RNNComponentPresenter {
     TopBarTitlePresenter *_topBarTitlePresenter;
     RNNButtonsPresenter *_buttonsPresenter;
@@ -34,6 +108,11 @@
 - (void)componentDidAppear {
     [_topBarTitlePresenter componentDidAppear];
     [_buttonsPresenter componentDidAppear];
+
+    RNNComponentViewController *viewController = self.boundViewController;
+    RNNNavigationOptions *withDefault =
+        [viewController.options withDefault:[self defaultOptions]];
+    RNNApplyScrollEdgeEffectToView(viewController.view, withDefault.scrollEdgeEffect);
 }
 
 - (void)componentDidDisappear {
@@ -102,6 +181,8 @@
             defaultDisabledColor:withDefault.topBar.rightButtonDisabledColor
                         animated:[withDefault.topBar.animateRightButtons withDefault:NO]];
     }
+
+    RNNApplyScrollEdgeEffectToView(viewController.view, withDefault.scrollEdgeEffect);
 }
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
@@ -236,6 +317,10 @@
     }
 
     [_topBarTitlePresenter mergeOptions:mergeOptions.topBar resolvedOptions:withDefault.topBar];
+
+    if (RNNScrollEdgeEffectHasAnyValue(mergeOptions.scrollEdgeEffect)) {
+        RNNApplyScrollEdgeEffectToView(viewController.view, mergeOptions.scrollEdgeEffect);
+    }
 }
 
 - (void)renderComponents:(RNNNavigationOptions *)options

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/RNNNavigationOptions.h

@@ -6,6 +6,7 @@
 #import "RNNModalOptions.h"
 #import "RNNOverlayOptions.h"
 #import "RNNPreviewOptions.h"
+#import "RNNScrollEdgeEffectOptions.h"
 #import "RNNSharedElementAnimationOptions.h"
 #import "RNNSideMenuOptions.h"
 #import "RNNSplitViewOptions.h"
@@ -34,6 +35,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 @property(nonatomic, strong) RNNModalOptions *modal;
 @property(nonatomic, strong) DeprecationOptions *deprecations;
 @property(nonatomic, strong) WindowOptions *window;
+@property(nonatomic, strong) RNNScrollEdgeEffectOptions *scrollEdgeEffect;
 
 @property(nonatomic, strong) Bool *popGesture;
 @property(nonatomic, strong) Bool *navigationButtonEventOnSwipeBack;

package/ios/RNNNavigationOptions.mm

@@ -39,6 +39,8 @@
     self.modal = [[RNNModalOptions alloc] initWithDict:dict[@"modal"]];
     self.deprecations = [[DeprecationOptions alloc] initWithDict:dict[@"deprecations"]];
     self.window = [[WindowOptions alloc] initWithDict:dict[@"window"]];
+    self.scrollEdgeEffect =
+        [[RNNScrollEdgeEffectOptions alloc] initWithDict:dict[@"scrollEdgeEffect"]];
 
     self.popGesture = [[Bool alloc] initWithValue:dict[@"popGesture"]];
     self.navigationButtonEventOnSwipeBack = [[Bool alloc] initWithValue:dict[@"navigationButtonEventOnSwipeBack"]];
@@ -71,6 +73,7 @@
     [result.modal mergeOptions:options.modal];
     [result.deprecations mergeOptions:options.deprecations];
     [result.window mergeOptions:options.window];
+    [result.scrollEdgeEffect mergeOptions:options.scrollEdgeEffect];
 
     if (options.popGesture.hasValue)
         result.popGesture = options.popGesture;
@@ -105,6 +108,7 @@
     [newOptions.modal mergeOptions:self.modal];
     [newOptions.deprecations mergeOptions:self.deprecations];
     [newOptions.window mergeOptions:self.window];
+    [newOptions.scrollEdgeEffect mergeOptions:self.scrollEdgeEffect];
 
     newOptions.popGesture = self.popGesture;
     newOptions.navigationButtonEventOnSwipeBack = self.navigationButtonEventOnSwipeBack;

package/ios/RNNScreenTransition.mm

@@ -11,7 +11,7 @@
     self.content = [[RNNEnterExitAnimation alloc] initWithDict:dict[@"content"]];
     self.bottomTabs = [[ElementTransitionOptions alloc] initWithDict:dict[@"bottomTabs"]];
     self.enable = [BoolParser parse:dict key:@"enabled"];
-	self.waitForRender = [Bool withValue: [[BoolParser parse:dict key:@"waitForRender"] withDefault: [RNNUtils getDefaultWaitForRender]]];
+    self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
     self.duration = [TimeIntervalParser parse:dict key:@"duration"];
     self.sharedElementTransitions = [OptionsArrayParser parse:dict
                                                           key:@"sharedElementTransitions"

package/ios/RNNScrollEdgeEffectOptions.h

@@ -0,0 +1,20 @@
+#import "RNNOptions.h"
+
+@interface RNNScrollEdgeOptions : RNNOptions
+
+@property(nonatomic, strong) Bool *hidden;
+@property(nonatomic, strong) Text *style;
+
+@end
+
+@interface RNNScrollEdgeEffectOptions : RNNOptions
+
+@property(nonatomic, strong) Bool *hidden;
+@property(nonatomic, strong) Text *style;
+
+@property(nonatomic, strong) RNNScrollEdgeOptions *top;
+@property(nonatomic, strong) RNNScrollEdgeOptions *bottom;
+@property(nonatomic, strong) RNNScrollEdgeOptions *left;
+@property(nonatomic, strong) RNNScrollEdgeOptions *right;
+
+@end

package/ios/RNNScrollEdgeEffectOptions.mm

@@ -0,0 +1,45 @@
+#import "RNNScrollEdgeEffectOptions.h"
+
+@implementation RNNScrollEdgeOptions
+
+- (instancetype)initWithDict:(NSDictionary *)dict {
+    self = [super initWithDict:dict];
+    self.hidden = [BoolParser parse:dict key:@"hidden"];
+    self.style = [TextParser parse:dict key:@"style"];
+    return self;
+}
+
+- (void)mergeOptions:(RNNScrollEdgeOptions *)options {
+    if (options.hidden.hasValue)
+        self.hidden = options.hidden;
+    if (options.style.hasValue)
+        self.style = options.style;
+}
+
+@end
+
+@implementation RNNScrollEdgeEffectOptions
+
+- (instancetype)initWithDict:(NSDictionary *)dict {
+    self = [super initWithDict:dict];
+    self.hidden = [BoolParser parse:dict key:@"hidden"];
+    self.style = [TextParser parse:dict key:@"style"];
+    self.top = [[RNNScrollEdgeOptions alloc] initWithDict:dict[@"top"]];
+    self.bottom = [[RNNScrollEdgeOptions alloc] initWithDict:dict[@"bottom"]];
+    self.left = [[RNNScrollEdgeOptions alloc] initWithDict:dict[@"left"]];
+    self.right = [[RNNScrollEdgeOptions alloc] initWithDict:dict[@"right"]];
+    return self;
+}
+
+- (void)mergeOptions:(RNNScrollEdgeEffectOptions *)options {
+    if (options.hidden.hasValue)
+        self.hidden = options.hidden;
+    if (options.style.hasValue)
+        self.style = options.style;
+    [self.top mergeOptions:options.top];
+    [self.bottom mergeOptions:options.bottom];
+    [self.left mergeOptions:options.left];
+    [self.right mergeOptions:options.right];
+}
+
+@end

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 {