Jonny Borges
Committed by GitHub

Merge pull request #3049 from songgnqing/master

fix: PopScope swipe back
@@ -780,6 +780,8 @@ Cannot read the previousTitle for a route that has not yet been installed''', @@ -780,6 +780,8 @@ Cannot read the previousTitle for a route that has not yet been installed''',
780 // If attempts to dismiss this route might be vetoed such as in a page 780 // If attempts to dismiss this route might be vetoed such as in a page
781 // with forms, then do not allow the user to dismiss the route with a swipe. 781 // with forms, then do not allow the user to dismiss the route with a swipe.
782 if (route.hasScopedWillPopCallback) return false; 782 if (route.hasScopedWillPopCallback) return false;
  783 + // support [PopScope]
  784 + if (route.popDisposition == RoutePopDisposition.doNotPop) return false;
783 // Fullscreen dialogs aren't dismissible by back swipe. 785 // Fullscreen dialogs aren't dismissible by back swipe.
784 if (route.fullscreenDialog) return false; 786 if (route.fullscreenDialog) return false;
785 // If we're in an animation already, we cannot be manually swiped. 787 // If we're in an animation already, we cannot be manually swiped.