Merge pull request #3183 from jonataslaw/RC-10

New release
jonataslaw · Aug 16, 2024 · fc1619e · fc1619e
2 parents f7a6330 + 92dee00
commit fc1619e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [5.0.0-release-candidate-10]
+
+- Fix Get.offNamedUntil
+- Fix GetObserver
+
 ## [5.0.0-release-candidate-9]
 
 - Fix redirectDelegate middleware

diff --git a/lib/get_navigation/src/extension_navigation.dart b/lib/get_navigation/src/extension_navigation.dart
@@ -172,7 +172,7 @@ extension ExtensionDialog on GetInterface {
     List<Widget>? actions,
 
     // onWillPop Scope
-    PopInvokedCallback? onWillPop,
+    PopInvokedWithResultCallback<T>? onWillPop,
 
     // the navigator used to push the dialog
     GlobalKey<NavigatorState>? navigatorKey,
@@ -268,8 +268,10 @@ extension ExtensionDialog on GetInterface {
 
     return dialog<T>(
       onWillPop != null
-          ? PopScope(
-              onPopInvoked: onWillPop,
+          ? PopScope<T>(
+              onPopInvokedWithResult: (didPop, result) =>
+                  onWillPop(didPop, result),
+              // onPopInvoked: onWillPop,
               child: baseAlertDialog,
             )
           : baseAlertDialog,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: get
 description: Open screens/snackbars/dialogs without context, manage states and inject dependencies easily with GetX.
-version: 5.0.0-release-candidate-9
+version: 5.0.0-release-candidate-10
 homepage: https://github.com/jonataslaw/getx
 
 environment: