react-native-navigation 8.7.6-snapshot.2279 → 8.7.6-snapshot.2352

package/android/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -232,11 +232,11 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     }
 
     @Override
-    public void onCatalystInstanceDestroy() {
+    public void invalidate() {
         final NavigationActivity navigationActivity = activity();
         if (navigationActivity != null) {
             navigationActivity.onCatalystInstanceDestroy();
         }
-        super.onCatalystInstanceDestroy();
+        super.invalidate();
     }
 }

package/android/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/ButtonBar.kt

@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.ActionMenuView
 import androidx.appcompat.widget.Toolbar
+import com.reactnativenavigation.R
 import com.reactnativenavigation.utils.ObjectUtils
 import com.reactnativenavigation.utils.ViewUtils
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController
@@ -21,6 +22,7 @@ open class ButtonBar internal constructor(context: Context) : Toolbar(context) {
     init {
         super.setContentInsetsAbsolute(0, 0)
         this.contentInsetStartWithNavigation = 0
+        setPopupTheme(R.style.TopBarOverflowPopup)
     }
 
     override fun onViewAdded(child: View) {

package/android/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/IconBackgroundDrawable.kt

@@ -8,12 +8,12 @@ import com.reactnativenavigation.options.params.DensityPixel
 
 
 class IconBackgroundDrawable(
-        private val wrapped: Drawable,
-        private val cornerRadius: DensityPixel,
-        private val backgroundWidth: Int,
-        private val backgroundHeight: Int,
-        private val iconColor: Int?,
-        val backgroundColor: Int?
+    private val wrapped: Drawable,
+    private val cornerRadius: DensityPixel,
+    private val backgroundWidth: Int,
+    private val backgroundHeight: Int,
+    private val iconColor: Int?,
+    val backgroundColor: Int?
 ) : Drawable() {
     private val path: Path = Path()
     private val bitmapPaint = Paint().apply {
@@ -56,28 +56,31 @@ class IconBackgroundDrawable(
         canvas.drawBitmap(wrapped.toBitmap(), null, bitmapRect, bitmapPaint)
     }
 
+    override fun getIntrinsicWidth(): Int = backgroundWidth
+    override fun getIntrinsicHeight(): Int = backgroundHeight
+
     override fun setBounds(l: Int, t: Int, r: Int, b: Int) {
-        updatePath(RectF(l.toFloat(), t.toFloat(), backgroundWidth.toFloat(), backgroundHeight.toFloat()))
-        super.setBounds(l, t, backgroundWidth, backgroundHeight)
+        updatePath(RectF(0f, 0f, backgroundWidth.toFloat(), backgroundHeight.toFloat()))
+        super.setBounds(l, t, l + backgroundWidth, t + backgroundHeight)
     }
 
     override fun setBounds(r: Rect) {
-        r.right = backgroundWidth
-        r.bottom = backgroundHeight
-        updatePath(RectF(r))
+        r.right = r.left + backgroundWidth
+        r.bottom = r.top + backgroundHeight
+        updatePath(RectF(0f, 0f, backgroundWidth.toFloat(), backgroundHeight.toFloat()))
         super.setBounds(r)
     }
 
     override fun onBoundsChange(bounds: Rect) {
         if (bounds != null) {
             backgroundRect = Rect((bounds.width() - backgroundWidth) / 2,
-                    (bounds.height() - backgroundHeight) / 2,
-                    bounds.width() - (bounds.width() - backgroundWidth) / 2,
-                    bounds.height() - (bounds.height() - backgroundHeight) / 2)
+                (bounds.height() - backgroundHeight) / 2,
+                bounds.width() - (bounds.width() - backgroundWidth) / 2,
+                bounds.height() - (bounds.height() - backgroundHeight) / 2)
             bitmapRect = Rect((bounds.width() - bitmapWidth) / 2,
-                    (bounds.height() - bitmapHeight) / 2,
-                    bounds.width() - (bounds.width() - bitmapWidth) / 2,
-                    bounds.height() - (bounds.height() - bitmapHeight) / 2)
+                (bounds.height() - bitmapHeight) / 2,
+                bounds.width() - (bounds.width() - bitmapWidth) / 2,
+                bounds.height() - (bounds.height() - bitmapHeight) / 2)
         }
         super.onBoundsChange(bounds)
     }

package/android/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleAndButtonsMeasurer.kt

@@ -17,7 +17,8 @@ typealias TitleBottom = Int
 
 fun makeTitleAtMostWidthMeasureSpec(containerWidth: Int, rightBarWidth: Int, leftBarWidth: Int, isCenter: Boolean, isFill: Boolean = false): Int {
     return if (isCenter) {
-        View.MeasureSpec.makeMeasureSpec(containerWidth, View.MeasureSpec.AT_MOST)
+        val availableWidth = containerWidth - rightBarWidth - leftBarWidth
+        View.MeasureSpec.makeMeasureSpec(availableWidth, View.MeasureSpec.AT_MOST)
     } else {
         val availableWidth = containerWidth - rightBarWidth - leftBarWidth - 2 * DEFAULT_LEFT_MARGIN_PX
         View.MeasureSpec.makeMeasureSpec(

package/android/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -3,25 +3,22 @@ package com.reactnativenavigation.views.stack.topbar.titlebar
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.children
-import com.facebook.react.ReactInstanceManager
 import com.reactnativenavigation.react.ReactView
 
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, componentId: String?,
                         componentName: String?) : ReactView(context, componentId, componentName) {
     var centered: Boolean = false
+
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        var titleHeightMeasureSpec: Int
-        var titleWidthMeasureSpec: Int
         if (centered) {
-            titleHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
-            titleWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+            val availableWidth = MeasureSpec.getSize(widthMeasureSpec)
+            super.onMeasure(
+                MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST),
+                heightMeasureSpec
+            )
         } else {
-            titleHeightMeasureSpec = heightMeasureSpec
-            titleWidthMeasureSpec = widthMeasureSpec
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec)
         }
-        super.onMeasure(titleWidthMeasureSpec, titleHeightMeasureSpec)
     }
 }

package/android/src/main/res/values/styles.xml

@@ -4,6 +4,8 @@
         <item name="elevation">0dp</item>
     </style>
 
+    <style name="TopBarOverflowPopup" parent="ThemeOverlay.AppCompat.Light" />
+
     <!--The following is a workaround needed to run unit tests in command line-->
     <style name="Widget.Support.CoordinatorLayout" parent="android:Widget">
         @null

package/ios/BottomTabsAfterInitialTabAttacher.mm

@@ -8,7 +8,38 @@
       [bottomTabsController readyForPresentation];
       for (UIViewController *viewController in bottomTabsController.deselectedViewControllers) {
         dispatch_async(dispatch_get_main_queue(), ^{
+          UIWindow *preloadWindow = [[UIWindow alloc] initWithFrame:CGRectZero];
+          preloadWindow.hidden = NO;
+
+          dispatch_group_t ready = dispatch_group_create();
+          dispatch_group_enter(ready);
+
+          viewController.waitForRender = YES;
+
+          [viewController setReactViewReadyCallback:^{
+            dispatch_group_leave(ready);
+          }];
+
           [viewController render];
+
+          UIView *containerView = nil;
+          UIView *reactView = nil;
+          if ([viewController isKindOfClass:[UINavigationController class]]) {
+              containerView = [(UINavigationController *)viewController topViewController].view;
+              reactView = containerView.subviews.firstObject;
+          }
+
+          if (reactView && !reactView.window) {
+              [preloadWindow addSubview:reactView];
+          }
+
+          dispatch_notify(ready, dispatch_get_main_queue(), ^{
+            if (reactView) {
+                reactView.frame = containerView.bounds;
+                [containerView addSubview:reactView];
+            }
+            preloadWindow.hidden = YES;
+          });
         });
       }
     }];

