optimize

Author: xdd666t

CHANGELOG.md

@@ -1,3 +1,15 @@
+# [4.0.x]
+
+- Breaking Change!!! migrate doc: [3.x migrate 4.0]() | [3.x 迁移 4.0]()
+- Major update
+- Subdivided 'config', can control 'show', 'showAttach', 'showLoading', 'showToast' in more detail
+- Add 'bindPage' feature, it can reasonably solve the problem of dialog jumping pages
+- Now 'dismiss' can carry the return value, similar to pop and push usage
+- You can use the 'permanent' param to set a permanent dialog
+- The interval time that can be added between successive displays of toasts
+- Loading can set the least loading time
+- Add click listener for dialog mask
+
 # [3.4.x]
 
 - 'showToast' add 'consumeEvent' param: [#27](https://github.com/fluttercandies/flutter_smart_dialog/issues/27)

lib/src/custom/custom_dialog.dart

@@ -73,7 +73,7 @@ class CustomDialog extends BaseDialog {
       reuse: true,
       onMask: () {
         onMask?.call();
-        if (!clickMaskDismiss || !_clickMaskDebounce()) return;
+        if (!clickMaskDismiss || !_clickMaskDebounce() || permanent) return;
         dismiss();
       },
     );
@@ -128,7 +128,7 @@ class CustomDialog extends BaseDialog {
       useSystem: useSystem,
       onMask: () {
         onMask?.call();
-        if (!clickMaskDismiss || !_clickMaskDebounce()) return;
+        if (!clickMaskDismiss || !_clickMaskDebounce() || permanent) return;
         dismiss();
       },
     );

lib/src/custom/custom_toast.dart

@@ -62,7 +62,7 @@ class CustomToast extends BaseDialog {
       );
     }
 
-    multiTypeToast() async {
+    Future<void> multiTypeToast() async {
       // provider multiple toast display logic
       if (displayType == SmartToastType.normal) {
         await _normalToast(time: displayTime, onShowToast: showToast);
@@ -78,7 +78,7 @@ class CustomToast extends BaseDialog {
     }
 
     //handling different types of toast
-    handleMultiTypeToast(curType: displayType, fun: multiTypeToast);
+    await handleMultiTypeToast(curType: displayType, fun: multiTypeToast);
   }
 
   ///--------------------------multi type toast--------------------------
@@ -152,15 +152,15 @@ class CustomToast extends BaseDialog {
 
   ///--------------------------multi type toast--------------------------
 
-  void handleMultiTypeToast({
+  Future<void> handleMultiTypeToast({
     required SmartToastType curType,
-    required Function() fun,
+    required Future<void> Function() fun,
   }) async {
     _lastType = _lastType ?? curType;
     if (_lastType != curType || _tempQueue.isNotEmpty) {
       _tempQueue.add(_ToastInfo(type: curType, fun: fun));
     } else {
-      fun();
+      await fun();
     }
     _lastType = curType;
   }
@@ -215,5 +215,5 @@ class _ToastInfo {
   _ToastInfo({required this.type, required this.fun});
 
   SmartToastType type;
-  Function() fun;
+  Future<void> Function() fun;
 }