fix: [MDS-1008] Fix open modal giving error on Storybook navigation (#…

…367) Co-authored-by: Birgitt Majas <birgitt.majas@yolo.com>
coingaming · Feb 26, 2024 · 170173a · 170173a
1 parent 5c58366
commit 170173a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/example/lib/src/storybook/routing/app_router.dart b/example/lib/src/storybook/routing/app_router.dart
@@ -198,6 +198,10 @@ GoRouter router = GoRouter(
       pageBuilder: (BuildContext context, GoRouterState state) => const NoTransitionPage(
         child: ModalStory(),
       ),
+      onExit: (BuildContext _) {
+        if (router.canPop()) router.pop();
+        return true;
+      },
     ),
     GoRoute(
       path: PopoverStory.path,

diff --git a/example/lib/src/storybook/stories/modal.dart b/example/lib/src/storybook/stories/modal.dart
@@ -56,7 +56,7 @@ class ModalStory extends StatelessWidget {
         context: context,
         useRootNavigator: false,
         barrierColor: barrierColor,
-        builder: (BuildContext _) {
+        builder: (BuildContext context) {
           return Directionality(
             textDirection: Directionality.of(context),
             child: MoonModal(
@@ -104,21 +104,13 @@ class ModalStory extends StatelessWidget {
     }
 
     return Center(
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 64.0, horizontal: 16.0),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Builder(
-              builder: (BuildContext context) {
-                return MoonFilledButton(
-                  label: const Text("Tap me"),
-                  onTap: () => modalBuilder(context),
-                );
-              },
-            ),
-          ],
-        ),
+      child: Builder(
+        builder: (BuildContext context) {
+          return MoonFilledButton(
+            label: const Text("Tap me"),
+            onTap: () => modalBuilder(context),
+          );
+        },
       ),
     );
   }