Files
supabase/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsx
Gildas GarciaandIvan Vasilov 96d43099bb chore: refactor Button API so that it can be used a standard button (#46880)
## Problem

Our `<Button>` component breaks the default `button` contract by
redefining the `type` prop to set its variant (`primary`, `default`,
etc) instead of the button type (`submit`, `button`, etc).
This is confusing and forces to write more code when using it with
shadcn components that expect/inject the standard button props.

## Solution

- rename the `type` prop to `variant`
- rename the `htmlType` prop to `type`
- propagate the changes where necessary
- format code

## How to test

As this is just prop renaming, if it builds it's ok

---------

Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com>
2026-06-16 23:59:58 +02:00

199 lines
5.8 KiB
TypeScript

import { ListTree, MessageCircle, Plus } from 'lucide-react'
import Link from 'next/link'
import {
Button,
cn,
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
CommandSeparator,
ScrollArea,
} from 'ui'
import { BranchLink } from './BranchLink'
import type { Branch } from '@/data/branches/branches-query'
import { useTrack } from '@/lib/telemetry/track'
const BRANCHING_GITHUB_DISCUSSION_LINK = 'https://github.com/orgs/supabase/discussions/18937'
export interface BranchDropdownCommandContentProps {
embedded: boolean
className?: string
branchList: Branch[]
selectedBranch: Branch | undefined
branchesCount: number
isBranchingEnabled: boolean
projectRef: string | undefined
onClose: () => void
onCreateBranch: () => void
}
export function BranchDropdownCommandContent({
embedded,
className,
branchList,
selectedBranch,
branchesCount,
isBranchingEnabled,
projectRef,
onClose,
onCreateBranch,
}: BranchDropdownCommandContentProps) {
const track = useTrack()
if (embedded) {
return (
<Command className={cn(className, 'flex flex-col flex-1 min-h-0 overflow-hidden')}>
<div className="grid grid-cols-2 gap-2 shrink-0 p-2 border-b">
<Button
variant="text"
size="small"
asChild
block
icon={<ListTree size={14} strokeWidth={1.5} />}
>
<Link
href={`/project/${projectRef}/branches`}
className="text-xs text-foreground-light hover:text-foreground"
onClick={onClose}
>
Manage branches
</Link>
</Button>
<Button
variant="text"
size="small"
asChild
block
icon={<MessageCircle size={14} strokeWidth={1.5} />}
>
<a
target="_blank"
rel="noreferrer noopener"
href={BRANCHING_GITHUB_DISCUSSION_LINK}
onClick={onClose}
className="text-xs text-foreground-light hover:text-foreground"
>
Branching feedback
</a>
</Button>
<Button
variant="default"
size="small"
block
className="col-span-full text-xs text-foreground-light hover:text-foreground"
onClick={() => {
track('branch_selector_create_clicked')
onClose()
onCreateBranch()
}}
icon={<Plus size={14} strokeWidth={1.5} />}
>
Create branch
</Button>
</div>
{isBranchingEnabled && (
<CommandInput placeholder="Find branch..." wrapperClassName="shrink-0 border-b" />
)}
<CommandList className="flex flex-col flex-1 p-1 min-h-0 overflow-y-auto max-h-none!">
{isBranchingEnabled && <CommandEmpty>No branches found</CommandEmpty>}
<CommandGroup className="min-h-0">
{branchList.map((branch) => (
<BranchLink
key={branch.id}
branch={branch}
isSelected={branch.id === selectedBranch?.id || branchesCount === 0}
onClose={onClose}
/>
))}
</CommandGroup>
</CommandList>
</Command>
)
}
return (
<Command className={className}>
{isBranchingEnabled && <CommandInput placeholder="Find branch..." />}
<CommandList>
{isBranchingEnabled && <CommandEmpty>No branches found</CommandEmpty>}
<CommandGroup>
<ScrollArea className="max-h-[210px] overflow-y-auto">
{branchList.map((branch) => (
<BranchLink
key={branch.id}
branch={branch}
isSelected={branch.id === selectedBranch?.id || branchesCount === 0}
onClose={onClose}
/>
))}
</ScrollArea>
</CommandGroup>
<CommandSeparator />
<CommandGroup>
<CommandItem
className="cursor-pointer w-full"
onSelect={() => {
track('branch_selector_create_clicked')
onClose()
onCreateBranch()
}}
>
<div className="w-full flex items-center gap-2">
<Plus size={14} strokeWidth={1.5} />
<p>Create branch</p>
</div>
</CommandItem>
<CommandItem
className="cursor-pointer w-full"
onSelect={() => {
track('branch_selector_manage_clicked')
onClose()
}}
>
<Link
href={`/project/${projectRef}/branches`}
className="w-full flex items-center gap-2"
>
<ListTree size={14} strokeWidth={1.5} />
<p>Manage branches</p>
</Link>
</CommandItem>
</CommandGroup>
<CommandSeparator />
<CommandGroup>
<CommandItem
className="cursor-pointer w-full"
onSelect={() => {
onClose()
window?.open(BRANCHING_GITHUB_DISCUSSION_LINK, '_blank')?.focus()
}}
onClick={onClose}
>
<a
target="_blank"
rel="noreferrer noopener"
href={BRANCHING_GITHUB_DISCUSSION_LINK}
onClick={onClose}
className="w-full flex gap-2"
>
<MessageCircle size={14} strokeWidth={1} className="mt-0.5" />
<div>
<p>Branching feedback</p>
<p className="text-lighter">Join GitHub Discussion</p>
</div>
</a>
</CommandItem>
</CommandGroup>
</CommandList>
</Command>
)
}