refactor: extract editor overlay close state

rust/spikes/leptos-tiptap-spike/src/editor_runtime/overlays.rs

@@ -1,6 +1,7 @@
 use leptos::prelude::{Set, WriteSignal};
 
 use crate::{
+    editor_runtime::block_hover_state::HoveredBlockState,
     editor_runtime::dom_selection::active_editor_text_selection, editor_stage_element,
 };
 
@@ -10,6 +11,44 @@ pub(crate) struct FloatingToolbarAnchor {
     pub(crate) left: f64,
 }
 
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct ImageToolbarAnchor {
+    pub(crate) top: f64,
+    pub(crate) left: f64,
+    pub(crate) align: String,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct TableOverlayAnchor {
+    pub(crate) top: f64,
+    pub(crate) left: f64,
+    pub(crate) width: f64,
+    pub(crate) height: f64,
+    pub(crate) rows: usize,
+    pub(crate) cols: usize,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) enum TableSelectionKind {
+    Row,
+    Column,
+}
+
+impl TableSelectionKind {
+    pub(crate) fn id(self) -> &'static str {
+        match self {
+            Self::Row => "row",
+            Self::Column => "column",
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct TableSelectionOverlayState {
+    pub(crate) kind: TableSelectionKind,
+    pub(crate) index: usize,
+}
+
 pub(crate) fn floating_toolbar_anchor_from_selection() -> Option<FloatingToolbarAnchor> {
     let selection = active_editor_text_selection()?;
     let range = selection.get_range_at(0).ok()?;
@@ -37,3 +76,44 @@ pub(crate) fn sync_text_selection_overlay(
     set_floating_toolbar_anchor.set(toolbar_anchor);
     has_text_selection
 }
+
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn close_editor_floating_overlays(
+    set_slash_open: WriteSignal<bool>,
+    set_slash_index: WriteSignal<usize>,
+    set_slash_query: WriteSignal<String>,
+    set_turn_into_open: WriteSignal<bool>,
+    set_color_menu_open: WriteSignal<bool>,
+    set_more_menu_open: WriteSignal<bool>,
+    set_locked_toolbar_anchor: WriteSignal<Option<FloatingToolbarAnchor>>,
+    set_text_selection_active: WriteSignal<bool>,
+    set_floating_toolbar_anchor: WriteSignal<Option<FloatingToolbarAnchor>>,
+    set_image_toolbar_anchor: WriteSignal<Option<ImageToolbarAnchor>>,
+    set_table_toolbar_open: WriteSignal<bool>,
+    set_table_options_open: WriteSignal<bool>,
+    set_table_overlay_anchor: WriteSignal<Option<TableOverlayAnchor>>,
+    set_table_selection_overlay: WriteSignal<Option<TableSelectionOverlayState>>,
+    set_block_menu_open: WriteSignal<bool>,
+    set_block_menu_anchor: WriteSignal<Option<HoveredBlockState>>,
+    set_block_turn_into_open: WriteSignal<bool>,
+    set_block_folded_title_open: WriteSignal<bool>,
+) {
+    set_slash_open.set(false);
+    set_slash_index.set(0);
+    set_slash_query.set(String::new());
+    set_turn_into_open.set(false);
+    set_color_menu_open.set(false);
+    set_more_menu_open.set(false);
+    set_locked_toolbar_anchor.set(None);
+    set_text_selection_active.set(false);
+    set_floating_toolbar_anchor.set(None);
+    set_image_toolbar_anchor.set(None);
+    set_table_toolbar_open.set(false);
+    set_table_options_open.set(false);
+    set_table_overlay_anchor.set(None);
+    set_table_selection_overlay.set(None);
+    set_block_menu_open.set(false);
+    set_block_menu_anchor.set(None);
+    set_block_turn_into_open.set(false);
+    set_block_folded_title_open.set(false);
+}

rust/spikes/leptos-tiptap-spike/src/lib.rs

@@ -40,7 +40,9 @@ use editor_runtime::dom_selection::{
 };
 use editor_runtime::editor_focus::{active_editor_stage, body_has_focus, schedule_editor_focus};
 use editor_runtime::overlays::{
-    floating_toolbar_anchor_from_selection, sync_text_selection_overlay, FloatingToolbarAnchor,
+    close_editor_floating_overlays, floating_toolbar_anchor_from_selection,
+    sync_text_selection_overlay, FloatingToolbarAnchor, ImageToolbarAnchor, TableOverlayAnchor,
+    TableSelectionKind, TableSelectionOverlayState,
 };
 use editor_runtime::persistence::{
     load_persisted_document, normalize_identity_value, persist_document_state,
@@ -4789,44 +4791,6 @@ fn build_command_listener(mount_id: u32) -> Closure<dyn FnMut(Event)> {
     }))
 }
 
-#[derive(Clone, Debug, PartialEq)]
-struct ImageToolbarAnchor {
-    top: f64,
-    left: f64,
-    align: String,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-struct TableOverlayAnchor {
-    top: f64,
-    left: f64,
-    width: f64,
-    height: f64,
-    rows: usize,
-    cols: usize,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-enum TableSelectionKind {
-    Row,
-    Column,
-}
-
-impl TableSelectionKind {
-    fn id(self) -> &'static str {
-        match self {
-            Self::Row => "row",
-            Self::Column => "column",
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-struct TableSelectionOverlayState {
-    kind: TableSelectionKind,
-    index: usize,
-}
-
 fn default_title() -> String {
     "Leptos Tiptap 主编辑器 P0".to_string()
 }
@@ -5692,46 +5656,6 @@ fn toolbar_overlay_locked(
     turn_into_open || color_menu_open || more_menu_open
 }
 
-fn close_editor_floating_overlays(
-    set_slash_open: WriteSignal<bool>,
-    set_slash_index: WriteSignal<usize>,
-    set_slash_query: WriteSignal<String>,
-    set_turn_into_open: WriteSignal<bool>,
-    set_color_menu_open: WriteSignal<bool>,
-    set_more_menu_open: WriteSignal<bool>,
-    set_locked_toolbar_anchor: WriteSignal<Option<FloatingToolbarAnchor>>,
-    set_text_selection_active: WriteSignal<bool>,
-    set_floating_toolbar_anchor: WriteSignal<Option<FloatingToolbarAnchor>>,
-    set_image_toolbar_anchor: WriteSignal<Option<ImageToolbarAnchor>>,
-    set_table_toolbar_open: WriteSignal<bool>,
-    set_table_options_open: WriteSignal<bool>,
-    set_table_overlay_anchor: WriteSignal<Option<TableOverlayAnchor>>,
-    set_table_selection_overlay: WriteSignal<Option<TableSelectionOverlayState>>,
-    set_block_menu_open: WriteSignal<bool>,
-    set_block_menu_anchor: WriteSignal<Option<HoveredBlockState>>,
-    set_block_turn_into_open: WriteSignal<bool>,
-    set_block_folded_title_open: WriteSignal<bool>,
-) {
-    set_slash_open.set(false);
-    set_slash_index.set(0);
-    set_slash_query.set(String::new());
-    set_turn_into_open.set(false);
-    set_color_menu_open.set(false);
-    set_more_menu_open.set(false);
-    set_locked_toolbar_anchor.set(None);
-    set_text_selection_active.set(false);
-    set_floating_toolbar_anchor.set(None);
-    set_image_toolbar_anchor.set(None);
-    set_table_toolbar_open.set(false);
-    set_table_options_open.set(false);
-    set_table_overlay_anchor.set(None);
-    set_table_selection_overlay.set(None);
-    set_block_menu_open.set(false);
-    set_block_menu_anchor.set(None);
-    set_block_turn_into_open.set(false);
-    set_block_folded_title_open.set(false);
-}
-
 #[allow(clippy::too_many_arguments)]
 fn close_editor_floating_overlays_if_escape(
     slash_open: ReadSignal<bool>,
@@ -5938,28 +5862,29 @@ fn open_block_menu_overlay(
     should_open
 }
 
-fn sync_editor_overlay_state(
-    set_editor_focused: WriteSignal<bool>,
-    set_text_selection_active: WriteSignal<bool>,
-    set_floating_toolbar_anchor: WriteSignal<Option<FloatingToolbarAnchor>>,
+fn try_close_block_menu_overlays(
     set_slash_open: WriteSignal<bool>,
     set_turn_into_open: WriteSignal<bool>,
     set_hovered_block: WriteSignal<Option<HoveredBlockState>>,
     set_block_menu_anchor: WriteSignal<Option<HoveredBlockState>>,
     set_block_menu_open: WriteSignal<bool>,
-) {
-    let focused = active_editor_stage();
-    set_editor_focused.set(focused);
-    let has_text_selection =
-        sync_text_selection_overlay(set_text_selection_active, set_floating_toolbar_anchor);
-
-    if focused && has_text_selection {
-        set_slash_open.set(false);
-        set_turn_into_open.set(false);
-        set_block_menu_open.set(false);
-        set_block_menu_anchor.set(None);
-        set_hovered_block.set(None);
+) -> bool {
+    if set_slash_open.try_set(false).is_none() {
+        return false;
     }
+    if set_turn_into_open.try_set(false).is_none() {
+        return false;
+    }
+    if set_block_menu_open.try_set(false).is_none() {
+        return false;
+    }
+    if set_block_menu_anchor.try_set(None).is_none() {
+        return false;
+    }
+    if set_hovered_block.try_set(None).is_none() {
+        return false;
+    }
+    true
 }
 
 fn try_sync_editor_overlay_state(
@@ -5993,19 +5918,13 @@ fn try_sync_editor_overlay_state(
     }
 
     if focused && has_text_selection {
-        if set_slash_open.try_set(false).is_none() {
-            return false;
-        }
-        if set_turn_into_open.try_set(false).is_none() {
-            return false;
-        }
-        if set_block_menu_open.try_set(false).is_none() {
-            return false;
-        }
-        if set_block_menu_anchor.try_set(None).is_none() {
-            return false;
-        }
-        if set_hovered_block.try_set(None).is_none() {
+        if !try_close_block_menu_overlays(
+            set_slash_open,
+            set_turn_into_open,
+            set_hovered_block,
+            set_block_menu_anchor,
+            set_block_menu_open,
+        ) {
             return false;
         }
     }