Skip to content

[iOS] Fix getCurrentlyVisibleScreenId with drawer #2052

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

Merged
yogevbd merged 3 commits into from
Dec 24, 2017
Merged

[iOS] Fix getCurrentlyVisibleScreenId with drawer #2052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c03bfbc
Improve getCurrentlyVisibleScreenId on iOS with drawers.
Oct 20, 2017
58d51ba
Merge branch 'master' into fix-getcurrentlyvisiblescreenId-ios-with-d…
guyca Dec 23, 2017
aee6f94
Merge branch 'master' into fix-getcurrentlyvisiblescreenId-ios-with-d…
yogevbd Dec 24, 2017
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
8 changes: 8 additions & 0 deletions ios/RCCManagerModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,14 @@ - (UIViewController *) getVisibleViewControllerFor:(UIViewController *)vc
{
return [self getVisibleViewControllerFor:vc.presentedViewController];
}
else if ([vc isKindOfClass:[TheSidebarController class]]) {
TheSidebarController *drawerController = (TheSidebarController*) vc;
return [self getVisibleViewControllerFor:drawerController.contentViewController];
}
else if ([vc isKindOfClass:[MMDrawerController class]]) {
MMDrawerController *drawerController = (MMDrawerController*) vc;
return [self getVisibleViewControllerFor:drawerController.centerViewController];
}
else
{
return vc;
Expand Down
2 changes: 1 addition & 1 deletion ios/RCCNavigationController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children

RCCViewController *viewController = [[RCCViewController alloc] initWithComponent:component passProps:passProps navigatorStyle:navigatorStyle globalProps:globalProps bridge:bridge];
if (!viewController) return nil;
viewController.controllerId = props[@"id"];
viewController.controllerId = passProps[@"screenInstanceID"];

NSArray *leftButtons = props[@"leftButtons"];
if (leftButtons)
Expand Down