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

🐛 https://github.com/siyuan-note/siyuan/issues/5395

Browse source
This commit is contained in:
Vanessa 2022-07-12 16:35:46 +08:00
parent 38538ada66
commit e73bb58a0e
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,6 @@ const setHTML = (options: { content: string, action?: string[] }, protyle: IProt
if (options.action.includes(Constants.CB_GET_APPEND)) {
// 动态加载移除
if (!protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select") && !protyle.scroll.keepLazyLoad && protyle.contentElement.scrollHeight > REMOVED_OVER_HEIGHT) {
preventScroll(protyle);
let removeElement = protyle.wysiwyg.element.firstElementChild as HTMLElement;
const removeElements = [];
while (protyle.wysiwyg.element.childElementCount > 2) {
@ -121,16 +120,15 @@ const setHTML = (options: { content: string, action?: string[] }, protyle: IProt
item.remove();
});
protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + (removeElement.getBoundingClientRect().top - lastRemoveTop);
protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop;
}
protyle.wysiwyg.element.insertAdjacentHTML("beforeend", options.content);
// https://github.com/siyuan-note/siyuan/issues/5395
protyle.scroll.lastScrollTop = 0;
} else if (options.action.includes(Constants.CB_GET_BEFORE)) {
preventScroll(protyle);
const lastElement = protyle.wysiwyg.element.firstElementChild as HTMLElement;
const lastTop = lastElement.getBoundingClientRect().top;
protyle.wysiwyg.element.insertAdjacentHTML("afterbegin", options.content);
protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + (lastElement.getBoundingClientRect().top - lastTop);
protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop;
// 动态加载移除
if (!protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select") && !protyle.scroll.keepLazyLoad) {
while (protyle.wysiwyg.element.childElementCount > 2 && protyle.contentElement.scrollHeight > REMOVED_OVER_HEIGHT &&
@ -138,8 +136,6 @@ const setHTML = (options: { content: string, action?: string[] }, protyle: IProt
protyle.wysiwyg.element.lastElementChild.remove();
}
}
// https://github.com/siyuan-note/siyuan/issues/5395
protyle.scroll.lastScrollTop = 0;
} else {
protyle.wysiwyg.element.innerHTML = options.content;
}