Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4257116b49 |
No files matched your search
@@ -698,3 +698,51 @@ test('connection log host snapshot includes custom host icon fields', () => {
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
for (const scenario of [
|
||||
{ name: 'single orphan', active: 'one', sessions: [{ id: 'one' }], available: false, expected: null },
|
||||
{ name: 'two orphans', active: 'one', sessions: [{ id: 'one' }, { id: 'two' }], available: true, expected: 'global' },
|
||||
{ name: 'hidden active session', active: 'hidden', sessions: [{ id: 'one' }, { id: 'two' }, { id: 'hidden', hiddenFromTabs: true }], available: true, expected: null },
|
||||
{ name: 'non-terminal tab', active: 'vault', sessions: [{ id: 'one' }, { id: 'two' }], available: true, expected: null },
|
||||
{ name: 'workspace', active: 'workspace', sessions: [{ id: 'one', workspaceId: 'workspace' }, { id: 'two', workspaceId: 'workspace' }], available: false, expected: 'workspace' },
|
||||
]) {
|
||||
for (const scheme of ['pc', 'mac'] as const) {
|
||||
test(`broadcast shortcut ${scheme}: ${scenario.name} only consumes an executed toggle`, () => {
|
||||
const target = new FakeHTMLElement();
|
||||
let prevented = 0;
|
||||
let stopped = 0;
|
||||
let globalEnabled = false;
|
||||
let workspaceEnabled = false;
|
||||
const toggles: string[] = [];
|
||||
const event = {
|
||||
key: 'b', code: 'KeyB', ctrlKey: scheme === 'pc', metaKey: scheme === 'mac',
|
||||
altKey: false, shiftKey: false, target, composedPath: () => [target],
|
||||
preventDefault: () => { prevented += 1; },
|
||||
stopPropagation: () => { stopped += 1; },
|
||||
} as unknown as KeyboardEvent;
|
||||
const actionCtx = {
|
||||
activeTabStore: { getActiveTabId: () => scenario.active },
|
||||
editorTabs: [], orderedTabs: [], settings: {}, toEditorTabId: (id: string) => id,
|
||||
sessions: scenario.sessions,
|
||||
workspaces: scenario.active === 'workspace' ? [{ id: 'workspace' }] : [],
|
||||
canUseGlobalBroadcast: scenario.available,
|
||||
toggleGlobalBroadcast: () => { globalEnabled = !globalEnabled; toggles.push('global'); },
|
||||
toggleBroadcast: (id: string) => { assert.equal(id, 'workspace'); workspaceEnabled = !workspaceEnabled; toggles.push('workspace'); },
|
||||
};
|
||||
const invoke = () => handleGlobalHotkeyKeyDownImpl(() => ({
|
||||
HOTKEY_DEBUG: false, closeTabKeyStr: '', hotkeyScheme: scheme,
|
||||
keyBindings: DEFAULT_KEY_BINDINGS, matchesKeyBinding,
|
||||
executeHotkeyAction: (action: string, e: KeyboardEvent) => executeHotkeyActionImpl(() => actionCtx, action, e),
|
||||
}), event);
|
||||
invoke();
|
||||
assert.equal(globalEnabled, scenario.expected === 'global');
|
||||
assert.equal(workspaceEnabled, scenario.expected === 'workspace');
|
||||
invoke();
|
||||
assert.equal(globalEnabled, false);
|
||||
assert.equal(workspaceEnabled, false);
|
||||
assert.deepEqual(toggles, scenario.expected ? [scenario.expected, scenario.expected] : []);
|
||||
assert.equal(prevented, scenario.expected ? 2 : 0);
|
||||
assert.equal(stopped, scenario.expected ? 2 : 0);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -313,6 +313,16 @@ export function handleGlobalHotkeyKeyDownImpl(getCtx: AppContextGetter, e: Keybo
|
||||
continue;
|
||||
}
|
||||
|
||||
// An unavailable broadcast action must leave the chord to the terminal
|
||||
// (notably tmux's Ctrl+B prefix). Dispatch once before consuming it.
|
||||
if (binding.action === 'broadcast') {
|
||||
if (executeHotkeyAction(binding.action, e) === true) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
if (HOTKEY_DEBUG) {
|
||||
@@ -963,12 +973,14 @@ export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string
|
||||
const activeWs = workspaces.find(w => w.id === currentId);
|
||||
if (activeWs) {
|
||||
toggleBroadcast(activeWs.id);
|
||||
return true;
|
||||
} else if (sessions.some((session: TerminalSession) => (
|
||||
session.id === currentId && !session.workspaceId
|
||||
session.id === currentId && !session.workspaceId && !session.hiddenFromTabs
|
||||
)) && canUseGlobalBroadcast) {
|
||||
toggleGlobalBroadcast();
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
return false;
|
||||
}
|
||||
case 'openSettings':
|
||||
handleOpenSettingsRef.current();
|
||||
|
||||
@@ -252,6 +252,8 @@ export function AppSideEffects() {
|
||||
runSnippet,
|
||||
getOrderedWorkTabs,
|
||||
toggleBroadcast,
|
||||
toggleGlobalBroadcast,
|
||||
canUseGlobalBroadcast,
|
||||
logViews,
|
||||
closeLogView,
|
||||
copySession,
|
||||
@@ -906,6 +908,8 @@ export function AppSideEffects() {
|
||||
// array thrash does not rebuild appTerminalDomain (see domain isolation).
|
||||
const sessionsRef = useRef(sessions);
|
||||
sessionsRef.current = sessions;
|
||||
const canUseGlobalBroadcastRef = useRef(canUseGlobalBroadcast);
|
||||
canUseGlobalBroadcastRef.current = canUseGlobalBroadcast;
|
||||
// Logs live in connectionLogsStore — keep a ref fresh without re-rendering App.
|
||||
const connectionLogsRef = useRef(getConnectionLogsSnapshot().connectionLogs);
|
||||
useEffect(() => {
|
||||
@@ -1076,6 +1080,8 @@ export function AppSideEffects() {
|
||||
terminalPaneMagnificationRef,
|
||||
toEditorTabId,
|
||||
toggleBroadcast,
|
||||
toggleGlobalBroadcast,
|
||||
canUseGlobalBroadcast: canUseGlobalBroadcastRef.current,
|
||||
toggleScriptsSidePanelRef,
|
||||
toggleSidePanelRef,
|
||||
toggleWorkspaceViewMode,
|
||||
@@ -1090,6 +1096,7 @@ export function AppSideEffects() {
|
||||
splitSessionWithCurrentShell,
|
||||
moveFocusInWorkspace,
|
||||
toggleBroadcast,
|
||||
toggleGlobalBroadcast,
|
||||
toggleWorkspaceViewMode,
|
||||
confirmIfBusyLocalTerminal,
|
||||
]);
|
||||
|
||||
Reference in new issue
Block a user