An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Prevent native text selection during mobile block dragging https://github.com/siyuan-note/siyuan/issues/20536
Daniel4e5c57b79aec
diff --git a/app/src/util/touchDragBridge.test.ts b/app/src/util/touchDragBridge.test.tsindex 1eb9939b09..6c8bbc2b10 100644--- a/app/src/util/touchDragBridge.test.ts+++ b/app/src/util/touchDragBridge.test.ts@@ -86,6 +86,7 @@ const createBridge = (rowClass = "b3-menu__item", panelClass = "av__panel", mobiconst handle = new TestElement(["fn__grab"], row);const handleIcon = new TestElement([], handle);const runtime = {touchDragActive: false, touchDragGhost: null as HTMLElement | null};+ const selection = {rangeCount: 1, removeAllRanges() { this.rangeCount = 0; }};const exports: {initTouchDragBridge?: () => void} = {};runInNewContext(compiled(!!options.browser, mobile), {exports,@@ -133,6 +134,7 @@ const createBridge = (rowClass = "b3-menu__item", panelClass = "av__panel", mobi},querySelectorAll: (): Element[] => [],elementFromPoint: () => dropTarget,+ getSelection: () => selection,},});exports.initTouchDragBridge();@@ -187,7 +189,7 @@ const createBridge = (rowClass = "b3-menu__item", panelClass = "av__panel", mobiframes.clear();callbacks.forEach(callback => callback(now));};- return {row, label, handleIcon, runtime, dispatch, advance, flushFrames,+ return {row, label, handleIcon, runtime, selection, dispatch, advance, flushFrames,setDropTarget: (target: TestElement | null) => dropTarget = target};};@@ -336,6 +338,47 @@ test("small finger movements keep the block gutter long press pending", () => {assert.equal(bridge.row.draggable, "true");});+test("mobile block gutter dragging excludes native text selection until completion", () => {+ const bridge = createBridge("", "protyle-gutters", true);+ assert.equal(bridge.dispatch("selectstart", bridge.label), false);+ bridge.dispatch("touchstart", bridge.row);+ assert.equal(bridge.dispatch("selectstart", bridge.label), true);+ assert.equal(bridge.selection.rangeCount, 1, "keep the source range available until dragstart resolves the blocks");+ bridge.advance(460);+ assert.equal(bridge.selection.rangeCount, 0);+ assert.equal(bridge.dispatch("selectstart", bridge.label), true);+ bridge.selection.rangeCount = 1;+ bridge.dispatch("selectionchange", bridge.label);+ assert.equal(bridge.selection.rangeCount, 0, "native handles cannot recreate a text range during block dragging");+ bridge.dispatch("touchmove", bridge.row, 140);+ bridge.dispatch("touchend", bridge.row, 140);+ assert.equal(bridge.dispatch("selectstart", bridge.label), false);+ bridge.selection.rangeCount = 1;+ bridge.dispatch("selectionchange", bridge.label);+ assert.equal(bridge.selection.rangeCount, 1);+});++test("canceling a pending mobile block gutter gesture restores native selection", () => {+ const bridge = createBridge("", "protyle-gutters", true, {scrollable: true});+ bridge.dispatch("touchstart", bridge.row);+ assert.equal(bridge.dispatch("selectstart", bridge.label), true);+ assert.equal(bridge.dispatch("touchmove", bridge.row, 140, 50), false);+ assert.equal(bridge.dispatch("selectstart", bridge.label), false);+ assert.equal(bridge.selection.rangeCount, 1);+ bridge.dispatch("touchcancel", bridge.row);+ assert.equal(bridge.dispatch("selectstart", bridge.label), false);+});++for (const mobile of [false, true]) {+ test(`other drag sources preserve native text selection (mobile=${mobile})`, () => {+ const bridge = createBridge("b3-list-item", "sy__file", mobile);+ bridge.dispatch("touchstart", bridge.label);+ bridge.dispatch("touchmove", bridge.label, 140, 500);+ assert.equal(bridge.dispatch("selectstart", bridge.label), false);+ assert.equal(bridge.selection.rangeCount, 1);+ });+}+for (const cancel of ["touchcancel", "blur", "visibilitychange", "additional touch"]) {for (const active of [false, true]) {test(`${cancel} cancels ${active ? "active" : "pending"} block gutter dragging`, () => {diff --git a/app/src/util/touchDragBridge.ts b/app/src/util/touchDragBridge.tsindex 458018f676..0d3cbe35c4 100644--- a/app/src/util/touchDragBridge.ts+++ b/app/src/util/touchDragBridge.ts@@ -752,6 +752,8 @@ const startBridgeDrag = (point: DragPoint) => {const dragStartEvent = createBridgeDragEvent("dragstart", point, dt);// 部分拖拽处理会在 dragstart 中再次检查 draggable 属性,派发合成事件时短暂恢复。dispatchWithNativeDragEnabled(dragState, () => dragState.draggableElement.dispatchEvent(dragStartEvent));+ // 块标先根据原文本选区确定拖动范围,再清除原生选区,避免选词手柄接管后续触摸。+ clearGutterTextSelection();dragState.ghostElement = window.siyuan.touchDragGhost || null;if (dragState.ghostElement) {@@ -883,6 +885,15 @@ const clearGutterLongPressTimer = (state: DragState | null) => {}};+const clearGutterTextSelection = () => {+ if (dragState?.gutterLongPress && dragState.isDragging) {+ const selection = document.getSelection();+ if (selection?.rangeCount) {+ selection.removeAllRanges();+ }+ }+};+const resetLocalDragIdleTimeout = () => {const currentState = dragState;if (!currentState?.isDragging) {@@ -1227,6 +1238,13 @@ export const initTouchDragBridge = () => {document.addEventListener("keydown", handleDragKey, {capture: true});document.addEventListener("keyup", handleDragKey, {capture: true});document.addEventListener("visibilitychange", handleVisibilityChange);+ document.addEventListener("selectstart", event => {+ // 候选块标手势只阻止原生选词,完整块标栏仍可在长按前滑动滚动。+ if (dragState?.gutterLongPress && !dragState.longPressCancelled) {+ event.preventDefault();+ }+ }, {capture: true});+ document.addEventListener("selectionchange", clearGutterTextSelection);window.addEventListener("blur", () => {if (dragState?.gutterLongPress) {completeBridgeDrag(undefined, true);diff --git a/app/src/util/touchDragSelection.test.ts b/app/src/util/touchDragSelection.test.tsnew file mode 100644index 0000000000..d73e576b9a--- /dev/null+++ b/app/src/util/touchDragSelection.test.ts@@ -0,0 +1,173 @@+import * as assert from "node:assert/strict";+import {execFile} from "node:child_process";+import {mkdtempSync, readFileSync, rmSync, writeFileSync} from "node:fs";+import {tmpdir} from "node:os";+import * as path from "node:path";+import {test} from "node:test";+import {promisify} from "node:util";+import {ModuleKind, ScriptTarget, transpileModule} from "typescript";++const browserFixture = (bridgeSource: string, coreSource: string) => {+ document.body.innerHTML = `<style>+body{margin:0}.protyle-wysiwyg{padding-left:50px}.block{height:100px;padding:12px;box-sizing:border-box}+.protyle-gutters{position:fixed;left:0;top:20px;width:32px;user-select:none}+.protyle-gutters button{display:block;position:relative;width:32px;height:50px;padding:0}+.protyle-gutters span{position:absolute;inset:0;touch-action:none}+.protyle-gutters[data-scrollable=true] span{touch-action:pan-y}+.protyle-gutters--dragging{pointer-events:none;opacity:0}+</style><div class="protyle"><div class="protyle-wysiwyg" contenteditable="false">+<div id="source" class="block"><div contenteditable="true">Heading with an existing editor selection</div></div>+<div id="target" class="block"><div contenteditable="true">Paragraph below the heading</div></div>+</div><div class="protyle-gutters"><button><span draggable="true"></span></button></div></div>`;+ const source = document.getElementById("source");+ const target = document.getElementById("target");+ const gutter = document.querySelector<HTMLElement>(".protyle-gutters");+ const handle = gutter.querySelector<HTMLElement>("span");+ const state = {starts: 0, drops: 0, ends: 0, clicks: 0, sourceText: ""};+ window.siyuan = {touchDragActive: false, touchDragGhost: null, zIndex: 1} as typeof window.siyuan;+ const core = {} as typeof import("./touchDragBridgeCore");+ new Function("exports", coreSource)(core);+ const bridge = {} as typeof import("./touchDragBridge");+ new Function("exports", "require", bridgeSource)(bridge, (id: string) => {+ if (id === "./touchDragBridgeCore") {+ return core;+ }+ return {Constants: {SIZE_DRAG_THRESHOLD: 5, TIMEOUT_LONGPRESS: 460},+ isMobile: () => true, isInAndroid: () => true, isInHarmony: () => false, stopScrollAnimation() {}};+ });+ handle.addEventListener("dragstart", (event: DragEvent) => {+ state.starts++;+ state.sourceText = document.getSelection().toString();+ source.classList.add("protyle-wysiwyg--select");+ const ghost = document.createElement("div");+ ghost.id = "ghost";+ ghost.textContent = source.textContent;+ ghost.style.position = "fixed";+ document.body.append(ghost);+ window.siyuan.touchDragGhost = ghost;+ gutter.classList.add("protyle-gutters--dragging");+ event.dataTransfer.setData("text/plain", source.textContent);+ });+ handle.addEventListener("dragend", () => {+ state.ends++;+ gutter.classList.remove("protyle-gutters--dragging");+ });+ gutter.addEventListener("click", () => { state.clicks++; });+ target.addEventListener("dragover", event => event.preventDefault());+ target.addEventListener("drop", event => { event.preventDefault(); state.drops++; });+ bridge.initTouchDragBridge();+ Object.assign(window, {nativeDrag: {+ selectText: () => {+ const editable = source.firstElementChild as HTMLElement;+ editable.focus();+ document.getSelection().selectAllChildren(editable);+ },+ selectStart: () => source.dispatchEvent(new Event("selectstart", {bubbles: true, cancelable: true})),+ state: () => ({...state, selection: document.getSelection().toString(),+ selected: source.classList.contains("protyle-wysiwyg--select"),+ active: window.siyuan.touchDragActive, ghost: !!document.getElementById("ghost"), scroll: gutter.scrollTop}),+ makeScrollable: () => {+ gutter.dataset.scrollable = "true";+ gutter.style.height = "60px";+ gutter.style.overflowY = "auto";+ for (let i = 0; i < 5; i++) {+ gutter.append(gutter.firstElementChild.cloneNode(true));+ }+ },+ }});+};++test("native mobile gutter gestures preserve taps and scrolling while excluding text selection", {+ skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,+ timeout: 30000,+}, async () => {+ const {parse} = require("ifdef-loader/preprocessor");+ const compile = (file: string) => transpileModule(+ parse(readFileSync(file, "utf8"), {BROWSER: true, MOBILE: true}, false, true), {+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},+ }).outputText;+ const bridge = compile("src/util/touchDragBridge.ts");+ const core = compile("src/util/touchDragBridgeCore.ts");+ const temporary = mkdtempSync(path.join(tmpdir(), "siyuan-touch-drag-selection-"));+ const script = path.join(temporary, "run.cjs");+ writeFileSync(script, `const assert = require("node:assert/strict");+const {app, BrowserWindow} = require("electron");+const delay = ms => new Promise(resolve => setTimeout(resolve, ms));+app.setPath("userData", ${JSON.stringify(path.join(temporary, "profile"))});+app.commandLine.appendSwitch("disable-gpu");+app.whenReady().then(async () => {+ const win = new BrowserWindow({show: false, width: 400, height: 600,+ webPreferences: {nodeIntegration: true, contextIsolation: false, offscreen: true, backgroundThrottling: false}});+ try {+ await win.loadURL("data:text/html,<html><body></body></html>");+ win.webContents.debugger.attach("1.3");+ await win.webContents.debugger.sendCommand("Emulation.setTouchEmulationEnabled", {enabled: true});+ const evaluate = code => win.webContents.executeJavaScript(code);+ await evaluate(${JSON.stringify("const __name = value => value; (" + browserFixture.toString() + ")(" + JSON.stringify(bridge) + "," + JSON.stringify(core) + ");")});+ const touch = (type, x = 15, y = 45) => win.webContents.debugger.sendCommand("Input.dispatchTouchEvent", {+ type, touchPoints: ["touchEnd", "touchCancel"].includes(type) ? [] : [{x, y, id: 1}],+ });+ for (let attempt = 1; attempt <= 2; attempt++) {+ await evaluate("nativeDrag.selectText()");+ await touch("touchStart");+ await delay(550);+ let state = await evaluate("nativeDrag.state()");+ assert.equal(state.starts, attempt);+ assert.ok(state.sourceText.length > 0, "dragstart can still resolve blocks from the original text range");+ assert.equal(state.selection, "", "block activation clears the editor's native text selection");+ assert.equal(state.selected, true);+ assert.equal(state.active, true);+ assert.equal(state.ghost, true);+ assert.equal(await evaluate("nativeDrag.selectStart()"), false);+ await evaluate("nativeDrag.selectText()");+ await delay(30);+ assert.equal((await evaluate("nativeDrag.state()")).selection, "");+ await touch("touchMove", 80, 90);+ await touch("touchMove", 80, 150);+ await touch("touchEnd");+ await delay(100);+ state = await evaluate("nativeDrag.state()");+ assert.equal(state.drops, attempt);+ assert.equal(state.ends, attempt);+ assert.equal(state.active, false);+ assert.equal(state.ghost, false);+ assert.equal(await evaluate("nativeDrag.selectStart()"), true);+ }+ await touch("touchStart");+ await delay(50);+ await touch("touchEnd");+ await delay(100);+ assert.equal((await evaluate("nativeDrag.state()")).clicks, 1, "short taps still activate the block menu once");+ await evaluate("nativeDrag.selectText(); nativeDrag.makeScrollable()");+ await touch("touchStart");+ for (const y of [35, 20, 5]) {+ await delay(25);+ await touch("touchMove", 15, y);+ }+ await touch("touchEnd");+ await delay(150);+ const scrolled = await evaluate("nativeDrag.state()");+ assert.ok(scrolled.scroll > 0, "full gutter swipes still scroll natively");+ assert.equal(scrolled.starts, 2);+ assert.equal(await evaluate("nativeDrag.selectStart()"), true);+ console.log("Native gutter selection exclusion passed");+ win.destroy();+ app.exit(0);+ } catch (error) {+ console.error(error);+ win.destroy();+ app.exit(1);+ }+});`, "utf8");+ const env = {...process.env};+ delete env.ELECTRON_RUN_AS_NODE;+ try {+ const {stdout} = await promisify(execFile)(require("electron") as unknown as string, [script],+ {env, timeout: 25000, windowsHide: true});+ assert.match(stdout, /Native gutter selection exclusion passed/);+ } finally {+ assert.equal(path.dirname(path.resolve(temporary)), path.resolve(tmpdir()));+ assert.ok(path.basename(temporary).startsWith("siyuan-touch-drag-selection-"));+ rmSync(temporary, {recursive: true, force: true, maxRetries: 5, retryDelay: 100});+ }+});