fix(ios): make use of darkStatusBarText property in modal controller

Tencent · Nov 6, 2023 · 7aedc7c · 7aedc7c
1 parent b6b22bb
commit 7aedc7c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/framework/examples/ios-demo/HippyDemo/Info.plist b/framework/examples/ios-demo/HippyDemo/Info.plist
@@ -10,8 +10,6 @@
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
@@ -53,6 +51,6 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 </dict>
 </plist>
diff --git a/renderer/native/ios/renderer/component/modal/HippyModalHostView.m b/renderer/native/ios/renderer/component/modal/HippyModalHostView.m
@@ -129,7 +129,12 @@ - (void)didMoveToWindow {
         [_delegate presentModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
         _isPresented = YES;
         originStyle = _modalViewController.preferredStatusBarStyle;
-        UIStatusBarStyle theStyle = self.darkStatusBarText ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent;
+        UIStatusBarStyle theStyle;
+        if (@available(iOS 13.0, *)) {
+            theStyle = self.darkStatusBarText ? UIStatusBarStyleDarkContent : UIStatusBarStyleLightContent;
+        } else {
+            theStyle = self.darkStatusBarText ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent;
+        }
         [_modalViewController setPreferredStatusBarStyle:theStyle];
     }
 }

diff --git a/renderer/native/ios/renderer/component/modal/HippyModalTransitioningDelegate.m b/renderer/native/ios/renderer/component/modal/HippyModalTransitioningDelegate.m
@@ -61,9 +61,9 @@ - (void)presentModalHostView:(HippyModalHostView *)modalHostView
         _presentationBlock([modalHostView hippyViewController], viewController, animated, completionBlock);
     } else {
         if ([modalHostView.hideStatusBar boolValue]) {
-            viewController.modalPresentationCapturesStatusBarAppearance = YES;
             viewController.hideStatusBar = [modalHostView hideStatusBar];
         }
+        viewController.modalPresentationCapturesStatusBarAppearance = YES;
         [[modalHostView hippyViewController] presentViewController:viewController animated:animated completion:completionBlock];
     }
 }