[go_router] Fix ShellRoutes break iOS swipe back navigation #9968
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request fixes an issue with the iOS back gesture on ShellRoute and StatefulShellRoute. The fix involves wrapping the nested navigator in a PopScope to prevent it from being popped when there are active sub-routes. The logic seems correct and is well-covered by new regression tests for both ShellRoute and StatefulShellRoute.
I have a couple of suggestions for the new test files to improve code clarity and maintainability. Please see my comments.
packages/go_router/test/stateful_shell_route_ios_back_gesture_test.dart
Outdated
Show resolved
Hide resolved
LukasMirbt
force-pushed
the
go-router/shell-route-ios-back-gesture
branch
3 times, most recently
from
986413c to
1a2594d
Compare
| errorBuilder: widget.errorBuilder, | ||
| errorPageBuilder: widget.errorPageBuilder, | ||
| requestFocus: widget.requestFocus, | ||
| return PopScope( |
There was a problem hiding this comment.
@justinmc is this the right way to prevent an iOS backgesture? or should we use NavigatorPopHandler?
There was a problem hiding this comment.
Seems like Justin is on vacation. Is there anybody else we can loop in or should we wait for him?
There was a problem hiding this comment.
Let's wait for him. I "think" we should use NavigatorPopHandler and I also remember Justin was also fixing something about the nested navigator in go_router
There was a problem hiding this comment.
@LukasMirbt Could you check if flutter/flutter#152330 fixes this issue? If so I'd prefer to wait for that PR. If not, we should confirm that any fix made inside of go_router here will still work after that PR lands.
There was a problem hiding this comment.
@justinmc flutter/flutter#152330 does seem to fix this issue 🎉
However, I don't see a compelling reason to wait for your PR since it will most likely take a couple of months before it hits stable, even once it's merged, and the issue linked in this PR has over 50 upvotes.
All the go_router tests + regression tests seem to pass (on your fork) both with and without the fix added in this PR. I propose we add a TODO to remove the PopScope once your fix has hit stable and merge this PR in the meantime.
Let me know if you disagree!
There was a problem hiding this comment.
Can the change here and flutter change coexist? If so, can you add a test to make sure android back button work correctly so that when stable roll into package won't break go_router?
Otherwise, adding a todo and merge this now sgtm
There was a problem hiding this comment.
Can the change here and flutter change coexist?
Yes, it seems like the fix is forward compatible 👍 The tests are passing with flutter/flutter#152330.
If so, can you add a test to make sure android back button work correctly so that when stable roll into package won't break go_router?
Done ✅
Otherwise, adding a todo and merge this now sgtm
TODO added as well!
This comment was marked as abuse.
This comment was marked as abuse.
LukasMirbt
force-pushed
the
go-router/shell-route-ios-back-gesture
branch
2 times, most recently
from
2583e75 to
18b96f1
Compare
LukasMirbt
force-pushed
the
go-router/shell-route-ios-back-gesture
branch
from
867f618 to
c3c3f87
Compare
Adds
PopScopewhich prevents iOS back gesture from poppingShellRoutewhen there are active sub-routes.Closes flutter/flutter#120353.
Pre-Review Checklist
[shared_preferences]pubspec.yamlwith an appropriate new version according to the pub versioning philosophy, or I have commented below to indicate which version change exemption this PR falls under1.CHANGELOG.mdto add a description of the change, following repository CHANGELOG style, or I have commented below to indicate which CHANGELOG exemption this PR falls under1.///).If you need help, consider asking for advice on the #hackers-new channel on Discord.
Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the
gemini-code-assistbot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.Footnotes
Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩2 ↩3