process #135

CHANGELOG.md

@@ -1,7 +1,8 @@
-# [4.9.1]
+# [4.9.x]
 * fix [#132](https://github.com/fluttercandies/flutter_smart_dialog/issues/132)
 * optimize nonAnimationTypes
 * toast add some param
+*  fix [#135](https://github.com/fluttercandies/flutter_smart_dialog/issues/135)
 
 # [4.9.0]
 * Breaking Change

lib/src/init_dialog.dart

@@ -114,9 +114,16 @@ class _FlutterSmartDialogState extends State<FlutterSmartDialog> {
   void initState() {
     ViewUtils.addSafeUse(() {
       try {
-        var navigator = widget.child as Navigator;
-        var key = navigator.key as GlobalKey;
-        DialogProxy.contextNavigator = key.currentContext;
+        BuildContext? context;
+        if (widget.child is Navigator) {
+          context = getNavigatorContext(widget.child as Navigator);
+        } else if (widget.child is FocusScope) {
+          var focusScope = widget.child as FocusScope;
+          if (focusScope.child is Navigator) {
+            context = getNavigatorContext(focusScope.child as Navigator);
+          }
+        }
+        DialogProxy.contextNavigator = context;
       } catch (_) {}
     });
 
@@ -207,4 +214,12 @@ class _FlutterSmartDialogState extends State<FlutterSmartDialog> {
       ]),
     );
   }
+
+  BuildContext? getNavigatorContext(Navigator navigator) {
+    BuildContext? context;
+    if (navigator.key is GlobalKey) {
+      context = (navigator.key as GlobalKey).currentContext;
+    }
+    return context;
+  }
 }

macos/Flutter/ephemeral/Flutter-Generated.xcconfig

@@ -3,8 +3,8 @@ FLUTTER_ROOT=/Users/xdd666/Develop/SDK/flutter_sdk
 FLUTTER_APPLICATION_PATH=/Users/xdd666/Develop/Github/flutter_smart_dialog
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=4.9.1
-FLUTTER_BUILD_NUMBER=4.9.1
+FLUTTER_BUILD_NAME=4.9.2
+FLUTTER_BUILD_NUMBER=4.9.2
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=true
 TREE_SHAKE_ICONS=false

macos/Flutter/ephemeral/flutter_export_environment.sh

@@ -4,8 +4,8 @@ export "FLUTTER_ROOT=/Users/xdd666/Develop/SDK/flutter_sdk"
 export "FLUTTER_APPLICATION_PATH=/Users/xdd666/Develop/Github/flutter_smart_dialog"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=4.9.1"
-export "FLUTTER_BUILD_NUMBER=4.9.1"
+export "FLUTTER_BUILD_NAME=4.9.2"
+export "FLUTTER_BUILD_NUMBER=4.9.2"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"

pubspec.yaml

@@ -3,7 +3,7 @@ description:
   An elegant Flutter Dialog solution,
   Easily implement Toast, Loading and custom Dialog,
   Make the use of the dialog easier!
-version: 4.9.1+1
+version: 4.9.2
 homepage: https://github.com/fluttercandies/flutter_smart_dialog
 # flutter pub publish --server=https://pub.dartlang.org