Merge branch 'main' into feature/GH-15/add_golden_test_for_material_c…

…omponents
yumemi-inc · Jan 17, 2025 · eec575f · eec575f
2 parents f10b07c + 975b1ff
commit eec575f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/apps/catalog/lib/use_case/cores/designsystem/theme/containment/alert_dialog.dart b/apps/catalog/lib/use_case/cores/designsystem/theme/containment/alert_dialog.dart
@@ -17,6 +17,7 @@ Widget alertDialog(BuildContext context) => Scaffold(
           onPressed: () {
             unawaited(
               showDialog<void>(
+                useRootNavigator: false,
                 context: context,
                 builder: (context) {
                   return AlertDialog(
@@ -63,6 +64,7 @@ Widget adaptiveAlertDialog(BuildContext context) => Scaffold(
           onPressed: () {
             unawaited(
               showDialog<void>(
+                useRootNavigator: false,
                 context: context,
                 builder: (context) {
                   return AlertDialog.adaptive(

diff --git a/apps/catalog/lib/use_case/cores/designsystem/theme/selection/date_picker.dart b/apps/catalog/lib/use_case/cores/designsystem/theme/selection/date_picker.dart
@@ -20,6 +20,7 @@ Widget datePicker(BuildContext context) {
             context: context,
             firstDate: first,
             lastDate: last,
+            useRootNavigator: false,
           );
           if (context.mounted) {
             ScaffoldMessenger.maybeOf(context)

diff --git a/apps/catalog/lib/use_case/cores/designsystem/theme/selection/date_range_picker.dart b/apps/catalog/lib/use_case/cores/designsystem/theme/selection/date_range_picker.dart
@@ -20,6 +20,7 @@ Widget dateRangePicker(BuildContext context) {
             context: context,
             firstDate: first,
             lastDate: last,
+            useRootNavigator: false,
           );
           if (context.mounted) {
             ScaffoldMessenger.maybeOf(context)?.showSnackBar(

diff --git a/apps/catalog/lib/use_case/cores/designsystem/theme/selection/time_picker.dart b/apps/catalog/lib/use_case/cores/designsystem/theme/selection/time_picker.dart
@@ -23,6 +23,7 @@ Widget timePicker(BuildContext context) {
       child: ElevatedButton(
         onPressed: () async {
           final result = await showTimePicker(
+            useRootNavigator: false,
             context: context,
             initialTime: TimeOfDay.now(),
             orientation: orientation,