react-native-navigation 8.3.2 → 8.4.0-snapshot.1887

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -16,7 +16,7 @@ class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
 
     private val mJSTouchDispatcher = JSTouchDispatcher(this)
 
-    override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent) {
+    override fun onChildStartedNativeGesture(child: View?, androidEvent: MotionEvent) {
         mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
     }
     override fun onChildStartedNativeGesture(androidEvent: MotionEvent) {
@@ -31,7 +31,7 @@ class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
         return UIManagerHelper.getEventDispatcher(reactContext, UIManagerType.FABRIC) ?: throw IllegalStateException("EventDispatcher for Fabric UI Manager is not found")
     }
 
-    override fun handleException(t: Throwable?) {
+    override fun handleException(t: Throwable) {
         getReactContext().handleException(RuntimeException(t))
     }
 

package/lib/ios/RNNAppDelegate.mm

@@ -13,7 +13,21 @@
 #import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 #import <ReactCommon/RCTTurboModuleManager.h>
+
+
+
+#if __has_include(<React-RCTAppDelegate/RCTReactNativeFactory.h>)
+#import <React-RCTAppDelegate/RCTAppDelegate.h>
+#import <React-RCTAppDelegate/RCTReactNativeFactory.h>
+#elif __has_include(<React_RCTAppDelegate/RCTReactNativeFactory.h>)
+#import <React_RCTAppDelegate/RCTAppDelegate.h>
+#import <React_RCTAppDelegate/RCTReactNativeFactory.h>
+#else
+// RN 0.77 support
+#define RN077
 #import <react/config/ReactNativeConfig.h>
+#endif
+
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #import <React/RCTSurfacePresenter.h>
@@ -37,15 +51,17 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
+#ifdef RN077
     [self _setUpFeatureFlags];
-
-    // Copied from RCTAppDelegate, it private inside it
     self.rootViewFactory = [self createRCTRootViewFactory];
-
     [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-
     RCTAppSetupPrepareApp(application, self.newArchEnabled);
     RCTSetNewArchEnabled(TRUE);
+#else
+    self.reactNativeFactory = [RCTReactNativeFactory new];
+    self.reactNativeFactory = [self.reactNativeFactory initWithDelegate:self];
+#endif
+    
     RCTEnableTurboModuleInterop(YES);
     RCTEnableTurboModuleInteropBridgeProxy(YES);
 
@@ -56,34 +72,37 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
     return YES;
 }
 
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
+	[NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
+				format:@"Subclasses must implement a valid sourceURLForBridge method"];
+	return nil;
+}
+
+- (BOOL)concurrentRootEnabled {
+	return true;
+}
+
+
+
+#ifdef RN077
 - (RCTRootViewFactory *)createRCTRootViewFactory
 {
   __weak __typeof(self) weakSelf = self;
   RCTBundleURLBlock bundleUrlBlock = ^{
-	RCTAppDelegate *strongSelf = weakSelf;
-	return strongSelf.bundleURL;
+    RCTAppDelegate *strongSelf = weakSelf;
+    return strongSelf.bundleURL;
   };
 
   RCTRootViewFactoryConfiguration *configuration =
-	  [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
-													   newArchEnabled:self.newArchEnabled];
+      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
+                                                       newArchEnabled:self.newArchEnabled];
 
 
   return [[RCTRootViewFactory alloc] initWithConfiguration:configuration andTurboModuleManagerDelegate:self];
 }
 
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
-	[NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
-				format:@"Subclasses must implement a valid sourceURLForBridge method"];
-	return nil;
-}
-
-- (BOOL)concurrentRootEnabled {
-	return true;
-}
 
 #pragma mark - Feature Flags
-
 class RCTAppDelegateBridgelessFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults {
  public:
   bool enableBridgelessArchitecture() override
@@ -113,6 +132,7 @@ class RCTAppDelegateBridgelessFeatureFlags : public facebook::react::ReactNative
     facebook::react::ReactNativeFeatureFlags::override(
         std::make_unique<RCTAppDelegateBridgelessFeatureFlags>());
 }
+#endif
 
 @end
 

package/lib/ios/TurboModules/RNNTurboManager.mm

@@ -11,8 +11,8 @@
 #import "RNNTurboCommandsHandler.h"
 #import <React-RuntimeApple/ReactCommon/RCTHost.h>
 
-@interface RNNTurboManager ()
 
+@interface RNNTurboManager ()
 @property(nonatomic, strong, readwrite) RNNExternalComponentStore *store;
 @property(nonatomic, strong, readwrite) RNNReactComponentRegistry *componentRegistry;
 @property(nonatomic, strong, readonly) RNNLayoutManager *layoutManager;
@@ -21,15 +21,16 @@
 @property(nonatomic, strong, readonly) RNNModalHostViewManagerHandler *modalHostViewHandler;
 @property(nonatomic, strong, readonly) RNNCommandsHandler *commandsHandler;
 @property(nonatomic, strong, readonly) RNNEventEmitter *eventEmitter;
