fix [#53](#53), fix back event cannot close loading

Author: xdd666t

CHANGELOG.md

@@ -1,5 +1,10 @@
 # [4.0.x]
 
+- Fix [#53](https://github.com/fluttercandies/flutter_smart_dialog/issues/53)
+- Fix back event cannot close loading
+
+# [4.0.0]
+
 - Breaking Change!!! migrate doc: [3.x migrate 4.0](https://github.com/fluttercandies/flutter_smart_dialog/blob/master/docs/3.x%20migrate%204.0.md) | [3.x 迁移 4.0](https://juejin.cn/post/7093867453012246565)
 - Major update
 - Subdivided 'config', can control 'show', 'showAttach', 'showLoading', 'showToast' in more detail
@@ -10,6 +15,7 @@
 - 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

@@ -5,6 +5,7 @@ import 'package:flutter_smart_dialog/src/data/dialog_info.dart';
 import 'package:flutter_smart_dialog/src/data/smart_tag.dart';
 import 'package:flutter_smart_dialog/src/helper/dialog_proxy.dart';
 import 'package:flutter_smart_dialog/src/helper/route_record.dart';
+import 'package:flutter_smart_dialog/src/util/view_utils.dart';
 import 'package:flutter_smart_dialog/src/widget/attach_dialog_widget.dart';
 
 import '../config/enum_config.dart';
@@ -215,10 +216,12 @@ class CustomDialog extends BaseDialog {
       proxy.dialogQueue.addLast(dialogInfo);
     }
     // insert the dialog carrier into the page
-    Overlay.of(DialogProxy.contextOverlay)!.insert(
-      overlayEntry,
-      below: proxy.entryLoading,
-    );
+    ViewUtils.addRouteSafeUse(() {
+      Overlay.of(DialogProxy.contextOverlay)!.insert(
+        overlayEntry,
+        below: proxy.entryLoading,
+      );
+    });
   }
 
   bool _checkDebounce(bool debounce, DialogType type) {

lib/src/custom/custom_loading.dart

@@ -23,7 +23,7 @@ class CustomLoading extends BaseDialog {
     required Color maskColor,
     required Widget? maskWidget,
     required bool backDismiss,
-  }) async {
+  }) {
     DialogProxy.instance.loadingBackDismiss = backDismiss;
     SmartDialog.config.loading.isExist = true;
 

lib/src/custom/main_dialog.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/src/data/base_controller.dart';
 import 'package:flutter_smart_dialog/src/data/smart_tag.dart';
 import 'package:flutter_smart_dialog/src/helper/dialog_proxy.dart';
+import 'package:flutter_smart_dialog/src/util/view_utils.dart';
 import 'package:flutter_smart_dialog/src/widget/attach_dialog_widget.dart';
 import 'package:flutter_smart_dialog/src/widget/smart_dialog_widget.dart';
 
@@ -104,23 +105,25 @@ class MainDialog {
     required VoidCallback? onDismiss,
     required bool useSystem,
   }) {
-    _onDismiss = onDismiss;
-
-    if (useSystem && DialogProxy.contextNavigator != null) {
-      var tempWidget = _widget;
-      showDialog(
-        context: DialogProxy.contextNavigator!,
-        barrierColor: Colors.transparent,
-        barrierDismissible: false,
-        useSafeArea: false,
-        routeSettings: RouteSettings(name: SmartTag.systemDialog),
-        builder: (BuildContext context) => tempWidget,
-      );
-      _widget = Container();
-    }
-
-    //refresh dialog
-    overlayEntry.markNeedsBuild();
+    ViewUtils.addRouteSafeUse(() {
+      _onDismiss = onDismiss;
+
+      if (useSystem && DialogProxy.contextNavigator != null) {
+        var tempWidget = _widget;
+        _widget = Container();
+        showDialog(
+          context: DialogProxy.contextNavigator!,
+          barrierColor: Colors.transparent,
+          barrierDismissible: false,
+          useSafeArea: false,
+          routeSettings: RouteSettings(name: SmartTag.systemDialog),
+          builder: (BuildContext context) => tempWidget,
+        );
+      }
+
+      //refresh dialog
+      overlayEntry.markNeedsBuild();
+    });
   }
 
   Future<void> dismiss<T>({

lib/src/helper/dialog_proxy.dart

@@ -188,7 +188,7 @@ class DialogProxy {
     required bool debounce,
     required SmartToastType displayType,
     required Widget widget,
-  }) async {
+  }) {
     return _toast.showToast(
       alignment: alignment,
       clickMaskDismiss: clickMaskDismiss,

lib/src/helper/navigator_observer.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/src/config/enum_config.dart';
 import 'package:flutter_smart_dialog/src/data/smart_tag.dart';
 import 'package:flutter_smart_dialog/src/helper/route_record.dart';
+import 'package:flutter_smart_dialog/src/util/view_utils.dart';
 
 import '../custom/custom_dialog.dart';
 import '../smart_dialog.dart';
@@ -12,6 +14,8 @@ class SmartNavigatorObserver extends NavigatorObserver {
     DialogProxy.contextNavigator ??= navigator?.context;
     RouteRecord.instance.push(route, previousRoute);
     RouteRecord.curRoute = route;
+
+    ViewUtils.routeSafeUse = false;
   }
 
   @override

lib/src/helper/route_record.dart

@@ -1,6 +1,7 @@
 import 'dart:collection';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:flutter_smart_dialog/src/data/smart_tag.dart';
 import 'package:flutter_smart_dialog/src/helper/dialog_proxy.dart';
 
@@ -33,6 +34,12 @@ class RouteRecord {
   bool handleSmartDialog() {
     bool shouldHandle = true;
     try {
+      //handle loading
+      if (SmartDialog.config.isExistLoading) {
+        return true;
+      }
+
+      //handle dialog
       if (DialogProxy.instance.dialogQueue.isEmpty) {
         if (routeQueue.isNotEmpty) routeQueue.clear();
         shouldHandle = false;

lib/src/init_dialog.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/src/helper/navigator_observer.dart';
+import 'package:flutter_smart_dialog/src/util/view_utils.dart';
 import 'package:flutter_smart_dialog/src/widget/toast_widget.dart';
 
 import 'helper/dialog_proxy.dart';
@@ -71,7 +72,7 @@ class FlutterSmartDialog extends StatefulWidget {
 class _FlutterSmartDialogState extends State<FlutterSmartDialog> {
   @override
   void initState() {
-    WidgetsBinding.instance?.addPostFrameCallback((timeStamp) {
+    ViewUtils.addPostFrameCallback((timeStamp) {
       try {
         var navigator = widget.child as Navigator;
         var key = navigator.key as GlobalKey;

lib/src/util/view_utils.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/scheduler.dart';
+
+class ViewUtils {
+  static bool routeSafeUse = false;
+
+  static void addRouteSafeUse(VoidCallback callback) async {
+    if (routeSafeUse) {
+      callback();
+      return;
+    }
+
+    ViewUtils.addPostFrameCallback((timeStamp) {
+      routeSafeUse = true;
+      callback();
+    });
+  }
+
+  static void addPostFrameCallback(FrameCallback callback) {
+    WidgetsBinding.instance?.addPostFrameCallback(callback);
+  }
+}

lib/src/widget/attach_dialog_widget.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/src/data/base_controller.dart';
 import 'package:flutter_smart_dialog/src/data/location.dart';
+import 'package:flutter_smart_dialog/src/util/view_utils.dart';
 
 import '../config/enum_config.dart';
 
@@ -120,7 +121,7 @@ class _AttachDialogWidgetState extends State<AttachDialogWidget>
       targetOffset = widget.target!;
       targetSize = Size.zero;
     }
-    WidgetsBinding.instance?.addPostFrameCallback((timeStamp) {
+    ViewUtils.addPostFrameCallback((timeStamp) {
       if (mounted) _handleAnimatedAndLocation();
     });
     _axis = Axis.vertical;