package/ios/BottomTabsAppearancePresenter.mm

@@ -7,6 +7,11 @@
 #pragma mark - public
 
 - (void)applyBackgroundColor:(UIColor *)backgroundColor translucent:(BOOL)translucent {
+    if (@available(iOS 26.0, *)) {
+        [self setTabBarTransparentBackground];
+        self.tabBar.backgroundColor = UIColor.clearColor;
+        return;
+    }
     if (translucent)
         [self setTabBarTranslucent:YES];
     else if (backgroundColor.isTransparent)
@@ -19,26 +24,33 @@
 
 - (void)applyTabBarBorder:(RNNBottomTabsOptions *)options {
     if (options.borderColor.hasValue || options.borderWidth.hasValue) {
-        for (UIViewController *childViewController in self.tabBarController.childViewControllers)
-            childViewController.tabBarItem.standardAppearance.shadowImage = [UIImage
-                imageWithSize:CGSizeMake(1.0, [[options.borderWidth withDefault:@(0.1)] floatValue])
-                        color:[options.borderColor withDefault:UIColor.blackColor]];
+        UIImage *borderImage = [UIImage
+            imageWithSize:CGSizeMake(1.0, [[options.borderWidth withDefault:@(0.1)] floatValue])
+                    color:[options.borderColor withDefault:UIColor.blackColor]];
+
+        for (UIViewController *childViewController in self.tabBarController.childViewControllers) {
+            childViewController.tabBarItem.standardAppearance.shadowImage = borderImage;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
+            if (@available(iOS 15.0, *)) {
+                childViewController.tabBarItem.scrollEdgeAppearance.shadowImage = borderImage;
+            }
+#endif
+        }
     }
 }
 
 - (void)setTabBarBackgroundColor:(UIColor *)backgroundColor {
-    [self setTabBarOpaqueBackground];
-    for (UIViewController *childViewController in self.tabBarController.childViewControllers) {
-        childViewController.tabBarItem.standardAppearance.backgroundColor = backgroundColor;
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
-        if (@available(iOS 15.0, *)) {
-            childViewController.tabBarItem.scrollEdgeAppearance.backgroundColor = backgroundColor;
-        }
-#endif
+    UITabBarAppearance *appearance = [self appearanceWithColor:backgroundColor];
+    [self applyTabBarAppearance:appearance];
+    self.tabBar.barTintColor = backgroundColor;
+    self.tabBar.translucent = NO;
+    if (@available(iOS 26.0, *)) {
+        self.tabBar.backgroundColor = backgroundColor;
     }
 }
 
 - (void)setTabBarTranslucent:(BOOL)translucent {
+    self.tabBar.translucent = translucent;
     if (translucent)
         [self setTabBarTranslucentBackground];
     else
@@ -48,38 +60,63 @@
 #pragma mark - private
 
 - (void)setTabBarDefaultBackground {
-    [self setTabBarOpaqueBackground];
+    if (@available(iOS 26.0, *)) {
+        [self setTabBarTransparentBackground];
+        self.tabBar.backgroundColor = UIColor.clearColor;
+    } else {
+        [self setTabBarOpaqueBackground];
+    }
 }
 
 - (void)setTabBarTranslucentBackground {
-    for (UIViewController *childViewController in self.tabBarController.childViewControllers) {
-        [childViewController.tabBarItem.standardAppearance configureWithDefaultBackground];
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
-        if (@available(iOS 15.0, *)) {
-            [childViewController.tabBarItem.scrollEdgeAppearance configureWithDefaultBackground];
-        }
-#endif
-    }
+    UITabBarAppearance *appearance = [UITabBarAppearance new];
+    [appearance configureWithDefaultBackground];
+    [self applyTabBarAppearance:appearance];
+    self.tabBar.barTintColor = nil;
 }
 
 - (void)setTabBarTransparentBackground {
-    for (UIViewController *childViewController in self.tabBarController.childViewControllers) {
-        [childViewController.tabBarItem.standardAppearance configureWithTransparentBackground];
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
-        if (@available(iOS 15.0, *)) {
-            [childViewController.tabBarItem
-                    .scrollEdgeAppearance configureWithTransparentBackground];
-        }
-#endif
-    }
+    UITabBarAppearance *appearance = [UITabBarAppearance new];
+    [appearance configureWithTransparentBackground];
+    appearance.backgroundEffect = nil;
+    appearance.backgroundColor = UIColor.clearColor;
+    [self applyTabBarAppearance:appearance];
+    self.tabBar.barTintColor = UIColor.clearColor;
 }
 
 - (void)setTabBarOpaqueBackground {
+    UITabBarAppearance *appearance = [self appearanceWithColor:nil];
+    [self applyTabBarAppearance:appearance];
+    self.tabBar.barTintColor = UIColor.systemBackgroundColor;
+    self.tabBar.translucent = NO;
+}
+
+#pragma mark - helpers
+
+- (UITabBarAppearance *)appearanceWithColor:(UIColor *)color {
+    UITabBarAppearance *appearance = [UITabBarAppearance new];
+    [appearance configureWithOpaqueBackground];
+    appearance.backgroundEffect = nil;
+    appearance.shadowColor = nil;
+    UIColor *resolvedColor = color ?: UIColor.systemBackgroundColor;
+    appearance.backgroundColor = resolvedColor;
+    appearance.backgroundImage = [UIImage imageWithSize:CGSizeMake(1, 1) color:resolvedColor];
+    return appearance;
+}
+
+- (void)applyTabBarAppearance:(UITabBarAppearance *)appearance {
+    self.tabBar.standardAppearance = appearance;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
+    if (@available(iOS 15.0, *)) {
+        self.tabBar.scrollEdgeAppearance = [appearance copy];
+    }
+#endif
+
     for (UIViewController *childViewController in self.tabBarController.childViewControllers) {
-        [childViewController.tabBarItem.standardAppearance configureWithOpaqueBackground];
+        childViewController.tabBarItem.standardAppearance = [appearance copy];
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
         if (@available(iOS 15.0, *)) {
-            [childViewController.tabBarItem.scrollEdgeAppearance configureWithOpaqueBackground];
+            childViewController.tabBarItem.scrollEdgeAppearance = [appearance copy];
         }
 #endif
     }

package/ios/BottomTabsBasePresenter.mm

@@ -27,11 +27,12 @@
     [bottomTabs setTabBarVisible:[withDefault.bottomTabs.visible withDefault:YES]];
 
     [bottomTabs.view setBackgroundColor:[withDefault.layout.backgroundColor withDefault:nil]];
+    [bottomTabs setTabBarHideShadow:[withDefault.bottomTabs.hideShadow withDefault:NO]];
+    if (options.bottomTabs.barStyle.hasValue) {
+        [bottomTabs setTabBarStyle:[RNNConvert UIBarStyle:options.bottomTabs.barStyle.get]];
+    }
     [self applyBackgroundColor:[withDefault.bottomTabs.backgroundColor withDefault:nil]
                    translucent:[withDefault.bottomTabs.translucent withDefault:NO]];
-    [bottomTabs setTabBarHideShadow:[withDefault.bottomTabs.hideShadow withDefault:NO]];
-    [bottomTabs setTabBarStyle:[RNNConvert UIBarStyle:[withDefault.bottomTabs.barStyle
-                                                          withDefault:@"default"]]];
     [self applyTabBarBorder:withDefault.bottomTabs];
     [self applyTabBarShadow:withDefault.bottomTabs.shadow];
 }
@@ -65,7 +66,7 @@
     }
 
     if (mergeOptions.bottomTabs.translucent.hasValue) {
-        [bottomTabs setTabBarTranslucent:mergeOptions.bottomTabs.translucent.get];
+        [self setTabBarTranslucent:mergeOptions.bottomTabs.translucent.get];
     }
 
     if (mergeOptions.bottomTabs.hideShadow.hasValue) {

package/ios/RCTHelpers.mm

@@ -1,6 +1,8 @@
 #import "RCTHelpers.h"
 #import <React/RCTFont.h>
+#if __has_include(<React/RCTScrollView.h>)
 #import <React/RCTScrollView.h>
+#endif
 #import <React/RCTView.h>
 
 @implementation RCTHelpers
@@ -201,7 +203,7 @@
                 UIView *yelloboxParentView = view;
                 while (view.superview != nil) {
                     yelloboxParentView = yelloboxParentView.superview;
-                    if ([yelloboxParentView isKindOfClass:[RCTScrollView class]]) {
+                    if ([yelloboxParentView isKindOfClass:NSClassFromString(@"RCTScrollView")]) {
                         yelloboxParentView = yelloboxParentView.superview;
                         break;
                     }

package/ios/RNNAppDelegate.mm

@@ -5,11 +5,17 @@
 
 #import "RCTAppSetupUtils.h"
 #import <React/CoreModulesPlugins.h>
+#if __has_include(<React/RCTCxxBridgeDelegate.h>)
 #import <React/RCTCxxBridgeDelegate.h>
+#endif
 #import <React/RCTLegacyViewManagerInteropComponentView.h>
 #import <React/RCTSurfacePresenter.h>
+#if __has_include(<React/RCTSurfacePresenterStub.h>)
 #import <React/RCTSurfacePresenterStub.h>
+#endif
+#if __has_include(<React/RCTSurfacePresenterBridgeAdapter.h>)
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
+#endif
 #import <ReactCommon/RCTTurboModuleManager.h>
 
 #if __has_include(<react/config/ReactNativeConfig.h>)
@@ -19,9 +25,13 @@
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #import <React/RCTSurfacePresenter.h>
+#if __has_include(<React/RCTBridge+Private.h>)
 #import <React/RCTBridge+Private.h>
+#endif
 #import <React/RCTImageLoader.h>
+#if __has_include(<React/RCTBridgeProxy.h>)
 #import <React/RCTBridgeProxy.h>
+#endif
 #import <React/RCTSurfacePresenter.h>
 #import <react/utils/ManagedObjectWrapper.h>
 

package/ios/RNNBottomTabsController.mm

@@ -48,14 +48,27 @@
                       eventEmitter:eventEmitter
               childViewControllers:childViewControllers];
 
-    if (@available(iOS 13.0, *)) {
-        self.tabBar.standardAppearance = [UITabBarAppearance new];
-    }
+    if (@available(iOS 26.0, *)) {
+        UITabBarAppearance *appearance = [UITabBarAppearance new];
+        [appearance configureWithTransparentBackground];
+        appearance.backgroundEffect = nil;
+        appearance.backgroundColor = UIColor.clearColor;
+        self.tabBar.standardAppearance = appearance;
+        self.tabBar.scrollEdgeAppearance = [appearance copy];
+        self.tabBar.barTintColor = UIColor.clearColor;
+    } else if (@available(iOS 13.0, *)) {
+        UITabBarAppearance *appearance = [UITabBarAppearance new];
+        [appearance configureWithOpaqueBackground];
+        appearance.backgroundEffect = nil;
+        appearance.backgroundColor = UIColor.systemBackgroundColor;
+        self.tabBar.standardAppearance = appearance;
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
-    if (@available(iOS 15.0, *)) {
-        self.tabBar.scrollEdgeAppearance = [UITabBarAppearance new];
-    }
+        if (@available(iOS 15.0, *)) {
+            self.tabBar.scrollEdgeAppearance = [appearance copy];
+        }
 #endif
+        self.tabBar.translucent = NO;
+    }
 
     [self createTabBarItems:childViewControllers];
 

package/ios/RNNBottomTabsOptions.mm

@@ -72,7 +72,11 @@
 }
 
 - (BOOL)shouldDrawBehind {
-    return [self.drawBehind withDefault:NO] || [self.translucent withDefault:NO] ||
+    BOOL defaultDrawBehind = NO;
+    if (@available(iOS 26.0, *)) {
+        defaultDrawBehind = YES;
+    }
+    return [self.drawBehind withDefault:defaultDrawBehind] || [self.translucent withDefault:NO] ||
            ![self.visible withDefault:YES];
 }
 

package/ios/RNNBridgeManager.mm

@@ -107,8 +107,10 @@
 
 - (void)onJavaScriptLoaded {
 	[_commandsHandler setReadyToReceiveCommands:true];
+#ifndef RCT_REMOVE_LEGACY_ARCH
 	[_modalHostViewHandler
 		connectModalHostViewManager:[self.bridge moduleForClass:RCTModalHostViewManager.class]];
+#endif
 	[[_bridge moduleForClass:[RNNBridgeEventEmitter class]] sendOnAppLaunched];
 }
 

package/ios/RNNComponentViewController.mm

@@ -91,6 +91,7 @@
                                   }];
         self.reactView.backgroundColor = UIColor.clearColor;
         self.reactView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+        self.reactView.clipsToBounds = YES;
         [self.reactView setFrame:self.view.frame];
         [self.view addSubview:self.reactView];
         [self updateReactViewFrame];
@@ -118,14 +119,15 @@
     if (self.isViewLoaded && self.reactView) {
         CGFloat bottomInset = self.shouldDrawBehindBottomTabs ? 0 : self.view.safeAreaInsets.bottom;
         CGFloat topInset = self.shouldDrawBehindTopBar ? 0 : self.view.safeAreaInsets.top;
+
         [self.reactView setFrame:CGRectMake(0, topInset, self.view.frame.size.width,
                                             self.view.frame.size.height - topInset - bottomInset)];
     }
 }
 
 - (BOOL)shouldDrawBehindBottomTabs {
-    return (!self.tabBarController.tabBar || self.tabBarController.tabBar.isHidden ||
-            _drawBehindBottomTabs);
+    return !self.tabBarController.tabBar || self.tabBarController.tabBar.isHidden ||
+           _drawBehindBottomTabs;
 }
 
 - (BOOL)shouldDrawBehindTopBar {

package/ios/RNNModalHostViewManagerHandler.h

@@ -1,11 +1,16 @@
 #import "RNNModalManager.h"
 #import <Foundation/Foundation.h>
+
+#ifndef RCT_REMOVE_LEGACY_ARCH
 #import <React/RCTModalHostViewManager.h>
+#endif
 
 @interface RNNModalHostViewManagerHandler : NSObject
 
 - (instancetype)initWithModalManager:(RNNModalManager *)modalManager;
 
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager;
+#endif
 
 @end

package/ios/RNNModalHostViewManagerHandler.mm

@@ -10,6 +10,7 @@
     return self;
 }
 
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager {
     modalHostViewManager.presentationBlock =
         ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
@@ -36,5 +37,6 @@
                                  }];
         };
 }
