fix: add missing ifdefs, sync with upstream

Author: okwasniewski

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

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/out-of-tree-platforms",
-  "version": "0.76.0-main",
+  "version": "0.75.0-rc.6",
   "description": "Utils for React Native out of tree platforms.",
   "keywords": ["out-of-tree", "react-native"],
   "homepage": "https://github.com/callstack/react-native-visionos/tree/HEAD/packages/out-of-tree-platforms#readme",

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

@@ -51,9 +51,6 @@ - (void)initialize
                                            selector:@selector(didReceiveNewContentSizeMultiplier)
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
                                              object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
-    
-
-  _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
 
   _currentInterfaceDimensions = [self _exportedDimensions];
 
@@ -71,10 +68,16 @@ - (void)initialize
                                            selector:@selector(interfaceFrameDidChange)
                                                name:RCTWindowFrameDidChangeNotification
                                              object:nil];
+
+#if TARGET_OS_IOS
+
+  _currentInterfaceOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
                                                name:UIDeviceOrientationDidChangeNotification
                                              object:nil];
+#endif
 
   // TODO T175901725 - Registering the RCTDeviceInfo module to the notification is a short-term fix to unblock 0.73
   // The actual behavior should be that the module is properly registered in the TurboModule/Bridge infrastructure
@@ -101,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];
@@ -115,26 +113,25 @@ - (void)_cleanupObservers
 
   [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
 
+#if TARGET_OS_IOS
   [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
+#endif
 }
 
 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, ^{
     RCTAssertMainQueue();
 
     // 20pt is the top safeArea value in non-notched devices
     isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20;
   });
-
-      // 20pt is the top safeArea value in non-notched devices
-      isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20;
-    });
 #endif
+
   return isIPhoneNotched;
 }
 
@@ -217,8 +214,9 @@ - (void)interfaceOrientationDidChange
 
 - (void)_interfaceOrientationDidChange
 {
+#if TARGET_OS_IOS
   UIApplication *application = RCTSharedApplication();
-  UIInterfaceOrientation nextOrientation = [application statusBarOrientation];
+  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
 
   BOOL isRunningInFullScreen =
       CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
@@ -246,6 +244,7 @@ - (void)_interfaceOrientationDidChange
     _isFullscreen = isRunningInFullScreen;
 #pragma clang diagnostic pop
   }
+#endif
 }
 
 - (void)interfaceFrameDidChange

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

@@ -170,9 +170,14 @@ - (UIPanGestureRecognizer *)gestureRecognizer
 
 - (UIView *)container
 {
+
   if (!_container) {
+#if TARGET_OS_IOS
     CGSize statusBarSize = RCTSharedApplication().statusBarFrame.size;
     CGFloat statusBarHeight = statusBarSize.height;
+#else
+    CGFloat statusBarHeight = 0;
+#endif
     _container = [[UIView alloc] initWithFrame:CGRectMake(10, statusBarHeight, 180, RCTPerfMonitorBarHeight)];
     _container.layer.borderWidth = 2;
     _container.layer.borderColor = [UIColor lightGrayColor].CGColor;
@@ -185,6 +190,7 @@ - (UIView *)container
   }
 
   return _container;
+
 }
 
 - (UILabel *)memory

packages/react-native/React/Views/RCTModalHostView.m

@@ -72,6 +72,7 @@ - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)co
 
 - (void)notifyForOrientationChange
 {
+#if TARGET_OS_IOS
   if (!_onOrientationChange) {
     return;
   }
@@ -88,6 +89,7 @@ - (void)notifyForOrientationChange
     @"orientation" : isPortrait ? @"portrait" : @"landscape",
   };
   _onOrientationChange(eventPayload);
+#endif
 }
 
 - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex

packages/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-visionos",
-  "version": "1000.0.0",
+  "version": "0.75.0-rc.6",
   "description": "React Native for visionOS",
   "license": "MIT",
   "repository": {