0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-08-03 18:08:28 +08:00
parent e29c3d5e26
commit b458903a4c
5 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/assets/scss/_toolbar.scss
View file

@ -6,6 +6,7 @@
box-shadow: var(--b3-point-shadow);
border-radius: 4px;
display: flex;
transition: top .15s cubic-bezier(0, 0, .2, 1) 0ms;
&__item {
color: var(--b3-theme-on-surface);

22
app/src/protyle/scroll/event.ts
View file

@ -6,7 +6,23 @@ import {showMessage} from "../../dialog/message";
import {updateHotkeyTip} from "../util/compatibility";
export const scrollEvent = (protyle: IProtyle, element: HTMLElement) => {
element.addEventListener("scroll", () => {
let elementRect = element.getBoundingClientRect();
element.addEventListener("scroll", (event) => {
if (!protyle.toolbar.element.classList.contains("fn__none")) {
const initY = protyle.toolbar.element.getAttribute("data-inity").split(Constants.ZWSP);
const top = parseInt(initY[0]) + (parseInt(initY[1]) - element.scrollTop)
if (elementRect.width === 0) {
elementRect = element.getBoundingClientRect();
}
const toolbarHeight = 29;
if (top < elementRect.top - toolbarHeight || top > elementRect.bottom - toolbarHeight) {
protyle.toolbar.element.style.display = "none";
} else {
protyle.toolbar.element.style.top = top + "px";
protyle.toolbar.element.style.display = "";
}
return;
}
if (!window.siyuan.dragElement) { // https://ld246.com/article/1649638389841
hideElements(["gutter"], protyle);
}
@ -50,5 +66,9 @@ export const scrollEvent = (protyle: IProtyle, element: HTMLElement) => {
});
}
protyle.scroll.lastScrollTop = Math.max(element.scrollTop, 0);
}, {
capture: false,
passive: true,
once: false
});
};

4
app/src/protyle/toolbar/index.ts
View file

@ -115,7 +115,9 @@ export class Toolbar {
}
const rangePosition = getSelectionPosition(nodeElement, range);
this.element.classList.remove("fn__none");
setPosition(this.element, rangePosition.left - 52, rangePosition.top - this.toolbarHeight - 4);
const y = rangePosition.top - this.toolbarHeight - 4
this.element.setAttribute("data-inity", y + Constants.ZWSP + protyle.contentElement.scrollTop.toString());
setPosition(this.element, rangePosition.left - 52, y);
this.element.querySelectorAll(".protyle-toolbar__item--current").forEach(item => {
item.classList.remove("protyle-toolbar__item--current");
});

1
app/src/protyle/ui/hideElements.ts
View file

@ -23,6 +23,7 @@ export const hideElements = (panels: string[], protyle?: IProtyle) => {
}
if (protyle.toolbar && panels.includes("toolbar")) {
protyle.toolbar.element.classList.add("fn__none");
protyle.toolbar.element.style.display = "";
}
if (protyle.toolbar && panels.includes("util")) {
const pinElement = protyle.toolbar.subElement.querySelector('[data-type="pin"]');

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

@ -121,6 +121,7 @@ const setHTML = (options: { content: string, action?: string[] }, protyle: IProt
});
protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + (removeElement.getBoundingClientRect().top - lastRemoveTop);
protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop;
hideElements(["toolbar"], protyle);
}
protyle.wysiwyg.element.insertAdjacentHTML("beforeend", options.content);
} else if (options.action.includes(Constants.CB_GET_BEFORE)) {
@ -135,6 +136,7 @@ const setHTML = (options: { content: string, action?: string[] }, protyle: IProt
protyle.wysiwyg.element.lastElementChild.getBoundingClientRect().top > window.innerHeight) {
protyle.wysiwyg.element.lastElementChild.remove();
}
hideElements(["toolbar"], protyle);
}
} else {
protyle.wysiwyg.element.innerHTML = options.content;