Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Keep desktop maps visible during unrelated hover changes https://github.com/siyuan-note/siyuan/issues/20129

Daniela39579aa109c
diff --git a/app/src/protyle/render/av/map/desktopTransport.test.ts b/app/src/protyle/render/av/map/desktopTransport.test.ts
index ba836b9d33..384f51325e 100644
--- a/app/src/protyle/render/av/map/desktopTransport.test.ts
+++ b/app/src/protyle/render/av/map/desktopTransport.test.ts
@@ -74,8 +74,8 @@ const fixture = () => {
resolveCreate({version: 1, instanceID});
await new Promise<void>((resolve) => setImmediate(resolve));
},
- advance: () => {
- now += 150;
+ advance: (milliseconds = 150) => {
+ now += milliseconds;
const pending = [...frames.values()];
frames.clear();
pending.forEach((fn) => fn());
@@ -194,6 +194,60 @@ describe("desktop map transport", () => {
globalThis.ResizeObserver = oldResize;
}
});
+ it("keeps unrelated hover mutations visible while geometry and occlusion changes hide immediately", async () => {
+ const oldMutation = globalThis.MutationObserver, oldResize = globalThis.ResizeObserver;
+ const callbacks: Array<() => void> = [];
+ class Observer {
+ constructor(callback: () => void) { callbacks.push(callback); }
+ observe() {}
+ disconnect() {}
+ }
+ globalThis.MutationObserver = Observer as any;
+ globalThis.ResizeObserver = Observer as any;
+ const f = fixture();
+ const geometryCalls = () => f.calls.filter(([name]) => name === "siyuan-map-geometry");
+ const lastGeometry = () => geometryCalls().at(-1)[1];
+ try {
+ await f.created();
+ f.reply({type: "ready"});
+ f.advance();
+ assert.equal(lastGeometry().visible, true);
+ const count = geometryCalls().length;
+ for (let i = 0; i < 5; i++) {
+ callbacks[0]();
+ f.advance(30);
+ }
+ assert.equal(geometryCalls().length, count, "unrelated gutter and tooltip mutations must not hide the map");
+ f.rect.x += 10;
+ callbacks[0]();
+ assert.equal(lastGeometry().visible, false, "a real geometry change hides before the next animation frame");
+ f.advance(119);
+ assert.equal(lastGeometry().visible, false);
+ callbacks[0]();
+ f.advance(1);
+ assert.equal(lastGeometry().visible, true, "unrelated mutations must not restart the stability delay");
+ assert.equal(lastGeometry().bounds.x, f.rect.x);
+ const menu = {contains: () => false, getClientRects: () => [f.rect],
+ getBoundingClientRect: () => ({...f.rect, width: 5, height: 5})};
+ f.doc.querySelectorAll = () => [menu];
+ callbacks[0]();
+ assert.equal(lastGeometry().visible, false, "an overlapping menu hides immediately even with unchanged bounds");
+ f.doc.querySelectorAll = (): HTMLElement[] => [];
+ callbacks[0]();
+ f.advance(119);
+ assert.equal(lastGeometry().visible, false);
+ f.advance(1);
+ assert.equal(lastGeometry().visible, true);
+ f.host.destroy();
+ const destroyedCount = f.calls.length;
+ callbacks[0]();
+ assert.equal(f.calls.length, destroyedCount, "queued mutations cannot reactivate a destroyed host");
+ } finally {
+ f.host.destroy();
+ globalThis.MutationObserver = oldMutation;
+ globalThis.ResizeObserver = oldResize;
+ }
+ });
it("destroys a create that resolves after disposal and never recreates listeners", async () => {
const f = fixture();
f.host.destroy();
diff --git a/app/src/protyle/render/av/map/desktopTransport.ts b/app/src/protyle/render/av/map/desktopTransport.ts
index 10de17bf87..5317850a63 100644
--- a/app/src/protyle/render/av/map/desktopTransport.ts
+++ b/app/src/protyle/render/av/map/desktopTransport.ts
@@ -154,16 +154,20 @@ export const createDesktopAVMapHost = (container: HTMLElement, options: AVMapHos
geometry({visible: false});
}
};
- const tick = () => {
- if (destroyed) {
- return;
- }
+ const checkGeometry = () => {
const next = readGeometry(container);
const key = JSON.stringify(next);
if (key !== lastGeometry) {
lastGeometry = key;
invalidate();
}
+ return next;
+ };
+ const tick = () => {
+ if (destroyed) {
+ return;
+ }
+ const next = checkGeometry();
if (!next.visible || scope.performance.now() >= stableAfter) {
geometry(next);
}
@@ -278,7 +282,12 @@ export const createDesktopAVMapHost = (container: HTMLElement, options: AVMapHos
// BrowserWindow focus is enforced in main. DOM blur also fires when the map view gains focus.
scope.addEventListener("focus", invalidate);
container.ownerDocument.addEventListener("visibilitychange", invalidate);
- observer = new MutationObserver(invalidate);
+ observer = new MutationObserver(() => {
+ // 悬停提示和块标也会改变 DOM;仅地图几何或遮挡变化需要隐藏原生视图。
+ if (!destroyed) {
+ checkGeometry();
+ }
+ });
observer.observe(container.ownerDocument.documentElement, {childList: true, subtree: true,
attributes: true, attributeFilter: ["class", "style", "hidden", "open"]});
resizeObserver = new ResizeObserver(invalidate);