Bohdan Triapitsyn
f3dd894209
- Add switch_context_surface shortcut (default Cmd/Ctrl + 1..9, 0 for the 10th surface) that opens/closes/switches context panel rail surfaces by their visible order, configurable and persisted in Settings -> Shortcuts. - Show order-number badges on rail icons while the modifier is held >500ms; dismiss on release, blur, or a number press until the next press-and-hold. - Remove the legacy mod+2/3/4 (diff/terminal/git) and switch_tab_1..9 bindings so numbered surface switching goes only through the new mechanism. - Replace the help-dialog 'Switch Project' row with the surface-switch row and update the shortcuts footer/header icons to the command icon.
81 lines
3.0 KiB
TypeScript
81 lines
3.0 KiB
TypeScript
import { describe, expect, test } from 'bun:test';
|
|
|
|
import {
|
|
eventMatchesShortcutPrefix,
|
|
getEffectiveShortcutPrefix,
|
|
isShortcutPrefixHeld,
|
|
UNASSIGNED_SHORTCUT,
|
|
} from './shortcuts';
|
|
|
|
describe('getEffectiveShortcutPrefix', () => {
|
|
test('falls back to the action default (bare mod) when unset', () => {
|
|
expect(getEffectiveShortcutPrefix('switch_context_surface', {})).toBe('mod');
|
|
});
|
|
|
|
test('honors modifier + key overrides', () => {
|
|
expect(getEffectiveShortcutPrefix('switch_context_surface', { switch_context_surface: 'mod+p' })).toBe('mod+p');
|
|
});
|
|
|
|
test('honors modifier-only overrides', () => {
|
|
expect(getEffectiveShortcutPrefix('switch_context_surface', { switch_context_surface: 'shift' })).toBe('shift');
|
|
});
|
|
|
|
test('returns UNASSIGNED for an explicit unassignment', () => {
|
|
expect(
|
|
getEffectiveShortcutPrefix('switch_context_surface', { switch_context_surface: UNASSIGNED_SHORTCUT }),
|
|
).toBe(UNASSIGNED_SHORTCUT);
|
|
});
|
|
|
|
test('returns empty string for an unknown action', () => {
|
|
expect(getEffectiveShortcutPrefix('does_not_exist', {})).toBe('');
|
|
});
|
|
});
|
|
|
|
describe('isShortcutPrefixHeld', () => {
|
|
test('false for an unassigned prefix', () => {
|
|
expect(isShortcutPrefixHeld(UNASSIGNED_SHORTCUT, new Set(['control']))).toBe(false);
|
|
});
|
|
|
|
test('requires the prefix primary key to be held', () => {
|
|
expect(isShortcutPrefixHeld('mod+p', new Set(['control']))).toBe(false);
|
|
expect(isShortcutPrefixHeld('mod+p', new Set(['control', 'p']))).toBe(true);
|
|
});
|
|
|
|
test('requires every prefix modifier to be held', () => {
|
|
expect(isShortcutPrefixHeld('mod+shift', new Set(['control']))).toBe(false);
|
|
expect(isShortcutPrefixHeld('mod+shift', new Set(['control', 'shift']))).toBe(true);
|
|
});
|
|
});
|
|
|
|
const keydown = (key: string, mods: { meta?: boolean; ctrl?: boolean; shift?: boolean; alt?: boolean }): KeyboardEvent =>
|
|
({
|
|
key,
|
|
metaKey: mods.meta ?? false,
|
|
ctrlKey: mods.ctrl ?? false,
|
|
shiftKey: mods.shift ?? false,
|
|
altKey: mods.alt ?? false,
|
|
}) as KeyboardEvent;
|
|
|
|
describe('eventMatchesShortcutPrefix', () => {
|
|
test('matches a bare mod prefix when the primary modifier is held', () => {
|
|
expect(eventMatchesShortcutPrefix(keydown('1', { ctrl: true }), 'mod')).toBe(true);
|
|
});
|
|
|
|
test('rejects a bare mod prefix without the primary modifier', () => {
|
|
expect(eventMatchesShortcutPrefix(keydown('1', {}), 'mod')).toBe(false);
|
|
});
|
|
|
|
test('rejects when the event carries modifiers the prefix does not expect', () => {
|
|
expect(eventMatchesShortcutPrefix(keydown('1', { ctrl: true, shift: true }), 'mod')).toBe(false);
|
|
});
|
|
|
|
test('requires the prefix primary key to be held at match time', () => {
|
|
expect(eventMatchesShortcutPrefix(keydown('1', { ctrl: true }), 'mod+p', new Set(['control']))).toBe(false);
|
|
expect(eventMatchesShortcutPrefix(keydown('1', { ctrl: true }), 'mod+p', new Set(['control', 'p']))).toBe(true);
|
|
});
|
|
|
|
test('false for an unassigned prefix', () => {
|
|
expect(eventMatchesShortcutPrefix(keydown('1', { ctrl: true }), UNASSIGNED_SHORTCUT)).toBe(false);
|
|
});
|
|
});
|