Skip to content

Replace terminal action buttons with dropdown menu #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BunsDev merged 1 commit into from
Apr 1, 2026
Merged

Replace terminal action buttons with dropdown menu #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 93 additions & 53 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FitAddon } from "@xterm/addon-fit";
import { Plus, SquareSplitHorizontal, TerminalSquare, Trash2, XIcon } from "lucide-react";
import { ChevronDown, Plus, SquareSplitHorizontal, TerminalSquare, Trash2, XIcon } from "lucide-react";
import { type ThreadId } from "@okcode/contracts";
import { Terminal, type ITheme } from "@xterm/xterm";
import {
Expand All @@ -12,6 +12,7 @@ import {
useRef,
useState,
} from "react";
import { Menu, MenuItem, MenuPopup, MenuSeparator, MenuShortcut, MenuTrigger } from "~/components/ui/menu";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import { openInPreferredEditor } from "../editorPreferences";
Expand Down Expand Up @@ -837,6 +838,71 @@ function TerminalActionButton({ label, className, onClick, children }: TerminalA
);
}

interface TerminalDropdownMenuProps {
onSplitTerminal: () => void;
onNewTerminal: () => void;
onCloseTerminal: () => void;
splitDisabled: boolean;
splitLabel: string;
newLabel: string;
closeLabel: string;
splitShortcutLabel?: string | undefined;
newShortcutLabel?: string | undefined;
closeShortcutLabel?: string | undefined;
triggerClassName: string;
}

function TerminalDropdownMenu({
onSplitTerminal,
onNewTerminal,
onCloseTerminal,
splitDisabled,
splitLabel,
newLabel,
closeLabel,
splitShortcutLabel,
newShortcutLabel,
closeShortcutLabel,
triggerClassName,
}: TerminalDropdownMenuProps) {
return (
<Menu>
<MenuTrigger
render={
<button
type="button"
className={triggerClassName}
aria-label="Terminal actions"
/>
}
>
<ChevronDown className="size-3.25" />
</MenuTrigger>
<MenuPopup align="end" side="bottom" sideOffset={6}>
<MenuItem
className={splitDisabled ? "pointer-events-none opacity-45" : ""}
onClick={onSplitTerminal}
>
<SquareSplitHorizontal className="size-4" />
{splitLabel}
{splitShortcutLabel ? <MenuShortcut>{splitShortcutLabel}</MenuShortcut> : null}
</MenuItem>
<MenuItem onClick={onNewTerminal}>
<Plus className="size-4" />
{newLabel}
{newShortcutLabel ? <MenuShortcut>{newShortcutLabel}</MenuShortcut> : null}
</MenuItem>
<MenuSeparator />
<MenuItem variant="destructive" onClick={onCloseTerminal}>
<Trash2 className="size-4" />
{closeLabel}
{closeShortcutLabel ? <MenuShortcut>{closeShortcutLabel}</MenuShortcut> : null}
</MenuItem>
</MenuPopup>
</Menu>
);
}

export default function ThreadTerminalDrawer({
threadId,
cwd,
Expand Down Expand Up @@ -1097,33 +1163,19 @@ export default function ThreadTerminalDrawer({
{!hasTerminalSidebar && (
<div className="pointer-events-none absolute right-2 top-2 z-20">
<div className="pointer-events-auto inline-flex items-center overflow-hidden rounded-md border border-border/80 bg-background/70">
<TerminalActionButton
className={`p-1 text-foreground/90 transition-colors ${
hasReachedSplitLimit
? "cursor-not-allowed opacity-45 hover:bg-transparent"
: "hover:bg-accent"
}`}
onClick={onSplitTerminalAction}
label={splitTerminalActionLabel}
>
<SquareSplitHorizontal className="size-3.25" />
</TerminalActionButton>
<div className="h-4 w-px bg-border/80" />
<TerminalActionButton
className="p-1 text-foreground/90 transition-colors hover:bg-accent"
onClick={onNewTerminalAction}
label={newTerminalActionLabel}
>
<Plus className="size-3.25" />
</TerminalActionButton>
<div className="h-4 w-px bg-border/80" />
<TerminalActionButton
className="p-1 text-foreground/90 transition-colors hover:bg-accent"
onClick={() => onCloseTerminal(resolvedActiveTerminalId)}
label={closeTerminalActionLabel}
>
<Trash2 className="size-3.25" />
</TerminalActionButton>
<TerminalDropdownMenu
onSplitTerminal={onSplitTerminalAction}
onNewTerminal={onNewTerminalAction}
onCloseTerminal={() => onCloseTerminal(resolvedActiveTerminalId)}
splitDisabled={hasReachedSplitLimit}
splitLabel="Split Terminal"
newLabel="New Terminal"
closeLabel="Close Terminal"
splitShortcutLabel={splitShortcutLabel}
newShortcutLabel={newShortcutLabel}
closeShortcutLabel={closeShortcutLabel}
triggerClassName="p-1 text-foreground/90 transition-colors hover:bg-accent"
/>
</div>
</div>
)}
Expand Down Expand Up @@ -1195,31 +1247,19 @@ export default function ThreadTerminalDrawer({
<aside className="flex w-36 min-w-36 flex-col border border-border/70 bg-muted/10">
<div className="flex h-[22px] items-stretch justify-end border-b border-border/70">
<div className="inline-flex h-full items-stretch">
<TerminalActionButton
className={`inline-flex h-full items-center px-1 text-foreground/90 transition-colors ${
hasReachedSplitLimit
? "cursor-not-allowed opacity-45 hover:bg-transparent"
: "hover:bg-accent/70"
}`}
onClick={onSplitTerminalAction}
label={splitTerminalActionLabel}
>
<SquareSplitHorizontal className="size-3.25" />
</TerminalActionButton>
<TerminalActionButton
className="inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors hover:bg-accent/70"
onClick={onNewTerminalAction}
label={newTerminalActionLabel}
>
<Plus className="size-3.25" />
</TerminalActionButton>
<TerminalActionButton
className="inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors hover:bg-accent/70"
onClick={() => onCloseTerminal(resolvedActiveTerminalId)}
label={closeTerminalActionLabel}
>
<Trash2 className="size-3.25" />
</TerminalActionButton>
<TerminalDropdownMenu
onSplitTerminal={onSplitTerminalAction}
onNewTerminal={onNewTerminalAction}
onCloseTerminal={() => onCloseTerminal(resolvedActiveTerminalId)}
splitDisabled={hasReachedSplitLimit}
splitLabel="Split Terminal"
newLabel="New Terminal"
closeLabel="Close Terminal"
splitShortcutLabel={splitShortcutLabel}
newShortcutLabel={newShortcutLabel}
closeShortcutLabel={closeShortcutLabel}
triggerClassName="inline-flex h-full items-center px-1 text-foreground/90 transition-colors hover:bg-accent/70"
/>
</div>
</div>

Expand Down
Loading