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

颜色修复

Browse Source
This commit is contained in:
lix-2026
2026-04-19 22:09:13 +08:00
parent 394e2a155c
commit 1e686bfa3c
1 changed files with 225 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rust/spikes/leptos-tiptap-spike/src/main.rs
+61 -36
View File
@@ -1209,6 +1209,16 @@ fn target_element(target: web_sys::EventTarget) -> Option<Element> {
})
}
fn event_target_matches_selector(
target: Option<web_sys::EventTarget>,
selector: &str,
) -> bool {
target
.and_then(target_element)
.and_then(|element| element.closest(selector).ok().flatten())
.is_some()
}
fn current_target_html_element(event: &WheelEvent) -> Option<HtmlElement> {
event.current_target()?.dyn_into::<HtmlElement>().ok()
}
@@ -2250,6 +2260,8 @@ fn App() -> impl IntoView {
let (text_selection_active, set_text_selection_active) = signal(false);
let (floating_toolbar_anchor, set_floating_toolbar_anchor) =
signal(None::<FloatingToolbarAnchor>);
let (locked_toolbar_anchor, set_locked_toolbar_anchor) =
signal(None::<FloatingToolbarAnchor>);
let (slash_open, set_slash_open) = signal(false);
let (slash_index, set_slash_index) = signal(0_usize);
let (turn_into_open, set_turn_into_open) = signal(false);
@@ -2294,6 +2306,18 @@ fn App() -> impl IntoView {
});
}
{
let turn_into_open = turn_into_open;
let color_menu_open = color_menu_open;
let more_menu_open = more_menu_open;
let set_locked_toolbar_anchor = set_locked_toolbar_anchor;
Effect::new(move |_| {
if !(turn_into_open.get() || color_menu_open.get() || more_menu_open.get()) {
set_locked_toolbar_anchor.set(None);
}
});
}
{
let editor_focused = editor_focused;
let text_selection_active = text_selection_active;
@@ -2311,8 +2335,7 @@ fn App() -> impl IntoView {
color_menu_open.get_untracked(),
more_menu_open.get_untracked(),
);
if !editor_focused.get()
|| (!text_selection_active.get() && !toolbar_locked)
if ((!editor_focused.get() || !text_selection_active.get()) && !toolbar_locked)
|| slash_open.get()
|| block_menu_open.get()
{
@@ -2390,7 +2413,7 @@ fn App() -> impl IntoView {
if let Some(target) = event.target() {
if let Some(element) = target_element(target) {
if element
.closest(HANDLE_SHELL_SELECTOR)
.closest(&format!("{HANDLE_SHELL_SELECTOR}, .floating-toolbar"))
.ok()
.flatten()
.is_some()
@@ -2808,14 +2831,20 @@ fn App() -> impl IntoView {
}
>
{move || {
if let Some(anchor) = floating_toolbar_anchor.get() {
let toolbar_locked = toolbar_overlay_locked(
turn_into_open.get(),
color_menu_open.get(),
more_menu_open.get(),
);
if !editor_focused.get()
|| (!text_selection_active.get() && !toolbar_locked)
let toolbar_anchor = if toolbar_locked {
locked_toolbar_anchor
.get()
.or_else(|| floating_toolbar_anchor.get())
} else {
floating_toolbar_anchor.get()
};
if let Some(anchor) = toolbar_anchor {
if ((!editor_focused.get() || !text_selection_active.get()) && !toolbar_locked)
|| slash_open.get()
|| block_menu_open.get()
|| dragging_block_index.get().is_some()
@@ -2829,7 +2858,12 @@ fn App() -> impl IntoView {
style:top=format!("{}px", anchor.top)
style:left=format!("{}px", anchor.left)
on:mousedown=move |event: MouseEvent| {
if event_target_matches_selector(
event.target(),
".toolbar-btn, .toolbar-menu-item, .turn-into-item",
) {
event.prevent_default();
}
event.stop_propagation();
}
on:click=move |event: MouseEvent| {
@@ -2844,20 +2878,22 @@ fn App() -> impl IntoView {
data-active=move || turn_into_open.get().to_string()
data-testid="toolbar-turn-into"
on:click=move |_| {
set_turn_into_open.update(|open| *open = !*open);
let next_open = !turn_into_open.get_untracked();
if next_open {
set_locked_toolbar_anchor
.set(floating_toolbar_anchor.get_untracked());
}
set_turn_into_open.set(next_open);
set_block_menu_open.set(false);
}
>
"Text"
</button>
{move || {
if turn_into_open.get() {
view! {
<div
class="turn-into-panel"
data-testid="turn-into-panel"
style:display=move || if turn_into_open.get() { "grid" } else { "none" }
on:mousedown=move |event: MouseEvent| {
event.prevent_default();
event.stop_propagation();
}
on:click=move |event: MouseEvent| {
@@ -2887,11 +2923,6 @@ fn App() -> impl IntoView {
}
}).collect_view()}
</div>
}.into_any()
} else {
().into_any()
}
}}
</div>
</div>
@@ -2959,21 +2990,23 @@ fn App() -> impl IntoView {
|| color_menu_open.get()).to_string()
data-testid="toolbar-color"
on:click=move |_| {
set_color_menu_open.update(|open| *open = !*open);
let next_open = !color_menu_open.get_untracked();
if next_open {
set_locked_toolbar_anchor
.set(floating_toolbar_anchor.get_untracked());
}
set_color_menu_open.set(next_open);
set_more_menu_open.set(false);
set_turn_into_open.set(false);
}
>
"Color"
</button>
{move || {
if color_menu_open.get() {
view! {
<div
class="toolbar-popover-panel"
data-testid="toolbar-color-panel"
style:display=move || if color_menu_open.get() { "grid" } else { "none" }
on:mousedown=move |event: MouseEvent| {
event.prevent_default();
event.stop_propagation();
}
on:click=move |event: MouseEvent| {
@@ -3061,11 +3094,6 @@ fn App() -> impl IntoView {
</button>
</div>
</div>
}.into_any()
} else {
().into_any()
}
}}
</div>
</div>
@@ -3082,21 +3110,23 @@ fn App() -> impl IntoView {
|| more_menu_open.get()).to_string()
data-testid="toolbar-more"
on:click=move |_| {
set_more_menu_open.update(|open| *open = !*open);
let next_open = !more_menu_open.get_untracked();
if next_open {
set_locked_toolbar_anchor
.set(floating_toolbar_anchor.get_untracked());
}
set_more_menu_open.set(next_open);
set_color_menu_open.set(false);
set_turn_into_open.set(false);
}
>
"More"
</button>
{move || {
if more_menu_open.get() {
view! {
<div
class="toolbar-popover-panel"
data-testid="toolbar-more-panel"
style:display=move || if more_menu_open.get() { "grid" } else { "none" }
on:mousedown=move |event: MouseEvent| {
event.prevent_default();
event.stop_propagation();
}
on:click=move |event: MouseEvent| {
@@ -3140,11 +3170,6 @@ fn App() -> impl IntoView {
</div>
</div>
</div>
}.into_any()
} else {
().into_any()
}
}}
</div>
</div>
</div>