Skip to content

Commit e1ea707

Browse files
committed
chore: sync with upstream
1 parent 2b1a6bb commit e1ea707

File tree

10 files changed

+160
-153
lines changed

10 files changed

+160
-153
lines changed

packages/helloworld/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"test": "jest"
1313
},
1414
"dependencies": {
15-
"react": "18.3.1",
16-
"@callstack/react-native-visionos": "1000.0.0"
15+
"react": "19.0.0",
16+
"@callstack/react-native-visionos": "0.77.0-main"
1717
},
1818
"devDependencies": {
1919
"@babel/core": "^7.25.2",

packages/out-of-tree-platforms/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dist"
2020
],
2121
"devDependencies": {
22-
"metro-resolver": "^0.81.0-alpha.0"
22+
"metro-resolver": "^0.81.0"
2323
},
2424
"engines": {
2525
"node": ">=18"

packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
4444
return YES;
4545
}
4646

47+
48+
#if !TARGET_OS_VISION
4749
- (void)loadReactNativeWindow:(NSDictionary *)launchOptions
4850
{
4951
UIView *rootView = [self.rootViewFactory viewWithModuleName:self.moduleName
@@ -56,6 +58,7 @@ - (void)loadReactNativeWindow:(NSDictionary *)launchOptions
5658
_window.rootViewController = rootViewController;
5759
[_window makeKeyAndVisible];
5860
}
61+
#endif
5962

6063
- (RCTRootViewFactory *)rootViewFactory
6164
{

packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ - (UIView *)viewWithModuleName:(NSString *)moduleName
152152
surfaceHostingProxyRootView.backgroundColor = [UIColor clearColor];
153153
#else
154154
surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
155+
#endif
155156
if (_configuration.customizeRootView != nil) {
156157
_configuration.customizeRootView(surfaceHostingProxyRootView);
157158
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
154154
self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
155155
self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
156156
}
157+
#endif
157158
_disableKeyboardShortcuts = disableKeyboardShortcuts;
158159
#endif
159160
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
141141
self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
142142
self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
143143
}
144+
#endif
144145
_disableKeyboardShortcuts = disableKeyboardShortcuts;
145146
#endif
146147
}

packages/react-native/React/Base/RCTUtils.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ BOOL RCTRunningInAppExtension(void)
610610
}
611611

612612
UIScene *sceneToUse = foregroundActiveScene ? foregroundActiveScene : foregroundInactiveScene;
613+
UIWindowScene *windowScene = (UIWindowScene *)sceneToUse;
613614

614615
#if TARGET_OS_VISION
615616
// Ornaments are supported only on visionOS.

packages/react-native/React/Views/ScrollView/RCTScrollView.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,13 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)notification
321321
// Text field active region is below visible area with keyboard - update diff to bring into view
322322
contentDiff = endFrame.origin.y - focusEnd;
323323
} else {
324+
#if !TARGET_OS_VISION
324325
UIView *inputAccessoryView = _firstResponderViewOutsideScrollView.inputAccessoryView;
325326
if (inputAccessoryView) {
326327
// Text input view is within the inputAccessoryView.
327328
contentDiff = endFrame.origin.y - beginFrame.origin.y;
328329
}
330+
#endif
329331
}
330332
} else if (endFrame.origin.y <= beginFrame.origin.y) {
331333
// Keyboard opened for other reason

0 commit comments

Comments
 (0)