Files
supabase/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.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

135 lines
3.8 KiB
TypeScript

import { Plus } from 'lucide-react'
import Link from 'next/link'
import {
Button,
cn,
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
CommandSeparator,
ScrollArea,
} from 'ui'
import { OrgCommandItem } from './OrgCommandItem'
import type { Organization } from '@/types'
export interface OrganizationDropdownCommandContentProps {
embedded: boolean
className?: string
organizations: Organization[]
selectedSlug: string | undefined
routePathname: string
hasRouteSlug: boolean
organizationCreationEnabled: boolean
onClose: () => void
}
export function OrganizationDropdownCommandContent({
embedded,
className,
organizations,
selectedSlug,
routePathname,
hasRouteSlug,
organizationCreationEnabled,
onClose,
}: OrganizationDropdownCommandContentProps) {
const orgList = (
<>
{organizations?.map((org) => (
<OrgCommandItem
key={org.slug}
org={org}
selectedSlug={selectedSlug}
routePathname={routePathname}
hasRouteSlug={hasRouteSlug}
onClose={onClose}
compactPadding={!embedded}
/>
))}
</>
)
if (embedded) {
return (
<Command className={cn(className, 'flex flex-col flex-1 min-h-0 overflow-hidden')}>
<div className="flex items-center gap-2 shrink-0 border-b p-2">
<Button variant="text" block size="small" asChild>
<Link
href="/organizations"
className="text-xs text-foreground-light hover:text-foreground"
onClick={onClose}
>
All Organizations
</Link>
</Button>
{organizationCreationEnabled && (
<Button
variant="default"
block
size="small"
asChild
icon={<Plus size={14} strokeWidth={1.5} />}
>
<Link
href="/new"
className="text-xs text-foreground-light hover:text-foreground"
onClick={onClose}
>
New organization
</Link>
</Button>
)}
</div>
<CommandInput
placeholder="Find organization..."
wrapperClassName="shrink-0"
className="text-base sm:text-sm"
/>
<CommandList className="flex flex-col flex-1 min-h-0 overflow-y-auto p-1 max-h-none!">
<CommandEmpty>No organizations found</CommandEmpty>
<CommandGroup className="min-h-0">{orgList}</CommandGroup>
</CommandList>
</Command>
)
}
return (
<Command className={className}>
<CommandInput placeholder="Find organization..." />
<CommandList>
<CommandEmpty>No organizations found</CommandEmpty>
<CommandGroup>
<ScrollArea className={(organizations || []).length > 7 ? 'md:h-[210px]' : ''}>
{orgList}
</ScrollArea>
</CommandGroup>
<CommandSeparator />
<CommandGroup>
<CommandItem className="cursor-pointer w-full" onSelect={() => onClose()}>
<Link href="/organizations" className="flex items-center gap-2 w-full">
All Organizations
</Link>
</CommandItem>
</CommandGroup>
{organizationCreationEnabled && (
<>
<CommandSeparator />
<CommandGroup>
<CommandItem className="cursor-pointer w-full" onSelect={() => onClose()}>
<Link href="/new" className="flex items-center gap-2 w-full">
<Plus size={14} strokeWidth={1.5} />
<p>New organization</p>
</Link>
</CommandItem>
</CommandGroup>
</>
)}
</CommandList>
</Command>
)
}