Revert D127555263: Fix StatusBar style and visibility on iOS 27

Differential Revision:
D127555263

Original commit changeset: 9a6d21236987

Original Phabricator Diff: D127555263

fbshipit-source-id: 3b4ff52a41f53277841288d2c339d0d5277eb7ba

Author: generatedunixname89002005232357

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

@@ -14,32 +14,9 @@
 #endif
 
 #import <RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.h>
-#import <React/RCTStatusBarAppearance.h>
 #import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/nativemodule/defaults/DefaultTurboModules.h>
 
-@interface RCTRootViewController : UIViewController
-@end
-
-@implementation RCTRootViewController
-
-- (UIStatusBarStyle)preferredStatusBarStyle
-{
-  return RCTStatusBarAppearance.style;
-}
-
-- (BOOL)prefersStatusBarHidden
-{
-  return RCTStatusBarAppearance.hidden;
-}
-
-- (UIStatusBarAnimation)preferredStatusBarUpdateAnimation
-{
-  return RCTStatusBarAppearance.updateAnimation;
-}
-
-@end
-
 @implementation RCTDefaultReactNativeFactoryDelegate {
   // C++ Native Animated provider, created once on first use (getTurboModule: may be called
   // concurrently for different module names).
@@ -58,7 +35,7 @@ - (NSURL *_Nullable)sourceURLForBridge:(nonnull RCTBridge *)bridge
 
 - (UIViewController *)createRootViewController
 {
-  return [RCTRootViewController new];
+  return [UIViewController new];
 }
 
 - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController

packages/react-native/Libraries/AppDelegate/RCTUIConfiguratorProtocol.h

@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * It creates the RootViewController.
- * By default, it creates a view controller that returns the `RCTStatusBarAppearance` values.
+ * By default, it creates a new instance of a `UIViewController`.
  * You can override it to provide your own initial ViewController.
  *
  * @return: an instance of `UIViewController`.

packages/react-native/React/Base/RCTStatusBarAppearance.h

@@ -11,7 +11,6 @@
 #import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTInitializing.h>
 #import <React/RCTLog.h>
-#import <React/RCTStatusBarAppearance.h>
 #import <React/RCTUtils.h>
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
@@ -69,28 +68,6 @@ static BOOL RCTViewControllerBasedStatusBarAppearance()
   return value;
 }
 
-// UIKit makes the app-level setters no-ops only for apps built with the iOS 27 SDK.
-static BOOL RCTAppLevelStatusBarIsNoOp()
-{
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 270000
-  if (@available(iOS 27.0, *)) {
-    return YES;
-  }
-#endif
-  return NO;
-}
-
-static void RCTWarnAppLevelStatusBarUnavailable()
-{
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    RCTLogWarn(
-        @"StatusBar has no effect because UIViewControllerBasedStatusBarAppearance is NO in Info.plist. "
-        @"Apps built with the iOS 27 SDK cannot use the app-level status bar API that this setting uses. "
-        @"Set UIViewControllerBasedStatusBarAppearance to YES to control the status bar from JavaScript.");
-  });
-}
-
 RCT_EXPORT_MODULE()
 
 + (BOOL)requiresMainQueueSetup
@@ -170,32 +147,30 @@ - (void)setStyle:(NSString *)style animated:(BOOL)animated
 {
   dispatch_async(dispatch_get_main_queue(), ^{
     UIStatusBarStyle statusBarStyle = [RCTConvert UIStatusBarStyle:style];
-    [RCTStatusBarAppearance setStyle:statusBarStyle animated:animated];
-    if (!RCTViewControllerBasedStatusBarAppearance()) {
+    if (RCTViewControllerBasedStatusBarAppearance()) {
+      RCTLogWarn(@"RCTStatusBarManager is a no-op when \
+                UIViewControllerBasedStatusBarAppearance is YES; set the status bar from your view controller instead");
+    } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
       [RCTSharedApplication() setStatusBarStyle:statusBarStyle animated:animated];
-#pragma clang diagnostic pop
-      if (RCTAppLevelStatusBarIsNoOp()) {
-        RCTWarnAppLevelStatusBarUnavailable();
-      }
     }
+#pragma clang diagnostic pop
   });
 }
 
 - (void)setHidden:(BOOL)hidden withAnimation:(NSString *)withAnimation
 {
   dispatch_async(dispatch_get_main_queue(), ^{
     UIStatusBarAnimation animation = [RCTConvert UIStatusBarAnimation:withAnimation];
-    [RCTStatusBarAppearance setHidden:hidden withAnimation:animation];
-    if (!RCTViewControllerBasedStatusBarAppearance()) {
+    if (RCTViewControllerBasedStatusBarAppearance()) {
+      RCTLogWarn(@"RCTStatusBarManager is a no-op when \
+                UIViewControllerBasedStatusBarAppearance is YES; set the status bar from your view controller instead");
+    } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
       [RCTSharedApplication() setStatusBarHidden:hidden withAnimation:animation];
 #pragma clang diagnostic pop
-      if (RCTAppLevelStatusBarIsNoOp()) {
-        RCTWarnAppLevelStatusBarUnavailable();
-      }
     }
   });
 }

packages/react-native/React/Base/RCTStatusBarAppearance.mm

@@ -8,19 +8,13 @@
 #import "RCTFabricModalHostViewController.h"
 
 #import <React/RCTLog.h>
