Fix canpop logic to be more robust #73993
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flutter-dashboard
bot
added
f: cupertino
HansMuller
approved these changes
Jan 15, 2021
| @@ -1483,10 +1483,14 @@ abstract class ModalRoute<T> extends TransitionRoute<T> with LocalHistoryRoute<T | |||
|
|
|||
| /// Whether this route can be popped. | |||
| /// | |||
| /// A route can be popped if there is at least one active route underneath | |||
There was a problem hiding this comment.
A route can be popped if there is at least one active route below it, or if [willHandlePopInternally] returns true.
| /// When this changes, if the route is visible, the route will | ||
| /// rebuild, and any widgets that used [ModalRoute.of] will be | ||
| /// notified. | ||
| bool get canPop => isActive && (!isFirst || willHandlePopInternally); | ||
| bool get canPop => hasActiveRouteBelow || willHandlePopInternally; |
There was a problem hiding this comment.
This is much easier to understand than the old version :-)
| } | ||
| return false; | ||
| } | ||
| _navigator!._history.cast<_RouteEntry?>().firstWhere( |
There was a problem hiding this comment.
This is OK, although a for loop might have been simpler.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As title
Fixes #73956
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.