Fix AlertDialog broken content when testing in Flet app (#2192)

* Fix AlertDialog broken content when testing in Flet app Fix #2073 * Do not use root navigator and date and time pickers * Cleanup
flet-dev · Dec 4, 2023 · d02f9d7 · d02f9d7
1 parent dfe9b4e
commit d02f9d7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/package/lib/src/controls/alert_dialog.dart b/package/lib/src/controls/alert_dialog.dart
@@ -20,13 +20,12 @@ class AlertDialogControl extends StatefulWidget {
   final Widget? nextChild;
 
   const AlertDialogControl(
-      {Key? key,
+      {super.key,
       this.parent,
       required this.control,
       required this.children,
       required this.parentDisabled,
-      required this.nextChild})
-      : super(key: key);
+      required this.nextChild});
 
   @override
   State<AlertDialogControl> createState() => _AlertDialogControlState();
@@ -96,16 +95,17 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
 
             // close previous dialog
             if (ModalRoute.of(context)?.isCurrent != true) {
-              Navigator.pop(context);
+              Navigator.of(context).pop();
             }
 
             widget.control.state["open"] = open;
 
             WidgetsBinding.instance.addPostFrameCallback((_) {
               showDialog(
                   barrierDismissible: !modal,
+                  useRootNavigator: false,
                   context: context,
-                  builder: (context) => _createAlertDialog()).then((value) {
+                  builder: (context) => dialog).then((value) {
                 lastOpen = widget.control.state["open"] ?? false;
                 debugPrint("Dialog should be dismissed ($hashCode): $lastOpen");
                 bool shouldDismiss = lastOpen;
@@ -126,7 +126,7 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
               });
             });
           } else if (open != lastOpen && lastOpen) {
-            Navigator.pop(context);
+            Navigator.of(context).pop();
           }
 
           return widget.nextChild ?? const SizedBox.shrink();

diff --git a/package/lib/src/controls/bottom_sheet.dart b/package/lib/src/controls/bottom_sheet.dart
@@ -17,14 +17,13 @@ class BottomSheetControl extends StatefulWidget {
   final Widget? nextChild;
 
   const BottomSheetControl(
-      {Key? key,
+      {super.key,
       this.parent,
       required this.control,
       required this.children,
       required this.parentDisabled,
       required this.dispatch,
-      required this.nextChild})
-      : super(key: key);
+      required this.nextChild});
 
   @override
   State<BottomSheetControl> createState() => _BottomSheetControlState();
@@ -119,7 +118,7 @@ class _BottomSheetControlState extends State<BottomSheetControl> {
         });
       });
     } else if (open != lastOpen && lastOpen) {
-      Navigator.pop(context);
+      Navigator.of(context).pop();
     }
 
     return const SizedBox.shrink();

diff --git a/package/lib/src/controls/date_picker.dart b/package/lib/src/controls/date_picker.dart
@@ -15,13 +15,13 @@ class DatePickerControl extends StatefulWidget {
   final dynamic dispatch;
 
   const DatePickerControl({
-    Key? key,
+    super.key,
     this.parent,
     required this.control,
     required this.children,
     required this.parentDisabled,
     required this.dispatch,
-  }) : super(key: key);
+  });
 
   @override
   State<DatePickerControl> createState() => _DatePickerControlState();
@@ -137,6 +137,7 @@ class _DatePickerControlState extends State<DatePickerControl> {
 
       WidgetsBinding.instance.addPostFrameCallback((_) {
         showDialog<DateTime>(
+            useRootNavigator: false,
             context: context,
             builder: (context) => createSelectDateDialog()).then((result) {
           debugPrint("pickDate() completed");

diff --git a/package/lib/src/controls/time_picker.dart b/package/lib/src/controls/time_picker.dart
@@ -13,13 +13,13 @@ class TimePickerControl extends StatefulWidget {
   final dynamic dispatch;
 
   const TimePickerControl({
-    Key? key,
+    super.key,
     this.parent,
     required this.control,
     required this.children,
     required this.parentDisabled,
     required this.dispatch,
-  }) : super(key: key);
+  });
 
   @override
   State<TimePickerControl> createState() => _TimePickerControlState();
@@ -97,6 +97,7 @@ class _TimePickerControlState extends State<TimePickerControl> {
 
       WidgetsBinding.instance.addPostFrameCallback((_) {
         showDialog<TimeOfDay>(
+            useRootNavigator: false,
             context: context,
             builder: (context) => createSelectTimeDialog()).then((result) {
           debugPrint("pickTime() completed");