Skip to content

Commit 3c74db7

Browse files
committed
add-cmd-k (squashed)
1 parent 02f56e7 commit 3c74db7

3 files changed

Lines changed: 384 additions & 1 deletion

File tree

src/renderer/App.tsx

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { Guide } from './components/Guide'
1818
import { Activity } from './components/Activity'
1919
import { Cleanup } from './components/Cleanup'
2020
import { CommandCenter } from './components/CommandCenter'
21+
import { CommandPalette } from './components/CommandPalette'
2122
import iconUrl from '../../resources/icon.png'
2223
import { focusTerminalById, flushAllTerminalHistory, markTerminalClosing } from './components/XTerminal'
2324
import { useHotkeys } from './hooks/useHotkeys'
@@ -115,6 +116,7 @@ export default function App(): JSX.Element {
115116
const [showActivity, setShowActivity] = useState(false)
116117
const [showCleanup, setShowCleanup] = useState(false)
117118
const [showCommandCenter, setShowCommandCenter] = useState(false)
119+
const [showCommandPalette, setShowCommandPalette] = useState(false)
118120
const [tailLines, setTailLines] = useState<Record<string, string>>({})
119121
const [hasGithubToken, setHasGithubToken] = useState<boolean | null>(null)
120122
const [hotkeyOverrides, setHotkeyOverrides] = useState<Record<string, string> | undefined>(undefined)
@@ -1206,6 +1208,7 @@ const setQuestStep = useCallback((next: QuestStep) => {
12061208
window.api.openInEditor(activeWorktreeId)
12071209
},
12081210
toggleCommandCenter: () => setShowCommandCenter((v) => !v),
1211+
commandPalette: () => setShowCommandPalette((v) => !v),
12091212
}),
12101213
[
12111214
cycleWorktree,
@@ -1539,6 +1542,28 @@ const setQuestStep = useCallback((next: QuestStep) => {
15391542
</div>
15401543
</div>
15411544
{settingsOverlay}
1545+
{showCommandPalette && (
1546+
<CommandPalette
1547+
worktrees={worktrees}
1548+
worktreeStatuses={worktreeStatuses}
1549+
prStatuses={prStatuses}
1550+
mergedPaths={mergedPaths}
1551+
activeWorktreeId={activeWorktreeId}
1552+
resolvedHotkeys={resolvedHotkeys}
1553+
onClose={() => setShowCommandPalette(false)}
1554+
onSelectWorktree={(path) => {
1555+
setShowNewWorktree(false)
1556+
setShowActivity(false)
1557+
setShowCleanup(false)
1558+
setShowCommandCenter(false)
1559+
setActiveWorktreeId(path)
1560+
}}
1561+
onAction={(action) => {
1562+
const handler = hotkeyActions[action]
1563+
if (handler) handler()
1564+
}}
1565+
/>
1566+
)}
15421567
</HotkeysProvider>
15431568
)
15441569
}

0 commit comments

Comments
 (0)