chore: sync with upstream

okwasniewski · okwasniewski · commit 69723aee25dd · 2024-11-27T14:48:13.000+01:00
diff --git a/packages/helloworld/package.json b/packages/helloworld/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "react": "18.3.1",
-    "@callstack/react-native-visionos": "1000.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/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/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
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ - (UIView )viewWithModuleName:(NSString )moduleName`
`157`	`157`	`surfaceHostingProxyRootView.backgroundColor = [UIColor clearColor];`
`158`	`158`	`#else`
`159`	`159`	`surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];`
	`160`	`+#endif`
`160`	`161`	`if (_configuration.customizeRootView != nil) {`
`161`	`162`	`_configuration.customizeRootView(surfaceHostingProxyRootView);`
`162`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -610,6 +610,7 @@ BOOL RCTRunningInAppExtension(void)`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`UIScene *sceneToUse = foregroundActiveScene ? foregroundActiveScene : foregroundInactiveScene;`
	`613`	`+ UIWindowScene windowScene = (UIWindowScene )sceneToUse;`
`613`	`614`
`614`	`615`	`#if TARGET_OS_VISION`
`615`	`616`	`// Ornaments are supported only on visionOS.`
Original file line number	Diff line number	Diff line change
`@@ -321,11 +321,13 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)notification`
`321`	`321`	`// Text field active region is below visible area with keyboard - update diff to bring into view`
`322`	`322`	`contentDiff = endFrame.origin.y - focusEnd;`
`323`	`323`	`} else {`
	`324`	`+#if !TARGET_OS_VISION`
`324`	`325`	`UIView *inputAccessoryView = _firstResponderViewOutsideScrollView.inputAccessoryView;`
`325`	`326`	`if (inputAccessoryView) {`
`326`	`327`	`// Text input view is within the inputAccessoryView.`
`327`	`328`	`contentDiff = endFrame.origin.y - beginFrame.origin.y;`
`328`	`329`	`}`
	`330`	`+#endif`
`329`	`331`	`}`
`330`	`332`	`} else if (endFrame.origin.y <= beginFrame.origin.y) {`
`331`	`333`	`// Keyboard opened for other reason`