diff --git a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec index 7bf32502ae818e..2988120a1741f4 100644 --- a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -45,7 +45,7 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.framework = "UIKit" - + s.dependency "React-Core/RCTLinkingHeaders", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec index b10757fc62e66f..8a10d02f1fe8b0 100644 --- a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -44,7 +44,7 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") } s.framework = ["UIKit", "QuartzCore"] - + s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety" s.dependency "React-jsi" diff --git a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm index 6a48f9c26dafd3..b72352f5453f3b 100644 --- a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm +++ b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm @@ -51,7 +51,6 @@ - (void)initialize selector:@selector(didReceiveNewContentSizeMultiplier) name:RCTAccessibilityManagerDidUpdateMultiplierNotification object:[_moduleRegistry moduleForName:"AccessibilityManager"]]; - _currentInterfaceDimensions = [self _exportedDimensions]; @@ -105,12 +104,7 @@ - (void)_cleanupObservers [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTAccessibilityManagerDidUpdateMultiplierNotification object:[_moduleRegistry moduleForName:"AccessibilityManager"]]; -#if !TARGET_OS_VISION - [[NSNotificationCenter defaultCenter] removeObserver:self - name:UIApplicationDidChangeStatusBarOrientationNotification - object:nil]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil]; -#endif + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTUserInterfaceStyleDidChangeNotification object:nil]; @@ -127,8 +121,7 @@ - (void)_cleanupObservers static BOOL RCTIsIPhoneNotched() { static BOOL isIPhoneNotched = NO; -#if !TARGET_OS_VISION - static dispatch_once_t onceToken; + static dispatch_once_t onceToken; #if TARGET_OS_IOS dispatch_once(&onceToken, ^{ @@ -139,10 +132,6 @@ static BOOL RCTIsIPhoneNotched() }); #endif - // 20pt is the top safeArea value in non-notched devices - isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20; - }); -#endif return isIPhoneNotched; } diff --git a/packages/react-native/React/CoreModules/RCTKeyboardObserver.mm b/packages/react-native/React/CoreModules/RCTKeyboardObserver.mm index 0774d1f9a81ef7..ce483ddceb95fc 100644 --- a/packages/react-native/React/CoreModules/RCTKeyboardObserver.mm +++ b/packages/react-native/React/CoreModules/RCTKeyboardObserver.mm @@ -23,7 +23,6 @@ @implementation RCTKeyboardObserver - (void)startObserving { -#if !TARGET_OS_VISION NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; #define ADD_KEYBOARD_HANDLER(NAME, SELECTOR) [nc addObserver:self selector:@selector(SELECTOR:) name:NAME object:nil] @@ -36,7 +35,6 @@ - (void)startObserving ADD_KEYBOARD_HANDLER(UIKeyboardDidChangeFrameNotification, keyboardDidChangeFrame); #undef ADD_KEYBOARD_HANDLER -#endif } - (NSArray *)supportedEvents @@ -53,12 +51,9 @@ - (void)startObserving - (void)stopObserving { -#if !TARGET_OS_VISION [[NSNotificationCenter defaultCenter] removeObserver:self]; -#endif } -#if !TARGET_OS_VISION // Bridge might be already invalidated by the time the keyboard is about to be dismissed. // This might happen, for example, when reload from the packager is performed. // Thus we need to check against nil here. @@ -77,7 +72,6 @@ -(void)EVENT : (NSNotification *)notification IMPLEMENT_KEYBOARD_HANDLER(keyboardDidHide) IMPLEMENT_KEYBOARD_HANDLER(keyboardWillChangeFrame) IMPLEMENT_KEYBOARD_HANDLER(keyboardDidChangeFrame) -#endif - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params diff --git a/packages/react-native/React/Views/RCTWrapperViewController.m b/packages/react-native/React/Views/RCTWrapperViewController.m index 7b455799e1571a..eb041ad79a646e 100644 --- a/packages/react-native/React/Views/RCTWrapperViewController.m +++ b/packages/react-native/React/Views/RCTWrapperViewController.m @@ -29,9 +29,6 @@ - (instancetype)initWithContentView:(UIView *)contentView if ((self = [super initWithNibName:nil bundle:nil])) { _contentView = contentView; -#if !TARGET_OS_VISION - self.automaticallyAdjustsScrollViewInsets = NO; -#endif } return self; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/localCommands.js b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/localCommands.js deleted file mode 100644 index dc87001156ac06..00000000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/localCommands.js +++ /dev/null @@ -1,45 +0,0 @@ -const { - createBuild, - createLog, - createRun, - getRunOptions, - getLogOptions, - getBuildOptions, -} = require('@react-native-community/cli-platform-apple'); - -const platformName = 'visionos'; - -const run = { - name: 'run-visionos', - description: 'builds your app and starts it on visionOS simulator', - func: createRun({platformName}), - examples: [ - { - desc: 'Run on a specific simulator', - cmd: 'npx @callstack/react-native-visionos run-visionos --simulator "Apple Vision Pro"', - }, - ], - options: getRunOptions({platformName}), -}; - -const log = { - name: 'log-visionos', - description: 'starts visionOS device syslog tail', - func: createLog({platformName: 'visionos'}), - options: getLogOptions({platformName}), -}; - -const build = { - name: 'build-visionos', - description: 'builds your app for visionOS platform', - func: createBuild({platformName}), - examples: [ - { - desc: 'Build the app for all visionOS devices in Release mode', - cmd: 'npx @callstack/react-native-visionos build-visionos --mode "Release"', - }, - ], - options: getBuildOptions({platformName}), -}; - -module.exports = [run, log, build]; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec index 4360e8cee66932..1faeaf8581af65 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec +++ b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec @@ -54,7 +54,7 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../../.." header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""] end - + s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => header_search_paths.join(" "), "DEFINES_MODULE" => "YES", diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm index 98be3fb1ada575..5ca3ce39faa6e5 100644 --- a/packages/rn-tester/RNTester/AppDelegate.mm +++ b/packages/rn-tester/RNTester/AppDelegate.mm @@ -107,7 +107,6 @@ - (void)application:(__unused UIApplication *)application [RCTPushNotificationManager didFailToRegisterForRemoteNotificationsWithError:error]; } -#if !TARGET_OS_VISION #pragma mark - UNUserNotificationCenterDelegate // Required for the remoteNotificationReceived and localNotificationReceived events @@ -137,7 +136,6 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center [RCTPushNotificationManager didReceiveNotification:notification]; completionHandler(); } -#endif #pragma mark - New Arch Enabled settings