fix: the menu dismissed after selecting block style (#670)

AppFlowy-IO · Jan 11, 2024 · 3d373be · 3d373be
1 parent f053a1e
commit 3d373be
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/lib/src/editor/editor_component/service/selection/mobile_selection_service.dart b/lib/src/editor/editor_component/service/selection/mobile_selection_service.dart
@@ -76,6 +76,12 @@ class _MobileSelectionServiceWidgetState
   final List<SelectionGestureInterceptor> _interceptors = [];
   final ValueNotifier<Offset?> _lastPanOffset = ValueNotifier(null);
 
+  // the selection from editorState will be updated directly, but the cursor
+  // or selection area depends on the layout of the text, so we need to update
+  // the selection after the layout.
+  final PropertyValueNotifier<Selection?> selectionNotifierAfterLayout =
+      PropertyValueNotifier<Selection?>(null);
+
   /// Pan
   Offset? _panStartOffset;
   double? _panStartScrollDy;
@@ -102,6 +108,7 @@ class _MobileSelectionServiceWidgetState
   void dispose() {
     clearSelection();
     WidgetsBinding.instance.removeObserver(this);
+    selectionNotifierAfterLayout.dispose();
     editorState.selectionNotifier.removeListener(_updateSelection);
 
     super.dispose();
@@ -149,7 +156,7 @@ class _MobileSelectionServiceWidgetState
 
   Widget _buildCollapsedHandle() {
     return ValueListenableBuilder(
-      valueListenable: editorState.selectionNotifier,
+      valueListenable: selectionNotifierAfterLayout,
       builder: (context, selection, _) {
         if (selection == null ||
             !selection.isCollapsed ||
@@ -199,7 +206,7 @@ class _MobileSelectionServiceWidgetState
     }
 
     return ValueListenableBuilder(
-      valueListenable: editorState.selectionNotifier,
+      valueListenable: selectionNotifierAfterLayout,
       builder: (context, selection, _) {
         if (selection == null || selection.isCollapsed) {
           return const SizedBox.shrink();
@@ -341,6 +348,11 @@ class _MobileSelectionServiceWidgetState
 
   void _updateSelection() {
     final selection = editorState.selection;
+
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      selectionNotifierAfterLayout.value = selection;
+    });
+
     if (currentSelection.value != selection) {
       clearSelection();
       return;

diff --git a/lib/src/editor/toolbar/mobile/toolbar_items/blocks_mobile_toolbar_item.dart b/lib/src/editor/toolbar/mobile/toolbar_items/blocks_mobile_toolbar_item.dart
@@ -109,6 +109,9 @@ class _BlocksMenuState extends State<_BlocksMenu> {
                     HeadingBlockKeys.level: list.level,
                 },
               ),
+              selectionExtraInfo: {
+                selectionExtraInfoDoNotAttachTextService: true,
+              },
             );
           });
         },

diff --git a/lib/src/editor/toolbar/mobile/toolbar_items/heading_mobile_toolbar_item.dart b/lib/src/editor/toolbar/mobile/toolbar_items/heading_mobile_toolbar_item.dart
@@ -92,6 +92,9 @@ class _HeadingMenuState extends State<_HeadingMenu> {
                     ParagraphBlockKeys.delta: (node.delta ?? Delta()).toJson(),
                   },
                 ),
+                selectionExtraInfo: {
+                  selectionExtraInfoDoNotAttachTextService: true,
+                },
               );
             });
           },
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,6 +109,9 @@ class _BlocksMenuState extends State<_BlocksMenu> { @@
                         HeadingBlockKeys.level: list.level,
                     },
                   ),
+                  selectionExtraInfo: {
+                    selectionExtraInfoDoNotAttachTextService: true,
+                  },
                 );
               });
             },
@@ Expand Down @@