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

🎨 fix https://github.com/siyuan-note/siyuan/issues/7081

Browse source
This commit is contained in:
Vanessa 2023-01-15 23:16:48 +08:00
parent 46b818c987
commit 968bcd433e
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ export const initBlockPopover = () => {
let timeout: number; let timeout: number;
let timeoutHide: number; let timeoutHide: number;
// 编辑器内容块引用/backlinks/tag/bookmark/套娃中使用 // 编辑器内容块引用/backlinks/tag/bookmark/套娃中使用
document.addEventListener("mouseover", (event: MouseEvent & { target: HTMLElement }) => { document.addEventListener("mouseover", (event: MouseEvent & { target: HTMLElement, path: HTMLElement[] }) => {
if (!window.siyuan.config) { if (!window.siyuan.config) {
return; return;
} }
@ -74,7 +74,7 @@ export const initBlockPopover = () => {
}); });
}; };
const hidePopover = (event: MouseEvent & { target: HTMLElement }) => { const hidePopover = (event: MouseEvent & { target: HTMLElement, path: HTMLElement[] }) => {
if (hasClosestByClassName(event.target, "b3-menu") || if (hasClosestByClassName(event.target, "b3-menu") ||
(event.target.id && event.target.tagName !== "svg" && (event.target.id.startsWith("minder_node") || event.target.id.startsWith("kity_") || event.target.id.startsWith("node_"))) (event.target.id && event.target.tagName !== "svg" && (event.target.id.startsWith("minder_node") || event.target.id.startsWith("kity_") || event.target.id.startsWith("node_")))
|| event.target.classList.contains("counter") || event.target.classList.contains("counter")
@ -97,7 +97,13 @@ const hidePopover = (event: MouseEvent & { target: HTMLElement }) => {
popoverTargetElement = linkElement; popoverTargetElement = linkElement;
} }
if (!popoverTargetElement) { if (!popoverTargetElement) {
const blockElement = hasClosestByClassName(event.target, "block__popover", true); // 移动到弹窗的 loading 元素上，但经过 settimeout 后 loading 已经被移除了
// https://ld246.com/article/1673596577519/comment/1673767749885#comments
let targetElement = event.target
if (!targetElement.parentElement) {
targetElement = event.path[1]
}
const blockElement = hasClosestByClassName(targetElement, "block__popover", true);
const maxEditLevels: { [key: string]: number } = {oid: 0}; const maxEditLevels: { [key: string]: number } = {oid: 0};
window.siyuan.blockPanels.forEach((item) => { window.siyuan.blockPanels.forEach((item) => {
if (item.targetElement && item.element.getAttribute("data-pin") === "true") { if (item.targetElement && item.element.getAttribute("data-pin") === "true") {