Replace WillPopScope with PopScope, closes darioielardi#331

Guillergood · Jun 15, 2024 · 784377b · 784377b
1 parent 6608449
commit 784377b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -69,13 +69,13 @@ class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
   ];
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
-        if (isDialOpen.value) {
-          isDialOpen.value = false;
-          return false;
+    return PopScope(
+      onPopInvoked: (bool didPop) async {
+        if(didPop) {
+          if (isDialOpen.value) {
+            isDialOpen.value = false;
+          }
         }
-        return true;
       },
       child: Scaffold(
         appBar: AppBar(

diff --git a/lib/src/speed_dial.dart b/lib/src/speed_dial.dart
@@ -492,14 +492,14 @@ class _SpeedDialState extends State<SpeedDial>
   @override
   Widget build(BuildContext context) {
     return (kIsWeb || !Platform.isIOS) && widget.closeDialOnPop
-        ? WillPopScope(
+        ? PopScope(
             child: _renderButton(),
-            onWillPop: () async {
-              if (_open) {
-                _toggleChildren();
-                return false;
+            onPopInvoked: (bool didPop) async {
+              if (didPop) {  
+                if (_open) {
+                  _toggleChildren();
+                }
               }
-              return true;
             },
           )
         : _renderButton();