Skip to content

Commit c4c7eb1

Browse files
committed
fix(desktop): narrow AltGraph shortcut guard
1 parent 5710bd1 commit c4c7eb1

2 files changed

Lines changed: 57 additions & 39 deletions

File tree

‎apps/desktop/src/preview/Manager.test.ts‎

Lines changed: 51 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -265,24 +265,26 @@ const fileSystemLayer = FileSystem.layerNoop({
265265
}),
266266
});
267267

268-
const layer = PreviewManager.layer.pipe(
269-
Layer.provideMerge(browserSessionLayer),
270-
Layer.provideMerge(environmentLayer),
271-
Layer.provideMerge(fileSystemLayer),
272-
Layer.provideMerge(Path.layer),
273-
Layer.provideMerge(Layer.succeed(HostProcessPlatform, "darwin")),
274-
);
268+
const managerLayer = (platform: NodeJS.Platform = "darwin") =>
269+
PreviewManager.layer.pipe(
270+
Layer.provideMerge(browserSessionLayer),
271+
Layer.provideMerge(environmentLayer),
272+
Layer.provideMerge(fileSystemLayer),
273+
Layer.provideMerge(Path.layer),
274+
Layer.provideMerge(Layer.succeed(HostProcessPlatform, platform)),
275+
);
275276
const encodePreviewManagerError = Schema.encodeSync(PreviewManager.PreviewManagerError);
276277

277278
const withManager = <A>(
278279
use: (
279280
manager: PreviewManager.PreviewManager["Service"],
280281
) => Effect.Effect<A, PreviewManager.PreviewManagerError, Scope.Scope>,
282+
platform: NodeJS.Platform = "darwin",
281283
) =>
282284
Effect.gen(function* () {
283285
const manager = yield* PreviewManager.PreviewManager;
284286
return yield* use(manager);
285-
}).pipe(Effect.provide(layer), Effect.scoped);
287+
}).pipe(Effect.provide(managerLayer(platform)), Effect.scoped);
286288

287289
interface TestCapturedPreviewImage {
288290
readonly toJPEG: () => Buffer;
@@ -669,36 +671,47 @@ describe("PreviewManager", () => {
669671
),
670672
);
671673

672-
effectIt.effect("does not intercept ambiguous AltGraph input in the focused guest", () =>
673-
withManager((manager) =>
674-
Effect.gen(function* () {
675-
const preview = makeFaviconWebContents();
676-
const send = vi.fn();
677-
Object.assign(preview.webContents, {
678-
hostWebContents: { isDestroyed: () => false, send },
679-
});
680-
fromId.mockReturnValue(preview.webContents);
681-
getFocusedWebContents.mockReturnValue(preview.webContents as never);
682-
yield* manager.createTab("tab_alt_graph");
683-
yield* manager.registerWebview("tab_alt_graph", 42);
684-
yield* manager.setReopenClosedShortcuts([parseKeybindingShortcut("ctrl+alt+[")!]);
685-
const preventDefault = vi.fn();
686-
preview.listeners.get("before-input-event")!(
687-
{ preventDefault } as never,
688-
{
689-
type: "keyDown",
690-
key: "[",
691-
code: "BracketLeft",
692-
meta: false,
693-
control: true,
694-
shift: false,
695-
alt: true,
696-
} as never,
697-
);
698-
expect(preventDefault).not.toHaveBeenCalled();
699-
expect(send).not.toHaveBeenCalled();
700-
}),
701-
),
674+
effectIt.effect.each([
675+
["linux", "ctrl+alt+[", "[", "BracketLeft", false],
676+
["win32", "ctrl+alt+8", "[", "Digit8", false],
677+
["win32", "ctrl+alt+k", "K", "KeyK", false],
678+
["linux", "ctrl+alt+`", "Dead", "Backquote", false],
679+
["darwin", "ctrl+alt+[", "[", "BracketLeft", true],
680+
["linux", "ctrl+alt+f7", "F7", "F7", true],
681+
] as const)(
682+
"handles ambiguous preview chords on %s: %s",
683+
([platform, chord, key, code, expected]) =>
684+
withManager(
685+
(manager) =>
686+
Effect.gen(function* () {
687+
const preview = makeFaviconWebContents();
688+
const send = vi.fn();
689+
Object.assign(preview.webContents, {
690+
hostWebContents: { isDestroyed: () => false, send },
691+
});
692+
fromId.mockReturnValue(preview.webContents);
693+
getFocusedWebContents.mockReturnValue(preview.webContents as never);
694+
yield* manager.createTab("tab_alt_graph");
695+
yield* manager.registerWebview("tab_alt_graph", 42);
696+
yield* manager.setReopenClosedShortcuts([parseKeybindingShortcut(chord)!]);
697+
const preventDefault = vi.fn();
698+
preview.listeners.get("before-input-event")!(
699+
{ preventDefault } as never,
700+
{
701+
type: "keyDown",
702+
key,
703+
code,
704+
meta: false,
705+
control: true,
706+
shift: false,
707+
alt: true,
708+
} as never,
709+
);
710+
expect(preventDefault).toHaveBeenCalledTimes(expected ? 1 : 0);
711+
expect(send).toHaveBeenCalledTimes(expected ? 1 : 0);
712+
}),
713+
platform,
714+
),
702715
);
703716

704717
effectIt.effect("preserves focused browser editing in tabs and sign-in popups", () =>

‎apps/desktop/src/preview/Manager.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,12 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
20132013
!host.isDestroyed() &&
20142014
webContents.getFocusedWebContents() === wc &&
20152015
!automationKeyboardTargets.has(wc.id) &&
2016-
!(input.control && input.alt && !/^[a-z0-9]$/i.test(input.key)) &&
2016+
!(
2017+
hostPlatform !== "darwin" &&
2018+
input.control &&
2019+
input.alt &&
2020+
/^(?:[^a-zA-Z0-9]|Dead)$/u.test(input.key)
2021+
) &&
20172022
reopenClosedShortcuts.some((shortcut) =>
20182023
matchesKeybindingShortcut(
20192024
{

0 commit comments

Comments
 (0)