chore: sync with upstream

callstack · Jan 7, 2025 · a59ad5f · a59ad5f
1 parent ef3bcfe
commit a59ad5f
Show file tree

Hide file tree

Showing 11 changed files with 189 additions and 242 deletions.
diff --git a/packages/helloworld/package.json b/packages/helloworld/package.json
@@ -12,8 +12,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "react": "18.3.1",
-    "@callstack/react-native-visionos": "1000.0.0"
+    "react": "19.0.0",
+    "@callstack/react-native-visionos": "0.77.0-main"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

diff --git a/packages/out-of-tree-platforms/package.json b/packages/out-of-tree-platforms/package.json
@@ -19,7 +19,7 @@
     "dist"
   ],
   "devDependencies": { 
-    "metro-resolver": "^0.81.0-alpha.0"
+    "metro-resolver": "^0.81.0"
   },
   "engines": {
     "node": ">=18"

diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -49,6 +49,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
+
+#if !TARGET_OS_VISION
 - (void)loadReactNativeWindow:(NSDictionary *)launchOptions
 {
   UIView *rootView = [self.rootViewFactory viewWithModuleName:self.moduleName
@@ -62,6 +64,7 @@ - (void)loadReactNativeWindow:(NSDictionary *)launchOptions
   _window.rootViewController = rootViewController;
   [_window makeKeyAndVisible];
 }
+#endif
 
 #pragma mark - UISceneDelegate
 

diff --git a/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm b/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm
@@ -157,6 +157,7 @@ - (UIView *)viewWithModuleName:(NSString *)moduleName
     surfaceHostingProxyRootView.backgroundColor = [UIColor clearColor];
 #else
     surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
+#endif
     if (_configuration.customizeRootView != nil) {
       _configuration.customizeRootView(surfaceHostingProxyRootView);
     }

diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
@@ -138,6 +138,7 @@ - (void)textDidChange
 
 - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
 {
+#if TARGET_OS_IOS
   // Initialize the initial values only once
   if (_initialValueLeadingBarButtonGroups == nil) {
     // Capture initial values of leading and trailing button groups
@@ -153,6 +154,7 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
+#endif
   _disableKeyboardShortcuts = disableKeyboardShortcuts;
 }
 

diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
@@ -400,6 +400,7 @@ - (void)setInputAccessoryViewButtonLabel:(NSString *)inputAccessoryViewButtonLab
 
 - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
 {
+#if TARGET_OS_IOS
   // Initialize the initial values only once
   if (_initialValueLeadingBarButtonGroups == nil) {
     // Capture initial values of leading and trailing button groups
@@ -415,6 +416,7 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.backedTextInputView.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
     self.backedTextInputView.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
+#endif
 }
 
 #pragma mark - RCTBackedTextInputDelegate

diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
@@ -121,6 +121,7 @@ - (void)setSecureTextEntry:(BOOL)secureTextEntry
 
 - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
 {
+#if TARGET_OS_IOS
   // Initialize the initial values only once
   if (_initialValueLeadingBarButtonGroups == nil) {
     // Capture initial values of leading and trailing button groups
@@ -136,6 +137,7 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
+#endif
   _disableKeyboardShortcuts = disableKeyboardShortcuts;
 }
 

diff --git a/packages/react-native/React/Base/RCTUtils.m b/packages/react-native/React/Base/RCTUtils.m
@@ -610,6 +610,7 @@ BOOL RCTRunningInAppExtension(void)
   }
 
   UIScene *sceneToUse = foregroundActiveScene ? foregroundActiveScene : foregroundInactiveScene;
+  UIWindowScene *windowScene = (UIWindowScene *)sceneToUse;
 
 #if TARGET_OS_VISION
     // Ornaments are supported only on visionOS.

diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollView.m b/packages/react-native/React/Views/ScrollView/RCTScrollView.m
@@ -321,11 +321,13 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)notification
       // Text field active region is below visible area with keyboard - update diff to bring into view
       contentDiff = endFrame.origin.y - focusEnd;
     } else {
+#if !TARGET_OS_VISION
       UIView *inputAccessoryView = _firstResponderViewOutsideScrollView.inputAccessoryView;
       if (inputAccessoryView) {
         // Text input view is within the inputAccessoryView.
         contentDiff = endFrame.origin.y - beginFrame.origin.y;
       }
+#endif
     }
   } else if (endFrame.origin.y <= beginFrame.origin.y) {
     // Keyboard opened for other reason