react-native-navigation 8.8.6 → 8.8.7

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

@@ -5,11 +5,11 @@ import android.content.Context;
 import android.util.TypedValue;
 import android.view.View;
 
-import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.options.ComponentOptions;
 import com.reactnativenavigation.options.params.Number;
 import com.reactnativenavigation.react.ReactView;
 
+import static android.view.View.MeasureSpec.AT_MOST;
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static com.reactnativenavigation.utils.UiUtils.dpToPx;
@@ -25,28 +25,44 @@ public class TitleBarReactButtonView extends ReactView {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        
-        //This is a workaround, ReactNative throws exception when views have ids, On android MenuItems 
+        // This is a workaround, ReactNative throws exception when views have ids, On android MenuItems
         // With ActionViews like this got an id, see #7253
         if (!this.isAttachedToWindow()) {
             this.setId(View.NO_ID);
         }
 
-        super.onMeasure(createSpec(widthMeasureSpec, component.width), createSpec(heightMeasureSpec, component.height));
+        super.onMeasure(
+                createWidthSpec(widthMeasureSpec, component.width),
+                createHeightSpec(heightMeasureSpec, component.height)
+        );
     }
 
-    private int createSpec(int measureSpec, Number dimension) {
+    private int createWidthSpec(int measureSpec, Number dimension) {
+        return createSpec(measureSpec, dimension, Math.max(getResources().getDisplayMetrics().widthPixels, 1));
+    }
+
+    private int createHeightSpec(int measureSpec, Number dimension) {
+        if (dimension.hasValue()) {
+            return createExactSpec(dimension);
+        }
+        return makeMeasureSpec(Math.max(resolveActionBarSize(), 1), EXACTLY);
+    }
+
+    private int createSpec(int measureSpec, Number dimension, int fallbackSize) {
         if (dimension.hasValue()) {
-            return makeMeasureSpec(MeasureSpec.getSize(dpToPx(getContext(), dimension.get())), EXACTLY);
+            return createExactSpec(dimension);
         } else {
-            // When JS doesn't pass width/height, default to the theme's actionBarSize (48dp on Material).
-            // Yoga's intrinsic measurement of the React view collapses `paddingHorizontal` on the
-            // trailing edge in RTL (RN/Fabric measurement quirk), so we cannot trust UNSPECIFIED here -
-            // it produces a 0dp visible inset against the screen edge in RTL.
-            return makeMeasureSpec(resolveActionBarSize(), EXACTLY);
+            // Use bounded wrap-content width to avoid RN/Yoga RTL padding issues caused by
+            // UNSPECIFIED, without forcing every custom button to actionBarSize width.
+            int availableSize = MeasureSpec.getSize(measureSpec);
+            return makeMeasureSpec(availableSize > 0 ? availableSize : fallbackSize, AT_MOST);
         }
     }
 
+    private int createExactSpec(Number dimension) {
+        return makeMeasureSpec(MeasureSpec.getSize(dpToPx(getContext(), dimension.get())), EXACTLY);
+    }
+
     private int resolveActionBarSize() {
         TypedValue tv = new TypedValue();
         if (getContext().getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {

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

@@ -294,6 +294,20 @@ class TitleAndButtonsContainerTest : BaseTest() {
         assertThat(uut.getTitleComponent().right).isEqualTo(UUT_WIDTH - rightBarWidth - DEFAULT_LEFT_MARGIN_PX)
     }
 
+    @Test
+    fun `Component - title width shrinks by measured right buttons only`() {
+        val rightButtonsWidth = 48
+        setup(
+                rightBarWidth = rightButtonsWidth,
+                componentWidth = UUT_WIDTH,
+                alignment = Alignment.Default
+        )
+
+        idleMainLooper()
+        assertThat(uut.getTitleComponent().left).isEqualTo(DEFAULT_LEFT_MARGIN_PX)
+        assertThat(uut.getTitleComponent().right).isEqualTo(UUT_WIDTH - rightButtonsWidth - DEFAULT_LEFT_MARGIN_PX)
+    }
+
     @Test
     fun `Component - should place title between the toolbars`() {
         val leftBarWidth = 50
@@ -475,4 +489,4 @@ class TitleAndButtonsContainerTest : BaseTest() {
     }
 
     private fun getTitleSubtitleView() = (uut.getTitleComponent() as TitleSubTitleLayout)
-}
+}

package/android/src/test/java/com/reactnativenavigation/views/TitleBarReactButtonViewTest.java

@@ -0,0 +1,135 @@
+package com.reactnativenavigation.views;
+
+import static android.view.View.MeasureSpec.AT_MOST;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.getMode;
+import static android.view.View.MeasureSpec.getSize;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+import android.app.Activity;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.options.ComponentOptions;
+import com.reactnativenavigation.options.params.Number;
+import com.reactnativenavigation.options.params.Text;
+import com.reactnativenavigation.utils.UiUtils;
+import com.reactnativenavigation.views.stack.topbar.titlebar.TitleBarReactButtonView;
+
+import org.junit.Test;
+
+public class TitleBarReactButtonViewTest extends BaseTest {
+    private static final int PARENT_WIDTH = 200;
+    private static final int PARENT_HEIGHT = 100;
+    private static final int CHILD_WIDTH = 24;
+    private static final int CHILD_HEIGHT = 16;
+
+    @Test
+    public void missingDimensionsMeasureToContentWithinParentBounds() {
+        Activity activity = newActivity();
+        TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
+        uut.addView(new FixedSizeView(activity), new ViewGroup.LayoutParams(CHILD_WIDTH, CHILD_HEIGHT));
+
+        uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
+
+        assertThat(uut.getMeasuredWidth()).isEqualTo(CHILD_WIDTH);
+        assertThat(uut.getMeasuredHeight()).isEqualTo(resolveActionBarSize(activity));
+    }
+
+    @Test
+    public void explicitDimensionsMeasureExactly() {
+        Activity activity = newActivity();
+        ComponentOptions component = new ComponentOptions();
+        component.width = new Number(72);
+        component.height = new Number(32);
+        TitleBarReactButtonView uut = createView(activity, component);
+        uut.addView(new FixedSizeView(activity), new ViewGroup.LayoutParams(CHILD_WIDTH, CHILD_HEIGHT));
+
+        uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
+
+        assertThat(uut.getMeasuredWidth()).isEqualTo(UiUtils.dpToPx(activity, 72));
+        assertThat(uut.getMeasuredHeight()).isEqualTo(UiUtils.dpToPx(activity, 32));
+    }
+
+    @Test
+    public void zeroParentWidthFallbacksToBoundedAtMostSpecAndHeightUsesActionBarSize() {
+        Activity activity = newActivity();
+        TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
+        RecordingView child = new RecordingView(activity);
+        uut.addView(child, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+        ));
+
+        uut.measure(makeMeasureSpec(0, AT_MOST), makeMeasureSpec(0, AT_MOST));
+
+        assertThat(getMode(child.lastWidthMeasureSpec)).isEqualTo(AT_MOST);
+        assertThat(getSize(child.lastWidthMeasureSpec))
+                .isEqualTo(Math.max(activity.getResources().getDisplayMetrics().widthPixels, 1));
+        assertThat(getMode(child.lastHeightMeasureSpec)).isEqualTo(EXACTLY);
+        assertThat(getSize(child.lastHeightMeasureSpec)).isEqualTo(Math.max(resolveActionBarSize(activity), 1));
+    }
+
+    @Test
+    public void rtlMissingDimensionsUseBoundedSpecs() {
+        Activity activity = newActivity();
+        TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
+        RecordingView child = new RecordingView(activity);
+        uut.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+        uut.addView(child, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+        ));
+
+        uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
+
+        assertThat(getMode(child.lastWidthMeasureSpec)).isEqualTo(AT_MOST);
+        assertThat(getSize(child.lastWidthMeasureSpec)).isEqualTo(PARENT_WIDTH);
+        assertThat(getMode(child.lastHeightMeasureSpec)).isEqualTo(EXACTLY);
+        assertThat(getSize(child.lastHeightMeasureSpec)).isEqualTo(resolveActionBarSize(activity));
+    }
+
+    private TitleBarReactButtonView createView(Activity activity, ComponentOptions component) {
+        component.name = new Text("ButtonComponent");
+        component.componentId = new Text("ButtonComponentId");
+        return new TitleBarReactButtonView(activity, component);
+    }
+
+    private int resolveActionBarSize(Activity activity) {
+        TypedValue tv = new TypedValue();
+        if (activity.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
+            return TypedValue.complexToDimensionPixelSize(tv.data, activity.getResources().getDisplayMetrics());
+        }
+        return UiUtils.dpToPx(activity, 48);
+    }
+
+    private static class FixedSizeView extends View {
+        FixedSizeView(Activity activity) {
+            super(activity);
+        }
+
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            setMeasuredDimension(CHILD_WIDTH, CHILD_HEIGHT);
+        }
+    }
+
+    private static class RecordingView extends View {
+        int lastWidthMeasureSpec;
+        int lastHeightMeasureSpec;
+
+        RecordingView(Activity activity) {
+            super(activity);
+        }
+
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            lastWidthMeasureSpec = widthMeasureSpec;
+            lastHeightMeasureSpec = heightMeasureSpec;
+            setMeasuredDimension(getSize(widthMeasureSpec), getSize(heightMeasureSpec));
+        }
+    }
+}

