Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-03-27 20:11:04 +08:00
parent 65d677984f
commit 57d2cd14f0
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/protyle/scroll/index.ts
View file

@ -78,7 +78,7 @@ export class Scroll {
});
}
public updateIndex(protyle: IProtyle, id: string) {
public updateIndex(protyle: IProtyle, id: string, cb?:(index: number) => void) {
fetchPost("/api/block/getBlockIndex", {id}, (response) => {
if (!response.data) {
return;
@ -86,6 +86,9 @@ export class Scroll {
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}`);
if (cb) {
cb(response.data);
}
});
}

13
app/src/protyle/util/onGet.ts
View file

@ -254,11 +254,14 @@ const setHTML = (options: {
}
if (options.scrollAttr && !protyle.scroll.element.classList.contains("fn__none") && !protyle.element.classList.contains("fn__none")) {
// 使用动态滚动条定位到最后一个块，重启后无法触发滚动事件，需要再次更新 index
protyle.scroll.updateIndex(protyle, options.scrollAttr.startId);
// https://github.com/siyuan-note/siyuan/issues/8224
if (protyle.contentElement.scrollHeight <= protyle.contentElement.clientHeight) {
showMessage(window.siyuan.languages.scrollGetMore);
}
protyle.scroll.updateIndex(protyle, options.scrollAttr.startId, (index) => {
// https://github.com/siyuan-note/siyuan/issues/8224
// https://github.com/siyuan-note/siyuan/issues/10716
if (index > 1 && protyle.block.blockCount > 1 && protyle.contentElement.scrollHeight <= protyle.contentElement.clientHeight) {
showMessage(window.siyuan.languages.scrollGetMore);
}
});
}
protyle.app.plugins.forEach(item => {
item.eventBus.emit("loaded-protyle", protyle); // 准备废弃