Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[iOS] Fixes system navigator pop not work when App's root vc is TabBarController #30939

Merged
gaaclarke merged 3 commits into from
Jan 25, 2022
Merged

[iOS] Fixes system navigator pop not work when App's root vc is TabBarController #30939

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
d2d8b27
[iOS] Fixes system navigator pop not work when App's root vc is TabBa…
zhongwuzw Jan 20, 2022
ea828af
Add test
zhongwuzw Jan 20, 2022
d19f269
Update review feedback
zhongwuzw Jan 25, 2022
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
13 changes: 8 additions & 5 deletions shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,15 @@ - (void)popSystemNavigator:(BOOL)isAnimated {
// in the navigation hierarchy.
// It's also possible in an Add2App scenario that the FlutterViewController was presented
// outside the context of a UINavigationController, and still wants to be popped.
UIViewController* viewController = [UIApplication sharedApplication].keyWindow.rootViewController;
if ([viewController isKindOfClass:[UINavigationController class]]) {
[((UINavigationController*)viewController) popViewControllerAnimated:isAnimated];

UIViewController* engineViewController = [_engine.get() viewController];
UINavigationController* navigationController = [engineViewController navigationController];
Copy link
Member

@jmagman jmagman Jan 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this fall back on UIApplication.sharedApplication.keyWindow.rootViewController if it's nil to match the old behavior?

Copy link
Contributor

@dnfield dnfield Jan 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that what it's doing on line 250?

Copy link
Member

@jmagman jmagman Jan 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That code path isn't calling popViewControllerAnimated.

Copy link
Member Author

@zhongwuzw zhongwuzw Jan 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this fall back on UIApplication.sharedApplication.keyWindow.rootViewController if it's nil to match the old behavior?

Em, I think we can't match the old behavior, because if UIApplication.sharedApplication.keyWindow.rootViewController is UINavigationController but FlutterViewController's navigationController is nil, like FlutterViewController is presented, it would pop the top native view controller but not presented FlutterViewController

Copy link
Member

@jmagman jmagman Jan 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see, thanks for the explanation.

if (navigationController) {
[navigationController popViewControllerAnimated:isAnimated];
Copy link

@rakeyang rakeyang Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果是present出来的UINavigationController而且rootViewController是FlutterViewController，这里是没办法关闭的吧？

Copy link
Member

@jmagman jmagman Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Translation:

If it is the presented UINavigationController and the rootViewController is the FlutterViewController, there is no way to close it, right?

@rakeyang If you're seeing a specific problem related to this, please file an issue and we'll investigate. Closed PRs aren't usually monitored.

} else {
auto engineViewController = static_cast<UIViewController*>([_engine.get() viewController]);
if (engineViewController != viewController) {
UIViewController* rootViewController =
[UIApplication sharedApplication].keyWindow.rootViewController;
if (engineViewController != rootViewController) {
[engineViewController dismissViewControllerAnimated:isAnimated completion:nil];
}
}
Expand Down
29 changes: 29 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
#import "flutter/shell/platform/darwin/ios/platform_view_ios.h"

Expand Down Expand Up @@ -48,4 +49,32 @@ - (void)testHasStrings {
XCTAssertEqual(value, true);
}

- (void)testPopSystemNavigator {
FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
[engine runWithEntrypoint:nil];
FlutterViewController* flutterViewController =
[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
UINavigationController* navigationController =
[[UINavigationController alloc] initWithRootViewController:flutterViewController];
UITabBarController* tabBarController = [[UITabBarController alloc] init];
tabBarController.viewControllers = @[ navigationController ];
std::unique_ptr<fml::WeakPtrFactory<FlutterEngine>> _weakFactory =
std::make_unique<fml::WeakPtrFactory<FlutterEngine>>(engine);
FlutterPlatformPlugin* plugin =
[[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakPtr()];

id navigationControllerMock = OCMPartialMock(navigationController);
OCMStub([navigationControllerMock popViewControllerAnimated:YES]);
// Set some string to the pasteboard.
__block bool calledSet = false;
FlutterResult resultSet = ^(id result) {
calledSet = true;
};
FlutterMethodCall* methodCallSet =
[FlutterMethodCall methodCallWithMethodName:@"SystemNavigator.pop" arguments:@(YES)];
[plugin handleMethodCall:methodCallSet result:resultSet];
XCTAssertEqual(calledSet, true);
OCMVerify([navigationControllerMock popViewControllerAnimated:YES]);
}

@end