Skip to content

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

:sparkles: Reduce mind map zoom jitter during two-finger panning https://github.com/siyuan-note/siyuan/issues/20775

Danielfab355f7f2a7
diff --git a/app/src/protyle/render/listMindmap/pinch.test.ts b/app/src/protyle/render/listMindmap/pinch.test.ts
index 77822962ee..2b7a1c7a9b 100644
--- a/app/src/protyle/render/listMindmap/pinch.test.ts
+++ b/app/src/protyle/render/listMindmap/pinch.test.ts
@@ -80,6 +80,27 @@ test("saved view locks prohibit two-finger gestures", () => {
assert.equal(cancelled(), 0);
});
+test("two-finger panning ignores small distance jitter until a deliberate pinch starts", () => {
+ for (const [distance, jitter] of [[100, 6], [400, 12]]) {
+ const {target} = setup();
+ target.pinchStart(event(touch(60), touch(60 + distance)));
+ target.pinchMove(event(touch(80), touch(80 + distance + jitter)));
+ assert.equal(target.scale, 1);
+ assert.equal(target.offsetX, 20 + jitter / 2);
+ target.pinchMove(event(touch(90), touch(90 + distance - jitter)));
+ assert.equal(target.scale, 1);
+ target.pinchMove(event(touch(90), touch(90 + distance * 1.5)));
+ assert.equal(target.scale, 1.5);
+ target.pinchMove(event(touch(90), touch(90 + distance + jitter)));
+ assert.equal(target.scale, (distance + jitter) / distance);
+ target.pinchEnd(event());
+ const scale = target.scale;
+ target.pinchStart(event(touch(60), touch(60 + distance)));
+ target.pinchMove(event(touch(80), touch(80 + distance + jitter)));
+ assert.equal(target.scale, scale);
+ }
+});
+
test("remaining fingers cannot start a drag and a new gesture starts at the current scale", () => {
const {target} = setup();
target.pinchStart(event(touch(60), touch(160)));
diff --git a/app/src/protyle/render/listMindmap/view.ts b/app/src/protyle/render/listMindmap/view.ts
index b9ec670874..6cd893d5d1 100644
--- a/app/src/protyle/render/listMindmap/view.ts
+++ b/app/src/protyle/render/listMindmap/view.ts
@@ -179,7 +179,7 @@ export class ListMindmapView {
private pointer?: PointerState;
private pointerCapture?: HTMLElement;
private pinching = false;
- private pinch?: {distance: number, scale: number, x: number, y: number};
+ private pinch?: {distance: number, scale: number, x: number, y: number, zooming?: boolean};
private pendingPointerId?: number;
private endInteraction?: () => void;
private linkTimer = 0;
@@ -2270,8 +2270,10 @@ export class ListMindmapView {
this.offsetY += y - this.pinch.y;
this.pinch.x = x;
this.pinch.y = y;
- this.zoomAt(this.pinch.scale * Math.hypot(first.clientX - second.clientX, first.clientY - second.clientY) /
- this.pinch.distance, x, y);
+ const distance = Math.hypot(first.clientX - second.clientX, first.clientY - second.clientY);
+ // 起始容差过滤平移时的间距抖动,进入缩放后保留连续的捏合反馈。
+ this.pinch.zooming ||= Math.abs(distance - this.pinch.distance) > Math.max(8, this.pinch.distance * .04);
+ this.zoomAt(this.pinch.zooming ? this.pinch.scale * distance / this.pinch.distance : this.pinch.scale, x, y);
};
private pinchEnd = (event: TouchEvent) => {