package/ios/ARCHITECTURE.md

@@ -28,6 +28,11 @@ Base class that user's AppDelegate must extend. Handles React Native and navigat
 - Creates `RCTRootViewFactory` and `ReactHost`
 - Calls `[ReactNativeNavigation bootstrapWithHost:]` to initialize navigation
 - Handles RN version differences (0.77, 0.78, 0.79+) via compile-time macros
+- **Deep linking plumbing**:
+  - Implements `application:openURL:options:` and `application:continueUserActivity:restorationHandler:`; both call `-dispatchDeepLinkURL:`.
+  - `-dispatchDeepLinkURL:` posts `RCTOpenURLNotification` directly if the React runtime is ready, otherwise enqueues the URL.
+  - Observes `RCTContentDidAppearNotification` (the Fabric/bridgeless signal) to flush the queue. This solves the cold-start race where URLs (push notifications, OS link launches) arrive before `RCTLinkingManager` is listening.
+  - Subclasses can call `-dispatchDeepLinkURL:` manually from notification delegates or any other URL source; the queueing behavior is reused automatically.
 
 ### ReactNativeNavigation Bootstrap
 **File**: `ReactNativeNavigation.h/mm`

package/ios/BottomTabPresenter.h

@@ -4,6 +4,13 @@
 
 @property(nonatomic, strong, readonly) RNNTabBarItemCreator *tabCreator;
 
