Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 01:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/13296#

Browse source
This commit is contained in:
Vanessa 2025-05-05 11:43:57 +08:00
parent 7994ea861a
commit d20b009dba
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/block/popover.ts
View file

@ -272,7 +272,16 @@ const hidePopover = (event: MouseEvent & { path: HTMLElement[] }) => {
itemLevel > parseInt(blockElement.getAttribute("data-level"))) { itemLevel > parseInt(blockElement.getAttribute("data-level"))) {
if (menuLevel && menuLevel >= itemLevel) { if (menuLevel && menuLevel >= itemLevel) {
// 有 gutter 菜单时不隐藏 // 有 gutter 菜单时不隐藏
break;
} else { } else {
const hasToolbar = item.editors.find(editItem => {
if (!editItem.protyle.toolbar.subElement.classList.contains("fn__none")) {
return true;
}
});
if (hasToolbar) {
break;
}
item.destroy(); item.destroy();
} }
} }
@ -284,10 +293,20 @@ const hidePopover = (event: MouseEvent & { path: HTMLElement[] }) => {
if ((item.targetElement || typeof item.x === "number") && item.element.getAttribute("data-pin") === "false") { if ((item.targetElement || typeof item.x === "number") && item.element.getAttribute("data-pin") === "false") {
if (menuLevel && menuLevel >= itemLevel) { if (menuLevel && menuLevel >= itemLevel) {
// 有 gutter 菜单时不隐藏 // 有 gutter 菜单时不隐藏
break;
} else if (item.targetElement && item.targetElement.classList.contains("protyle-wysiwyg__embed") && } else if (item.targetElement && item.targetElement.classList.contains("protyle-wysiwyg__embed") &&
item.targetElement.contains(targetElement)) { item.targetElement.contains(targetElement)) {
// 点击嵌入块后浮窗消失后再快速点击嵌入块无法弹出浮窗 https://github.com/siyuan-note/siyuan/issues/12511 // 点击嵌入块后浮窗消失后再快速点击嵌入块无法弹出浮窗 https://github.com/siyuan-note/siyuan/issues/12511
break;
} else { } else {
const hasToolbar = item.editors.find(editItem => {
if (!editItem.protyle.toolbar.subElement.classList.contains("fn__none")) {
return true;
}
});
if (hasToolbar) {
break;
}
item.destroy(); item.destroy();
} }
} }