Skip to content

Commit 750017c

Browse files
committed
fix(web): stabilize diff copy test and non-Latin shortcuts
1 parent c73f6af commit 750017c

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

‎apps/web/src/components/diffs/StyledDiffCodeView.browser.test.tsx‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import type { CodeViewHandle } from "@pierre/diffs/react";
12
import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";
3+
import { createRef } from "react";
24
import { describe, expect, it, vi } from "vite-plus/test";
35

46
import { render } from "../../../test/render";
@@ -30,26 +32,32 @@ function copy(): string {
3032

3133
describe("StyledDiffCodeView", () => {
3234
it("copies every line of a file after select all, including rows the virtualizer dropped", async () => {
33-
await using screen = await render(
35+
const viewerRef = createRef<CodeViewHandle<undefined, undefined>>();
36+
await using _screen = await render(
3437
<StyledDiffCodeView
38+
viewerRef={viewerRef}
3539
style={{ height: 300, overflow: "auto" }}
3640
items={[{ id: "big", type: "diff", fileDiff }]}
3741
/>,
3842
);
39-
const root = () => screen.container.querySelector("diffs-container")?.shadowRoot;
43+
const root = () => viewerRef.current?.getInstance()?.getRenderedItems()[0]?.element.shadowRoot;
4044
await vi.waitFor(() => expect(root()?.querySelector("[data-line]")).toBeTruthy());
4145
const rows = root()!.querySelectorAll("[data-line]");
4246
expect(rows.length).toBeLessThan(LINE_COUNT);
4347

4448
rows[1]!.dispatchEvent(new PointerEvent("pointerdown", { bubbles: true, composed: true }));
4549
const selectAll = new KeyboardEvent("keydown", {
46-
key: "a",
50+
key: "ф",
51+
code: "KeyA",
4752
metaKey: true,
4853
ctrlKey: true,
4954
bubbles: true,
5055
cancelable: true,
5156
});
5257
document.body.dispatchEvent(selectAll);
58+
document.body.dispatchEvent(
59+
new KeyboardEvent("keydown", { key: "с", code: "KeyC", metaKey: true, bubbles: true }),
60+
);
5361

5462
expect(selectAll.defaultPrevented).toBe(true);
5563
expect(copy()).toBe(lines.join("\n"));

‎apps/web/src/components/diffs/useDiffSelectAllCopy.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ import { buildDiffFileText } from "~/reviewCommentContext";
66

77
function isSelectAll(event: KeyboardEvent): boolean {
88
return (
9-
event.key.toLowerCase() === "a" &&
9+
(event.key.toLowerCase() === "a" || event.code === "KeyA") &&
1010
(event.metaKey || event.ctrlKey) &&
1111
!event.altKey &&
1212
!event.shiftKey
1313
);
1414
}
1515

1616
function isCopy(event: KeyboardEvent): boolean {
17-
return event.key.toLowerCase() === "c" && (event.metaKey || event.ctrlKey);
17+
return (
18+
(event.key.toLowerCase() === "c" || event.code === "KeyC") && (event.metaKey || event.ctrlKey)
19+
);
1820
}
1921

2022
const MODIFIER_KEYS = new Set(["Meta", "Control", "Shift", "Alt"]);

0 commit comments

Comments
 (0)