+/**
+ * When YES, tabs whose options declare `bottomTab.component` skip native
+ * icon/text/sfSymbol/role application. The accompanying
+ * `RNNCustomTabBarItemView` is responsible for visual rendering of the tab.
+ */
+@property(nonatomic, assign) BOOL useCustomItemViews;
+
 - (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions
                             tabCreator:(RNNTabBarItemCreator *)tabCreator;
 

package/ios/BottomTabPresenter.mm

@@ -36,10 +36,37 @@
 
 - (void)createTabBarItem:(UIViewController *)child
         bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions {
+    if (_useCustomItemViews && bottomTabOptions.component.name.hasValue) {
+        UITabBarItem *blankItem = [self createBlankTabBarItem:child
+                                             bottomTabOptions:bottomTabOptions];
+        if (blankItem != child.tabBarItem) {
+            child.tabBarItem = blankItem;
+        }
+        return;
+    }
+
     UITabBarItem *updatedItem = [_tabCreator createTabBarItem:bottomTabOptions mergeItem:child.tabBarItem];
     if (updatedItem != child.tabBarItem) {
         child.tabBarItem = updatedItem;
     }
 }
 
+// Builds a truly blank `UITabBarItem` (nil image, nil title). When custom
+// item views are active, `RNNBottomTabsController` hides the native tab bar
+// visuals and renders the custom row on top. The bar item still needs to
+// exist so that `UITabBarController` reserves the right number of slots and
+// the bottom safe-area inset.
+- (UITabBarItem *)createBlankTabBarItem:(UIViewController *)child
+                       bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions {
+    UITabBarItem *item = child.tabBarItem ?: [UITabBarItem new];
+    item.image = nil;
+    item.selectedImage = nil;
+    item.title = nil;
+    item.tag = bottomTabOptions.tag;
+    item.accessibilityIdentifier = [bottomTabOptions.testID withDefault:nil];
+    item.accessibilityLabel = [bottomTabOptions.accessibilityLabel withDefault:nil];
+    item.imageInsets = UIEdgeInsetsZero;
+    return item;
+}
+
 @end

package/ios/RNNAppDelegate.h

@@ -56,4 +56,20 @@
 @property(nonatomic) BOOL bridgelessEnabled;
 #endif
 
+/**
+ * Dispatch a deep link URL through React Native's Linking module so JS
+ * subscribers (including RNN's built-in deep linking framework) receive it.
+ *
+ * Safe to call before the JS bridge is ready: URLs that arrive early
+ * (e.g. cold-start notification taps) are queued natively and flushed
+ * automatically once Fabric/React content first appears.
+ *
+ * Custom-scheme and universal-link openings dispatched by the OS are
+ * forwarded through this method automatically; call it manually only
+ * when your app receives a deep link from a source RNN can't intercept
+ * (e.g. a custom `UNUserNotificationCenterDelegate`, a third-party push
+ * SDK callback, etc.).
+ */
+- (void)dispatchDeepLinkURL:(NSURL *)url;
+
 @end

package/ios/RNNAppDelegate.mm

@@ -8,6 +8,8 @@
 #import <React/RCTCxxBridgeDelegate.h>
 #endif
 #import <React/RCTLegacyViewManagerInteropComponentView.h>
+#import <React/RCTLinkingManager.h>
+#import <React/RCTRootView.h>
 #import <React/RCTSurfacePresenter.h>
 #if __has_include(<React/RCTSurfacePresenterStub.h>)
 #import <React/RCTSurfacePresenterStub.h>
@@ -36,6 +38,13 @@
 
 #import <React/RCTComponentViewFactory.h>
 
+// Deep-link URLs that arrive (openURL, universal link, or external dispatch)
+// before the React runtime is ready are queued here and flushed when Fabric
+// posts `RCTContentDidAppearNotification` — by which point
+// `RCTLinkingManager` is instantiated and JS subscribers are listening.
+static NSMutableArray<NSURL *> *gRNNPendingDeepLinkURLs = nil;
+static BOOL gRNNReactRuntimeReady = NO;
+
 
 static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 
@@ -92,9 +101,73 @@ didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [ReactNativeNavigation bootstrapWithHost:self.reactNativeFactory.rootViewFactory.reactHost];
 #endif
     
+    [self rnn_installDeepLinkObservers];
+    
     return YES;
 }
 
