react-native-navigation 8.6.2 → 8.6.3

package/android/src/androidTest/java/com/reactnativenavigation/TestApplication.kt

@@ -9,7 +9,6 @@ import com.reactnativenavigation.react.NavigationReactNativeHost
 
 class TestApplication : NavigationApplication() {
 
-
     override val reactNativeHost: ReactNativeHost
         get() = object : NavigationReactNativeHost(this) {
             override fun getJSMainModuleName(): String {

package/android/src/androidTest/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -5,11 +5,12 @@ import static com.reactnativenavigation.utils.ObjectUtils.perform;
 import android.app.Activity;
 import android.content.Context;
 import android.view.MotionEvent;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.react.ReactView;
 import com.reactnativenavigation.viewcontrollers.child.ChildController;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.component.ComponentPresenterBase;
@@ -24,7 +25,8 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
         this(activity, childRegistry, id, new Presenter(activity, new Options()), options);
     }
 
-    public SimpleViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, Options options) {
+    public SimpleViewController(Activity activity, ChildControllersRegistry childRegistry, String id,
+            Presenter presenter, Options options) {
         super(activity, childRegistry, id, presenter, options);
     }
 
@@ -40,7 +42,8 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
 
     @Override
     public void destroy() {
-        if (!isDestroyed()) performOnParentController(parent -> parent.onChildDestroyed(this));
+        if (!isDestroyed())
+            performOnParentController(parent -> parent.onChildDestroyed(this));
         super.destroy();
     }
 
@@ -58,7 +61,8 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
 
     @Override
     public void applyBottomInset() {
-        if (view != null) presenter.applyBottomInset(view, getBottomInset());
+        if (view != null)
+            presenter.applyBottomInset(view, getBottomInset());
     }
 
     @Override
@@ -66,10 +70,15 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
         return null;
     }
 
-    public static class SimpleView extends ReactView implements ReactComponent {
+    /**
+     * A simple mock view that implements ReactComponent without actually using
+     * React Native.
+     * This avoids triggering React surface rendering in instrumented tests.
+     */
+    public static class SimpleView extends FrameLayout implements ReactComponent {
 
         public SimpleView(@NonNull Context context) {
-            super(context, "compId", "compName");
+            super(context);
         }
 
         @Override
@@ -79,22 +88,22 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
 
         @Override
         public boolean isReady() {
-            return false;
+            return true;
         }
 
         @Override
-        public ReactView asView() {
+        public ViewGroup asView() {
             return this;
         }
 
         @Override
         public void destroy() {
-
+            // No-op for mock
         }
 
         @Override
         public void sendOnNavigationButtonPressed(String buttonId) {
-
+            // No-op for mock
         }
 
         @Override
@@ -104,7 +113,7 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
 
         @Override
         public void dispatchTouchEventToJs(MotionEvent event) {
-
+            // No-op for mock
         }
     }
 }

package/android/src/androidTest/js/index.js

@@ -0,0 +1,14 @@
+
+/**
+ * Minimal entry point for Android instrumented tests
+ * This registers a no-op component to satisfy React Native's initialization.
+ * Used only in Android instrumented application class.
+ * Regenerate bundle when upgrading React Native:
+ * npx react-native bundle --platform android --dev false \
+ *   --entry-file android/src/androidTest/js/index.js \
+ *   --bundle-output android/src/androidTest/assets/index.android.bundle \
+ *   --minify true
+ */
+import { AppRegistry } from 'react-native';
+AppRegistry.registerComponent('RNNTest', () => () => null);
+

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

@@ -155,8 +155,9 @@ class TitleAndButtonsContainer(context: Context) : ViewGroup(context) {
         val rightBarWidth = rightButtonBar.measuredWidth
         val leftBarWidth = leftButtonBar.measuredWidth
         val isCenter = titleComponentAlignment == Alignment.Center
+        val isFill = titleComponentAlignment == Alignment.Fill
         val titleHeightMeasureSpec = MeasureSpec.makeMeasureSpec(containerHeight, MeasureSpec.AT_MOST)
-        val titleWidthMeasureSpec = makeTitleAtMostWidthMeasureSpec(containerWidth, rightBarWidth, leftBarWidth, isCenter)
+        val titleWidthMeasureSpec = makeTitleAtMostWidthMeasureSpec(containerWidth, rightBarWidth, leftBarWidth, isCenter, isFill)
         if (titleComponent is TitleBarReactView) {
             titleComponent.centered = isCenter
         }

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

@@ -15,11 +15,15 @@ typealias TitleRight = Int
 typealias TitleTop = Int
 typealias TitleBottom = Int
 
-fun makeTitleAtMostWidthMeasureSpec(containerWidth: Int, rightBarWidth: Int, leftBarWidth: Int, isCenter: Boolean): 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)
     } else {
-        View.MeasureSpec.makeMeasureSpec(containerWidth - rightBarWidth - leftBarWidth - 2 * DEFAULT_LEFT_MARGIN_PX, View.MeasureSpec.AT_MOST)
+        val availableWidth = containerWidth - rightBarWidth - leftBarWidth - 2 * DEFAULT_LEFT_MARGIN_PX
+        View.MeasureSpec.makeMeasureSpec(
+            availableWidth,
+            if (isFill) View.MeasureSpec.EXACTLY else View.MeasureSpec.AT_MOST
+        )
     }
 }
 

