lix/mnote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: extract editor overlay open helpers

Browse Source
This commit is contained in:
lix-2026
2026-05-25 04:10:16 +08:00
parent 9798888909
commit 32adfb38a1
5 changed files with 153 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
design/05-editor-mainline/process/5-29-editor-runtime-followup-checklist-v1.md
+3
View File
@@ -152,3 +152,6 @@ UI / 浏览器可见项必须有真实浏览器截图或结构化 smoke 证据
- 2026-05-25：Batch N 继续收口 overlay escape 小切片：Codex 主控把 `close_editor_floating_overlays_if_escape` 机械迁入 `editor_runtime/overlays.rs`，`lib.rs` 仅保留调用和仍需壳层状态的 open / sync overlay 编排。 - 2026-05-25：Batch N 继续收口 overlay escape 小切片：Codex 主控把 `close_editor_floating_overlays_if_escape` 机械迁入 `editor_runtime/overlays.rs`，`lib.rs` 仅保留调用和仍需壳层状态的 open / sync overlay 编排。
- 未迁：`try_sync_editor_overlay_state`、`on_selection_change`、`open_slash_menu_overlay` / `open_image_toolbar_overlay` / `open_block_menu_overlay`，原因是仍依赖 DOM event、toolbar lock、selection bridge 或 Leptos shell signal 编排。 - 未迁：`try_sync_editor_overlay_state`、`on_selection_change`、`open_slash_menu_overlay` / `open_image_toolbar_overlay` / `open_block_menu_overlay`，原因是仍依赖 DOM event、toolbar lock、selection bridge 或 Leptos shell signal 编排。
- 已验证：`cargo fmt --manifest-path rust/Cargo.toml --all --check`、`cargo check --manifest-path rust/spikes/leptos-tiptap-spike/Cargo.toml`、wasm release build、`wasm-bindgen`、`NODE_PATH=/mnt/Data1T/mnote/node_modules node scripts/task489-block-menu-delete-undo-smoke.js`、`NODE_PATH=/mnt/Data1T/mnote/node_modules node scripts/task488-local-attachment-link-delete-undo-smoke.js`。 - 已验证：`cargo fmt --manifest-path rust/Cargo.toml --all --check`、`cargo check --manifest-path rust/spikes/leptos-tiptap-spike/Cargo.toml`、wasm release build、`wasm-bindgen`、`NODE_PATH=/mnt/Data1T/mnote/node_modules node scripts/task489-block-menu-delete-undo-smoke.js`、`NODE_PATH=/mnt/Data1T/mnote/node_modules node scripts/task488-local-attachment-link-delete-undo-smoke.js`。
- 2026-05-25：Batch O 继续收口 overlay open helper：Codex 主控把 `open_slash_menu_overlay`、`open_image_toolbar_overlay`、`open_block_menu_overlay` 迁入 `editor_runtime/overlays.rs`。这三者只复用 `close_editor_floating_overlays` 并设置 Leptos signals；`open_block_menu_overlay` 仅读取 `block_menu_open` 判定是否重新打开。
- 未迁：`try_sync_editor_overlay_state`、`on_selection_change` 和各调用点 DOM / selection bridge 逻辑，原因是仍属于 editor shell 编排。
- 已验证：`cargo fmt --manifest-path rust/Cargo.toml --all --check`、`cargo check --manifest-path rust/spikes/leptos-tiptap-spike/Cargo.toml`、wasm release build、`wasm-bindgen`、`MNOTE_WEB_SMOKE_BASE_URL=http://127.0.0.1:3001 NODE_PATH=/mnt/Data1T/mnote/node_modules node scripts/task489-block-menu-delete-undo-smoke.js`、`MNOTE_WEB_SMOKE_BASE_URL=http://127.0.0.1:3001 NODE_PATH=/mnt/Data1T/mnote/node_modules node scripts/task488-local-attachment-link-delete-undo-smoke.js`。
rust/spikes/leptos-tiptap-spike/generated/island/mnote-leptos-tiptap-spike-island.js
+1 -1
View File
@@ -1284,7 +1284,7 @@ function __wbg_get_imports() {
return ret; return ret;
}, },
__wbindgen_cast_0000000000000006: function(arg0, arg1) { __wbindgen_cast_0000000000000006: function(arg0, arg1) {
// Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("KeyboardEvent")], shim_idx: 524, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`. // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("KeyboardEvent")], shim_idx: 883, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
const ret = makeMutClosure(arg0, arg1, wasm_bindgen__convert__closures_____invoke__hd90af689bc3e71bf); const ret = makeMutClosure(arg0, arg1, wasm_bindgen__convert__closures_____invoke__hd90af689bc3e71bf);
return ret; return ret;
}, },
rust/spikes/leptos-tiptap-spike/generated/island/mnote-leptos-tiptap-spike-island_bg.wasm
BIN
View File
Binary file not shown.
rust/spikes/leptos-tiptap-spike/src/editor_runtime/overlays.rs
+145
View File
@@ -182,6 +182,151 @@ pub(crate) fn close_editor_floating_overlays_if_escape(
overlay_open overlay_open
} }
#[allow(clippy::too_many_arguments)]
pub(crate) fn open_slash_menu_overlay(
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>,
) {
close_editor_floating_overlays(
set_slash_open,
set_slash_index,
set_slash_query,
set_turn_into_open,
set_color_menu_open,
set_more_menu_open,
set_locked_toolbar_anchor,
set_text_selection_active,
set_floating_toolbar_anchor,
set_image_toolbar_anchor,
set_table_toolbar_open,
set_table_options_open,
set_table_overlay_anchor,
set_table_selection_overlay,
set_block_menu_open,
set_block_menu_anchor,
set_block_turn_into_open,
set_block_folded_title_open,
);
set_slash_open.set(true);
}
#[allow(clippy::too_many_arguments)]
pub(crate) fn open_image_toolbar_overlay(
image_anchor: Option<ImageToolbarAnchor>,
set_block_keyboard_mode: WriteSignal<bool>,
set_hovered_block: WriteSignal<Option<HoveredBlockState>>,
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>,
) {
close_editor_floating_overlays(
set_slash_open,
set_slash_index,
set_slash_query,
set_turn_into_open,
set_color_menu_open,
set_more_menu_open,
set_locked_toolbar_anchor,
set_text_selection_active,
set_floating_toolbar_anchor,
set_image_toolbar_anchor,
set_table_toolbar_open,
set_table_options_open,
set_table_overlay_anchor,
set_table_selection_overlay,
set_block_menu_open,
set_block_menu_anchor,
set_block_turn_into_open,
set_block_folded_title_open,
);
set_block_keyboard_mode.set(false);
set_hovered_block.set(None);
set_image_toolbar_anchor.set(image_anchor);
}
#[allow(clippy::too_many_arguments)]
pub(crate) fn open_block_menu_overlay(
anchor: HoveredBlockState,
same_anchor: bool,
block_menu_open: ReadSignal<bool>,
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>,
) -> bool {
let should_open = !block_menu_open.get_untracked() || !same_anchor;
close_editor_floating_overlays(
set_slash_open,
set_slash_index,
set_slash_query,
set_turn_into_open,
set_color_menu_open,
set_more_menu_open,
set_locked_toolbar_anchor,
set_text_selection_active,
set_floating_toolbar_anchor,
set_image_toolbar_anchor,
set_table_toolbar_open,
set_table_options_open,
set_table_overlay_anchor,
set_table_selection_overlay,
set_block_menu_open,
set_block_menu_anchor,
set_block_turn_into_open,
set_block_folded_title_open,
);
if should_open {
set_block_menu_open.set(true);
set_block_menu_anchor.set(Some(anchor));
}
should_open
}
pub(crate) fn try_close_block_menu_overlays( pub(crate) fn try_close_block_menu_overlays(
set_slash_open: WriteSignal<bool>, set_slash_open: WriteSignal<bool>,
set_turn_into_open: WriteSignal<bool>, set_turn_into_open: WriteSignal<bool>,
rust/spikes/leptos-tiptap-spike/src/lib.rs
+4 -146
View File
@@ -40,10 +40,10 @@ use editor_runtime::dom_selection::{
}; };
use editor_runtime::editor_focus::{active_editor_stage, body_has_focus, schedule_editor_focus}; use editor_runtime::editor_focus::{active_editor_stage, body_has_focus, schedule_editor_focus};
use editor_runtime::overlays::{ use editor_runtime::overlays::{
close_editor_floating_overlays, close_editor_floating_overlays_if_escape, close_editor_floating_overlays_if_escape, floating_toolbar_anchor_from_selection,
floating_toolbar_anchor_from_selection, sync_text_selection_overlay, try_close_block_menu_overlays, open_block_menu_overlay, open_image_toolbar_overlay, open_slash_menu_overlay,
FloatingToolbarAnchor, ImageToolbarAnchor, TableOverlayAnchor, TableSelectionKind, sync_text_selection_overlay, try_close_block_menu_overlays, FloatingToolbarAnchor,
TableSelectionOverlayState, ImageToolbarAnchor, TableOverlayAnchor, TableSelectionKind, TableSelectionOverlayState,
}; };
use editor_runtime::persistence::{ use editor_runtime::persistence::{
load_persisted_document, normalize_identity_value, persist_document_state, load_persisted_document, normalize_identity_value, persist_document_state,
@@ -5657,148 +5657,6 @@ fn toolbar_overlay_locked(
turn_into_open || color_menu_open || more_menu_open turn_into_open || color_menu_open || more_menu_open
} }
fn open_slash_menu_overlay(
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>,
) {
close_editor_floating_overlays(
set_slash_open,
set_slash_index,
set_slash_query,
set_turn_into_open,
set_color_menu_open,
set_more_menu_open,
set_locked_toolbar_anchor,
set_text_selection_active,
set_floating_toolbar_anchor,
set_image_toolbar_anchor,
set_table_toolbar_open,
set_table_options_open,
set_table_overlay_anchor,
set_table_selection_overlay,
set_block_menu_open,
set_block_menu_anchor,
set_block_turn_into_open,
set_block_folded_title_open,
);
set_slash_open.set(true);
}
fn open_image_toolbar_overlay(
image_anchor: Option<ImageToolbarAnchor>,
set_block_keyboard_mode: WriteSignal<bool>,
set_hovered_block: WriteSignal<Option<HoveredBlockState>>,
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>,
) {
close_editor_floating_overlays(
set_slash_open,
set_slash_index,
set_slash_query,
set_turn_into_open,
set_color_menu_open,
set_more_menu_open,
set_locked_toolbar_anchor,
set_text_selection_active,
set_floating_toolbar_anchor,
set_image_toolbar_anchor,
set_table_toolbar_open,
set_table_options_open,
set_table_overlay_anchor,
set_table_selection_overlay,
set_block_menu_open,
set_block_menu_anchor,
set_block_turn_into_open,
set_block_folded_title_open,
);
set_block_keyboard_mode.set(false);
set_hovered_block.set(None);
set_image_toolbar_anchor.set(image_anchor);
}
fn open_block_menu_overlay(
anchor: HoveredBlockState,
same_anchor: bool,
block_menu_open: ReadSignal<bool>,
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>,
) -> bool {
let should_open = !block_menu_open.get_untracked() || !same_anchor;
close_editor_floating_overlays(
set_slash_open,
set_slash_index,
set_slash_query,
set_turn_into_open,
set_color_menu_open,
set_more_menu_open,
set_locked_toolbar_anchor,
set_text_selection_active,
set_floating_toolbar_anchor,
set_image_toolbar_anchor,
set_table_toolbar_open,
set_table_options_open,
set_table_overlay_anchor,
set_table_selection_overlay,
set_block_menu_open,
set_block_menu_anchor,
set_block_turn_into_open,
set_block_folded_title_open,
);
if should_open {
set_block_menu_open.set(true);
set_block_menu_anchor.set(Some(anchor));
}
should_open
}
fn try_sync_editor_overlay_state( fn try_sync_editor_overlay_state(
set_editor_focused: WriteSignal<bool>, set_editor_focused: WriteSignal<bool>,
set_text_selection_active: WriteSignal<bool>, set_text_selection_active: WriteSignal<bool>,