github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 02:21:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-09-01 21:23:58 +08:00
parent 493eba5a14
commit 3724d274c9
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/boot/globalEvent/event.ts
View File

@ -5,6 +5,7 @@ import {windowKeyUp} from "./keyup";
import {windowKeyDown} from "./keydown"; import {windowKeyDown} from "./keydown";
import {globalClick} from "./click"; import {globalClick} from "./click";
import {goBack, goForward} from "../../util/backForward"; import {goBack, goForward} from "../../util/backForward";
import {Constants} from "../../constants";
export const initWindowEvent = (app: App) => { export const initWindowEvent = (app: App) => {
document.body.addEventListener("mouseleave", () => { document.body.addEventListener("mouseleave", () => {
@ -14,9 +15,18 @@ export const initWindowEvent = (app: App) => {
window.siyuan.layout.bottomDock.hideDock(); window.siyuan.layout.bottomDock.hideDock();
} }
}); });
let mouseIsEnter = false;
document.body.addEventListener("mouseenter", () => {
if (window.siyuan.layout.leftDock) {
mouseIsEnter = true;
setTimeout(() => {
mouseIsEnter = false;
}, Constants.TIMEOUT_TRANSITION);
}
});
window.addEventListener("mousemove", (event: MouseEvent & { target: HTMLElement }) => { window.addEventListener("mousemove", (event: MouseEvent & { target: HTMLElement }) => {
windowMouseMove(event); windowMouseMove(event, mouseIsEnter);
}); });
window.addEventListener("mouseup", (event) => { window.addEventListener("mouseup", (event) => {
@ -46,6 +56,6 @@ export const initWindowEvent = (app: App) => {
}); });
window.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => { window.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => {
globalClick(event); globalClick(event);
}); });
}; };

9
app/src/boot/globalEvent/mousemove.ts
View File

@ -14,7 +14,11 @@ const getRightBlock = (element: HTMLElement, x: number, y: number) => {
return nodeElement; return nodeElement;
}; };
export const windowMouseMove = (event: MouseEvent & { target: HTMLElement }) => { export const windowMouseMove = (event: MouseEvent & { target: HTMLElement }, mouseIsEnter:boolean) => {
if (document.body.classList.contains("body--blur")) {
// 非激活状态下不执行 https://ld246.com/article/1693474547631
return;
}
// https://github.com/siyuan-note/siyuan/pull/8793 // https://github.com/siyuan-note/siyuan/pull/8793
const coordinates = window.siyuan.coordinates ?? (window.siyuan.coordinates = { const coordinates = window.siyuan.coordinates ?? (window.siyuan.coordinates = {
pageX: 0, pageX: 0,
@ -40,7 +44,8 @@ export const windowMouseMove = (event: MouseEvent & { target: HTMLElement }) =>
item.editor.protyle.breadcrumb.render(item.editor.protyle, true); item.editor.protyle.breadcrumb.render(item.editor.protyle, true);
}); });
} }
if (event.buttons === 0 && // 鼠标按键被按下时不触发 if (!mouseIsEnter &&
event.buttons === 0 && // 鼠标按键被按下时不触发
window.siyuan.layout.bottomDock && window.siyuan.layout.bottomDock &&
!isWindow() && !hasClosestByClassName(event.target, "b3-dialog") && !hasClosestByClassName(event.target, "b3-menu")) { !isWindow() && !hasClosestByClassName(event.target, "b3-dialog") && !hasClosestByClassName(event.target, "b3-menu")) {
if (event.clientX < 43) { if (event.clientX < 43) {