fix: Changed the specification of builder in Modal.show.

mathrunet · Aug 22, 2023 · 3c67fc3 · 3c67fc3
1 parent 6db7486
commit 3c67fc3
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/packages/katana_ui/lib/modal/modal.dart b/packages/katana_ui/lib/modal/modal.dart
@@ -54,7 +54,7 @@ class Modal {
     Color? backgroundColor,
     Color? color,
     required String title,
-    required List<Widget> Function(VoidCallback onClose) builder,
+    required List<Widget> Function(ModalRef ref) builder,
     bool disableBackKey = false,
     bool popOnPress = true,
     bool willShowRepetition = false,
@@ -68,12 +68,12 @@ class Modal {
     if (overlay == null) {
       return;
     }
-    onClose() {
+    final ref = ModalRef._(() {
       if (popOnPress) {
         Navigator.of(context, rootNavigator: true).pop();
       }
       clicked = true;
-    }
+    });
 
     do {
       await showDialog(
@@ -93,7 +93,7 @@ class Modal {
               ),
               backgroundColor:
                   backgroundColor ?? Theme.of(context).colorScheme.surface,
-              children: builder.call(onClose),
+              children: builder.call(ref),
             ),
           );
         },
@@ -306,3 +306,18 @@ class Modal {
     return state;
   }
 }
+
+/// Class for controlling Modal.
+///
+/// Modalをコントロールするためのクラスです。
+@immutable
+class ModalRef {
+  const ModalRef._(this._onClose);
+
+  final VoidCallback _onClose;
+
+  /// Closes the modal.
+  ///
+  /// モーダルを閉じます。
+  void close() => _onClose();
+}