+#pragma mark - Deep linking
+
+// Forward OS-delivered custom-scheme URLs to React Native's Linking module.
+- (BOOL)application:(UIApplication *)application
+            openURL:(NSURL *)url
+            options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
+    [self dispatchDeepLinkURL:url];
+    return YES;
+}
+
+// Forward universal links (associated domains) to React Native's Linking
+// module by extracting the underlying https URL and routing it through the
+// same pre-bridge queue as everything else.
+- (BOOL)application:(UIApplication *)application
+   continueUserActivity:(NSUserActivity *)userActivity
+     restorationHandler:
+         (void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler {
+    if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
+        [self dispatchDeepLinkURL:userActivity.webpageURL];
+        return YES;
+    }
+    return NO;
+}
+
+- (void)dispatchDeepLinkURL:(NSURL *)url {
+    if (url == nil) {
+        return;
+    }
+    if (gRNNReactRuntimeReady) {
+        [RCTLinkingManager application:[UIApplication sharedApplication]
+                               openURL:url
+                               options:@{}];
+        return;
+    }
+    if (gRNNPendingDeepLinkURLs == nil) {
+        gRNNPendingDeepLinkURLs = [NSMutableArray array];
+    }
+    [gRNNPendingDeepLinkURLs addObject:url];
+}
+
+- (void)rnn_installDeepLinkObservers {
+    // `RCTContentDidAppearNotification` is posted by Fabric's root view
+    // once content has rendered. RNN forces bridgeless/new-arch, so the
+    // legacy `RCTJavaScriptDidLoadNotification` never fires; we rely on
+    // this Fabric signal exclusively.
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(rnn_handleReactRuntimeReady:)
+                                                 name:RCTContentDidAppearNotification
+                                               object:nil];
+}
+
+- (void)rnn_handleReactRuntimeReady:(NSNotification *)notification {
+    gRNNReactRuntimeReady = YES;
+    NSArray<NSURL *> *pending = [gRNNPendingDeepLinkURLs copy];
+    [gRNNPendingDeepLinkURLs removeAllObjects];
+    for (NSURL *url in pending) {
+        [RCTLinkingManager application:[UIApplication sharedApplication]
+                               openURL:url
+                               options:@{}];
+    }
+}
+
 
 #if !RNN_RN_VERSION_79_OR_NEWER
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {

package/ios/RNNBottomTabOptions.h

@@ -1,3 +1,4 @@
+#import "RNNComponentOptions.h"
 #import "RNNOptions.h"
 
 @class DotIndicatorOptions;
@@ -5,6 +6,7 @@
 @interface RNNBottomTabOptions : RNNOptions
 
 @property(nonatomic) NSUInteger tag;
+@property(nonatomic, strong) RNNComponentOptions *component;
 @property(nonatomic, strong) Text *text;
 @property(nonatomic, strong) Text *badge;
 @property(nonatomic, strong) Color *badgeColor;

package/ios/RNNBottomTabOptions.mm

@@ -8,6 +8,9 @@
     self = [super initWithDict:dict];
     self.tag = arc4random();
 
+    self.component =
+        [[RNNComponentOptions alloc] initWithDict:[dict objectForKey:@"component"]];
+
     self.text = [TextParser parse:dict key:@"text"];
     self.badge = [TextParser parse:dict key:@"badge"];
     self.fontFamily = [TextParser parse:dict key:@"fontFamily"];
@@ -38,6 +41,7 @@
 
 - (void)mergeOptions:(RNNBottomTabOptions *)options {
     [self.dotIndicator mergeOptions:options.dotIndicator];
+    [self.component mergeOptions:options.component];
 
     if (options.text.hasValue)
         self.text = options.text;
@@ -88,7 +92,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.role.hasValue;
+           self.sfSelectedSymbol.hasValue || self.role.hasValue || self.component.hasValue;
 }
 
 @end

package/ios/RNNBottomTabsController.h

@@ -3,6 +3,7 @@
 #import "RNNBottomTabsPresenter.h"
 #import "RNNDotIndicatorPresenter.h"
 #import "RNNEventEmitter.h"
+#import "RNNReactComponentRegistry.h"
 #import "UIViewController+LayoutProtocol.h"
 #import <UIKit/UIKit.h>
 
@@ -16,6 +17,7 @@
                          presenter:(RNNBasePresenter *)presenter
                 bottomTabPresenter:(BottomTabPresenter *)bottomTabPresenter
              dotIndicatorPresenter:(RNNDotIndicatorPresenter *)dotIndicatorPresenter
+                 componentRegistry:(RNNReactComponentRegistry *)componentRegistry
                       eventEmitter:(RNNEventEmitter *)eventEmitter
               childViewControllers:(NSArray *)childViewControllers
                 bottomTabsAttacher:(BottomTabsBaseAttacher *)bottomTabsAttacher;