Back out "UIViewController-based status bar management"

Summary: Original commit changeset: 9ae1384ee20a Changelog: [Internal] Reviewed By: hramos Differential Revision: D20289822 fbshipit-source-id: 0db9d99bea458e150d33b3407c256b862dedb9c1
facebook · Mar 5, 2020 · f4538e5 · f4538e5 · adbl · Sep 8, 2020
1 parent fbd09b1
commit f4538e5
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 177 deletions.
diff --git a/RNTester/RNTester/AppDelegate.mm b/RNTester/RNTester/AppDelegate.mm
@@ -21,7 +21,6 @@
 #import <React/RCTDataRequestHandler.h>
 #import <React/RCTFileRequestHandler.h>
 #import <React/RCTRootView.h>
-#import <React/RCTRootViewController.h>
 #import <ReactCommon/BridgeJSCallInvoker.h>
 
 #import <cxxreact/JSExecutor.h>
@@ -90,13 +89,12 @@ - (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWith
 
   UIView *rootView = [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:_bridge moduleName:@"RNTesterApp" initialProperties:initProps];
 #else
-  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:_bridge
-                                                   moduleName:@"RNTesterApp"
-                                            initialProperties:initProps];
+  UIView *rootView = [[RCTRootView alloc] initWithBridge:_bridge moduleName:@"RNTesterApp" initialProperties:initProps];
 #endif
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  RCTRootViewController *rootViewController = [[RCTRootViewController alloc] initWithRootView:rootView];
+  UIViewController *rootViewController = [UIViewController new];
+  rootViewController.view = rootView;
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
   [self initializeFlipper:application];

diff --git a/RNTester/RNTester/Info.plist b/RNTester/RNTester/Info.plist
@@ -56,6 +56,8 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>You need to add NSPhotoLibraryUsageDescription key in Info.plist to enable photo library usage, otherwise it is going to *fail silently*!</string>
 	<key>RN_BUNDLE_PREFIX</key>

diff --git a/React/Base/RCTRootViewController.h b/React/Base/RCTRootViewController.h
diff --git a/React/Base/RCTRootViewController.m b/React/Base/RCTRootViewController.m
diff --git a/React/CoreModules/RCTStatusBarManager.mm b/React/CoreModules/RCTStatusBarManager.mm
@@ -13,7 +13,6 @@
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTUtils.h>
-#import <React/RCTRootViewController.h>
 
 #if !TARGET_OS_TV
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
@@ -145,27 +144,7 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification
   [self emitEvent:@"statusBarFrameWillChange" forNotification:notification];
 }
 
-- (UIViewController<RCTRootViewControllerProtocol>*) viewControllerForReactTag:(nonnull NSNumber *)reactTag
-{
-  if (!RCTViewControllerBasedStatusBarAppearance()) {
-    return nil;
-  }
-
-  UIView *view = [self.bridge.uiManager viewForReactTag:reactTag];
-  UIViewController *viewController = view.window.rootViewController ?: RCTKeyWindow().rootViewController;
-
-  if ([viewController conformsToProtocol:@protocol(RCTRootViewControllerProtocol)]) {
-    return (UIViewController<RCTRootViewControllerProtocol>*) viewController;
-  } else {
-    RCTLogError(@"RCTStatusBarManager could not find RCTRootViewController. \
-                If UIViewControllerBasedStatusBarAppearance key in the Info.plist is set to YES (recommended for new apps), \
-                You need to use RCTRootViewControllerProtocol-conforming view controller as app window's root view controller \
-                and must pass a node reference to `surface` argument of StatusBar methods.");
-    return nil;
-  }
-}
-
-RCT_EXPORT_METHOD(getHeight:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback)
 {
   callback(@[ @{
     @"height" : @(RCTSharedApplication().statusBarFrame.size.height),
@@ -176,43 +155,38 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification
                   animated:(BOOL)animated
                   reactTag:(double)reactTag)
 {
-    //  NSNumber *reactTag = options.reactTag() ? @(options.reactTag()) : @-1;
-    UIStatusBarStyle statusBarStyle = [RCTConvert UIStatusBarStyle:style];
-    UIViewController<RCTRootViewControllerProtocol> *viewController = [self viewControllerForReactTag:@(reactTag)];
+  UIStatusBarStyle statusBarStyle = [RCTConvert UIStatusBarStyle:style];
+  if (RCTViewControllerBasedStatusBarAppearance()) {
+    RCTLogError(@"RCTStatusBarManager module requires that the \
+                UIViewControllerBasedStatusBarAppearance key in the Info.plist is set to NO");
+    return;
+  }
 
-    if (viewController) {
-        [viewController updateStatusBarStyle:statusBarStyle
-                                      hidden:viewController.prefersStatusBarHidden
-                                   animation:viewController.preferredStatusBarUpdateAnimation
-                                    animated:animated];
-    } else {
+  // TODO (T62270453): Add proper support for UIScenes (this requires view controller based status bar management)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        [RCTSharedApplication() setStatusBarStyle:statusBarStyle
-                                         animated:animated];
+  [RCTSharedApplication() setStatusBarStyle:statusBarStyle
+                                   animated:animated];
 #pragma clang diagnostic pop
-    }
 }
 
 RCT_EXPORT_METHOD(setHidden:(BOOL)hidden
                   withAnimation:(NSString *)withAnimation
                   reactTag:(double)reactTag)
 {
   UIStatusBarAnimation animation = [RCTConvert UIStatusBarAnimation:withAnimation];
-  UIViewController<RCTRootViewControllerProtocol> *viewController = [self viewControllerForReactTag:@(reactTag)];
-
-  if (viewController) {
-    [viewController updateStatusBarStyle:viewController.preferredStatusBarStyle
-                                  hidden:hidden
-                               animation:animation
-                                animated:animation != UIStatusBarAnimationNone];
-  } else {
+  if (RCTViewControllerBasedStatusBarAppearance()) {
+    RCTLogError(@"RCTStatusBarManager module requires that the \
+                UIViewControllerBasedStatusBarAppearance key in the Info.plist is set to NO");
+    return;
+  }
+
+  // TODO (T62270453): Add proper support for UIScenes (this requires view controller based status bar management)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [RCTSharedApplication() setStatusBarHidden:hidden
-                                 withAnimation:animation];
+  [RCTSharedApplication() setStatusBarHidden:hidden
+                               withAnimation:animation];
 #pragma clang diagnostic pop
-  }
 }
 
 RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible)

diff --git a/template/ios/HelloWorld/AppDelegate.m b/template/ios/HelloWorld/AppDelegate.m
@@ -3,7 +3,6 @@
 #import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
-#import <React/RCTRootViewController.h>
 
 #if DEBUG
 #import <FlipperKit/FlipperClient.h>
@@ -40,7 +39,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  RCTRootViewController *rootViewController = [[RCTRootViewController alloc] initWithRootView:rootView];
+  UIViewController *rootViewController = [UIViewController new];
+  rootViewController.view = rootView;
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
   return YES;

diff --git a/template/ios/HelloWorld/Info.plist b/template/ios/HelloWorld/Info.plist
@@ -51,5 +51,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>