Skip to content

fix(ios): fix containment issues once and for all #14397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hansemannn wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −57
Open

fix(ios): fix containment issues once and for all #14397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 4 additions & 25 deletions iphone/Classes/TiUINavigationWindowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,34 +397,13 @@ - (void)viewWillAppear:(BOOL)animated
{
if (navController && [self viewAttached]) {
UIViewController *parentController = [self windowHoldingController];
[parentController addChildViewController:navController];
[navController didMoveToParentViewController:parentController];
[navController viewWillAppear:animated];
if (navController.parentViewController != parentController) {
[parentController addChildViewController:navController];
[navController didMoveToParentViewController:parentController];
}
}
[super viewWillAppear:animated];
}
- (void)viewWillDisappear:(BOOL)animated
{
if ([self viewAttached]) {
[navController viewWillDisappear:animated];
}
[super viewWillDisappear:animated];
}

- (void)viewDidAppear:(BOOL)animated
{
if ([self viewAttached]) {
[navController viewDidAppear:animated];
}
[super viewDidAppear:animated];
}
- (void)viewDidDisappear:(BOOL)animated
{
if ([self viewAttached]) {
[navController viewDidDisappear:animated];
}
[super viewDidDisappear:animated];
}

- (BOOL)homeIndicatorAutoHide
{
Expand Down
6 changes: 4 additions & 2 deletions iphone/Classes/TiUITabGroup.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,10 +701,12 @@ - (void)open:(id)args
^{
isTabBarHidden = NO;
UIViewController *parentController = TiApp.controller.topPresentedController;
[parentController addChildViewController:self.tabController];
if (self.tabController.parentViewController != parentController) {
[parentController addChildViewController:self.tabController];
[self.tabController didMoveToParentViewController:parentController];
}
[self addSubview:self.tabController.view];
self.tabController.view.frame = self.bounds;
[self.tabController didMoveToParentViewController:parentController];
},
NO);
}
Expand Down
34 changes: 4 additions & 30 deletions iphone/Classes/TiUITabGroupProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,40 +228,14 @@ - (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];
if (tabController.parentViewController != parentController) {
[parentController addChildViewController:tabController];
[tabController didMoveToParentViewController:parentController];
}
}
[super viewWillAppear:animated];
}

- (void)viewDidAppear:(BOOL)animated;
{
if ([self viewAttached]) {
UITabBarController *tabController = [(TiUITabGroup *)[self view] tabController];
[tabController viewDidAppear:animated];
}
[super viewDidAppear:animated];
}

- (void)viewWillDisappear:(BOOL)animated;
{
if ([self viewAttached]) {
UITabBarController *tabController = [(TiUITabGroup *)[self view] tabController];
[tabController viewWillDisappear:animated];
}
[super viewWillDisappear:animated];
}

- (void)viewDidDisappear:(BOOL)animated;
{
if ([self viewAttached]) {
UITabBarController *tabController = [(TiUITabGroup *)[self view] tabController];
[tabController viewDidDisappear:animated];
}
[super viewDidDisappear:animated];
}

- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
{
if ([self viewAttached]) {
Expand Down