package/android/src/test/resources/robolectric.properties

@@ -0,0 +1,3 @@
+# Android SDK 36 requires Java 21, so we force SDK 35 for tests (works with Java 17)
+sdk=35
+

package/autolink/fixtures/rn79/build.gradle.template

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
     }
     repositories {
         google()

package/ios/RNNAppDelegate.mm

@@ -70,6 +70,7 @@ didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     self.reactNativeDelegate.dependencyProvider = [RCTAppDependencyProvider new];
     
     RCTAppSetupPrepareApp(application, YES);
+    RCTEnableTurboModuleInterop(YES);
     RCTEnableTurboModuleInteropBridgeProxy(YES);
     
     self.reactNativeFactory.rootViewFactory.reactHost = [self.reactNativeFactory.rootViewFactory createReactHost:launchOptions];

package/ios/RNNReactTitleView.mm

@@ -2,6 +2,7 @@
 
 @implementation RNNReactTitleView {
     BOOL _fillParent;
+    CGFloat _expectedHeight;
 }
 
 - (NSString *)componentType {
@@ -10,7 +11,7 @@
 
 - (CGSize)intrinsicContentSize {
     if (_fillParent) {
-        return UILayoutFittingExpandedSize;
+        return CGSizeMake(UILayoutFittingExpandedSize.width, _expectedHeight > 0 ? _expectedHeight : 44);
     } else {
         return [super intrinsicContentSize];
     }
@@ -19,6 +20,7 @@
 - (void)setAlignment:(NSString *)alignment inFrame:(CGRect)frame {
     if ([alignment isEqualToString:@"fill"]) {
         _fillParent = YES;
+        _expectedHeight = frame.size.height;
         self.translatesAutoresizingMaskIntoConstraints = NO;
         self.sizeFlexibility = RCTRootViewSizeFlexibilityNone;
     } else {

package/ios/ScreenAnimationController.mm

@@ -75,14 +75,29 @@
 }
 
 - (void)prepareTransitionContext:(id<UIViewControllerContextTransitioning>)transitionContext {
-	UINavigationController *toViewController =
-		[transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
-	toViewController.view.alpha = 0;
-	UIView *fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];
-
-	[transitionContext.containerView addSubview:fromView];
-	[transitionContext.containerView addSubview:toViewController.view];
-	[toViewController prepareForTransition];
+    UIViewController *fromViewController =
+    [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    UIViewController *toViewController =
+    [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+    
+    UIView *fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];
+    UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];
+    
+    BOOL isDismiss = (toView == nil);
+    
+    if (isDismiss) {
+        if (fromView) {
+            [transitionContext.containerView addSubview:fromView];
+        }
+    } else {
+        toViewController.view.alpha = 0;
+        if (fromView) {
+            [transitionContext.containerView addSubview:fromView];
+        }
+        [transitionContext.containerView addSubview:toViewController.view];
+    }
+    
+    [toViewController prepareForTransition];
 }
 
 - (NSArray *)createTransitionsFromVC:(UIViewController *)fromVC
@@ -121,13 +136,18 @@
 
 - (void)animateTransitions:(NSArray<id<DisplayLinkAnimatorDelegate>> *)animators
 	andTransitioningContext:(id<UIViewControllerContextTransitioning>)transitionContext {
+    UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];
+    BOOL isDismiss = (toView == nil);
+    
 	DisplayLinkAnimator *displayLinkAnimator = [[DisplayLinkAnimator alloc]
 		initWithDisplayLinkAnimators:animators
 							duration:[self transitionDuration:transitionContext]];
 
 	[displayLinkAnimator setOnStart:^{
-	  [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey].view.alpha =
-		  1.f;
+	  UIViewController *toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+        if (!isDismiss) {
+            toVC.view.alpha = 1.f;
+        }
 	}];
 
 	[displayLinkAnimator setCompletion:^{
@@ -170,9 +190,13 @@
 	UIView *toView = [_transitionContext viewForKey:UITransitionContextToViewKey];
 	UIView *fromView = [_transitionContext viewForKey:UITransitionContextFromViewKey];
 	[_sharedElementAnimator animationEnded];
-	toView.layer.transform = CATransform3DIdentity;
-	fromView.layer.transform = CATransform3DIdentity;
-	toView.alpha = 1.f;
+    if (toView) {
+        toView.layer.transform = CATransform3DIdentity;
+        toView.alpha = 1.f;
+    }
+    if (fromView) {
+        fromView.layer.transform = CATransform3DIdentity;
+    }
 	_transitionContext = nil;
 	_sharedElementAnimator = nil;
 }

package/lib/module/commands/OptionsCrawler.js

@@ -64,7 +64,7 @@ export class OptionsCrawler {
       return isFunction(reactComponent.options) ? reactComponent.options({
         componentId: layout.id,
         ...layout.passProps
-      } || {}) : reactComponent.options;
+      }) : reactComponent.options;
     }
     return {};
   }

package/lib/module/commands/OptionsCrawler.js.map

@@ -1 +1 @@
-{"version":3,"names":["merge","isFunction","LayoutType","OptionsCrawler","constructor","store","uniqueIdProvider","crawl","bind","api","topTabs","sideMenu","bottomTabs","stack","component","splitView","children","map","center","left","right","detail","master","applyComponentId","applyStaticOptions","id","generate","Component","isComponentWithOptions","options","undefined","layout","staticOptions","staticOptionsIfPossible","foundReactGenerator","getComponentClassForName","name","reactComponent","componentId","passProps"],"sourceRoot":"../../../src","sources":["commands/OptionsCrawler.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["merge","isFunction","LayoutType","OptionsCrawler","constructor","store","uniqueIdProvider","crawl","bind","api","topTabs","sideMenu","bottomTabs","stack","component","splitView","children","map","center","left","right","detail","master","applyComponentId","applyStaticOptions","id","generate","Component","isComponentWithOptions","options","undefined","layout","staticOptions","staticOptionsIfPossible","foundReactGenerator","getComponentClassForName","name","reactComponent","componentId","passProps"],"sourceRoot":"../../../src","sources":["commands/OptionsCrawler.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/Mock/Components/LayoutComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LayoutComponent.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/LayoutComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKnD,eAAO,MAAM,eAAe;;;iCAqBD,KAAK,aAAa,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;iCAAjC,KAAK,aAAa,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;CAO3D,CAAC"}
+{"version":3,"file":"LayoutComponent.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/LayoutComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKnD,eAAO,MAAM,eAAe;;;iCAqBD,KAAK,aAAa,KAAK,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;iCAAjC,KAAK,aAAa,KAAK,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;CAO3D,CAAC"}

package/lib/typescript/Mock/Layouts/SideMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SideMenu.d.ts","sourceRoot":"","sources":["../../../../Mock/Layouts/SideMenu.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMlC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU;IACtD,YAAY,EAAE,UAAU,CAAC;gBAEb,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;IAShD,YAAY,CAAC,QAAQ,EAAE,OAAO;IAM9B,YAAY,CAAC,OAAO,EAAE,OAAO;IAM7B;;OAEG;IACH,gBAAgB,IAAI,aAAa;IAIjC,iBAAiB,CAAC,OAAO,EAAE,OAAO;IAelC,eAAe,mBAAyD;IACxE,aAAa,mBAAuD;IACpE,cAAc,mBAAwD;CACvE;AAED,qBAAa,YAAa,SAAQ,UAAU;gBAC9B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,UAAU;IAIhE,gBAAgB;CAGjB;AAED,qBAAa,gBAAiB,SAAQ,YAAY;gBACpC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;CAGjD;AACD,qBAAa,iBAAkB,SAAQ,YAAY;gBACrC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;CAGjD;AAED,qBAAa,kBAAmB,SAAQ,YAAY;gBACtC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;CAGjD"}
+{"version":3,"file":"SideMenu.d.ts","sourceRoot":"","sources":["../../../../Mock/Layouts/SideMenu.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMlC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU;IACtD,YAAY,EAAE,UAAU,CAAC;gBAEb,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;IAShD,YAAY,CAAC,QAAQ,EAAE,OAAO;IAM9B,YAAY,CAAC,OAAO,EAAE,OAAO;IAM7B;;OAEG;IACH,gBAAgB,IAAI,aAAa;IAIjC,iBAAiB,CAAC,OAAO,EAAE,OAAO;IAelC,eAAe,QAA8C,UAAU,CAAC;IACxE,aAAa,QAA4C,UAAU,CAAC;IACpE,cAAc,QAA6C,UAAU,CAAC;CACvE;AAED,qBAAa,YAAa,SAAQ,UAAU;gBAC9B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,UAAU;IAIhE,gBAAgB;CAGjB;AAED,qBAAa,gBAAiB,SAAQ,YAAY;gBACpC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;CAGjD;AACD,qBAAa,iBAAkB,SAAQ,YAAY;gBACrC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;CAGjD;AAED,qBAAa,kBAAmB,SAAQ,YAAY;gBACtC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,UAAU;CAGjD"}

package/lib/typescript/Mock/actions/layoutActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layoutActions.d.ts","sourceRoot":"","sources":["../../../../Mock/actions/layoutActions.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,eAAO,MAAM,gBAAgB,eAAgB,UAAU,GAAG,SAAS,SAAS,MAAM,SAMjF,CAAC;AAEF,eAAO,MAAM,YAAY,aAAc,YAAY,SAGlD,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,YAAY,SAGjD,CAAC"}
+{"version":3,"file":"layoutActions.d.ts","sourceRoot":"","sources":["../../../../Mock/actions/layoutActions.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,eAAO,MAAM,gBAAgB,GAAI,YAAY,UAAU,GAAG,SAAS,EAAE,OAAO,MAAM,SAMjF,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,UAAU,YAAY,SAGlD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,QAAQ,YAAY,SAGjD,CAAC"}

package/lib/typescript/src/adapters/NativeCommandsSender.d.ts

@@ -46,15 +46,15 @@ export declare class NativeCommandsSender implements NativeCommandsModule {
     dismissAllOverlays(commandId: string): Promise<string>;
     getLaunchArgs(commandId: string): Promise<string[]>;
     getNavigationConstants(): Promise<{
-        topBarHeight: number;
-        statusBarHeight: number;
-        bottomTabsHeight: number;
+        topBarHeight: import("react-native/Libraries/Types/CodegenTypes").Double;
+        statusBarHeight: import("react-native/Libraries/Types/CodegenTypes").Double;
+        bottomTabsHeight: import("react-native/Libraries/Types/CodegenTypes").Double;
         backButtonId: string;
     }>;
     getNavigationConstantsSync(): {
-        topBarHeight: number;
-        statusBarHeight: number;
-        bottomTabsHeight: number;
+        topBarHeight: import("react-native/Libraries/Types/CodegenTypes").Double;
+        statusBarHeight: import("react-native/Libraries/Types/CodegenTypes").Double;
+        bottomTabsHeight: import("react-native/Libraries/Types/CodegenTypes").Double;
         backButtonId: string;
     };
 }

package/lib/typescript/src/adapters/NativeRNNTurboEventEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeRNNTurboEventEmitter.d.ts","sourceRoot":"","sources":["../../../../src/adapters/NativeRNNTurboEventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9E,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C;;AAMD,wBAA4C"}
+{"version":3,"file":"NativeRNNTurboEventEmitter.d.ts","sourceRoot":"","sources":["../../../../src/adapters/NativeRNNTurboEventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9E,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C;wBAM8B,YAAY;AAA3C,wBAA4C"}

package/lib/typescript/src/adapters/TouchablePreview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TouchablePreview.d.ts","sourceRoot":"","sources":["../../../../src/adapters/TouchablePreview.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAIL,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACvB,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAGtB,UAAU,yBAA0B,SAAQ,gBAAgB;IAC1D,KAAK,EAAE,MAAM,CAAC;CACf;AACD,UAAU,8BAA+B,SAAQ,oBAAoB,CAAC,yBAAyB,CAAC;CAAG;AAEnG,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,kBAAkB,CAAC,EACf,OAAO,kBAAkB,GACzB,OAAO,gBAAgB,GACvB,uBAAuB,GACvB,wBAAwB,GACxB,KAAK,CAAC,SAAS,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAMD,qBAAa,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IAC9D,MAAM,CAAC,SAAS;;;;;;;;MAQd;IAEF,MAAM,CAAC,YAAY;;MAEjB;IAEF,MAAM,CAAC,OAAO,UAAS;IAEvB,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,aAQL;IAEF,SAAS,oBAeP;IAEF,YAAY,UAAW,qBAAqB,UAG1C;IAEF,WAAW,UAAW,8BAA8B,UAclD;IAEF,UAAU,aAOR;IAEF,MAAM;CA4BP"}
+{"version":3,"file":"TouchablePreview.d.ts","sourceRoot":"","sources":["../../../../src/adapters/TouchablePreview.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAIL,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACvB,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAGtB,UAAU,yBAA0B,SAAQ,gBAAgB;IAC1D,KAAK,EAAE,MAAM,CAAC;CACf;AACD,UAAU,8BAA+B,SAAQ,oBAAoB,CAAC,yBAAyB,CAAC;CAAG;AAEnG,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,kBAAkB,CAAC,EACf,OAAO,kBAAkB,GACzB,OAAO,gBAAgB,GACvB,uBAAuB,GACvB,wBAAwB,GACxB,KAAK,CAAC,SAAS,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAMD,qBAAa,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IAC9D,MAAM,CAAC,SAAS;;;;;;;;MAQd;IAEF,MAAM,CAAC,YAAY;;MAEjB;IAEF,MAAM,CAAC,OAAO,UAAS;IAEvB,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,aAQL;IAEF,SAAS,oBAeP;IAEF,YAAY,GAAI,OAAO,qBAAqB,UAG1C;IAEF,WAAW,GAAI,OAAO,8BAA8B,UAclD;IAEF,UAAU,aAOR;IAEF,MAAM;CA4BP"}

package/lib/typescript/src/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare module 'react-lifecycles-compat' {
     import * as React from 'react';
     function polyfill(component: React.ComponentClass<any>): void;

package/lib/typescript/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,yBAAyB,CAAC;IACvC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;IAE/B,SAAgB,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CACtE"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,yBAAyB,CAAC;IACvC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;IAE/B,SAAgB,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CACtE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -88,15 +88,15 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",
     "@babel/types": "7.25.0",
-    "@react-native-community/cli": "19.1.1",
-    "@react-native-community/cli-platform-android": "19.1.1",
-    "@react-native-community/cli-platform-ios": "19.1.1",
+    "@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.80.2",
-    "@react-native/eslint-config": "0.80.2",
-    "@react-native/metro-config": "0.80.2",
-    "@react-native/typescript-config": "0.80.2",
+    "@react-native/babel-preset": "0.82.1",
+    "@react-native/eslint-config": "0.82.1",
+    "@react-native/metro-config": "0.82.1",
+    "@react-native/typescript-config": "0.82.1",
     "@testing-library/jest-native": "^5.4.2",
     "@testing-library/react-native": "^13.0.1",
     "@types/hoist-non-react-statics": "^3.3.6",
@@ -104,7 +104,7 @@
     "@types/jest": "^29.5.13",
     "@types/lodash": "^4.17.20",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.1.1",
     "@types/react-test-renderer": "^19.1.0",
     "@typescript-eslint/eslint-plugin": "8.21.0",
     "@typescript-eslint/parser": "8.21.0",
@@ -124,15 +124,15 @@
     "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
     "prettier": "2.8.8",
-    "react": "19.1.0",
-    "react-native": "0.80.2",
+    "react": "19.1.1",
+    "react-native": "0.82.1",
     "react-native-builder-bob": "^0.40.13",
     "react-native-fast-image": "^8.6.3",
-    "react-native-gesture-handler": "^2.22.1",
+    "react-native-gesture-handler": "^2.29.1",
     "react-native-reanimated": "4.1.5",
     "react-native-worklets": "0.5.0",
     "react-redux": "9.1.2",
-    "react-test-renderer": "19.1.0",
+    "react-test-renderer": "19.1.1",
     "redux": "^5.0.1",
     "remx": "3.x.x",
     "semver": "5.x.x",
@@ -140,7 +140,7 @@
     "ssim.js": "^3.5.0",
     "ts-mockito": "^2.3.1",
     "typedoc": "0.x.x",
-    "typescript": "5.0.4"
+    "typescript": "^5.8.3"
   },
   "workspaces": [
     "playground"

package/src/commands/OptionsCrawler.ts

@@ -85,7 +85,7 @@ export class OptionsCrawler {
     const reactComponent = foundReactGenerator ? foundReactGenerator() : undefined;
     if (reactComponent && this.isComponentWithOptions(reactComponent)) {
       return isFunction(reactComponent.options)
-        ? reactComponent.options({ componentId: layout.id, ...layout.passProps } || {})
+        ? reactComponent.options({ componentId: layout.id, ...layout.passProps })
         : reactComponent.options;
     }
     return {};