Upgrade to RN 0.84

.buildkite/jobs/pipeline.android_rn_83.yml

@@ -1,7 +1,7 @@
-  - label: ":android: Android (RN 0.83.0)"
+  - label: ":android: Android (RN 0.83.2)"
     env:
       JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
-      REACT_NATIVE_VERSION: 0.83.0
+      REACT_NATIVE_VERSION: 0.83.2
     command:
     - "nvm install"
     - "./scripts/ci.android.sh"

.buildkite/jobs/pipeline.android_rn_84.yml

@@ -0,0 +1,12 @@
+  - label: ":android: Android (RN 0.84.0)"
+    env:
+      JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
+      REACT_NATIVE_VERSION: 0.84.0
+    command:
+    - "nvm install"
+    - "./scripts/ci.android.sh"
+    key: "android_rn_84"
+    timeout_in_minutes: 90
+    artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
+
+

.buildkite/jobs/pipeline.ios_rn_83.yml

@@ -1,6 +1,6 @@
-  - label: ":ios: iOS (RN 0.83.0)"
+  - label: ":ios: iOS (RN 0.83.2)"
     env:
-      REACT_NATIVE_VERSION: 0.83.0
+      REACT_NATIVE_VERSION: 0.83.2
     command:
     - "nvm install"
     - "./scripts/ci.ios.sh"

.buildkite/jobs/pipeline.ios_rn_84.yml

@@ -0,0 +1,11 @@
+  - label: ":ios: iOS (RN 0.84.0)"
+    env:
+      REACT_NATIVE_VERSION: 0.84.0
+    command:
+    - "nvm install"
+    - "./scripts/ci.ios.sh"
+    key: "ios_rn_84"
+    timeout_in_minutes: 90
+    artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
+
+

.buildkite/pipeline.sh

@@ -7,8 +7,10 @@ cat .buildkite/jobs/pipeline.android_rn_77.yml
 cat .buildkite/jobs/pipeline.android_rn_78.yml
 cat .buildkite/jobs/pipeline.android_rn_82.yml
 cat .buildkite/jobs/pipeline.android_rn_83.yml
+cat .buildkite/jobs/pipeline.android_rn_84.yml
 cat .buildkite/jobs/pipeline.ios_rn_77.yml
 cat .buildkite/jobs/pipeline.ios_rn_78.yml
 cat .buildkite/jobs/pipeline.ios_rn_82.yml
 cat .buildkite/jobs/pipeline.ios_rn_83.yml
+cat .buildkite/jobs/pipeline.ios_rn_84.yml
 cat .buildkite/jobs/pipeline.publish.yml

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

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

ios/RCTHelpers.mm

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

ios/RNNAppDelegate.mm

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

ios/RNNBridgeManager.mm

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

ios/RNNModalHostViewManagerHandler.h

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

ios/RNNModalHostViewManagerHandler.mm

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

ios/RNNOverlayWindow.mm

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

package.json

@@ -99,10 +99,10 @@
     "@react-native-community/cli-platform-ios": "20.0.0",
     "@react-native-community/datetimepicker": "^8.2.0",
     "@react-native-community/netinfo": "^11.4.1",
-    "@react-native/babel-preset": "0.83.0",
-    "@react-native/eslint-config": "0.83.0",
-    "@react-native/metro-config": "0.83.0",
-    "@react-native/typescript-config": "0.83.0",
+    "@react-native/babel-preset": "0.84.0",
+    "@react-native/eslint-config": "0.84.0",
+    "@react-native/metro-config": "0.84.0",
+    "@react-native/typescript-config": "0.84.0",
     "@testing-library/jest-native": "^5.4.2",
     "@testing-library/react-native": "^13.0.1",
     "@types/hoist-non-react-statics": "^3.3.6",
@@ -130,15 +130,15 @@
     "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
     "prettier": "2.8.8",
-    "react": "19.2.0",
-    "react-native": "0.83.0",
+    "react": "19.2.3",
+    "react-native": "0.84.0",
     "react-native-builder-bob": "^0.40.13",
-    "react-native-fast-image": "^8.6.3",
+    "@d11/react-native-fast-image": "^8.13.0",
     "react-native-gesture-handler": "^2.29.1",
-    "react-native-reanimated": "4.1.5",
-    "react-native-worklets": "0.5.0",
+    "react-native-reanimated": "4.2.2",
+    "react-native-worklets": "0.7.4",
     "react-redux": "9.1.2",
-    "react-test-renderer": "19.2.0",
+    "react-test-renderer": "19.2.3",
     "redux": "^5.0.1",
     "remx": "3.x.x",
     "semver": "5.x.x",

playground/android/app/build.gradle

@@ -56,7 +56,6 @@ dependencies {
 
     implementation("com.facebook.react:react-android")
 
-    implementation project(':react-native-fast-image')
 
     implementation 'androidx.core:core-ktx:1.16.0'
 

playground/android/rninfo.gradle

@@ -31,5 +31,6 @@ ext.rnInfo = [
     minorVersion  : rnMinorVer,
     isRN79OrHigher: rnMinorVer >= 79,
     isRN80OrHigher: rnMinorVer >= 80,
+    isRN84OrHigher: rnMinorVer >= 84,
 ]
 

playground/ios/NavigationTests/RNNModalHostViewManagerHandlerTest.mm

@@ -2,6 +2,8 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
+#ifndef RCT_REMOVE_LEGACY_ARCH
+
 @interface RNNModalHostViewManagerHandlerTest : XCTestCase
 @end
 
@@ -42,3 +44,5 @@ - (void)testPresentationBlock_shouldShowAndDismissModal {
 }
 
 @end
+
+#endif