refactor: move editor overlay sync helper

This commit is contained in:
lix-2026
2026-05-25 04:53:19 +08:00
parent 74dd955b3d
commit 63d1ea7e47
5 changed files with 62 additions and 52 deletions
@@ -1284,7 +1284,7 @@ function __wbg_get_imports() {
return ret;
},
__wbindgen_cast_0000000000000006: function(arg0, arg1) {
// Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("KeyboardEvent")], shim_idx: 736, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
// Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("KeyboardEvent")], shim_idx: 816, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
const ret = makeMutClosure(arg0, arg1, wasm_bindgen__convert__closures_____invoke__hd90af689bc3e71bf);
return ret;
},
@@ -2,7 +2,9 @@ use leptos::prelude::{GetUntracked, ReadSignal, Set, WriteSignal};
use crate::{
editor_runtime::block_hover_state::HoveredBlockState,
editor_runtime::dom_selection::active_editor_text_selection, editor_stage_element,
editor_runtime::dom_selection::active_editor_text_selection,
editor_runtime::editor_focus::active_editor_stage,
editor_stage_element,
};
#[derive(Clone, Debug, PartialEq)]
@@ -77,6 +79,52 @@ pub(crate) fn sync_text_selection_overlay(
has_text_selection
}
#[allow(clippy::too_many_arguments)]
pub(crate) fn try_sync_editor_overlay_state(
set_editor_focused: WriteSignal<bool>,
set_text_selection_active: WriteSignal<bool>,
set_floating_toolbar_anchor: WriteSignal<Option<FloatingToolbarAnchor>>,
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>,
) -> bool {
let focused = active_editor_stage();
if set_editor_focused.try_set(focused).is_none() {
return false;
}
let toolbar_anchor = floating_toolbar_anchor_from_selection();
let has_text_selection = toolbar_anchor.is_some();
if set_text_selection_active
.try_set(has_text_selection)
.is_none()
{
return false;
}
if set_floating_toolbar_anchor
.try_set(toolbar_anchor)
.is_none()
{
return false;
}
if focused && has_text_selection {
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;
}
}
true
}
pub(crate) fn toolbar_overlay_locked(
turn_into_open: bool,
color_menu_open: bool,
+4 -50
View File
@@ -40,11 +40,10 @@ use editor_runtime::dom_selection::{
};
use editor_runtime::editor_focus::{active_editor_stage, body_has_focus, schedule_editor_focus};
use editor_runtime::overlays::{
close_editor_floating_overlays_if_escape, floating_toolbar_anchor_from_selection,
open_block_menu_overlay, open_image_toolbar_overlay, open_slash_menu_overlay,
sync_text_selection_overlay, toolbar_overlay_locked, try_close_block_menu_overlays,
FloatingToolbarAnchor, ImageToolbarAnchor, TableOverlayAnchor, TableSelectionKind,
TableSelectionOverlayState,
close_editor_floating_overlays_if_escape, open_block_menu_overlay, open_image_toolbar_overlay,
open_slash_menu_overlay, sync_text_selection_overlay, toolbar_overlay_locked,
try_sync_editor_overlay_state, FloatingToolbarAnchor, ImageToolbarAnchor, TableOverlayAnchor,
TableSelectionKind, TableSelectionOverlayState,
};
use editor_runtime::persistence::{
load_persisted_document, normalize_identity_value, persist_document_state,
@@ -5647,51 +5646,6 @@ fn replace_top_level_block_kind(
Ok(())
}
fn try_sync_editor_overlay_state(
set_editor_focused: WriteSignal<bool>,
set_text_selection_active: WriteSignal<bool>,
set_floating_toolbar_anchor: WriteSignal<Option<FloatingToolbarAnchor>>,
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>,
) -> bool {
let focused = active_editor_stage();
if set_editor_focused.try_set(focused).is_none() {
return false;
}
let toolbar_anchor = floating_toolbar_anchor_from_selection();
let has_text_selection = toolbar_anchor.is_some();
if set_text_selection_active
.try_set(has_text_selection)
.is_none()
{
return false;
}
if set_floating_toolbar_anchor
.try_set(toolbar_anchor)
.is_none()
{
return false;
}
if focused && has_text_selection {
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;
}
}
true
}
fn apply_html_update(
editor: TiptapEditorHandle,
persisted_identity: &PersistedDocumentIdentity,