An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:lipstick: Improve iOS text selection and editing https://github.com/siyuan-note/siyuan/issues/20865
Vanessa7bb10c61864d
diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.tsindex 9b8ca027d9..97b043f5dd 100644--- a/app/src/mobile/index.ts+++ b/app/src/mobile/index.ts@@ -26,6 +26,7 @@ import {handleTouchSelectionChange,handleTouchStart,handleTouchUp,+ handleTouchEditing,handleTouchFocusOut,} from "./util/touch";import {fetchPost} from "../util/fetch";@@ -285,6 +286,9 @@ class App {document.addEventListener("focusout", handleTouchFocusOut, true);document.addEventListener("selectionchange", handleTouchSelectionChange, true);window.addEventListener("nativePhysicalTouchUp", handleTouchUp, false);+ window.addEventListener("nativeTextMenuWillPresent", handleTouchEditing, false);+ document.addEventListener("beforeinput", handleTouchEditing, true);+ document.addEventListener("paste", handleTouchEditing, true);window.addEventListener("keyup", () => {window.siyuan.ctrlIsPressed = false;window.siyuan.shiftIsPressed = false;diff --git a/app/src/mobile/util/touch.test.ts b/app/src/mobile/util/touch.test.tsindex d484c597ca..7c088483f8 100644--- a/app/src/mobile/util/touch.test.ts+++ b/app/src/mobile/util/touch.test.ts@@ -128,6 +128,7 @@ test("iOS repeated text taps cannot enter multi-select when the native gesture ofor (const initiallyCollapsed of [true, false]) {const f = fixture("word", initiallyCollapsed);f.nativeMenu();+ f.hideKeyboard();f.startBlockTouch(1000);f.delay();f.startBlockTouch(1100);@@ -143,7 +144,10 @@ test("iOS repeated text taps cannot enter multi-select when the native gesture otest("separate iOS text presses and other platforms retain long-press multi-select", () => {for (const kind of ["later", "elsewhere", "otherPlatform"]) {const f = fixture("", true);- if (kind !== "otherPlatform") f.nativeMenu();+ if (kind !== "otherPlatform") {+ f.nativeMenu();+ f.hideKeyboard();+ }f.startBlockTouch(1000);f.exports.handleTouchUp();f.startBlockTouch(kind === "later" ? 1500 : 1100, kind === "elsewhere" ? 140 : 100);@@ -186,6 +190,50 @@ test("an uninterrupted long press still enters block multi-select", () => {assert.equal(f.multiSelectCount(), 1);});+test("text input and native editing menus cancel block selection without changing the caret", () => {+ const f = fixture("word", true);+ f.startBlockTouch();+ const original = {...f.range};+ f.exports.handleTouchEditing();+ f.flushTimers();+ assert.equal(f.multiSelectCount(), 0);+ assert.equal(f.selection.rangeCount, 1);+ assert.equal(f.range.startContainer, original.startContainer);+ assert.equal(f.range.startOffset, original.startOffset);+ assert.equal(f.range.endOffset, original.endOffset);+ assert.equal(f.focusCount(), 0);+ assert.equal(f.blurCount(), 0);+});++test("releasing an iOS native text gesture leaves its editing menu and selection handles native", () => {+ const f = fixture("word", true);+ f.nativeMenu();+ f.startBlockTouch();+ f.exports.handleTouchEditing();+ f.flushTimers();+ let prevented = false;+ f.exports.handleTouchEnd({target: f.element, timeStamp: 3000,+ changedTouches: [{clientX: 100, clientY: 100}],+ stopImmediatePropagation: () => {}, preventDefault: () => { prevented = true; }});+ assert.equal(prevented, false);+ assert.equal(f.multiSelectCount(), 0);+});++test("iOS editing long presses retain the keyboard without waiting for a native menu callback", () => {+ const f = fixture("", true);+ f.nativeMenu();+ f.startBlockTouch();+ f.delay();+ f.flushTimers();+ assert.equal(f.multiSelectCount(), 0);+ let prevented = false;+ f.exports.handleTouchEnd({target: f.element, timeStamp: 3000,+ changedTouches: [{clientX: 100, clientY: 100}],+ stopImmediatePropagation: () => {}, preventDefault: () => { prevented = true; }});+ assert.equal(prevented, false);+ assert.equal(f.blurCount(), 0);+});+test("releasing a blank editor selection preserves the caret and keyboard", () => {const f = fixture();f.exports.handleTouchUp();diff --git a/app/src/mobile/util/touch.ts b/app/src/mobile/util/touch.tsindex a475630929..f28599d09e 100644--- a/app/src/mobile/util/touch.ts+++ b/app/src/mobile/util/touch.ts@@ -53,6 +53,7 @@ let preventSwipe = false;// 长按进入多选的定时器let longPressTimer: number;let longPressTriggered = false;+let nativeTextEditing = false;let previousNativeTextTouch: {editorElement: HTMLElement, x: number, y: number, time: number};let longPressBlockElement: HTMLElement;let longPressTouchRange: Range;@@ -163,11 +164,20 @@ export const handleTouchUp = () => {blankTouchFocus = undefined;};+export const handleTouchEditing = () => {+ // 输入、粘贴或系统菜单接管后,只结束块长按状态,不改写正在编辑的选区。+ clearLongPress();+ longPressBlockElement = undefined;+ longPressTouchRange = undefined;+ blankTouchFocus = undefined;+ nativeTextEditing = isIOSDevice();+};+export const handleTouchContextMenu = (event: MouseEvent) => {const editor = getCurrentEditor();if (isIOSDevice() && editor && usesNativeTextMenu(event.target as HTMLElement, editor.protyle.wysiwyg.element)) {// 系统接管文字菜单后,本轮触摸不再升级为块多选。- clearLongPress();+ handleTouchEditing();}const saved = blankTouchFocus;if (!saved || event.target !== saved.editorElement ||@@ -203,7 +213,11 @@ export const handleTouchSelectionChange = () => {editor.protyle.wysiwyg.element.contains(range.endContainer) &&hasVisibleSelectionText(stripSemanticMarkersFromRangeText(range))) {// 选词或拖动选择手柄后,即使选区随后折叠,也不恢复这一轮的块多选计时。- clearLongPress();+ if (isIOSDevice()) {+ handleTouchEditing();+ } else {+ clearLongPress();+ }}}if (longPressBlockElement && !restoreInvisibleLongPressSelection()) {@@ -229,6 +243,9 @@ export const handleTouchEnd = (event: TouchEvent) => {if (!isInHarmony() && !isInAndroid()) {handleTouchUp();}+ if (nativeTextEditing && !editor?.protyle.toolbar.isMultiSelectMode()) {+ return;+ }if (Math.abs(clientX - event.changedTouches[0].clientX) < Constants.SIZE_DRAG_THRESHOLD &&Math.abs(clientY - event.changedTouches[0].clientY) < Constants.SIZE_DRAG_THRESHOLD) {if (editor && editor.protyle.toolbar.isMultiSelectMode()) {@@ -384,6 +401,7 @@ export const handleTouchEnd = (event: TouchEvent) => {const resetTouchGesture = () => {longPressTriggered = false;+ nativeTextEditing = false;blankTouchFocus = undefined;isFirstMove = true;clientX = null;@@ -456,6 +474,9 @@ export const handleTouchStart = (event: TouchEvent) => {let repeatedNativeTextTouch = false;if (event.touches.length === 1 && editor && isIOSDevice() &&usesNativeTextMenu(target, editor.protyle.wysiwyg.element)) {+ // 编辑状态下的长按用于移动光标或粘贴,键盘收起后仍可长按进入块多选。+ nativeTextEditing = activeElement?.isContentEditable && editor.protyle.wysiwyg.element.contains(activeElement) &&+ document.getElementById("keyboardToolbar")?.classList.contains("fn__none") === false;const point = event.touches[0];const touchTime = Number.isFinite(event.timeStamp) ? event.timeStamp : time;repeatedNativeTextTouch = previousTextTouch?.editorElement === editor.protyle.wysiwyg.element &&@@ -492,7 +513,8 @@ export const handleTouchStart = (event: TouchEvent) => {}// 长按编辑器内块达到阈值时直接进入多选模式,无需抬手// 系统双击选词可能不再派发第二次 touchend,连续短按不启动块多选计时。- if (clientX && clientY && editor && !repeatedNativeTextTouch && !editor.protyle.toolbar.isMultiSelectMode()) {+ if (clientX && clientY && editor && !nativeTextEditing && !repeatedNativeTextTouch &&+ !editor.protyle.toolbar.isMultiSelectMode()) {const blockElement = hasClosestBlock(target);if (blockElement && editor.protyle.wysiwyg.element.contains(blockElement) &&shouldStartLongPressMultiSelect(diff --git a/app/src/protyle/render/tableCellInput.test.ts b/app/src/protyle/render/tableCellInput.test.tsindex 62fd024060..7342ac50ff 100644--- a/app/src/protyle/render/tableCellInput.test.ts+++ b/app/src/protyle/render/tableCellInput.test.ts@@ -31,7 +31,7 @@ const browserCases = async (source: string, queueSource: string, editorSource: s}});const dependencies = {Constants: {ZWSP: "\u200b", ATTRIBUTE_EDITING: "data-editing"},- dayjs: () => ({format: () => "20260924120000"}), isMobile: () => mobile,+ dayjs: () => ({format: () => "20260924120000"}), isMobile: () => mobile, isIOSDevice: () => mobile,normalizeSemanticInlineElements: noop, removeEmptySemanticInlineElement: noop,getSemanticMarkerPrefixLengthForNode: () => 0, getTextWithoutSemanticMarkers: (node: Node) => node.textContent,turnIntoTaskList: () => false, headingTurnIntoList: () => false, isProtyleListItemFirstParagraph: () => false,@@ -60,7 +60,7 @@ const browserCases = async (source: string, queueSource: string, editorSource: sconst api = new Function(...Object.keys(dependencies), source + "\nreturn {input, insertRow, insertRowAbove, insertColumn, " +"getAgentLute, configureAVRichTextLute, getTableCellEditorLute, getAVRichTextLute, " +"getTableCellRichBlockDOM, serializeTableCellRich, cleanTableCellRichHTML, renderTableCellRich, buildTableGrid, " +- "setTableCellRich, getTableCellInlineHTML, getTableCellPlainText, getSelectionOffset, focusByOffset, getTableBlockHTML, updateTableCellEditingValue, fixTable, " ++ "setTableCellRich, getTableCellInlineHTML, getTableCellPlainText, getSelectionOffset, focusByOffset, getTableBlockHTML, updateTableCellEditingValue, fixTable, isNativeTextSelectionHandleTouch, " +"updateTableCellContentLayout, captureRichCellSelection, captureRichCellSelectionAtPoint, restoreRichCellSelection, setTableCellRichEventTarget, " +"LargeTableVirtualizer, getTableVirtualCellIndex, getTableVirtualRowIndex, restoreTableVirtualizationDOM, " +"hasClosestBlock, hasClosestByClassName, hasClosestByTag, isInEmbedBlock, getEmbedChildOperationContext, setTaskListItemMarker, nextTaskListMarker};")(...Object.values(dependencies)) as@@ -68,7 +68,8 @@ const browserCases = async (source: string, queueSource: string, editorSource: stypeof import("./av/richText") & typeof import("./av/richTextValue") & typeof import("../util/tableCellRichLute") &typeof import("../util/tableCellRich") & typeof import("../util/selection") & typeof import("../util/tableVirtualizationDOM") &typeof import("../wysiwyg/tableVirtualization") & typeof import("../util/tableCellRichContext") & typeof import("../util/tableCellRichSelection") &- typeof import("../util/hasClosest") & typeof import("../wysiwyg/getBlock") & typeof import("../wysiwyg/list") & typeof import("../wysiwyg/taskListMarker");+ typeof import("../util/hasClosest") & typeof import("../wysiwyg/getBlock") & typeof import("../wysiwyg/list") &+ typeof import("../wysiwyg/taskListMarker") & typeof import("../wysiwyg/nativeTextMenu");const lute = api.configureAVRichTextLute(api.getAgentLute({emojiSite: "/emojis", emojis: {},headingAnchor: false, listStyle: false, paragraphBeginningSpace: true, sanitize: true}));const Queue = new Function(queueSource + "\nreturn InputQueue;")() as new () => {@@ -657,6 +658,31 @@ const browserCases = async (source: string, queueSource: string, editorSource: sawait finish(element);}+ // 系统选区手柄可落在内嵌编辑器外的单元格留白中,按下时不能关闭编辑器。+ for (const endpoint of ["start", "end"]) {+ const {owner, element, table} = fixture();+ const cell = table.querySelector("th");+ await open(owner, cell);+ const host = cell.querySelector(".table__cell-editor");+ const editable = host.querySelector('[contenteditable="true"]');+ const range = document.createRange();+ range.selectNodeContents(editable);+ focusByRange(range);+ const rects = Array.from(range.getClientRects()).filter(rect => rect.width > 0 && rect.height > 0);+ const rect = endpoint === "start" ? rects[0] : rects[rects.length - 1];+ const pointer = new PointerEvent("pointerdown", {bubbles: true, cancelable: true, pointerType: "touch",+ clientX: endpoint === "start" ? rect.left : rect.right,+ clientY: endpoint === "start" ? rect.top - 5 : rect.bottom + 5});+ cell.dispatchEvent(pointer);+ check.equal(host.isConnected, true, `${endpoint} handle outside the inner editor retains its host`);+ check.equal(pointer.defaultPrevented, false, "the native handle gesture remains available");+ check.equal(getSelection().toString(), "Hello");+ element.dispatchEvent(new PointerEvent("pointerdown", {bubbles: true, pointerType: "touch",+ clientX: rect.right + 100, clientY: rect.bottom + 100}));+ check.equal(host.isConnected, false, "an ordinary outside tap still closes the cell editor");+ await finish(element);+ }+let tableImageOwner: IProtyle;let imageMenus = 0;{@@ -1050,7 +1076,7 @@ test("table cell editors preserve input and alignment, and consume table menu En"../../util/escape.ts", "../util/tableVirtualizationDOM.ts", "setLute.ts", "../wysiwyg/codeBlockUtil.ts", "av/richTextValue.ts", "av/richText.ts","../wysiwyg/taskListMarker.ts", "../util/tableCellRichLute.ts", "../util/tableCellRichValue.ts", "../util/tableCellRich.ts","../util/tableCellRichContext.ts", "../util/tableCellRichSelection.ts", "../wysiwyg/tableVirtualization.ts",- "../util/hasClosest.ts", "../wysiwyg/getBlock.ts", "../util/table.ts", "../wysiwyg/input.ts"]+ "../util/hasClosest.ts", "../wysiwyg/getBlock.ts", "../util/table.ts", "../wysiwyg/input.ts", "../wysiwyg/nativeTextMenu.ts"].map(file => compile(read(file))).join("\n") + "\n" + compile(selectionSource) + "\n" + compile(taskSource);const wysiwyg = createSourceFile("wysiwyg.ts", read("../wysiwyg/index.ts"), ScriptTarget.Latest, true);const members = wysiwyg.statements.find(isClassDeclaration).members.filter(member =>diff --git a/app/src/protyle/render/tableCellRichEditor.ts b/app/src/protyle/render/tableCellRichEditor.tsindex 5753b6422b..6b5de118eb 100644--- a/app/src/protyle/render/tableCellRichEditor.ts+++ b/app/src/protyle/render/tableCellRichEditor.ts@@ -31,6 +31,8 @@ import {bindLiteCodeActions} from "../lite/codeActions";import {setTaskListItemMarker} from "../wysiwyg/list";import {nextTaskListMarker} from "../wysiwyg/taskListMarker";import {getTableVirtualCellIndex, getTableVirtualRowIndex, restoreTableVirtualizationDOM} from "../util/tableVirtualizationDOM";+import {isIOSDevice} from "../util/compatibility";+import {isNativeTextSelectionHandleTouch} from "../wysiwyg/nativeTextMenu";let activeEditor: {cell: Element, finish: () => void, prepareSwitch: () => boolean} | undefined;let openingEditor: object | undefined;@@ -443,7 +445,8 @@ const mountTableCellRichEditor = async (request: object, previousEditor: typeoffragment.protyle.toolbar.element.contains(target) || fragment.protyle.toolbar.subElement.contains(target) ||!!(target instanceof Element && target.closest("#keyboardToolbar, #commonMenu, .b3-dialog"));document.addEventListener("pointerdown", event => {- if (belongsToEditor(event.target as Node)) {+ if (belongsToEditor(event.target as Node) ||+ (isIOSDevice() && isNativeTextSelectionHandleTouch(event, fragment.wysiwyg))) {return;}const target = event.target instanceof Element ? event.target : undefined;diff --git a/app/src/protyle/util/tableTouch.test.ts b/app/src/protyle/util/tableTouch.test.tsindex fc338afd04..641f1f10a4 100644--- a/app/src/protyle/util/tableTouch.test.ts+++ b/app/src/protyle/util/tableTouch.test.ts@@ -497,6 +497,23 @@ const browserCases = async (sources: Record<string, string>) => {check.equal(transactions.length, count + 2, "dragging from a body row creates one width transaction");f.dispose();}+ for (const columnWidth of [12, 16]) {+ const f = fixture();+ f.table.querySelector<HTMLTableColElement>("col").style.width = `${columnWidth}px`;+ Array.from(f.table.rows).forEach(row => row.cells[0].textContent = "");+ const cell = f.cell(1, 0);+ const rect = cell.getBoundingClientRect();+ const middle = new MouseEvent("click", {bubbles: true, cancelable: true,+ clientX: (rect.left + rect.right) / 2, clientY: (rect.top + rect.bottom) / 2});+ cell.dispatchEvent(middle);+ check.equal(middle.defaultPrevented, false, "narrow cell centers remain available for text editing");+ check.equal(f.touch("[data-action='width']"), null);+ cell.dispatchEvent(new MouseEvent("click", {bubbles: true, cancelable: true,+ clientX: rect.right, clientY: (rect.top + rect.bottom) / 2}));+ f.render();+ check.ok(f.touch("[data-action='width']"), "the narrow column divider can still be resized");+ f.dispose();+ }for (const kind of ["merged", "no-header", "disabled", "block", "link"]) {const f = fixture();const first = f.cell(0, 0);diff --git a/app/src/protyle/util/tableTouch.ts b/app/src/protyle/util/tableTouch.tsindex 441e6bbcd3..11abbd0581 100644--- a/app/src/protyle/util/tableTouch.ts+++ b/app/src/protyle/util/tableTouch.ts@@ -390,11 +390,13 @@ export class TableTouchControl {}const columns = Array.from(table.querySelectorAll<HTMLTableColElement>(":scope > colgroup > col"));const rect = cell.getBoundingClientRect();- if (Math.min(Math.abs(rect.left - event.clientX), Math.abs(rect.right - event.clientX)) > 8) {+ // 窄单元格保留中间的文字点击区域,分隔线仍可进入列宽调整。+ const tolerance = Math.min(8, rect.width / 4);+ if (Math.min(Math.abs(rect.left - event.clientX), Math.abs(rect.right - event.clientX)) > tolerance) {return false;}// 点击可见的单元格分隔线后激活列宽调整,合并单元格内部没有分隔线的位置不响应。- const index = columns.findIndex(column => Math.abs(column.getBoundingClientRect().right - event.clientX) <= 8);+ const index = columns.findIndex(column => Math.abs(column.getBoundingClientRect().right - event.clientX) <= tolerance);if (index < 0 || !this.actions.activate(cell)) {return false;}diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.tsindex 9d54e2a879..3faf43ad4a 100644--- a/app/src/protyle/wysiwyg/index.ts+++ b/app/src/protyle/wysiwyg/index.ts@@ -577,7 +577,16 @@ export class WYSIWYG {if (isIOSDevice()) {this.disposeTouchCaret = bindIOSTouchCaret(this.element, () => !protyle.disabled &&!protyle.toolbar.isMultiSelectMode() && !window.siyuan.touchDragActive &&- !getBlockSelectionModeElement(this.element));+ !getBlockSelectionModeElement(this.element), (target, point) => {+ const cell = target.closest("td, th");+ if (!cell || cell.closest(".protyle-wysiwyg") !== this.element) {+ return false;+ }+ // 在短按结束时进入单元格编辑,避免键盘动画后的延迟点击重新命中其他内容。+ target.dispatchEvent(new MouseEvent("click", {bubbles: true, cancelable: true,+ clientX: point.x, clientY: point.y, button: 0, detail: 1}));+ return true;+ });}/// #if !MOBILEbindTouchNavigation(this.element, (target, point) => {diff --git a/app/src/protyle/wysiwyg/nativeTextMenu.ts b/app/src/protyle/wysiwyg/nativeTextMenu.tsindex 0f95c9bbee..3ed1615a0f 100644--- a/app/src/protyle/wysiwyg/nativeTextMenu.ts+++ b/app/src/protyle/wysiwyg/nativeTextMenu.ts@@ -1,12 +1,14 @@// 正文使用系统文字菜单,块控件和语义元素仍由各自的菜单处理。export const usesNativeTextMenu = (target: HTMLElement, editor: HTMLElement) => {const editable = target.closest('[contenteditable="true"]');- return !!editable && editor.contains(editable) && !target.closest(- "input, textarea, button, a, img, audio, video, iframe, [contenteditable='false']:not(.protyle-wysiwyg), " +- ".protyle-action, .protyle-attr, .table, .av, .protyle-custom, [data-prevent-swipe], " ++ const excluded = target.closest(+ "input, textarea, select, button, a, img, audio, video, iframe, [contenteditable='false']:not(.protyle-wysiwyg), " ++ ".protyle-action, .protyle-attr, .av, .protyle-custom, [data-prevent-swipe], " +"[data-type~='block-ref'], [data-type~='virtual-block-ref'], [data-type~='file-annotation-ref'], " +"[data-type~='a'], [data-type~='tag'], [data-type~='inline-memo'], [data-type~='inline-math']",);+ return !!editable && editable.closest(".protyle-wysiwyg") === editor &&+ (!excluded || !editable.contains(excluded));};type NativeTextMenuState = {range: Range, timer?: number, requested?: boolean};@@ -17,6 +19,37 @@ const sameRange = (current: Range, saved: Range) => current && !current.collapsecurrent.startContainer === saved.startContainer && current.startOffset === saved.startOffset &¤t.endContainer === saved.endContainer && current.endOffset === saved.endOffset;+export const isNativeTextSelectionHandleTouch = (event: Event, editor: HTMLElement) => {+ let point: {clientX: number, clientY: number};+ if (event instanceof PointerEvent && event.pointerType === "touch") {+ point = event;+ } else if (event instanceof TouchEvent && event.touches.length === 1) {+ point = event.touches[0];+ } else {+ return false;+ }+ if (event.target instanceof Element && event.target.closest(+ ".protyle-table-control, .protyle-toolbar, .protyle-action, button, a, input, textarea, select")) {+ return false;+ }+ const ownerDocument = editor.ownerDocument;+ const selection = ownerDocument.getSelection();+ const range = selection?.rangeCount > 0 ? selection.getRangeAt(0) : undefined;+ if (!editor.contains(ownerDocument.activeElement) || !range || range.collapsed ||+ !editor.contains(range.startContainer) || !editor.contains(range.endContainer)) {+ return false;+ }+ const rects = Array.from(range.getClientRects()).filter(rect => rect.width > 0 && rect.height > 0);+ if (!rects.length) {+ return false;+ }+ const first = rects[0];+ const last = rects[rects.length - 1];+ // 系统手柄位于选区端点外,触摸目标可能是内嵌编辑器之外的单元格留白。+ return Math.hypot(point.clientX - first.left, point.clientY - first.top + 5) <= 20 ||+ Math.hypot(point.clientX - last.right, point.clientY - last.bottom - 5) <= 20;+};+export const cancelNativeTextMenu = (editor: HTMLElement) => {const state = nativeMenus.get(editor);if (!state) {@@ -39,10 +72,31 @@ export const bindNativeTextMenu = (editor: HTMLElement) => {const selectionChange = () => {const state = nativeMenus.get(editor);const selection = ownerDocument.getSelection();- if (state && (!editor.contains(ownerDocument.activeElement) || !selection?.rangeCount ||- !sameRange(selection.getRangeAt(0), state.range))) {+ if (!state) {+ return;+ }+ const range = selection?.rangeCount > 0 ? selection.getRangeAt(0) : undefined;+ if (!editor.contains(ownerDocument.activeElement) || !range || range.collapsed ||+ !editor.contains(range.startContainer) || !editor.contains(range.endContainer)) {cancel();+ } else if (!sameRange(range, state.range)) {+ if (state.requested && state.timer === undefined) {+ // 系统手柄扩选时沿用新选区,不在拖动过程中关闭文字菜单。+ nativeMenus.set(editor, {range: range.cloneRange(), requested: true});+ } else {+ cancel();+ }+ }+ };+ const pointerDown = (event: Event) => {+ const state = nativeMenus.get(editor);+ const target = event.target;+ if (state?.requested && state.timer === undefined &&+ ((target instanceof Element && target.closest(".protyle-wysiwyg") === editor) ||+ isNativeTextSelectionHandleTouch(event, editor))) {+ return;}+ cancel();};const scroll = (event: Event) => {const target = event.target;@@ -58,14 +112,16 @@ export const bindNativeTextMenu = (editor: HTMLElement) => {ownerDocument.addEventListener("selectionchange", selectionChange);ownerDocument.addEventListener("scroll", scroll, true);ownerDocument.addEventListener("focusout", focusOut, true);- const cancelEvents = ["pointerdown", "touchstart", "beforeinput"];- cancelEvents.forEach(type => ownerDocument.addEventListener(type, cancel, {capture: true, passive: true}));+ const pointerEvents = ["pointerdown", "touchstart"];+ pointerEvents.forEach(type => ownerDocument.addEventListener(type, pointerDown, {capture: true, passive: true}));+ ownerDocument.addEventListener("beforeinput", cancel, true);return () => {cancel();ownerDocument.removeEventListener("selectionchange", selectionChange);ownerDocument.removeEventListener("scroll", scroll, true);ownerDocument.removeEventListener("focusout", focusOut, true);- cancelEvents.forEach(type => ownerDocument.removeEventListener(type, cancel, true));+ pointerEvents.forEach(type => ownerDocument.removeEventListener(type, pointerDown, true));+ ownerDocument.removeEventListener("beforeinput", cancel, true);};};diff --git a/app/src/protyle/wysiwyg/touchCaret.ts b/app/src/protyle/wysiwyg/touchCaret.tsindex 417432bef0..e8876d98e1 100644--- a/app/src/protyle/wysiwyg/touchCaret.ts+++ b/app/src/protyle/wysiwyg/touchCaret.ts@@ -2,10 +2,10 @@ import {Constants} from "../../constants";import {focusByRange} from "../util/selectionOffsets";import {isCommittedTextInput} from "./compositionInput";import {bindTouchNavigation} from "./touchNavigation";-import {bindNativeTextMenu, cancelNativeTextMenu, requestNativeTextMenu} from "./nativeTextMenu";+import {bindNativeTextMenu, requestNativeTextMenu} from "./nativeTextMenu";const TOUCH_CARET_EXCLUDED = "input, textarea, select, button, a, img, audio, video, iframe, " +- ".protyle-action, .protyle-attr, .table, .av, .protyle-custom, [data-prevent-swipe], " ++ ".protyle-action, .protyle-attr, .av, .protyle-custom, [data-prevent-swipe], " +"[data-type~='block-ref'], [data-type~='virtual-block-ref'], [data-type~='file-annotation-ref'], " +"[data-type~='a'], [data-type~='tag'], [data-type~='inline-memo'], [data-type~='inline-math']";@@ -30,7 +30,8 @@ const getTouchCharacterRange = (range: Range, point: {x: number, y: number}) =>}};-export const bindIOSTouchCaret = (element: HTMLElement, canPlaceCaret: () => boolean) => {+export const bindIOSTouchCaret = (element: HTMLElement, canPlaceCaret: () => boolean,+ onTap?: (target: HTMLElement, point: {x: number, y: number}) => boolean) => {const ownerDocument = element.ownerDocument;const ownerWindow = ownerDocument.defaultView;const disposeNativeMenu = bindNativeTextMenu(element);@@ -48,7 +49,6 @@ export const bindIOSTouchCaret = (element: HTMLElement, canPlaceCaret: () => boo};const cancel = () => {cancelFrame();- cancelNativeTextMenu(element);pendingTap = undefined;};const schedule = () => {@@ -235,10 +235,18 @@ export const bindIOSTouchCaret = (element: HTMLElement, canPlaceCaret: () => booreturn;}const editable = target.closest<HTMLElement>("[contenteditable]");- if (!editable || editable.getAttribute("contenteditable") !== "true" || !element.contains(editable)) {+ if (!editable || editable.getAttribute("contenteditable") !== "true" ||+ editable.closest(".protyle-wysiwyg") !== element) {return;}- const range = ownerDocument.caretRangeFromPoint(point.x, point.y);+ let range = ownerDocument.caretRangeFromPoint(point.x, point.y);+ const cell = target.closest("td, th");+ if (cell && element.contains(cell) && (!range || !cell.contains(range.startContainer))) {+ // 窄单元格和空单元格的坐标可能命中相邻格,保留本次实际点击的单元格。+ range = ownerDocument.createRange();+ range.selectNodeContents(cell);+ range.collapse(true);+ }const rangeElement = range && (range.startContainer.nodeType === Node.ELEMENT_NODE ?range.startContainer as Element : range.startContainer.parentElement);if (!rangeElement || rangeElement.closest("[contenteditable]") !== editable ||@@ -258,7 +266,7 @@ export const bindIOSTouchCaret = (element: HTMLElement, canPlaceCaret: () => boostartedUnfocused, time: Date.now(), touchTime, selection: savedSelection};rememberTouchStart(point);};- const disposeNavigation = bindTouchNavigation(element, () => {+ const disposeNavigation = bindTouchNavigation(element, (target, point) => {cancel();const caret = touchCaret;touchCaret = undefined;@@ -266,6 +274,9 @@ export const bindIOSTouchCaret = (element: HTMLElement, canPlaceCaret: () => boo!element.contains(caret.editable)) {return;}+ if (onTap?.(target, point)) {+ return true;+ }previousTap.time = Date.now();// 三击及更多次连续点击保留系统的整段选择行为。if (previousTap.count > 2) {diff --git a/app/tests/iosTouchCaret.test.js b/app/tests/iosTouchCaret.test.jsindex 7e9a7977f9..0cbf8ec242 100644--- a/app/tests/iosTouchCaret.test.js+++ b/app/tests/iosTouchCaret.test.js@@ -19,15 +19,20 @@ const rendererSource = () => {}).join("\n");const wysiwyg = ts.createSourceFile("index.ts", read("wysiwyg/index"), ts.ScriptTarget.Latest, true);let doubleClick;+ let tableTap;const visit = node => {if (ts.isCallExpression(node) && node.expression.getText(wysiwyg) === "this.element.addEventListener" &&node.arguments[0]?.getText(wysiwyg) === '"dblclick"') {doubleClick = node.getText(wysiwyg);}+ if (ts.isCallExpression(node) && node.expression.getText(wysiwyg) === "bindIOSTouchCaret") {+ tableTap = node.arguments[2]?.getText(wysiwyg);+ }ts.forEachChild(node, visit);};visit(wysiwyg);assert.ok(doubleClick);+ assert.ok(tableTap);const menus = ts.createSourceFile("protyle.ts", readFileSync(path.join(__dirname, "../src/menus/protyle.ts"), "utf8"),ts.ScriptTarget.Latest, true);const contentMenu = menus.statements.find(statement => ts.isVariableStatement(statement) &&@@ -39,6 +44,9 @@ const rendererSource = () => {const getAVTemplateInteractiveElement = () => undefined;(function() { ${doubleClick}; }).call({element});};+ exports.createNativeTableTap = function(element) {+ return (function() { return ${tableTap}; }).call({element});+ };exports.callNativeContentMenu = function(protyle, nodeElement) {const getEditorRange = () => document.getSelection().getRangeAt(0);const isIOSDevice = () => true;@@ -63,7 +71,7 @@ const runCases = async () => {const onError = event => errors.push(event.message);window.addEventListener("error", onError);let cases = 0;- const fixture = (focused = true) => {+ const fixture = (focused = true, tableTap = false) => {document.body.innerHTML = `<div class="protyle-wysiwyg" contenteditable="false" style="font: 20px monospace"><div data-node-id="one"><div contenteditable="true">97997974949464649</div></div><div data-node-id="two"><div contenteditable="true">点击定位文字</div></div>@@ -72,7 +80,8 @@ const runCases = async () => {const editable = root.querySelector('[contenteditable="true"]');const text = editable.firstChild;let enabled = true;- const dispose = bindIOSTouchCaret(root, () => enabled);+ const dispose = bindIOSTouchCaret(root, () => enabled,+ tableTap ? window.touchCaret.createNativeTableTap(root) : undefined);const place = (offset, node = text, end = offset) => {const range = document.createRange();range.setStart(node, offset);@@ -141,6 +150,164 @@ const runCases = async () => {window.webkit = originalWebkit;}});+ for (const kind of ["pointerdown", "touchstart", "drag"]) {+ await run(async f => {+ const originalWebkit = window.webkit;+ const messages = [];+ window.webkit = {messageHandlers: {showTextMenu: {postMessage: async text => {+ messages.push(text);+ return true;+ }}}};+ try {+ f.place(2, f.text, 6);+ const selected = selection.toString();+ window.touchCaret.requestNativeTextMenu(f.root, selection.getRangeAt(0));+ await new Promise(resolve => setTimeout(resolve, 150));+ const point = f.pointAt(5);+ if (kind === "pointerdown") {+ f.editable.dispatchEvent(new PointerEvent("pointerdown", {bubbles: true, pointerType: "touch", ...point}));+ } else {+ f.send("touchstart", point);+ }+ if (kind === "drag") {+ f.send("touchmove", {...point, clientX: point.clientX + 40});+ f.place(2, f.text, 10);+ document.dispatchEvent(new Event("selectionchange"));+ f.send("touchend", {...point, clientX: point.clientX + 40});+ }+ await nextFrame();+ check.deepEqual(messages, [selected], "selection handle gestures do not dismiss the native menu");+ check.equal(selection.toString(), f.text.textContent.slice(2, kind === "drag" ? 10 : 6));+ } finally {+ f.dispose();+ window.webkit = originalWebkit;+ }+ });+ }+ for (const endpoint of ["start", "end"]) {+ await run(async f => {+ const originalWebkit = window.webkit;+ const messages = [];+ window.webkit = {messageHandlers: {showTextMenu: {postMessage: async text => {+ messages.push(text);+ return true;+ }}}};+ try {+ const table = document.createElement("table");+ table.innerHTML = '<tbody><tr><td style="padding:24px"></td></tr></tbody>';+ f.root.replaceWith(table);+ const cell = table.querySelector("td");+ cell.appendChild(f.root);+ f.editable.focus();+ f.place(2, f.text, 6);+ const selected = selection.toString();+ window.touchCaret.requestNativeTextMenu(f.root, selection.getRangeAt(0));+ await new Promise(resolve => setTimeout(resolve, 150));+ const rect = selection.getRangeAt(0).getBoundingClientRect();+ const point = {clientX: endpoint === "start" ? rect.left : rect.right,+ clientY: endpoint === "start" ? rect.top - 5 : rect.bottom + 5};+ cell.dispatchEvent(new PointerEvent("pointerdown", {bubbles: true, pointerType: "touch", ...point}));+ f.send("touchstart", point, cell);+ check.deepEqual(messages, [selected], `${endpoint} handle outside the editor retains its native menu`);+ document.querySelector("#outside").dispatchEvent(new PointerEvent("pointerdown", {+ bubbles: true, pointerType: "touch", clientX: rect.right + 100, clientY: rect.bottom + 100,+ }));+ check.deepEqual(messages, [selected, ""], "an unrelated outside tap still dismisses the menu");+ } finally {+ f.dispose();+ window.webkit = originalWebkit;+ }+ });+ }+ await run(async f => {+ const originalWebkit = window.webkit;+ const messages = [];+ let rejectOldSelection;+ window.webkit = {messageHandlers: {showTextMenu: {postMessage: text => {+ messages.push(text);+ return text ? new Promise(resolve => { rejectOldSelection = resolve; }) : Promise.resolve(true);+ }}}};+ try {+ f.place(2, f.text, 6);+ const selected = selection.toString();+ window.touchCaret.requestNativeTextMenu(f.root, selection.getRangeAt(0));+ await new Promise(resolve => setTimeout(resolve, 150));+ f.place(2, f.text, 10);+ document.dispatchEvent(new Event("selectionchange"));+ rejectOldSelection(false);+ await nextFrame();+ check.deepEqual(messages, [selected], "a late response for the previous selection does not cancel a handle drag");+ } finally {+ f.dispose();+ window.webkit = originalWebkit;+ }+ });+ await run(async f => {+ f.root.innerHTML = '<div class="table" data-node-id="table" data-type="NodeTable">' ++ '<div contenteditable="false"><table contenteditable="true"><tbody><tr><td>table text</td></tr>' ++ "</tbody></table></div></div>";+ const cell = f.root.querySelector("td");+ check.equal(window.touchCaret.usesNativeTextMenu(cell, f.root), true, "table text uses the native menu");+ cell.innerHTML = '<div class="table__cell-editor" contenteditable="false">' ++ '<div class="protyle-wysiwyg" contenteditable="false"><div contenteditable="true">nested cell</div></div></div>';+ const inner = cell.querySelector(".protyle-wysiwyg");+ const target = inner.firstElementChild;+ check.equal(window.touchCaret.usesNativeTextMenu(target, inner), true, "the cell editor owns its text menu");+ check.equal(window.touchCaret.usesNativeTextMenu(target, f.root), false, "the outer editor ignores nested text menus");+ });+ for (const empty of [false, true]) {+ await run(async f => {+ f.root.innerHTML = '<div class="table" data-node-id="table" data-type="NodeTable">' ++ '<div contenteditable="false"><table contenteditable="true"><tbody><tr>' ++ '<td style="width:12px"></td><td>neighbor</td></tr></tbody></table></div></div>';+ const table = f.root.querySelector("table");+ const cell = table.querySelector("td");+ if (!empty) cell.textContent = "x";+ const neighbor = cell.nextElementSibling.firstChild;+ table.focus();+ f.place(0, neighbor);+ const originalCaret = document.caretRangeFromPoint;+ document.caretRangeFromPoint = () => {+ const range = document.createRange();+ range.setStart(neighbor, 0);+ range.collapse(true);+ return range;+ };+ try {+ const rect = cell.getBoundingClientRect();+ const point = {clientX: (rect.left + rect.right) / 2, clientY: (rect.top + rect.bottom) / 2};+ f.send("touchstart", point, cell);+ f.send("touchend", point, cell);+ await nextFrame();+ check.equal(selection.isCollapsed, true);+ check.equal(cell.contains(selection.anchorNode), true, "a tap stays in its narrow or empty table cell");+ } finally {+ document.caretRangeFromPoint = originalCaret;+ }+ });+ }+ {+ const clicks = [];+ const f = fixture(true, true);+ try {+ f.root.innerHTML = '<div class="table" data-node-id="table"><div contenteditable="false">' ++ '<table contenteditable="true"><tbody><tr><td>cell</td></tr></tbody></table></div></div>';+ const cell = f.root.querySelector("td");+ cell.addEventListener("click", event => clicks.push({target: event.target, x: event.clientX, y: event.clientY}));+ const point = f.pointAt(1, cell.firstChild);+ f.send("touchstart", point, cell);+ const end = f.send("touchend", point, cell);+ await nextFrame();+ check.equal(end.defaultPrevented, true, "the delayed compatibility click is suppressed after table activation");+ check.equal(clicks.length, 1, "a cell activates even when WebKit never dispatches click");+ check.equal(clicks[0].target, cell);+ check.ok(Math.abs(clicks[0].x - point.clientX) < 1);+ check.ok(Math.abs(clicks[0].y - point.clientY) < 1);+ cases++;+ } finally {+ f.dispose();+ }+ }for (const kind of ["selected", "native", "changed", "scroll"]) {await run(async f => {let calls = 0;@@ -199,7 +366,8 @@ const runCases = async () => {f.dispose();}await new Promise(resolve => setTimeout(resolve, 150));- check.deepEqual(messages, kind === "unrelatedScroll" || kind === "duplicate" ? [text] : [text, ""], kind);+ check.deepEqual(messages, kind === "unrelatedScroll" || kind === "duplicate" || kind === "changed" ?+ [text] : [text, ""], kind);} finally {window.webkit = originalWebkit;}@@ -677,7 +845,7 @@ if (process.versions.electron && process.type === "browser") {try {const {stdout} = await require("node:util").promisify(require("node:child_process").execFile)(require("electron"), [__filename, profile], {env, windowsHide: true, timeout: 40000});- assert.match(stdout, /iOS touch caret: 65 DOM cases passed/);+ assert.match(stdout, /iOS touch caret: 75 DOM cases passed/);} finally {assert.equal(path.dirname(path.resolve(profile)), path.resolve(os.tmpdir()));assert.ok(path.basename(profile).startsWith("siyuan-ios-touch-caret-"));