+#endif
 
 @end

package/ios/RNNOverlayWindow.mm

@@ -1,6 +1,5 @@
 #import "RNNOverlayWindow.h"
 #import "RNNReactView.h"
-#import <React/RCTModalHostView.h>
 
 @implementation RNNOverlayWindow
 
@@ -9,7 +8,7 @@
 
     if ([hitTestResult isKindOfClass:[UIWindow class]] ||
         [hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class] ||
-        [hitTestResult isKindOfClass:[RCTModalHostView class]] ||
+        [hitTestResult isKindOfClass:NSClassFromString(@"RCTModalHostView")] ||
         [hitTestResult isKindOfClass:NSClassFromString(@"RCTRootComponentView")]) {
         return nil;
     }

package/ios/TopBarAppearancePresenter.mm

@@ -22,8 +22,10 @@
     
     [self setTitleAttributes:options.title];
     [self setLargeTitleAttributes:options.largeTitle];
-    if (options.scrollEdgeAppearance.title && [options.scrollEdgeAppearance.title hasValue]) {
+    if (options.scrollEdgeAppearance.title.hasValue) {
         [self setScrollEdgeTitleAttributes:options.scrollEdgeAppearance.title];
+    } else {
+        [self setScrollEdgeTitleAttributes:options.title];
     }
     
     [self setBorderColor:[options.borderColor withDefault:nil]];
@@ -53,6 +55,12 @@
     if (options.scrollEdgeAppearance.noBorder.hasValue) {
         [self showScrollEdgeBorder:!options.scrollEdgeAppearance.noBorder.get];
     }
+
+    if (options.scrollEdgeAppearance.title.hasValue) {
+        [self setScrollEdgeTitleAttributes:defaultOptions.scrollEdgeAppearance.title];
+    } else if (options.title.hasValue && !defaultOptions.scrollEdgeAppearance.title.hasValue) {
+        [self setScrollEdgeTitleAttributes:defaultOptions.title];
+    }
 }
 
 - (void)setTranslucent:(BOOL)translucent {
@@ -160,7 +168,6 @@
     }
     
     self.getAppearance.titleTextAttributes = titleTextAttributes;
