Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

Leave the Plugins shortcut to focused browser pages (#36176)

Jinjing8784a55f6f65
diff --git a/src/main/browser/browser-guest-shortcut-forwarding.test.ts b/src/main/browser/browser-guest-shortcut-forwarding.test.ts
index 84a08d818c1..ce29758e578 100644
--- a/src/main/browser/browser-guest-shortcut-forwarding.test.ts
+++ b/src/main/browser/browser-guest-shortcut-forwarding.test.ts
@@ -161,28 +161,22 @@ describe('setupGuestShortcutForwarding', () => {
guestOffMock = vi.fn()
})
- it('replays the Plugins shortcut once and preserves unbound overrides', () => {
- let keybindings = { 'view.plugins': ['Mod+Shift+X'] }
- setupGuestShortcutForwarding({
- browserTabId,
- guest: makeGuest(),
- resolveRenderer: () => makeRenderer(),
- getKeybindings: () => keybindings
- })
-
- const input = { key: 'X', code: 'KeyX', shift: true }
- expect(triggerBeforeInput(input)).toHaveBeenCalledOnce()
- expect(rendererSendMock).toHaveBeenCalledWith(
- 'ui:browserPageTabShortcut',
- expect.objectContaining(input)
- )
- expect(triggerBeforeInput({ ...input, isAutoRepeat: true })).toHaveBeenCalledOnce()
- expect(rendererSendMock).toHaveBeenCalledTimes(1)
+ it.each([undefined, { 'view.plugins': ['Mod+Shift+X'] }])(
+ 'leaves the Plugins shortcut and repeats to the guest with keybindings %j',
+ (keybindings) => {
+ setupGuestShortcutForwarding({
+ browserTabId,
+ guest: makeGuest(),
+ resolveRenderer: () => makeRenderer(),
+ getKeybindings: () => keybindings
+ })
- keybindings = { 'view.plugins': [] }
- expect(triggerBeforeInput(input)).not.toHaveBeenCalled()
- expect(rendererSendMock).toHaveBeenCalledTimes(1)
- })
+ const input = { key: 'X', code: 'KeyX', shift: true }
+ expect(triggerBeforeInput(input)).not.toHaveBeenCalled()
+ expect(triggerBeforeInput({ ...input, isAutoRepeat: true })).not.toHaveBeenCalled()
+ expect(rendererSendMock).not.toHaveBeenCalled()
+ }
+ )
it('commits Ctrl+Tab switching from focused guest pages on generic release events', () => {
setupGuestShortcutForwarding({
diff --git a/src/main/browser/browser-guest-tab-shortcut.ts b/src/main/browser/browser-guest-tab-shortcut.ts
index d239d0de4da..bbfce28506e 100644
--- a/src/main/browser/browser-guest-tab-shortcut.ts
+++ b/src/main/browser/browser-guest-tab-shortcut.ts
@@ -13,7 +13,7 @@ const TAB_ACTIONS_WITHOUT_KEYBOARD_OWNER = new Set<KeybindingActionId>([
'tab.openMarkdown'
])
-/** A focused page hands tab chords and the Plugins launcher back to Orca. */
+/** A focused page hands tab chords back to Orca. */
export function matchesGuestTabShortcut(
input: WindowShortcutInput,
platform: NodeJS.Platform,
@@ -22,7 +22,7 @@ export function matchesGuestTabShortcut(
): boolean {
return KEYBINDING_DEFINITIONS.some(
(definition) =>
- (definition.scope === 'tabs' || definition.id === 'view.plugins') &&
+ definition.scope === 'tabs' &&
!TAB_ACTIONS_WITHOUT_KEYBOARD_OWNER.has(definition.id) &&
(definition.id !== 'tab.newSimulator' || isMobileEmulatorEnabled) &&
keybindingMatchesAction(definition.id, input, platform, keybindings)
diff --git a/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx b/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx
index 47672f1de27..4d87eda364e 100644
--- a/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx
+++ b/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx
@@ -11,7 +11,7 @@ export function PluginsSectionDescription({ text }: { text: string }): React.JSX
<span className="ml-2 inline-flex items-center gap-1.5 whitespace-nowrap align-middle">
{translate(
'auto.components.plugins.list.PluginsSectionDescription.openWith',
- 'Open anytime with'
+ 'Open with (when focus is not in an editable field)'
)}
<ShortcutKeyCombo keys={shortcut.keys} doubleTap={shortcut.doubleTap} />
</span>
diff --git a/src/renderer/src/components/status-bar/PluginsStatusSegment.tsx b/src/renderer/src/components/status-bar/PluginsStatusSegment.tsx
index ace508dbb31..81b4489a262 100644
--- a/src/renderer/src/components/status-bar/PluginsStatusSegment.tsx
+++ b/src/renderer/src/components/status-bar/PluginsStatusSegment.tsx
@@ -7,7 +7,7 @@ import { translate } from '@/i18n/i18n'
export function PluginsStatusSegment(): React.JSX.Element {
const shortcut = useShortcutKeyComboDetails('view.plugins')
- const label = translate('auto.components.status.bar.PluginsStatusSegment.label', 'Plugins')
+ const label = translate('auto.components.settings.PluginsSettingsSection.title', 'Plugins')
return (
<Tooltip>
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 23aa26714d0..d7e366baa09 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -5040,9 +5040,6 @@
},
"mainWorktree": "main worktree",
"detached": "detached"
- },
- "PluginsStatusSegment": {
- "label": "Plugins"
}
}
},
@@ -18911,7 +18908,7 @@
},
"list": {
"PluginsSectionDescription": {
- "openWith": "Open anytime with"
+ "openWith": "Open with (when focus is not in an editable field)"
}
}
}