fix: image block revamp issues (#517)

AppFlowy-IO · Oct 6, 2023 · af8d96b · af8d96b
1 parent e996c92
commit af8d96b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/lib/src/editor/block_component/image_block_component/image_upload_widget.dart b/lib/src/editor/block_component/image_block_component/image_upload_widget.dart
@@ -391,6 +391,13 @@ extension InsertImage on EditorState {
       );
     }
 
+    transaction.afterSelection = Selection.collapsed(
+      Position(
+        path: node.path.next,
+        offset: 0,
+      ),
+    );
+
     return apply(transaction);
   }
 }
diff --git a/lib/src/editor/editor_component/service/ime/non_delta_input_service.dart b/lib/src/editor/editor_component/service/ime/non_delta_input_service.dart
@@ -119,6 +119,7 @@ class NonDeltaTextInputService extends TextInputService with TextInputClient {
 
   @override
   void close() {
+    keepEditorFocusNotifier.value = 0;
     currentTextEditingValue = null;
     composingTextRange = null;
     _textInputConnection?.close();

diff --git a/lib/src/editor/editor_component/service/selection/desktop_selection_service.dart b/lib/src/editor/editor_component/service/selection/desktop_selection_service.dart
@@ -100,10 +100,6 @@ class _DesktopSelectionServiceWidgetState
 
   @override
   void updateSelection(Selection? selection) {
-    if (currentSelection.value == selection) {
-      return;
-    }
-
     currentSelection.value = selection;
     editorState.updateSelectionWithReason(
       selection,

diff --git a/lib/src/editor/selection_menu/selection_menu_service.dart b/lib/src/editor/selection_menu/selection_menu_service.dart
@@ -52,6 +52,8 @@ class SelectionMenu extends SelectionMenuService {
         editorState.service.selectionServiceKey.currentState == null;
     if (!isSelectionDisposed) {
       final selectionService = editorState.service.selectionService;
+      // focus to reload the selection after the menu dismissed.
+      editorState.selection = editorState.selection;
       selectionService.currentSelection.removeListener(_onSelectionChange);
     }
   }