fix(ios): navigation bar jumps at end of open animation on iOS15

Fixes TIMOB-28488
tidev · Sep 14, 2021 · d334ac9 · d334ac9
1 parent 54132d2
commit d334ac9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 26 deletions.
diff --git a/iphone/Classes/TiUINavigationWindowProxy.m b/iphone/Classes/TiUINavigationWindowProxy.m
@@ -391,7 +391,10 @@ - (void)cleanNavStack
 #pragma mark - TiWindowProtocol
 - (void)viewWillAppear:(BOOL)animated
 {
-  if ([self viewAttached]) {
+  if (navController && [self viewAttached]) {
+    UIViewController *parentController = [self windowHoldingController];
+    [parentController addChildViewController:navController];
+    [navController didMoveToParentViewController:parentController];
     [navController viewWillAppear:animated];
   }
   [super viewWillAppear:animated];
@@ -527,18 +530,6 @@ - (void)windowWillOpen
   [super windowWillOpen];
 }
 
-- (void)windowDidOpen
-{
-  // Set parent for navigation controller
-  if (navController) {
-    UIViewController *parentController = [self windowHoldingController];
-    [parentController addChildViewController:navController];
-    [navController didMoveToParentViewController:parentController];
-  }
-
-  [super windowDidOpen];
-}
-
 - (void)windowDidClose
 {
   [self cleanNavStack];

diff --git a/iphone/Classes/TiUITabGroupProxy.m b/iphone/Classes/TiUITabGroupProxy.m
@@ -150,19 +150,6 @@ - (void)windowWillOpen
   [super windowWillOpen];
 }
 
-- (void)windowDidOpen
-{
-  // Set parent view controller for UITabBarController
-  TiUITabGroup *tabGroup = (TiUITabGroup *)self.view;
-  if (tabGroup) {
-    UITabBarController *tabController = [tabGroup tabController];
-    UIViewController *parentController = [self windowHoldingController];
-    [parentController addChildViewController:tabController];
-    [tabController didMoveToParentViewController:parentController];
-  }
-  [super windowDidOpen];
-}
-
 - (void)windowWillClose
 {
   TiUITabGroup *tabGroup = (TiUITabGroup *)self.view;
@@ -230,6 +217,9 @@ - (void)viewWillAppear:(BOOL)animated;
 {
   if ([self viewAttached]) {
     UITabBarController *tabController = [(TiUITabGroup *)[self view] tabController];
+    UIViewController *parentController = [self windowHoldingController];
+    [parentController addChildViewController:tabController];
+    [tabController didMoveToParentViewController:parentController];
     [tabController viewWillAppear:animated];
   }
   [super viewWillAppear:animated];