-    self.getScrollEdgeAppearance.titleTextAttributes = titleTextAttributes;
 }
 
 - (void)setScrollEdgeTitleAttributes:(RNNTitleOptions *)titleOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.7.6-snapshot.2279",
+  "version": "8.7.6-snapshot.2352",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -94,15 +94,16 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",
     "@babel/types": "7.25.0",
+    "@d11/react-native-fast-image": "^8.13.0",
     "@react-native-community/cli": "20.0.0",
     "@react-native-community/cli-platform-android": "20.0.0",
     "@react-native-community/cli-platform-ios": "20.0.0",
     "@react-native-community/datetimepicker": "^8.2.0",
     "@react-native-community/netinfo": "^11.4.1",
-    "@react-native/babel-preset": "0.83.0",
-    "@react-native/eslint-config": "0.83.0",
-    "@react-native/metro-config": "0.83.0",
-    "@react-native/typescript-config": "0.83.0",
+    "@react-native/babel-preset": "0.84.0",
+    "@react-native/eslint-config": "0.84.0",
+    "@react-native/metro-config": "0.84.0",
+    "@react-native/typescript-config": "0.84.0",
     "@testing-library/jest-native": "^5.4.2",
     "@testing-library/react-native": "^13.0.1",
     "@types/hoist-non-react-statics": "^3.3.6",
@@ -130,15 +131,14 @@
     "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
     "prettier": "2.8.8",
-    "react": "19.2.0",
-    "react-native": "0.83.0",
+    "react": "19.2.3",
+    "react-native": "0.84.0",
     "react-native-builder-bob": "^0.40.13",
-    "react-native-fast-image": "^8.6.3",
     "react-native-gesture-handler": "^2.29.1",
-    "react-native-reanimated": "4.1.5",
-    "react-native-worklets": "0.5.0",
+    "react-native-reanimated": "4.2.2",
+    "react-native-worklets": "0.7.4",
     "react-redux": "9.1.2",
-    "react-test-renderer": "19.2.0",
+    "react-test-renderer": "19.2.3",
     "redux": "^5.0.1",
     "remx": "3.x.x",
     "semver": "5.x.x",