Порівняти коміти

...
Автор SHA1 Повідомлення Дата
l0ng-ai 62aac31018 fix(markdown): exclude trailing space from preview word selection 2026-11-18 19:29:14 +08:00
4 змінених файлів з 53 додано та 11 видалено

No files matched your search

+6 -3
Переглянути файл
@@ -196,6 +196,8 @@ test("Markdown preview highlights ⌘F matches, selected words and scales diagra
"",
"Manage **Order** items and `Order` status.",
"",
"The last word is Order.",
"",
"```mermaid",
"flowchart LR",
" A --> B",
@@ -210,6 +212,7 @@ test("Markdown preview highlights ⌘F matches, selected words and scales diagra
// Selecting a word in the preview auto-highlights its other occurrences in the preview and the split editor.
await preview.locator("strong").dblclick();
await expect.poll(() => page.evaluate(() => window.getSelection()?.toString())).toBe("Order");
await expect
.poll(() =>
@@ -218,8 +221,8 @@ test("Markdown preview highlights ⌘F matches, selected words and scales diagra
return set ? [...set].map((r) => (r as Range).toString()) : [];
}),
)
.toEqual(["Order", "Order"]);
await expect(editor.locator(".cm-selectionMatch")).toHaveCount(3);
.toEqual(["Order", "Order", "Order"]);
await expect(editor.locator(".cm-selectionMatch")).toHaveCount(4);
// Pressing ⌘F seeds from the preview selection and highlights current + other matches in the preview.
await page.keyboard.press("Meta+f");
@@ -232,7 +235,7 @@ test("Markdown preview highlights ⌘F matches, selected words and scales diagra
other: [...(CSS.highlights.get("markdown-find") ?? [])].map((r) => (r as Range).toString()),
})),
)
.toEqual({ current: ["Order"], other: ["Order", "Order"] });
.toEqual({ current: ["Order"], other: ["Order", "Order", "Order"] });
const mermaidSvg = preview.locator(".mermaid-output svg");
const excalidrawImg = preview.locator('img[alt="Diagram"]');
+5
Переглянути файл
@@ -37,6 +37,7 @@ import {
revealPreviewRange,
selectionMatchesInNode,
setPreviewHighlight,
trimPreviewWordSelection,
} from "./highlight";
import { publishPreviewSelection, publishPreviewTop, stepMarkdownPreviewFontZoom, useLiveMarkdown } from "./live";
import { subscribeTheme, themeKey } from "@/platform/themeWatch";
@@ -518,6 +519,10 @@ function MarkdownPreview({ path, sync }: { path: string; sync: boolean }) {
role="document"
aria-label={tx("Markdown preview")}
onClick={onClick}
onDoubleClick={(e) => {
if (e.defaultPrevented || e.button !== 0 || e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) return;
if (e.target instanceof Node && trimPreviewWordSelection(e.currentTarget, e.target)) e.preventDefault();
}}
onScroll={onScroll}
dangerouslySetInnerHTML={{ __html: html }}
/>
+16 -8
Переглянути файл
@@ -1,5 +1,5 @@
import { afterEach, beforeEach, describe, expect, it } from "vitest";
import { act, cleanup, render, screen, waitFor } from "@testing-library/react";
import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
import { EditorSelection, EditorState } from "@codemirror/state";
import { EditorView } from "@codemirror/view";
import { setSearchQuery } from "@codemirror/search";
@@ -269,8 +269,11 @@ describe("Markdown preview search & selection highlights", () => {
});
});
it("seeds Command+F from a word selected in the Markdown preview", () => {
openEditor("first second third\n");
it.each([
["double-click", true, "Order", ["Order", "Order", "Order"]],
["manual", false, "Order ", ["Order ", "Order "]],
] as const)("preserves the intended %s selection for highlights and Find", (_gesture, doubleClick, text, matches) => {
openEditor("# Order Service\n\nManage **Order** items and `Order` status.\n\nThe last word is Order.\n");
const pane = document.createElement("section");
pane.setAttribute("data-pane-id", "pane-1");
document.body.appendChild(pane);
@@ -284,13 +287,18 @@ describe("Markdown preview search & selection highlights", () => {
);
const preview = screen.getByRole("document", { name: "Markdown preview" });
const textNode = preview.querySelector("p")!.firstChild as Text;
const bold = preview.querySelector("strong")!;
const range = document.createRange();
range.setStart(textNode, 6);
range.setEnd(textNode, 12);
range.setStart(bold.firstChild!, 0);
range.setEnd(bold.nextSibling!, 1);
const sel = window.getSelection()!;
sel.removeAllRanges();
sel.addRange(range);
// Windows Chromium includes this space in the native word selection.
if (doubleClick) fireEvent.doubleClick(bold);
act(() => document.dispatchEvent(new Event("selectionchange")));
expect(sel.toString()).toBe(text);
expect(highlightTexts(SELECTION_MATCH_HIGHLIGHT)).toEqual(matches);
const target: FindTarget = {
id: "t",
@@ -302,7 +310,7 @@ describe("Markdown preview search & selection highlights", () => {
seedFind(target, false);
});
expect(useFindSessions.getState().t?.search).toBe("second");
expect(view.state.sliceDoc(view.state.selection.main.from, view.state.selection.main.to)).toBe("second");
expect(useFindSessions.getState().t?.search).toBe(text);
expect(view.state.sliceDoc(view.state.selection.main.from, view.state.selection.main.to)).toBe(text);
});
});
+26
Переглянути файл
@@ -271,6 +271,32 @@ function isSameRange(a: Range, b: Range): boolean {
}
}
/** The native double-click selection can include horizontal space after the word. */
export function trimPreviewWordSelection(root: HTMLElement, target: Node): boolean {
const selection = root.ownerDocument.getSelection();
if (!selection || selection.isCollapsed || selection.rangeCount !== 1) return false;
const range = selection.getRangeAt(0);
const common = range.commonAncestorContainer;
if (!root.contains(common) || !range.intersectsNode(target)) return false;
const word = /^(\S+)[\p{Zs}\t]+$/u.exec(range.toString())?.[1];
if (!word || !WORD_CHAR.test(word)) return false;
// The word and its trailing space can be in different inline nodes.
const walker = root.ownerDocument.createTreeWalker(common, NodeFilter.SHOW_TEXT);
let remaining = word.length;
for (let node = common instanceof Text ? common : walker.nextNode(); node; node = walker.nextNode()) {
if (!range.intersectsNode(node)) continue;
const start = node === range.startContainer ? range.startOffset : 0;
const end = node === range.endContainer ? range.endOffset : (node as Text).length;
if (remaining <= end - start) {
selection.setBaseAndExtent(range.startContainer, range.startOffset, node, start + remaining);
return true;
}
remaining -= end - start;
}
return false;
}
/** Single-line non-empty selection inside `root` (2..200 chars), matching CodeMirror's `highlightSelectionMatches`. */
export function previewSelectionOf(root: HTMLElement): { text: string; range: Range } | null {
if (typeof window === "undefined") return null;