react-native-navigation 8.6.1 → 8.6.2

package/ReactNativeNavigation.podspec

@@ -1,7 +1,10 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
+folly_compiler_flags = folly_flags()
+use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
+use_hermes_flag = use_hermes ? "-DUSE_HERMES=1" : ""
 
 Pod::Spec.new do |s|
   s.name         = "ReactNativeNavigation"
@@ -12,61 +15,33 @@ Pod::Spec.new do |s|
   s.authors      = "Wix.com"
   s.homepage     = package['homepage']
   s.license      = package['license']
-  s.platform     = :ios, "11.0"
+  s.platform     = :ios, min_ios_version_supported
 
   s.module_name  = 'ReactNativeNavigation'
-  s.default_subspec = 'Core'
-
-  s.subspec 'Core' do |ss|
-    s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
-    s.source_files        = 'ios/**/*.{h,m,mm,cpp}'
-    s.exclude_files       = "ios/ReactNativeNavigationTests/**/*.*", "ios/OCMock/**/*.*"
-    
-    s.public_header_files = [
-      'ios/RNNAppDelegate.h',
-      'ios/ReactNativeVersionExtracted.h'
-    ]
-  end
 
-  folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'
+  s.source       = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
+  s.source_files = 'ios/**/*.{h,m,mm,cpp}'
+  s.exclude_files = "ios/ReactNativeNavigationTests/**/*.*", "ios/OCMock/**/*.*"
 
