github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 https://github.com/siyuan-note/siyuan/issues/4612

Browse Source
This commit is contained in:
Vanessa 2022-10-25 15:20:32 +08:00
parent e009b91327
commit b75b878ff3
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/protyle/scroll/event.ts
View File

@ -42,6 +42,26 @@ export const scrollEvent = (protyle: IProtyle, element: HTMLElement) => {
// 悬浮窗需展开上下文后才能进行滚动 https://github.com/siyuan-note/siyuan/issues/2311 // 悬浮窗需展开上下文后才能进行滚动 https://github.com/siyuan-note/siyuan/issues/2311
return; return;
} }
if (protyle.scroll && !protyle.scroll.element.classList.contains("fn__none")) {
clearTimeout(getIndexTimeout);
getIndexTimeout = window.setTimeout(() => {
elementRect = element.getBoundingClientRect();
const targetElement = document.elementFromPoint(elementRect.left + elementRect.width / 2, elementRect.top + 10)
console.log(targetElement, hasClosestBlock(targetElement), event);
const blockElement = hasClosestBlock(targetElement);
if (!blockElement) {
return;
}
fetchPost("/api/block/getBlockIndex", {id: blockElement.getAttribute("data-node-id")}, (response) => {
if (!response.data) {
return;
}
const inputElement = protyle.scroll.element.querySelector(".b3-slider") as HTMLInputElement
inputElement.value = response.data;
protyle.scroll.element.setAttribute("aria-label", `Blocks ${response.data}/${protyle.block.blockCount}`);
});
}, Constants.TIMEOUT_BLOCKLOAD);
}
if (protyle.wysiwyg.element.getAttribute("data-top") || protyle.block.showAll || protyle.scroll.lastScrollTop === element.scrollTop || protyle.scroll.lastScrollTop === -1) { if (protyle.wysiwyg.element.getAttribute("data-top") || protyle.block.showAll || protyle.scroll.lastScrollTop === element.scrollTop || protyle.scroll.lastScrollTop === -1) {
return; return;
} }
@ -75,26 +95,6 @@ export const scrollEvent = (protyle: IProtyle, element: HTMLElement) => {
}); });
} }
protyle.scroll.lastScrollTop = Math.max(element.scrollTop, 0); protyle.scroll.lastScrollTop = Math.max(element.scrollTop, 0);
if (protyle.scroll && !protyle.scroll.element.classList.contains("fn__none")) {
clearTimeout(getIndexTimeout);
getIndexTimeout = window.setTimeout(() => {
elementRect = element.getBoundingClientRect();
const targetElement = document.elementFromPoint(elementRect.left + elementRect.width / 2, elementRect.top + 10)
console.log(targetElement, hasClosestBlock(targetElement), event);
const blockElement = hasClosestBlock(targetElement);
if (!blockElement) {
return;
}
fetchPost("/api/block/getBlockIndex", {id: blockElement.getAttribute("data-node-id")}, (response) => {
if (!response.data) {
return;
}
const inputElement = protyle.scroll.element.querySelector(".b3-slider") as HTMLInputElement
inputElement.value = response.data;
protyle.scroll.element.setAttribute("aria-label", `Blocks ${response.data}/${protyle.block.blockCount}`);
});
}, Constants.TIMEOUT_BLOCKLOAD);
}
}, { }, {
capture: false, capture: false,
passive: true, passive: true,