fix: use maybeOf for AFFocusManager

AppFlowy-IO · Jun 2, 2024 · 48a545c · 48a545c
1 parent ac7906e
commit 48a545c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart
@@ -262,7 +262,7 @@ class _AppFlowyEditorPageState extends State<AppFlowyEditorPage> {
         return;
       }
 
-      focusManager = AFFocusManager.of(context);
+      focusManager = AFFocusManager.maybeOf(context);
       focusManager!.loseFocusNotifier.addListener(_loseFocus);
 
       if (widget.initialSelection != null) {
@@ -273,11 +273,11 @@ class _AppFlowyEditorPageState extends State<AppFlowyEditorPage> {
 
   @override
   void didChangeDependencies() {
-    final currFocusManager = AFFocusManager.of(context);
+    final currFocusManager = AFFocusManager.maybeOf(context);
     if (focusManager != currFocusManager) {
       focusManager?.loseFocusNotifier.removeListener(_loseFocus);
       focusManager = currFocusManager;
-      focusManager!.loseFocusNotifier.addListener(_loseFocus);
+      focusManager?.loseFocusNotifier.addListener(_loseFocus);
     }
     super.didChangeDependencies();
   }

diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/af_focus_manager.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/af_focus_manager.dart
@@ -33,4 +33,8 @@ class AFFocusManager extends InheritedWidget {
     assert(result != null, "AFFocusManager could not be found");
     return result!;
   }
+
+  static AFFocusManager? maybeOf(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<AFFocusManager>();
+  }
 }