fix: find getting focus unexpectedly

AppFlowy-IO · Feb 7, 2025 · 70d6b76 · 70d6b76
1 parent b689a75
commit 70d6b76
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/lib/src/editor/editor_component/service/keyboard_service_widget.dart b/lib/src/editor/editor_component/service/keyboard_service_widget.dart
@@ -148,6 +148,7 @@ class KeyboardServiceWidgetState extends State<KeyboardServiceWidget>
 
   /// handle hardware keyboard
   KeyEventResult _onKeyEvent(FocusNode node, KeyEvent event) {
+    print(node.hasPrimaryFocus);
     if ((event is! KeyDownEvent && event is! KeyRepeatEvent) ||
         !enableShortcuts) {
       if (textInputService.composingTextRange != TextRange.empty) {
@@ -179,13 +180,6 @@ class KeyboardServiceWidgetState extends State<KeyboardServiceWidget>
   }
 
   void _onSelectionChanged() {
-    final doNotAttach = editorState
-        .selectionExtraInfo?[selectionExtraInfoDoNotAttachTextService];
-    if (doNotAttach == true) {
-      return;
-    }
-
-    // attach the delta text input service if needed
     final selection = editorState.selection;
 
     // if (PlatformExtension.isMobile && previousSelection == selection) {
@@ -198,13 +192,21 @@ class KeyboardServiceWidgetState extends State<KeyboardServiceWidget>
     if (selection == null) {
       textInputService.close();
     } else {
-      // For the deletion, we should attach the text input service immediately.
-      _attachTextInputService(selection);
       _updateCaretPosition(selection);
 
-      if (editorState.selectionUpdateReason == SelectionUpdateReason.uiEvent) {
-        focusNode.requestFocus();
-        AppFlowyEditorLog.editor.debug('keyboard service - request focus');
+      // For the deletion, we should attach the text input service immediately.
+      final attachTextService = editorState
+              .selectionExtraInfo?[selectionExtraInfoDoNotAttachTextService] ==
+          true;
+      final isUiEvent =
+          editorState.selectionUpdateReason == SelectionUpdateReason.uiEvent;
+
+      if (attachTextService) {
+        _attachTextInputService(selection);
+        if (isUiEvent) {
+          focusNode.requestFocus();
+          AppFlowyEditorLog.editor.debug('keyboard service - request focus');
+        }
       } else {
         AppFlowyEditorLog.editor.debug(
           'keyboard service - selection changed: $selection',

diff --git a/lib/src/editor/find_replace_menu/search_service_v3.dart b/lib/src/editor/find_replace_menu/search_service_v3.dart
@@ -1,6 +1,7 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:appflowy_editor/src/editor/find_replace_menu/search_algorithm.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
 
 const selectionExtraInfoDisableToolbar = 'selectionExtraInfoDisableToolbar';
 
@@ -113,6 +114,9 @@ class SearchServiceV3 {
       editorState.updateSelectionWithReason(
         null,
         reason: SelectionUpdateReason.searchHighlight,
+        extraInfo: {
+          selectionExtraInfoDoNotAttachTextService: true,
+        },
       );
     } else {
       selectedIndex = selectedIndex;
@@ -158,6 +162,7 @@ class SearchServiceV3 {
       reason: SelectionUpdateReason.searchHighlight,
       extraInfo: {
         selectionExtraInfoDisableToolbar: true,
+        selectionExtraInfoDoNotAttachTextService: true,
       },
     );
   }