Top notch view fix

expertanswerz · Apr 9, 2020 · 1f182ef · 1f182ef
1 parent 81aa8ba
commit 1f182ef
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/ios/CDVInAppBrowserNavigationController.m b/src/ios/CDVInAppBrowserNavigationController.m
@@ -32,7 +32,16 @@ - (void) dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))com
 - (void) viewDidLoad {
 
     CGRect statusBarFrame = [self invertFrameIfNeeded:[UIApplication sharedApplication].statusBarFrame];
-    statusBarFrame.size.height = STATUSBAR_HEIGHT;
+    //statusBarFrame.size.height = STATUSBAR_HEIGHT;
+     bool hasTopNotch = NO;
+      if (@available(iOS 11.0, *)) {
+          hasTopNotch = [[[UIApplication sharedApplication] delegate] window].safeAreaInsets.top > 20.0;
+      }
+      if(hasTopNotch){
+          statusBarFrame.size.height = [UIApplication sharedApplication].statusBarFrame.size.height;
+      } else {
+          statusBarFrame.size.height = STATUSBAR_HEIGHT;
+      }
     // simplified from: http://stackoverflow.com/a/25669695/219684
 
     UIToolbar* bgToolbar = [[UIToolbar alloc] initWithFrame:statusBarFrame];

diff --git a/src/ios/CDVWKInAppBrowser.m b/src/ios/CDVWKInAppBrowser.m
@@ -1121,8 +1121,23 @@ - (void)viewWillAppear:(BOOL)animated
     if (IsAtLeastiOSVersion(@"7.0") && !viewRenderedAtLeastOnce) {
         viewRenderedAtLeastOnce = TRUE;
         CGRect viewBounds = [self.webView bounds];
-        viewBounds.origin.y = STATUSBAR_HEIGHT;
-        viewBounds.size.height = viewBounds.size.height - STATUSBAR_HEIGHT;
+        // viewBounds.origin.y = STATUSBAR_HEIGHT;
+        // viewBounds.size.height = viewBounds.size.height - STATUSBAR_HEIGHT;
+
+
+        bool hasTopNotch = NO;
+        if (@available(iOS 11.0, *)) {
+            hasTopNotch = [[[UIApplication sharedApplication] delegate] window].safeAreaInsets.top > 20.0;
+        }
+        if(hasTopNotch){
+            viewBounds.origin.y = [UIApplication sharedApplication].statusBarFrame.size.height;
+            viewBounds.size.height = viewBounds.size.height - [UIApplication sharedApplication].statusBarFrame.size.height;
+        } else {
+            viewBounds.origin.y = STATUSBAR_HEIGHT;
+            viewBounds.size.height = viewBounds.size.height - STATUSBAR_HEIGHT;
+        }
+
+
         self.webView.frame = viewBounds;
         [[UIApplication sharedApplication] setStatusBarStyle:[self preferredStatusBarStyle]];
     }