-  # Base xcconfig settings
-  xcconfig_settings = {
-      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-      "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-  }
+  s.public_header_files = [
+    'ios/RNNAppDelegate.h',
+    'ios/ReactNativeVersionExtracted.h'
+  ]
 
-  xcconfig_settings["DEFINES_MODULE"] = "YES"
-  
-  s.pod_target_xcconfig = xcconfig_settings
+  # Add Folly compiler flags to prevent coroutines header issues
+  # Add Hermes flag when using Hermes engine
+  s.compiler_flags = "#{folly_compiler_flags} #{use_hermes_flag}"
 
-  if fabric_enabled
-    install_modules_dependencies(s)
-
-    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED' + ' ' + '-DUSE_HERMES=1'
-    s.requires_arc    = true
+  # Add header search paths for React-Core private headers (needed for RCTCxxBridgeDelegate.h, etc.)
+  s.pod_target_xcconfig = {
+    'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/React-Core"',
+    'DEFINES_MODULE' => 'YES'
+  }
 
-    s.dependency "React"
-    s.dependency "React-RCTFabric"
-    s.dependency "React-cxxreact"
-    s.dependency "React-Fabric"
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon"
-    s.dependency "React-runtimeexecutor"
-    s.dependency "React-rncore"
-    s.dependency "React-RuntimeCore"
-  else
-    s.compiler_flags  = folly_compiler_flags
-  end
+  # Let install_modules_dependencies handle all React Native dependencies
+  install_modules_dependencies(s)
 
-  s.dependency 'React-Core'
-  s.dependency 'React-CoreModules'
-  s.dependency 'React-RCTImage'
-  s.dependency 'React-RCTText'
+  s.requires_arc = true
   s.dependency 'HMSegmentedControl'
   s.frameworks = 'UIKit'
 end

package/android/src/main/java/com/reactnativenavigation/options/params/ReactPlatformColor.kt

@@ -5,7 +5,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.reactnativenavigation.NavigationApplication
 
 private fun parsePlatformColor(paths: ReadableMap) =
-    ColorPropConverter.getColor(paths, NavigationApplication.instance)
+    ColorPropConverter.getColor(paths, NavigationApplication.instance) ?: 0 // The default implementation
 
 class ReactPlatformColor(private val paths: ReadableMap) :
     Colour(parsePlatformColor(paths)) {

package/android/src/main/java/com/reactnativenavigation/options/parsers/ColorParser.kt

@@ -13,7 +13,7 @@ object ColorParser {
     private const val VAL_NO_COLOR = "NoColor"
 
     @JvmStatic
-    fun parse(context: Context?, json: JSONObject, colorName: String?): Colour {
+    fun parse(context: Context, json: JSONObject, colorName: String?): Colour {
         if (json.has(KEY_RESOURCE_PATHS)) {
             return ReactPlatformColor(JSONParser.convert(json))
         }

package/android/src/test/java/com/reactnativenavigation/options/parsers/ColorParseTest.java

@@ -2,6 +2,8 @@ package com.reactnativenavigation.options.parsers;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
+import android.content.Context;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.JavaOnlyMap;
@@ -23,7 +25,7 @@ public class ColorParseTest extends BaseRobolectricTest {
     public void nullIsParsedAsNoColor() throws JSONException {
         JSONObject json = new JSONObject();
         json.put("color", "NoColor");
-        assertThat(ColorParser.parse(null, json, "color")).isInstanceOf(DontApplyColour.class);
+        assertThat(ColorParser.parse(Mockito.mock(Context.class), json, "color")).isInstanceOf(DontApplyColour.class);
     }
 
     @Test

package/ios/RNNRefreshControll.m

@@ -0,0 +1,91 @@
+/**
+ * Fix for UIRefreshControl spinner flicker with large titles.
+ * iOS UIKit internally toggles hidden state during layout changes,
+ * causing the spinner to flicker. This swizzles setHidden to block
+ * visibility changes while the control is actively refreshing.
+ */
+
+#import <UIKit/UIKit.h>
+#import <objc/runtime.h>
+
+static char kRNNIsEndingRefreshKey;
+
+@implementation UIRefreshControl (RNNStable)
+
++ (void)load {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        Class class = [self class];
+        
+        // Swizzle setHidden
+        SEL originalSelector = @selector(setHidden:);
+        SEL swizzledSelector = @selector(rnn_setHidden:);
+        
+        Method originalMethod = class_getInstanceMethod(class, originalSelector);
+        Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
+        
+        BOOL didAddMethod = class_addMethod(class,
+                                            originalSelector,
+                                            method_getImplementation(swizzledMethod),
+                                            method_getTypeEncoding(swizzledMethod));
+        
+        if (didAddMethod) {
+            class_replaceMethod(class,
+                                swizzledSelector,
+                                method_getImplementation(originalMethod),
+                                method_getTypeEncoding(originalMethod));
+        } else {
+            method_exchangeImplementations(originalMethod, swizzledMethod);
+        }
+        
+        // Swizzle endRefreshing
+        SEL originalEndSelector = @selector(endRefreshing);
+        SEL swizzledEndSelector = @selector(rnn_endRefreshing);
+        
+        Method originalEndMethod = class_getInstanceMethod(class, originalEndSelector);
+        Method swizzledEndMethod = class_getInstanceMethod(class, swizzledEndSelector);
+        
+        didAddMethod = class_addMethod(class,
+                                       originalEndSelector,
+                                       method_getImplementation(originalEndMethod),
+                                       method_getTypeEncoding(originalEndMethod));
+        
+        if (didAddMethod) {
+            class_replaceMethod(class,
+                                swizzledEndSelector,
+                                method_getImplementation(originalEndMethod),
+                                method_getTypeEncoding(originalEndMethod));
+        } else {
+            method_exchangeImplementations(originalEndMethod, swizzledEndMethod);
+        }
+    });
+}
+
+- (BOOL)rnn_isEndingRefresh {
+    return [objc_getAssociatedObject(self, &kRNNIsEndingRefreshKey) boolValue];
+}
+
+- (void)rnn_setIsEndingRefresh:(BOOL)value {
+    objc_setAssociatedObject(self, &kRNNIsEndingRefreshKey, @(value), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (void)rnn_endRefreshing {
+    [self rnn_setIsEndingRefresh:YES];
+    [self rnn_endRefreshing];
+    [self rnn_setIsEndingRefresh:NO];
+}
+
+- (void)rnn_setHidden:(BOOL)hidden {
+    if ([self rnn_isEndingRefresh]) {
+        [self rnn_setHidden:hidden];
+        return;
+    }
+    
+    if (self.isRefreshing) {
+        return;
+    }
+    
+    [self rnn_setHidden:hidden];
+}
+
+@end

package/ios/RNNSideMenu/MMDrawerController/MMDrawerController.mm

@@ -387,7 +387,12 @@ static NSString *MMDrawerOpenSideKey = @"MMDrawerOpenSide";
         [self.centerContainerView bringSubviewToFront:self.centerContentOverlay];
         self.centerContentOverlay.alpha = 0.5;
     }
-
+    
+    //Reset the centerContainerView frame if it deviated
+    if (self.centerContainerView.frame.origin.x == visibleSide == MMDrawerSideLeft ? _maximumLeftDrawerWidth : _maximumRightDrawerWidth) {
+        [self.centerContainerView setFrame:self.childControllerContainerView.bounds];
+    }
+    
     CGFloat distance = ABS(currentFrame.origin.x - finalFrame.origin.x);
     NSTimeInterval duration = [self animationDurationForDistance:distance velocity:velocity];
 

package/ios/TopBarAppearancePresenter.mm

@@ -148,6 +148,12 @@
                                                  color:fontColor
                                               centered:YES];
 
+    // Let's not forget to set our UINavigationBarAppearance's lineBreakMode to TruncatingTail!
+    id attrib = titleTextAttributes[NSParagraphStyleAttributeName];
+    if ([attrib isKindOfClass:[NSMutableParagraphStyle class]]) {
+        ((NSMutableParagraphStyle*)titleTextAttributes[NSParagraphStyleAttributeName]).lineBreakMode = NSLineBreakByTruncatingTail;
+    }
+    
     self.getAppearance.titleTextAttributes = titleTextAttributes;
     self.getScrollEdgeAppearance.titleTextAttributes = titleTextAttributes;
 }

package/lib/typescript/Mock/Application.d.ts

@@ -10,9 +10,6 @@ export declare const Application: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ApplicationProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ApplicationProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -27,6 +24,7 @@ export declare const Application: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ApplicationProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 export {};
 //# sourceMappingURL=Application.d.ts.map

package/lib/typescript/Mock/Application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Mock/Application.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,UAAU,gBAAgB;IACxB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,eAAO,MAAM,WAAW;gBAED,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;CAmBtC,CAAC"}
+{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Mock/Application.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,UAAU,gBAAgB;IACxB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,eAAO,MAAM,WAAW;gBAED,gBAAgB;;;;;;;;;;;;;;;;;;;;;;CAmBtC,CAAC"}

package/lib/typescript/Mock/Components/BottomTabs.d.ts

@@ -8,9 +8,6 @@ export declare const BottomTabs: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -31,9 +28,6 @@ export declare const BottomTabs: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -48,5 +42,6 @@ export declare const BottomTabs: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=BottomTabs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BottomTabs.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/BottomTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAQtB,CAAC"}
+{"version":3,"file":"BottomTabs.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/BottomTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAQtB,CAAC"}

package/lib/typescript/Mock/Components/ComponentScreen.d.ts

@@ -11,9 +11,6 @@ export declare const ComponentScreen: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
@@ -27,5 +24,6 @@ export declare const ComponentScreen: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=ComponentScreen.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ComponentScreen.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/ComponentScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAanD,eAAO,MAAM,eAAe;gBAEL,cAAc;;qBAQpB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;CAgFvB,CAAC"}
+{"version":3,"file":"ComponentScreen.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/ComponentScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAanD,eAAO,MAAM,eAAe;gBAEL,cAAc;;qBAQpB,OAAO;;;;;;;;;;;;;;;;;;;;;;CAgFvB,CAAC"}

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

@@ -9,9 +9,6 @@ export declare const LayoutComponent: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -32,9 +29,6 @@ export declare const LayoutComponent: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -48,5 +42,6 @@ export declare const LayoutComponent: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=LayoutComponent.d.ts.map

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,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;iCAAjC,KAAK,aAAa,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;CAO3D,CAAC"}

package/lib/typescript/Mock/Components/Modals.d.ts

@@ -8,9 +8,6 @@ export declare const Modals: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -31,9 +28,6 @@ export declare const Modals: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -48,5 +42,6 @@ export declare const Modals: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=Modals.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Modals.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/Modals.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMnD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAalB,CAAC"}
+{"version":3,"file":"Modals.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/Modals.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMnD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAalB,CAAC"}

package/lib/typescript/Mock/Components/NavigationButton.d.ts

@@ -15,9 +15,6 @@ export declare const NavigationButton: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ButtonProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ButtonProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -41,9 +38,6 @@ export declare const NavigationButton: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ButtonProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ButtonProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -58,6 +52,7 @@ export declare const NavigationButton: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ButtonProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 export {};
 //# sourceMappingURL=NavigationButton.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"NavigationButton.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/NavigationButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAc,mBAAmB,EAAE,MAAM,KAAK,CAAC;AAGtD,UAAU,WAAW;IACnB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,gBAAgB;;;;;iCA4DF,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;iCAAH,GAAG;;;;;;;;;;;;;;;;;;;;;;;CAe7B,CAAC"}
+{"version":3,"file":"NavigationButton.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/NavigationButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAc,mBAAmB,EAAE,MAAM,KAAK,CAAC;AAGtD,UAAU,WAAW;IACnB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,gBAAgB;;;;;iCA4DF,GAAG;;;;;;;;;;;;;;;;;;;;;;;iCAAH,GAAG;;;;;;;;;;;;;;;;;;;;;CAe7B,CAAC"}

package/lib/typescript/Mock/Components/Overlays.d.ts

@@ -8,9 +8,6 @@ export declare const Overlays: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -31,9 +28,6 @@ export declare const Overlays: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -48,5 +42,6 @@ export declare const Overlays: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=Overlays.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Overlays.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/Overlays.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOnD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAapB,CAAC"}
+{"version":3,"file":"Overlays.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/Overlays.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOnD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAapB,CAAC"}

package/lib/typescript/Mock/Components/SideMenu.d.ts

@@ -8,9 +8,6 @@ export declare const SideMenuRoot: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -31,9 +28,6 @@ export declare const SideMenuRoot: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -48,6 +42,7 @@ export declare const SideMenuRoot: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 export declare const SideMenuLeft: {
     new (props: ComponentProps): {
@@ -57,9 +52,6 @@ export declare const SideMenuLeft: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -80,9 +72,6 @@ export declare const SideMenuLeft: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -97,6 +86,7 @@ export declare const SideMenuLeft: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 export declare const SideMenuCenter: {
     new (props: ComponentProps): {
@@ -106,9 +96,6 @@ export declare const SideMenuCenter: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -129,9 +116,6 @@ export declare const SideMenuCenter: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -146,6 +130,7 @@ export declare const SideMenuCenter: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 export declare const SideMenuRight: {
     new (props: ComponentProps): {
@@ -155,9 +140,6 @@ export declare const SideMenuRight: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -178,9 +160,6 @@ export declare const SideMenuRight: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -195,5 +174,6 @@ export declare const SideMenuRight: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=SideMenu.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SideMenu.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/SideMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASxB,CAAC;AASF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoB,CAAC;AAC9C,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoB,CAAC;AAChD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoB,CAAC"}
+{"version":3,"file":"SideMenu.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/SideMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASxB,CAAC;AASF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoB,CAAC;AAC9C,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoB,CAAC;AAChD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoB,CAAC"}

package/lib/typescript/Mock/Components/Stack.d.ts

@@ -8,9 +8,6 @@ export declare const Stack: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -31,9 +28,6 @@ export declare const Stack: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<ComponentProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -48,5 +42,6 @@ export declare const Stack: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=Stack.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/Stack.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKnD,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASjB,CAAC"}
+{"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/Stack.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKnD,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASjB,CAAC"}

package/lib/typescript/Mock/Components/TopBar.d.ts

@@ -18,9 +18,6 @@ export declare const TopBar: {
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<TopBarProps>;
         state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<TopBarProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
@@ -35,5 +32,6 @@ export declare const TopBar: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<TopBarProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
+    propTypes?: any;
 };
 //# sourceMappingURL=TopBar.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TopBar.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/TopBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAEL,aAAa,EACb,uBAAuB,EACvB,mBAAmB,EACpB,MAAM,KAAK,CAAC;AACb,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAO/C,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;CAC7C;AAED,eAAO,MAAM,MAAM;gBACE,WAAW;;2CA2BK,UAAU;gCAKtB,mBAAmB,EAAE;;4BAgCxB,MAAM,QAAQ,MAAM,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;CAS1D,CAAC"}
+{"version":3,"file":"TopBar.d.ts","sourceRoot":"","sources":["../../../../Mock/Components/TopBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EAEL,aAAa,EACb,uBAAuB,EACvB,mBAAmB,EACpB,MAAM,KAAK,CAAC;AACb,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAO/C,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;CAC7C;AAED,eAAO,MAAM,MAAM;gBACE,WAAW;;2CA2BK,UAAU;gCAKtB,mBAAmB,EAAE;;4BAgCxB,MAAM,QAAQ,MAAM,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;CAS1D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.6.1",
+  "version": "8.6.2",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -88,23 +88,24 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",
     "@babel/types": "7.25.0",
-    "@react-native-community/cli": "18.0.0",
-    "@react-native-community/cli-platform-android": "18.0.0",
-    "@react-native-community/cli-platform-ios": "18.0.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/datetimepicker": "^8.2.0",
     "@react-native-community/netinfo": "^11.4.1",
-    "@react-native/babel-preset": "0.79.7",
-    "@react-native/eslint-config": "0.79.7",
-    "@react-native/metro-config": "0.79.7",
-    "@react-native/typescript-config": "0.79.7",
+    "@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",
     "@testing-library/jest-native": "^5.4.2",
     "@testing-library/react-native": "^13.0.1",
     "@types/hoist-non-react-statics": "^3.3.6",
     "@types/jasmine": "3.5.10",
     "@types/jest": "^29.5.13",
     "@types/lodash": "^4.17.20",
-    "@types/react": "^18.2.6",
-    "@types/react-test-renderer": "^18.0.0",
+    "@types/prop-types": "^15.7.14",
+    "@types/react": "^19.1.0",
+    "@types/react-test-renderer": "^19.1.0",
     "@typescript-eslint/eslint-plugin": "8.21.0",
     "@typescript-eslint/parser": "8.21.0",
     "clang-format": "^1.4.0",
@@ -123,15 +124,15 @@
     "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
     "prettier": "2.8.8",
-    "react": "19.0.0",
-    "react-native": "0.79.7",
+    "react": "19.1.0",
+    "react-native": "0.80.2",
     "react-native-builder-bob": "^0.40.13",
     "react-native-fast-image": "^8.6.3",
     "react-native-gesture-handler": "^2.22.1",
     "react-native-reanimated": "4.1.5",
     "react-native-worklets": "0.5.0",
     "react-redux": "9.1.2",
-    "react-test-renderer": "19.0.0",
+    "react-test-renderer": "19.1.0",
     "redux": "^5.0.1",
     "remx": "3.x.x",
     "semver": "5.x.x",