-#import <React/RCTStatusBarAppearance.h>
 #import <React/RCTSurfaceTouchHandler.h>
 
 @implementation RCTFabricModalHostViewController {
   CGRect _lastViewBounds;
 #if !TARGET_OS_TV
   RCTSurfaceTouchHandler *_touchHandler;
 #endif
-  BOOL _hasCapturedStatusBar;
-  UIStatusBarStyle _capturedStatusBarStyle;
-  BOOL _capturedStatusBarHidden;
-  UIStatusBarStyle _jsStatusBarStyleAtCapture;
-  BOOL _jsStatusBarHiddenAtCapture;
 }
 
 - (instancetype)init
@@ -52,37 +46,15 @@ - (void)loadView
 #endif
 }
 
-- (void)captureStatusBarAppearance
-{
-  UIStatusBarManager *statusBarManager = RCTUIStatusBarManager();
-  _hasCapturedStatusBar = YES;
-  _capturedStatusBarStyle = statusBarManager.statusBarStyle;
-  _capturedStatusBarHidden = statusBarManager.isStatusBarHidden;
-  _jsStatusBarStyleAtCapture = RCTStatusBarAppearance.style;
-  _jsStatusBarHiddenAtCapture = RCTStatusBarAppearance.hidden;
-}
-
 #if !TARGET_OS_TV
-// Keep the status bar from before the modal until JS changes it.
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-  if (_hasCapturedStatusBar && RCTStatusBarAppearance.style == _jsStatusBarStyleAtCapture) {
-    return _capturedStatusBarStyle;
-  }
-  return RCTStatusBarAppearance.style;
+  return [RCTUIStatusBarManager() statusBarStyle];
 }
 
 - (BOOL)prefersStatusBarHidden
 {
-  if (_hasCapturedStatusBar && RCTStatusBarAppearance.hidden == _jsStatusBarHiddenAtCapture) {
-    return _capturedStatusBarHidden;
-  }
-  return RCTStatusBarAppearance.hidden;
-}
-
-- (UIStatusBarAnimation)preferredStatusBarUpdateAnimation
-{
-  return RCTStatusBarAppearance.updateAnimation;
+  return [RCTUIStatusBarManager() isStatusBarHidden];
 }
 #endif
 

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

@@ -17,10 +17,6 @@
 
 #import "RCTFabricModalHostViewController.h"
 
-@interface RCTFabricModalHostViewController ()
-- (void)captureStatusBarAppearance;
-@end
-
 using namespace facebook::react;
 
 #if !TARGET_OS_TV
@@ -177,7 +173,6 @@ - (void)ensurePresentedOnlyIfNeeded
     [self saveAccessibilityFocusedView];
     self.viewController.presentationController.delegate = self;
     self.viewController.modalInPresentation = _modalInPresentation;
-    [self.viewController captureStatusBarAppearance];
 
     _isPresented = YES;
     [self presentViewController:self.viewController

packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm

@@ -81,6 +81,6 @@
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
+	<false/>
 </dict>
 </plist>

packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -17,7 +17,6 @@
 		5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; };
 		602160B9478DAFF2BAB56595 /* RCTUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D5D13FB1445C5C19639921CC /* RCTUtilsTests.m */; };
 		79B29C2E2E607A99007612A5 /* SceneDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 79B29C2D2E607A99007612A5 /* SceneDelegate.mm */; };
-		7F806D4D4D97AD6403558B35 /* RCTStatusBarAppearanceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67B0814814F7C07E196BC295 /* RCTStatusBarAppearanceTests.mm */; };
 		8145AE06241172D900A3F8DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */; };
 		832F45BB2A8A6E1F0097B4E6 /* SwiftTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 832F45BA2A8A6E1F0097B4E6 /* SwiftTest.swift */; };
 		A975CA6C2C05EADF0043F72A /* RCTNetworkTaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A975CA6B2C05EADE0043F72A /* RCTNetworkTaskTests.m */; };
@@ -95,7 +94,6 @@
 		4C706D402EE4AF9BE838CBA9 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		51BC9297B6C3163C14532020 /* Pods-RNTester.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.release.xcconfig"; path = "Target Support Files/Pods-RNTester/Pods-RNTester.release.xcconfig"; sourceTree = "<group>"; };
 		5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = "<group>"; };
-		67B0814814F7C07E196BC295 /* RCTStatusBarAppearanceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTStatusBarAppearanceTests.mm; sourceTree = "<group>"; };
 		79B29C2C2E607A99007612A5 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SceneDelegate.h; path = RNTester/SceneDelegate.h; sourceTree = "<group>"; };
 		79B29C2D2E607A99007612A5 /* SceneDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = SceneDelegate.mm; path = RNTester/SceneDelegate.mm; sourceTree = "<group>"; };
 		8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = RNTester/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -352,7 +350,6 @@
 				E7DB20D022B2BAA5005AC45F /* RCTURLUtilsTests.m */,
 				D5D13FB1445C5C19639921CC /* RCTUtilsTests.m */,
 				E7DB20B322B2BAA4005AC45F /* RNTesterUnitTestsBundle.js */,
-				67B0814814F7C07E196BC295 /* RCTStatusBarAppearanceTests.mm */,
 			);
 			path = RNTesterUnitTests;
 			sourceTree = "<group>";
@@ -781,7 +778,6 @@
 				E7DB20E922B2BAA6005AC45F /* RCTComponentPropsTests.m in Sources */,
 				E7DB20D822B2BAA6005AC45F /* RCTJSONTests.m in Sources */,
 				602160B9478DAFF2BAB56595 /* RCTUtilsTests.m in Sources */,
-				7F806D4D4D97AD6403558B35 /* RCTStatusBarAppearanceTests.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};