Fixed MultipleCallbackPopScope not popping the navigator.

Fixed `MultipleCallbackPopScope` not closing the app on the last navigation pop
jeroen1602 · Dec 7, 2023 · afd22ce · afd22ce
1 parent c4e7e75
commit afd22ce
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/widgets/multiple_callback_pop_scope.dart b/lib/widgets/multiple_callback_pop_scope.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 
 class MultipleCallbackPopScope extends StatefulWidget {
@@ -22,12 +23,18 @@ class _MultipleCallbackPopScopeState extends State<MultipleCallbackPopScope> {
     return PopScope(
       canPop: false,
       onPopInvoked: (final bool didPop) {
+        if (didPop) {
+          return;
+        }
         for (final canPop in widget.canPop) {
           if (!canPop()) {
             return;
           }
         }
         Navigator.pop(context);
+        if (!Navigator.canPop(context)) {
+          SystemNavigator.pop(animated: true);
+        }
       },
       child: widget.child,
     );