chore: sync with upstream

Author: okwasniewski

packages/helloworld/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "react": "19.0.0",
-    "@callstack/react-native-visionos": "0.77.0-main"
+    "@callstack/react-native-visionos": "0.79.0-main"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm

@@ -154,7 +154,6 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
-#endif
   _disableKeyboardShortcuts = disableKeyboardShortcuts;
 #endif
 }

packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm

@@ -141,7 +141,6 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
-#endif
   _disableKeyboardShortcuts = disableKeyboardShortcuts;
 #endif
 }

packages/react-native/React/Base/UIKitProxies/RCTKeyWindowValuesProxy.mm

@@ -37,7 +37,11 @@ - (instancetype)init
   if (self) {
     _isObserving = NO;
     UIView *mainWindow = RCTKeyWindow();
+#if TARGET_OS_VISION
+    _currentWindowSize = mainWindow.bounds.size;
+#else
     _currentWindowSize = mainWindow ? mainWindow.bounds.size : UIScreen.mainScreen.bounds.size;
+#endif
   }
   return self;
 }

packages/react-native/React/CoreModules/RCTDeviceInfo.mm

@@ -142,23 +142,31 @@ static BOOL RCTIsIPhoneNotched()
 
 static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 {
+  CGFloat scale = [UITraitCollection currentTraitCollection].displayScale;
+#if TARGET_OS_IOS
   UIScreen *mainScreen = UIScreen.mainScreen;
-  CGSize screenSize = mainScreen.bounds.size;
-
+#endif
+  
   // We fallback to screen size if a key window is not found.
   CGSize windowSize = [RCTKeyWindowValuesProxy sharedInstance].windowSize;
+  
+#if TARGET_OS_IOS
+  CGSize screenSize = mainScreen.bounds.size;
+#else
+  CGSize screenSize = windowSize;
+#endif
 
   NSDictionary<NSString *, NSNumber *> *dimsWindow = @{
     @"width" : @(windowSize.width),
     @"height" : @(windowSize.height),
-    @"scale" : @(mainScreen.scale),
+    @"scale" : @(scale),
     @"fontScale" : @(fontScale)
   };
 
   NSDictionary<NSString *, NSNumber *> *dimsScreen = @{
     @"width" : @(screenSize.width),
     @"height" : @(screenSize.height),
-    @"scale" : @(mainScreen.scale),
+    @"scale" : @(scale),
     @"fontScale" : @(fontScale)
   };
   return @{@"window" : dimsWindow, @"screen" : dimsScreen};

packages/react-native/React/CoreModules/RCTKeyboardObserver.mm

@@ -110,6 +110,7 @@ -(void)EVENT : (NSNotification *)notification
 
 static NSDictionary *RCTParseKeyboardNotification(NSNotification *notification)
 {
+#if TARGET_OS_IOS
   NSDictionary *userInfo = notification.userInfo;
   CGRect beginFrame = [userInfo[UIKeyboardFrameBeginUserInfoKey] CGRectValue];
   CGRect endFrame = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
@@ -129,6 +130,9 @@ -(void)EVENT : (NSNotification *)notification
     @"easing" : RCTAnimationNameForCurve(curve),
     @"isEventFromThisApp" : isLocalUserInfoKey == 1 ? @YES : @NO,
   };
+#else
+  return {};
+#endif
 }
 
 Class RCTKeyboardObserverCls(void)

packages/react-native/React/UIUtils/RCTUIUtils.m

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-visionos",
-  "version": "0.77.0-main",
+  "version": "0.79.0-main",
   "description": "React Native for visionOS",
   "license": "MIT",
   "repository": {

packages/react-native/package.json

@@ -1,8 +1,15 @@
 import UIKit
 import React
 import React_RCTAppDelegate
+import ReactAppDependencyProvider
 
 class AppDelegate: RCTAppDelegate {
+  override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    self.dependencyProvider = RCTAppDependencyProvider()
+    
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+  
   override func sourceURL(for bridge: RCTBridge) -> URL? {
     self.bundleURL()
   }

packages/rn-tester/RNTester-visionOS/AppDelegate.swift

@@ -9,7 +9,6 @@
 
 'use strict';
 
-const {getPlatformResolver} = require('@callstack/out-of-tree-platforms');
 const {getDefaultConfig} = require('@react-native/metro-config');
 const {mergeConfig} = require('metro-config');
 const path = require('path');
@@ -39,9 +38,6 @@ const config = {
     extraNodeModules: {
       'react-native': path.resolve(__dirname, '../react-native'),
     },
-    resolveRequest: getPlatformResolver({
-      platformNameMap: {visionos: '@callstack/react-native-visionos'},
-    }),
   },
 };