feat: align unnecessary compiler conditionals (#51)

callstack · Jun 24, 2024 · a5f8d78 · a5f8d78
1 parent beda3f2
commit a5f8d78
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/packages/react-native/React/Base/RCTUtils.m b/packages/react-native/React/Base/RCTUtils.m
@@ -301,23 +301,17 @@ static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, disp
 
 void RCTComputeScreenScale(void)
 {
-#if !TARGET_OS_VISION
   dispatch_once(&onceTokenScreenScale, ^{
     screenScale = [UITraitCollection currentTraitCollection].displayScale;
   });
-#endif
 }
 
 CGFloat RCTScreenScale(void)
 {
-#if !TARGET_OS_VISION
   RCTUnsafeExecuteOnMainQueueOnceSync(&onceTokenScreenScale, ^{
     screenScale = [UITraitCollection currentTraitCollection].displayScale;
   });
   return screenScale;
-#endif
-
-  return 2;
 }
 
 CGFloat RCTFontSizeMultiplier(void)

diff --git a/...act-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm b/...act-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
@@ -42,29 +42,25 @@ - (void)loadView
   [_touchHandler attachToView:self.view];
 }
 
+#if !TARGET_OS_VISION
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-#if !TARGET_OS_VISION
-  return [RCTSharedApplication() statusBarStyle];
-#else
-    return UIStatusBarStyleDefault;
-#endif
+  return UIStatusBarStyleDefault;
 }
+#endif
 
 - (void)viewDidDisappear:(BOOL)animated
 {
   [super viewDidDisappear:animated];
   _lastViewBounds = CGRectZero;
 }
 
+#if !TARGET_OS_VISION
 - (BOOL)prefersStatusBarHidden
 {
-#if !TARGET_OS_VISION
   return [RCTSharedApplication() isStatusBarHidden];
-#else
-    return false;
-#endif
 }
+#endif
 
 #if RCT_DEV
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations

diff --git a/packages/react-native/React/UIUtils/RCTUIUtils.m b/packages/react-native/React/UIUtils/RCTUIUtils.m
@@ -22,7 +22,7 @@ RCTDimensions RCTGetDimensions(CGFloat fontScale)
   CGSize windowSize = mainWindow ? mainWindow.bounds.size : screenSize;
   CGFloat scale;
 #if TARGET_OS_VISION
-    scale = 2;
+    scale = [UITraitCollection currentTraitCollection].displayScale;
 #else
     scale = mainScreen.scale;
 #endif

diff --git a/packages/react-native/React/Views/RCTModalHostView.m b/packages/react-native/React/Views/RCTModalHostView.m
@@ -78,7 +78,7 @@ - (void)notifyForOrientationChange
 #if !TARGET_OS_VISION
   UIInterfaceOrientation currentOrientation = [RCTSharedApplication() statusBarOrientation];
 #else
-    UIInterfaceOrientation currentOrientation = UIDeviceOrientationUnknown;
+    UIInterfaceOrientation currentOrientation = UIInterfaceOrientationUnknown;
 #endif
   if (currentOrientation == _lastKnownOrientation) {
     return;