Fix applying drawBehind through mergeOptions (#5951)

mergeOptions did not handle bottomTabs.drawBehind options properly - the ReactRootView wasn't remeasured.
wix · Feb 23, 2020 · e002a68 · e002a68
1 parent 2b87be7
commit e002a68
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/ios/RNNComponentPresenter.m b/lib/ios/RNNComponentPresenter.m
@@ -118,9 +118,13 @@ - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigat
 
 	if (options.topBar.drawBehind.hasValue) {
 		[viewController setDrawBehindTopBar:options.topBar.drawBehind.get];
-  }
+    }
+
+    if (options.bottomTabs.drawBehind.hasValue) {
+        [viewController setDrawBehindTabBar:options.bottomTabs.drawBehind.get];
+    }
 
-  if (options.topBar.title.text.hasValue) {
+    if (options.topBar.title.text.hasValue) {
 		[viewController setNavigationItemTitle:options.topBar.title.text.get];
 	}
 

diff --git a/lib/ios/UIViewController+RNNOptions.m b/lib/ios/UIViewController+RNNOptions.m
@@ -62,6 +62,11 @@ - (void)setDrawBehindTopBar:(BOOL)drawBehind {
 	} else {
 		self.edgesForExtendedLayout &= ~UIRectEdgeTop;
 	}
+
+    if (self.isViewLoaded) {
+        [self.view setNeedsLayout];
+        [self.view layoutIfNeeded];
+    }
 }
 
 - (void)setDrawBehindTabBar:(BOOL)drawBehindTabBar {
@@ -70,6 +75,11 @@ - (void)setDrawBehindTabBar:(BOOL)drawBehindTabBar {
 	} else {
 		self.edgesForExtendedLayout &= ~UIRectEdgeBottom;
 	}
+
+    if (self.isViewLoaded) {
+        [self.view setNeedsLayout];
+        [self.view layoutIfNeeded];
+    }
 }
 
 - (void)setTabBarItemBadge:(NSString *)badge {