-
 @end
 
 @implementation RNNTurboManager {
 	UIWindow *_mainWindow;
+    BOOL _isInitialRun;
 }
 
 - (instancetype)initWithHost:(RCTHost *)host mainWindow:(UIWindow *)mainWindow {
 	if (self = [super init]) {
+        _isInitialRun = YES;
 		_host = host;
 		_mainWindow = mainWindow;
 		_overlayManager = [RNNOverlayManager new];
@@ -40,7 +41,12 @@
 													 name:@"RCTInstanceDidLoadBundle"
 												   object:nil];
 
-		// TODO: investigate which new event is fired
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(onReload)
+                                                     name:@"RCTTriggerReloadCommandNotification"
+                                                   object:nil];
+        
+        // TODO: investigate which new event is fired
 		[[NSNotificationCenter defaultCenter] addObserver:self
 												 selector:@selector(onJavaScriptWillLoad)
 													 name:RCTJavaScriptWillStartLoadingNotification
@@ -99,16 +105,24 @@
 }
 
 - (void)onJavaScriptLoaded {
-  RCTExecuteOnMainQueue(^{
-    UIApplication.sharedApplication.delegate.window.rootViewController = nil;
-    
-    [self->_commandsHandler setReadyToReceiveCommands:true];
-    // TODO: Refactor
-    //    [_modalHostViewHandler
-    //        connectModalHostViewManager:[[_host moduleRegistry] moduleForName:"RCTModalHostViewManager"]];
-    
-    [self->_eventEmitter sendOnAppLaunched];
-  });
+    RCTExecuteOnMainQueue(^{
+        // TODO: the isInitialRun is the right and final answer for this, this will stop a blackscreen appearing after the splashscreen on startup. OnReload this will still happen because of the rootViewController = nil; which is needed to clean up what is already appearing.
+        if (!self->_isInitialRun) {
+            UIApplication.sharedApplication.delegate.window.rootViewController = nil;
+        }
+        
+        self-> _isInitialRun = NO;
+        
+        [self->_commandsHandler setReadyToReceiveCommands:true];
+        // TODO: Refactor
+        //    [_modalHostViewHandler
+        //        connectModalHostViewManager:[[_host moduleRegistry] moduleForName:"RCTModalHostViewManager"]];
+        
+        [self->_eventEmitter sendOnAppLaunched];
+    });
+}
+
+- (void)onReload {
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.3.2",
+  "version": "8.4.0-snapshot.1887",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -77,15 +77,15 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",
     "@babel/types": "7.25.0",
-    "@react-native-community/cli": "15.0.1",
-    "@react-native-community/cli-platform-android": "15.0.1",
-    "@react-native-community/cli-platform-ios": "15.0.1",
+    "@react-native-community/cli": "15.1.0",
+    "@react-native-community/cli-platform-android": "15.1.0",
+    "@react-native-community/cli-platform-ios": "15.1.0",
     "@react-native-community/datetimepicker": "^8.2.0",
     "@react-native-community/netinfo": "^11.4.1",
-    "@react-native/babel-preset": "0.77.2",
-    "@react-native/eslint-config": "0.77.2",
-    "@react-native/metro-config": "0.77.2",
-    "@react-native/typescript-config": "0.77.2",
+    "@react-native/babel-preset": "0.78.3",
+    "@react-native/eslint-config": "0.78.3",
+    "@react-native/metro-config": "0.78.3",
+    "@react-native/typescript-config": "0.78.3",
     "@testing-library/jest-native": "^5.4.2",
     "@testing-library/react-native": "^13.0.1",
     "@types/hoist-non-react-statics": "^3.3.6",
@@ -102,8 +102,8 @@
     "eslint": "^8.19.0",
     "eslint-config-prettier": "6.11.0",
     "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-prettier": "3.1.4",
     "eslint-plugin-jest": "^28.11.0",
+    "eslint-plugin-prettier": "3.1.4",
     "github-release-notes": "https://github.com/yogevbd/github-release-notes/tarball/e601b3dba72dcd6cba323c1286ea6dd0c0110b58",
     "husky": "4.2.5",
     "identity-obj-proxy": "3.0.0",
@@ -112,14 +112,14 @@
     "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
     "prettier": "2.8.8",
-    "react": "18.3.1",
-    "react-native": "0.77.2",
+    "react": "19.0.0",
+    "react-native": "0.78.3",
     "react-native-fast-image": "^8.6.3",
     "react-native-gesture-handler": "^2.22.1",
-    "react-native-reanimated": "3.16.7",
-    "react-redux": "5.x.x",
-    "react-test-renderer": "18.3.1",
-    "redux": "3.x.x",
+    "react-native-reanimated": "3.18.0",
+    "react-redux": "9.1.2",
+    "react-test-renderer": "19.0.0",
+    "redux": "^5.0.1",
     "remx": "3.x.x",
     "semver": "5.x.x",
     "shell-utils": "1.x.x",