Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed pop scope exit

Browse source
This commit is contained in:
Thibault Deckers 2023-11-29 22:19:25 +01:00
parent 90d836cf37
commit 4c1c516206
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/widgets/common/behaviour/pop/scope.dart
View file

@ -1,3 +1,4 @@
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
// as of Flutter v3.3.10, the resolution order of multiple `WillPopScope` is random
@ -21,7 +22,12 @@ class AvesPopScope extends StatelessWidget {
final shouldPop = handlers.fold(true, (prev, v) => prev ? v(context) : false);
if (shouldPop) {
Navigator.of(context).pop();
if (Navigator.canPop(context)) {
Navigator.maybeOf(context)?.pop();
} else {
// exit
SystemNavigator.pop();
}
}
},
child: child,