Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore: migrate Popover usages to Shadcn components (#45980)

Gildas Garciad0fd4478c0d8
diff --git a/apps/design-system/registry/default/example/calendar-form.tsx b/apps/design-system/registry/default/example/calendar-form.tsx
index aaad24692e9..c94a7f56050 100644
--- a/apps/design-system/registry/default/example/calendar-form.tsx
+++ b/apps/design-system/registry/default/example/calendar-form.tsx
@@ -15,9 +15,9 @@ import {
FormItem,
FormLabel,
FormMessage,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { z } from 'zod'
@@ -53,8 +53,8 @@ export default function CalendarForm() {
render={({ field }) => (
<FormItem className="flex flex-col">
<FormLabel>Date of birth</FormLabel>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<FormControl>
<Button
type={'default'}
@@ -68,8 +68,8 @@ export default function CalendarForm() {
{field.value ? format(field.value, 'PPP') : <span>Pick a date</span>}
</Button>
</FormControl>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0" align="start" side="right">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start" side="right">
<Calendar
mode="single"
selected={field.value}
@@ -77,8 +77,8 @@ export default function CalendarForm() {
disabled={(date) => date > new Date() || date < new Date('1900-01-01')}
initialFocus
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<FormDescription>Your date of birth is used to calculate your age.</FormDescription>
<FormMessage />
</FormItem>
diff --git a/apps/design-system/registry/default/example/calendar-react-hook-form.tsx b/apps/design-system/registry/default/example/calendar-react-hook-form.tsx
index fbe9c6685e1..fd580854922 100644
--- a/apps/design-system/registry/default/example/calendar-react-hook-form.tsx
+++ b/apps/design-system/registry/default/example/calendar-react-hook-form.tsx
@@ -15,9 +15,9 @@ import {
FormItem,
FormLabel,
FormMessage,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { z } from 'zod'
@@ -53,8 +53,8 @@ export default function CalendarForm() {
render={({ field }) => (
<FormItem className="flex flex-col">
<FormLabel>Date of birth</FormLabel>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<FormControl>
<Button
type={'outline'}
@@ -67,8 +67,8 @@ export default function CalendarForm() {
<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
</Button>
</FormControl>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start">
<Calendar
mode="single"
selected={field.value}
@@ -76,8 +76,8 @@ export default function CalendarForm() {
disabled={(date) => date > new Date() || date < new Date('1900-01-01')}
initialFocus
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<FormDescription>Your date of birth is used to calculate your age.</FormDescription>
<FormMessage />
</FormItem>
diff --git a/apps/design-system/registry/default/example/combobox-demo.tsx b/apps/design-system/registry/default/example/combobox-demo.tsx
index eccdefbc137..558d83237e4 100644
--- a/apps/design-system/registry/default/example/combobox-demo.tsx
+++ b/apps/design-system/registry/default/example/combobox-demo.tsx
@@ -10,9 +10,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { cn } from '@/lib/utils'
@@ -45,8 +45,8 @@ export default function ComboboxDemo() {
const [value, setValue] = React.useState('')
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
role="combobox"
@@ -59,8 +59,8 @@ export default function ComboboxDemo() {
? frameworks.find((framework) => framework.value === value)?.label
: 'Select framework...'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[200px] p-0">
+ </PopoverTrigger>
+ <PopoverContent className="w-[200px] p-0">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search framework..." />
<CommandList_Shadcn_>
@@ -87,7 +87,7 @@ export default function ComboboxDemo() {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/design-system/registry/default/example/combobox-form.tsx b/apps/design-system/registry/default/example/combobox-form.tsx
index edf91161049..b83b07f07fa 100644
--- a/apps/design-system/registry/default/example/combobox-form.tsx
+++ b/apps/design-system/registry/default/example/combobox-form.tsx
@@ -19,9 +19,9 @@ import {
FormItem,
FormLabel,
FormMessage,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { z } from 'zod'
@@ -69,8 +69,8 @@ export default function ComboboxForm() {
render={({ field }) => (
<FormItem className="flex flex-col">
<FormLabel>Language</FormLabel>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<FormControl>
<Button
type="default"
@@ -92,8 +92,8 @@ export default function ComboboxForm() {
: 'Select language'}
</Button>
</FormControl>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[200px] p-0">
+ </PopoverTrigger>
+ <PopoverContent className="w-[200px] p-0">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search language..." />
<CommandList_Shadcn_>
@@ -119,8 +119,8 @@ export default function ComboboxForm() {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<FormDescription>
This is the language that will be used in the dashboard.
</FormDescription>
diff --git a/apps/design-system/registry/default/example/combobox-popover.tsx b/apps/design-system/registry/default/example/combobox-popover.tsx
index 904e55f1bc0..88ac417d507 100644
--- a/apps/design-system/registry/default/example/combobox-popover.tsx
+++ b/apps/design-system/registry/default/example/combobox-popover.tsx
@@ -18,9 +18,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { cn } from '@/lib/utils'
@@ -66,8 +66,8 @@ export default function ComboboxPopover() {
return (
<div className="flex items-center gap-4">
<p className="text-sm text-muted-foreground">Status</p>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
size="small"
@@ -82,8 +82,8 @@ export default function ComboboxPopover() {
>
{selectedStatus ? <>{selectedStatus.label}</> : <>Set status</>}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0" side="right" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="right" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Change status..." />
<CommandList_Shadcn_>
@@ -112,8 +112,8 @@ export default function ComboboxPopover() {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
)
}
diff --git a/apps/design-system/registry/default/example/combobox-responsive.tsx b/apps/design-system/registry/default/example/combobox-responsive.tsx
index 85b412dff9d..d09a1fd6285 100644
--- a/apps/design-system/registry/default/example/combobox-responsive.tsx
+++ b/apps/design-system/registry/default/example/combobox-responsive.tsx
@@ -13,9 +13,9 @@ import {
Drawer,
DrawerContent,
DrawerTrigger,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { useMediaQuery } from '@/hooks/use-media-query'
@@ -55,8 +55,8 @@ export default function ComboBoxResponsive() {
if (isDesktop) {
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
size="small"
@@ -65,11 +65,11 @@ export default function ComboBoxResponsive() {
>
{selectedStatus ? <>{selectedStatus.label}</> : <>Set status</>}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[200px] p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-[200px] p-0" align="start">
<StatusList setOpen={setOpen} setSelectedStatus={setSelectedStatus} />
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/design-system/registry/default/example/date-picker-demo.tsx b/apps/design-system/registry/default/example/date-picker-demo.tsx
index 841b6316fcd..3d1bd8ae6f8 100644
--- a/apps/design-system/registry/default/example/date-picker-demo.tsx
+++ b/apps/design-system/registry/default/example/date-picker-demo.tsx
@@ -3,13 +3,7 @@
import { format } from 'date-fns'
import { Calendar as CalendarIcon } from 'lucide-react'
import * as React from 'react'
-import {
- Button,
- Calendar,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, Calendar, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { cn } from '@/lib/utils'
@@ -17,8 +11,8 @@ export default function DatePickerDemo() {
const [date, setDate] = React.useState<Date>()
return (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
type={'outline'}
className={cn(
@@ -29,10 +23,10 @@ export default function DatePickerDemo() {
>
{date ? format(date, 'PPP') : <span>Pick a date</span>}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0">
<Calendar mode="single" selected={date} onSelect={setDate} initialFocus />
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/design-system/registry/default/example/date-picker-form.tsx b/apps/design-system/registry/default/example/date-picker-form.tsx
index 0f81cc719b9..3e04211b3e4 100644
--- a/apps/design-system/registry/default/example/date-picker-form.tsx
+++ b/apps/design-system/registry/default/example/date-picker-form.tsx
@@ -15,9 +15,9 @@ import {
FormItem,
FormLabel,
FormMessage,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { z } from 'zod'
@@ -53,8 +53,8 @@ export default function DatePickerForm() {
render={({ field }) => (
<FormItem className="flex flex-col">
<FormLabel>Date of birth</FormLabel>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<FormControl>
<Button
type={'outline'}
@@ -67,8 +67,8 @@ export default function DatePickerForm() {
{field.value ? format(field.value, 'PPP') : <span>Pick a date</span>}
</Button>
</FormControl>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start">
<Calendar
mode="single"
selected={field.value}
@@ -76,8 +76,8 @@ export default function DatePickerForm() {
disabled={(date) => date > new Date() || date < new Date('1900-01-01')}
initialFocus
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<FormDescription>Your date of birth is used to calculate your age.</FormDescription>
<FormMessage />
</FormItem>
diff --git a/apps/design-system/registry/default/example/date-picker-with-presets.tsx b/apps/design-system/registry/default/example/date-picker-with-presets.tsx
index be271ab5fdc..eb142bbad83 100644
--- a/apps/design-system/registry/default/example/date-picker-with-presets.tsx
+++ b/apps/design-system/registry/default/example/date-picker-with-presets.tsx
@@ -6,9 +6,9 @@ import * as React from 'react'
import {
Button,
Calendar,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Select_Shadcn_,
SelectContent_Shadcn_,
SelectItem_Shadcn_,
@@ -22,8 +22,8 @@ export default function DatePickerWithPresets() {
const [date, setDate] = React.useState<Date>()
return (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
type={'outline'}
className={cn(
@@ -34,8 +34,8 @@ export default function DatePickerWithPresets() {
>
{date ? format(date, 'PPP') : <span>Pick a date</span>}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="flex w-auto flex-col space-y-2 p-2">
+ </PopoverTrigger>
+ <PopoverContent className="flex w-auto flex-col space-y-2 p-2">
<Select_Shadcn_ onValueChange={(value) => setDate(addDays(new Date(), parseInt(value)))}>
<SelectTrigger_Shadcn_>
<SelectValue_Shadcn_ placeholder="Select" />
@@ -50,7 +50,7 @@ export default function DatePickerWithPresets() {
<div className="rounded-md border">
<Calendar mode="single" selected={date} onSelect={setDate} />
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/design-system/registry/default/example/date-picker-with-range.tsx b/apps/design-system/registry/default/example/date-picker-with-range.tsx
index 94fedd237cf..5ba900c01a6 100644
--- a/apps/design-system/registry/default/example/date-picker-with-range.tsx
+++ b/apps/design-system/registry/default/example/date-picker-with-range.tsx
@@ -4,13 +4,7 @@ import { addDays, format } from 'date-fns'
import { Calendar as CalendarIcon } from 'lucide-react'
import * as React from 'react'
import { DateRange } from 'react-day-picker'
-import {
- Button,
- Calendar,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, Calendar, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { cn } from '@/lib/utils'
@@ -22,8 +16,8 @@ export default function DatePickerWithRange({ className }: React.HTMLAttributes<
return (
<div className={cn('grid gap-2', className)}>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
id="date"
type={'outline'}
@@ -45,8 +39,8 @@ export default function DatePickerWithRange({ className }: React.HTMLAttributes<
<span>Pick a date</span>
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start">
<Calendar
initialFocus
mode="range"
@@ -55,8 +49,8 @@ export default function DatePickerWithRange({ className }: React.HTMLAttributes<
onSelect={setDate}
numberOfMonths={2}
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
)
}
diff --git a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx
index 3637afc32c3..fc26fb664a7 100644
--- a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx
+++ b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx
@@ -19,9 +19,9 @@ import {
InputGroup,
InputGroupAddon,
InputGroupText,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
RadioGroupStacked,
RadioGroupStackedItem,
Select_Shadcn_,
@@ -673,8 +673,8 @@ export default function FormPatternsPageLayout() {
description="Date selection with calendar popover"
>
<FormControl>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
type="outline"
className="bg-control w-full justify-start text-left font-normal px-3 py-4"
@@ -682,16 +682,16 @@ export default function FormPatternsPageLayout() {
>
{field.value ? format(field.value, 'PPP') : 'Pick a date'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start">
<Calendar
mode="single"
selected={field.value}
onSelect={field.onChange}
initialFocus
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormControl>
</FormItemLayout>
)}
diff --git a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx
index f23464f886f..f71fe6bc00e 100644
--- a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx
+++ b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx
@@ -16,9 +16,9 @@ import {
InputGroupAddon,
InputGroupInput,
InputGroupText,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
RadioGroupStacked,
RadioGroupStackedItem,
Select_Shadcn_,
@@ -669,8 +669,8 @@ export default function FormPatternsSidePanel() {
description="Date selection with calendar popover"
>
<FormControl className="col-span-6">
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
type="outline"
className="bg-control w-full justify-start text-left font-normal px-3 py-4"
@@ -678,16 +678,16 @@ export default function FormPatternsSidePanel() {
>
{field.value ? format(field.value, 'PPP') : 'Pick a date'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start">
<Calendar
mode="single"
selected={field.value}
onSelect={field.onChange}
initialFocus
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormControl>
</FormItemLayout>
)}
diff --git a/apps/design-system/registry/default/example/popover-demo.tsx b/apps/design-system/registry/default/example/popover-demo.tsx
index 63674f67373..8180aea5fff 100644
--- a/apps/design-system/registry/default/example/popover-demo.tsx
+++ b/apps/design-system/registry/default/example/popover-demo.tsx
@@ -1,19 +1,12 @@
-import {
- Button,
- Input,
- Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, Input, Label_Shadcn_, Popover, PopoverContent, PopoverTrigger } from 'ui'
export default function PopoverDemo() {
return (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button type="outline">Open popover</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-80">
+ </PopoverTrigger>
+ <PopoverContent className="w-80">
<div className="grid gap-4">
<div className="space-y-2">
<h4 className="font-medium leading-none">Dimensions</h4>
@@ -38,7 +31,7 @@ export default function PopoverDemo() {
</div>
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/docs/app/guides/deployment/terraform/reference/page.tsx b/apps/docs/app/guides/deployment/terraform/reference/page.tsx
index 220d551479a..d703ea17cb3 100644
--- a/apps/docs/app/guides/deployment/terraform/reference/page.tsx
+++ b/apps/docs/app/guides/deployment/terraform/reference/page.tsx
@@ -2,7 +2,7 @@ import { codeBlock } from 'common-tags'
import { Check, PlusCircle } from 'lucide-react'
import Link from 'next/link'
import ReactMarkdown from 'react-markdown'
-import { Heading, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'
+import { Heading, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { CodeBlock } from 'ui-patterns/CodeBlock'
import {
@@ -141,14 +141,14 @@ function Resources({ schema }: { schema: any }) {
</td>
<td>
{schema[resource].block.attributes[attribute].type ?? (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<button className="flex items-center justify-between gap-2">
Nested type
<PlusCircle size={14} className="shrink-0" />
</button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="max-h-[50vh] overflow-auto">
+ </PopoverTrigger>
+ <PopoverContent className="max-h-[50vh] overflow-auto">
<ul>
{Object.keys(
schema[resource].block.attributes[attribute].nested_type.attributes
@@ -178,8 +178,8 @@ function Resources({ schema }: { schema: any }) {
</li>
))}
</ul>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</td>
<td className="align-middle">
@@ -267,14 +267,14 @@ function DataSources({ schema }: { schema: any }) {
</td>
<td>
{schema[dataSource].block.attributes[attribute].type ?? (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<button className="flex items-center justify-between gap-2">
Nested type
<PlusCircle size={14} />
</button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="max-h-[50vh] overflow-auto">
+ </PopoverTrigger>
+ <PopoverContent className="max-h-[50vh] overflow-auto">
{schema[dataSource].block.attributes[attribute].nested_type
.nesting_mode === 'set' && 'Array of:'}
<ul>
@@ -307,8 +307,8 @@ function DataSources({ schema }: { schema: any }) {
</li>
))}
</ul>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</td>
<td className="align-middle">
diff --git a/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.ComboBox.tsx b/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.ComboBox.tsx
index 3433857be1d..fc8d2a50cf5 100644
--- a/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.ComboBox.tsx
+++ b/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.ComboBox.tsx
@@ -9,9 +9,9 @@ import {
CommandInput_Shadcn_ as CommandInput,
CommandItem_Shadcn_ as CommandItem,
CommandList_Shadcn_ as CommandList,
- Popover_Shadcn_ as Popover,
- PopoverContent_Shadcn_ as PopoverContent,
- PopoverTrigger_Shadcn_ as PopoverTrigger,
+ Popover as Popover,
+ PopoverContent as PopoverContent,
+ PopoverTrigger as PopoverTrigger,
ScrollArea,
} from 'ui'
import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
diff --git a/apps/docs/features/ui/McpConfigPanel.tsx b/apps/docs/features/ui/McpConfigPanel.tsx
index e3d29032384..e4723715f4a 100644
--- a/apps/docs/features/ui/McpConfigPanel.tsx
+++ b/apps/docs/features/ui/McpConfigPanel.tsx
@@ -13,9 +13,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
import { Admonition } from 'ui-patterns'
@@ -90,7 +90,7 @@ function ProjectSelector({
}, [isLoading, isFetching, isFetchingNextPage, hasNextPage, entry?.isIntersecting, fetchNextPage])
return (
- <Popover_Shadcn_
+ <Popover
modal={false}
open={open}
onOpenChange={(open) => {
@@ -110,7 +110,7 @@ function ProjectSelector({
</Link>
</Button>
) : (
- <PopoverTrigger_Shadcn_ asChild disabled={isUserLoading || isLoading || isError}>
+ <PopoverTrigger asChild disabled={isUserLoading || isLoading || isError}>
<Button
size="small"
type="default"
@@ -131,10 +131,10 @@ function ProjectSelector({
: 'Select a project')}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
+ </PopoverTrigger>
)}
</div>
- <PopoverContent_Shadcn_ className="mt-0 p-0 w-56" side="bottom" align="start">
+ <PopoverContent className="mt-0 p-0 w-56" side="bottom" align="start">
<Command_Shadcn_ shouldFilter={false}>
<CommandInput_Shadcn_
placeholder="Search ..."
@@ -188,8 +188,8 @@ function ProjectSelector({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
@@ -205,13 +205,13 @@ function PlatformSelector({
const [open, setOpen] = useState(false)
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
<div className={cn('flex', className)}>
<span className="flex items-center text-foreground-lighter px-3 rounded-lg rounded-r-none text-xs border border-button border-r-0">
Platform
</span>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
size="small"
type="default"
@@ -227,9 +227,9 @@ function PlatformSelector({
{PLATFORMS.find((p) => p.value === selectedPlatform)?.label}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
+ </PopoverTrigger>
</div>
- <PopoverContent_Shadcn_ className="mt-0 p-0 max-w-48" side="bottom" align="start">
+ <PopoverContent className="mt-0 p-0 max-w-48" side="bottom" align="start">
<Command_Shadcn_>
<CommandList_Shadcn_>
<CommandGroup_Shadcn_>
@@ -257,8 +257,8 @@ function PlatformSelector({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/grid/components/editor/DateTimeEditor.tsx b/apps/studio/components/grid/components/editor/DateTimeEditor.tsx
index 321308e17c9..a546af127e1 100644
--- a/apps/studio/components/grid/components/editor/DateTimeEditor.tsx
+++ b/apps/studio/components/grid/components/editor/DateTimeEditor.tsx
@@ -9,9 +9,9 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { TimestampInfo, timestampLocalFormatter } from 'ui-patterns'
import { Input } from 'ui-patterns/DataInputs/Input'
@@ -75,13 +75,13 @@ function BaseEditor<TRow, TSummaryRow = unknown>({
}, [])
return (
- <Popover_Shadcn_ open>
- <PopoverTrigger_Shadcn_>
+ <Popover open>
+ <PopoverTrigger>
<div className={cn('px-[8px]', value === null ? 'text-foreground-lighter' : '')}>
{value === null ? 'NULL' : value}
</div>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ align="start" className="p-0 rounded-none w-64">
+ </PopoverTrigger>
+ <PopoverContent align="start" className="p-0 rounded-none w-64">
<BlockKeys
ignoreOutsideClicks
value={inputValue}
@@ -164,8 +164,8 @@ function BaseEditor<TRow, TSummaryRow = unknown>({
)}
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/grid/components/editor/JsonEditor.tsx b/apps/studio/components/grid/components/editor/JsonEditor.tsx
index 58822f49b77..1c9012cfadb 100644
--- a/apps/studio/components/grid/components/editor/JsonEditor.tsx
+++ b/apps/studio/components/grid/components/editor/JsonEditor.tsx
@@ -3,7 +3,14 @@ import { Maximize } from 'lucide-react'
import { useCallback, useState } from 'react'
import type { RenderEditCellProps } from 'react-data-grid'
import { toast } from 'sonner'
-import { Popover, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from 'ui'
import { BlockKeys } from '../common/BlockKeys'
import { MonacoEditor } from '../common/MonacoEditor'
@@ -153,31 +160,26 @@ export const JsonEditor = <TRow, TSummaryRow = unknown>({
}
return (
- <Popover
- open={isPopoverOpen}
- side="bottom"
- align="start"
- sideOffset={-35}
- className="rounded-none"
- overlay={
- isTruncated && !isSuccess ? (
- <div
- style={{ width: `${column.width}px` }}
- className="flex items-center justify-center flex-col relative"
- >
- <MonacoEditor
- readOnly
- onChange={() => {}}
- width={`${column.width}px`}
- value={value ?? ''}
- language="markdown"
- />
+ <Popover open={isPopoverOpen}>
+ <PopoverTrigger asChild>
+ <div
+ className={`${
+ !!value && jsonString.trim().length == 0 ? 'sb-grid-fill-container' : ''
+ } sb-grid-json-editor__trigger`}
+ onClick={() => setIsPopoverOpen(!isPopoverOpen)}
+ >
+ {value === null || value === '' ? <NullValue /> : jsonString}
+ </div>
+ </PopoverTrigger>
+ <PopoverContent side="bottom" align="start" sideOffset={-35} className="rounded-none p-0">
+ {isTruncated && !isSuccess ? (
+ <div className="flex items-center justify-center flex-col relative">
+ <MonacoEditor readOnly onChange={() => {}} value={value ?? ''} language="markdown" />
<TruncatedWarningOverlay isLoading={isPending} loadFullValue={loadFullValue} />
</div>
) : (
<BlockKeys value={value} onEscape={cancelChanges} onEnter={saveChanges}>
<MonacoEditor
- width={`${column.width}px`}
value={value ?? ''}
language="json"
readOnly={!isEditable}
@@ -218,17 +220,8 @@ export const JsonEditor = <TRow, TSummaryRow = unknown>({
</Tooltip>
</div>
</BlockKeys>
- )
- }
- >
- <div
- className={`${
- !!value && jsonString.trim().length == 0 ? 'sb-grid-fill-container' : ''
- } sb-grid-json-editor__trigger`}
- onClick={() => setIsPopoverOpen(!isPopoverOpen)}
- >
- {value === null || value === '' ? <NullValue /> : jsonString}
- </div>
+ )}
+ </PopoverContent>
</Popover>
)
}
diff --git a/apps/studio/components/grid/components/editor/TextEditor.tsx b/apps/studio/components/grid/components/editor/TextEditor.tsx
index 7ffbc6cb4ff..0b3bfe907c4 100644
--- a/apps/studio/components/grid/components/editor/TextEditor.tsx
+++ b/apps/studio/components/grid/components/editor/TextEditor.tsx
@@ -3,7 +3,16 @@ import { Maximize } from 'lucide-react'
import { useCallback, useState } from 'react'
import type { RenderEditCellProps } from 'react-data-grid'
import { toast } from 'sonner'
-import { Button, cn, Popover, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
+import {
+ Button,
+ cn,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from 'ui'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { BlockKeys } from '../common/BlockKeys'
@@ -105,25 +114,22 @@ export const TextEditor = <TRow, TSummaryRow = unknown>({
return (
<>
- <Popover
- open={isPopoverOpen}
- side="bottom"
- align="start"
- sideOffset={-35}
- className="rounded-none"
- overlay={
- isTruncated && !isSuccess ? (
- <div
- style={{ width: `${column.width}px` }}
- className="flex items-center justify-center flex-col relative"
- >
- <MonacoEditor
- readOnly
- onChange={() => {}}
- width={`${column.width}px`}
- value={value ?? ''}
- language="markdown"
- />
+ <Popover open={isPopoverOpen}>
+ <PopoverTrigger asChild>
+ <div
+ className={cn(
+ !!value && value.toString().trim().length === 0 && 'sb-grid-fill-container',
+ 'sb-grid-text-editor__trigger'
+ )}
+ onClick={() => setIsPopoverOpen(!isPopoverOpen)}
+ >
+ {value === null ? <NullValue /> : value === '' ? <EmptyValue /> : value}
+ </div>
+ </PopoverTrigger>
+ <PopoverContent className="rounded-none p-0" side="bottom" align="start" sideOffset={-35}>
+ {isTruncated && !isSuccess ? (
+ <div className="flex items-center justify-center flex-col relative">
+ <MonacoEditor readOnly onChange={() => {}} value={value ?? ''} language="markdown" />
<TruncatedWarningOverlay isLoading={isPending} loadFullValue={loadFullValue} />
</div>
) : (
@@ -133,12 +139,7 @@ export const TextEditor = <TRow, TSummaryRow = unknown>({
onEnter={saveChanges}
ignoreOutsideClicks={isConfirmNextModalOpen}
>
- <MonacoEditor
- width={`${column.width}px`}
- value={value ?? ''}
- readOnly={!isEditable}
- onChange={onChange}
- />
+ <MonacoEditor value={value ?? ''} readOnly={!isEditable} onChange={onChange} />
{isEditable && (
<div className="flex items-start justify-between p-2 bg-surface-200 space-x-2">
<div className="space-y-1">
@@ -189,18 +190,8 @@ export const TextEditor = <TRow, TSummaryRow = unknown>({
</div>
)}
</BlockKeys>
- )
- }
- >
- <div
- className={cn(
- !!value && value.toString().trim().length === 0 && 'sb-grid-fill-container',
- 'sb-grid-text-editor__trigger'
)}
- onClick={() => setIsPopoverOpen(!isPopoverOpen)}
- >
- {value === null ? <NullValue /> : value === '' ? <EmptyValue /> : value}
- </div>
+ </PopoverContent>
</Popover>
<ConfirmationModal
visible={isConfirmNextModalOpen}
diff --git a/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx b/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx
index 6ad1debd533..176283f0969 100644
--- a/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx
+++ b/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx
@@ -2,7 +2,7 @@ import type { PGTable } from '@supabase/pg-meta'
import { ArrowRight } from 'lucide-react'
import type { PropsWithChildren } from 'react'
import type { RenderCellProps } from 'react-data-grid'
-import { Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'
+import { Popover, PopoverContent, PopoverTrigger } from 'ui'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import type { SupaRow } from '../../types'
@@ -73,8 +73,8 @@ export const ForeignKeyFormatter = (props: Props) => {
</div>
)}
{!isLoadingTargetTable && targetTable !== undefined && (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<ButtonTooltip
type="default"
className="w-6 h-6"
@@ -83,8 +83,8 @@ export const ForeignKeyFormatter = (props: Props) => {
onClick={(e) => e.stopPropagation()}
tooltip={{ content: { side: 'bottom', text: 'View referencing record' } }}
/>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
align="end"
className="p-0 w-96"
onDoubleClick={(e) => {
@@ -100,8 +100,8 @@ export const ForeignKeyFormatter = (props: Props) => {
column={relationship.target_column_name}
value={formattedValue}
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</>
)}
diff --git a/apps/studio/components/grid/components/header/filter/FilterPopoverPrimitive.tsx b/apps/studio/components/grid/components/header/filter/FilterPopoverPrimitive.tsx
index d19cecd56f5..eb584ba0d37 100644
--- a/apps/studio/components/grid/components/header/filter/FilterPopoverPrimitive.tsx
+++ b/apps/studio/components/grid/components/header/filter/FilterPopoverPrimitive.tsx
@@ -1,13 +1,7 @@
import { isEqual } from 'lodash'
import { Filter as FilterIcon, Plus } from 'lucide-react'
import { KeyboardEvent, useCallback, useMemo, useState } from 'react'
-import {
- Button,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverSeparator_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, Popover, PopoverContent, PopoverSeparator, PopoverTrigger } from 'ui'
import FilterRow from './FilterRow'
import type { Filter } from '@/components/grid/types'
@@ -86,13 +80,13 @@ export const FilterPopoverPrimitive = ({
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button type={filters.length > 0 ? 'link' : 'text'} icon={<FilterIcon />}>
{displayButtonText}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-96" side="bottom" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-96" side="bottom" align="start">
<div className="space-y-2 py-2">
<div className="space-y-2">
{localFilters.map((filter, index) => (
@@ -114,7 +108,7 @@ export const FilterPopoverPrimitive = ({
</div>
)}
</div>
- <PopoverSeparator_Shadcn_ />
+ <PopoverSeparator />
<div className="px-3 flex flex-row justify-between">
<Button icon={<Plus />} type="dashed" onClick={onAddFilter}>
Add filter
@@ -128,7 +122,7 @@ export const FilterPopoverPrimitive = ({
</Button>
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx b/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx
index 1faf873420a..0853bfa803d 100644
--- a/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx
+++ b/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx
@@ -18,13 +18,7 @@ import { useParams } from 'common'
import { isEqual } from 'lodash'
import { ChevronDown, List } from 'lucide-react'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import {
- Button,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverSeparator_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, Popover, PopoverContent, PopoverSeparator, PopoverTrigger } from 'ui'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { DropdownControl } from '../../common/DropdownControl'
@@ -237,13 +231,13 @@ export const SortPopoverPrimitive = ({
return (
<>
- <Popover_Shadcn_ modal={false} open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false} open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button type={localSorts.length > 0 ? 'link' : 'text'} icon={<List />}>
{displayButtonText}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-96" side="bottom" align="center">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-96" side="bottom" align="center">
<div className="space-y-2 py-2">
<DndContext
sensors={sensors}
@@ -283,7 +277,7 @@ export const SortPopoverPrimitive = ({
</div>
)}
- <PopoverSeparator_Shadcn_ />
+ <PopoverSeparator />
<div className="px-3 flex flex-row justify-between">
{dropdownOptions && dropdownOptions.length > 0 ? (
<DropdownControl
@@ -327,8 +321,8 @@ export const SortPopoverPrimitive = ({
</div>
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<ConfirmationModal
size="medium"
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/PermissionResourceSelector.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/PermissionResourceSelector.tsx
index ed503e8e9c3..8f6416c71a1 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/PermissionResourceSelector.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/PermissionResourceSelector.tsx
@@ -9,9 +9,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import {
@@ -39,13 +39,13 @@ export const PermissionResourceSelector = <TFormValues extends PermissionsFormVa
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={onOpenChange} modal={true}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={onOpenChange} modal={true}>
+ <PopoverTrigger asChild>
<Button type="default" size="tiny" icon={<Plus className="h-4 w-4" />}>
Add permission
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[400px] p-0" align={align}>
+ </PopoverTrigger>
+ <PopoverContent className="w-[400px] p-0" align={align}>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search resources..." />
<CommandList_Shadcn_>
@@ -84,7 +84,7 @@ export const PermissionResourceSelector = <TFormValues extends PermissionsFormVa
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/Permissions.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/Permissions.tsx
index d21dfde5773..8c252188997 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/Permissions.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/Permissions/Permissions.tsx
@@ -1,13 +1,6 @@
import { ChevronDown, RotateCcw, X } from 'lucide-react'
import { Path, PathValue } from 'react-hook-form'
-import {
- Button,
- Checkbox,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
- WarningIcon,
-} from 'ui'
+import { Button, Checkbox, Popover, PopoverContent, PopoverTrigger, WarningIcon } from 'ui'
import { PermissionResourceSelector } from './PermissionResourceSelector'
import { PermissionRow, PermissionsFormValues, PermissionsProps } from './Permissions.types'
@@ -86,8 +79,8 @@ export const Permissions = <TFormValues extends PermissionsFormValues = Permissi
</div>
<div className="flex items-center gap-2">
{selectedResource && (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
type="default"
size="tiny"
@@ -104,8 +97,8 @@ export const Permissions = <TFormValues extends PermissionsFormValues = Permissi
`${row.actions.length} selected`
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[180px] p-2" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="w-[180px] p-2" align="end">
<div className="space-y-2">
{sortActions(selectedResource.actions).map((action) => (
<label
@@ -134,8 +127,8 @@ export const Permissions = <TFormValues extends PermissionsFormValues = Permissi
</label>
))}
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
<Button
type="text"
diff --git a/apps/studio/components/interfaces/Account/Preferences/TimezoneSettings.tsx b/apps/studio/components/interfaces/Account/Preferences/TimezoneSettings.tsx
index 24ebb78d7ea..2430bf3bdee 100644
--- a/apps/studio/components/interfaces/Account/Preferences/TimezoneSettings.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/TimezoneSettings.tsx
@@ -12,9 +12,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -85,8 +85,8 @@ export const TimezoneSettings = () => {
: 'Pick "Auto detect" to follow your browser timezone again.'
}
>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
role="combobox"
aria-expanded={open}
@@ -101,11 +101,8 @@ export const TimezoneSettings = () => {
{isAutoDetected ? `Auto detect (${timezone})` : triggerLabel}
</span>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- id={listboxId}
- className="w-[--radix-popover-trigger-width] p-0"
- >
+ </PopoverTrigger>
+ <PopoverContent id={listboxId} className="w-[--radix-popover-trigger-width] p-0">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search timezone..." className="h-9" />
<CommandList_Shadcn_>
@@ -155,8 +152,8 @@ export const TimezoneSettings = () => {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormItemLayout>
</CardContent>
</Card>
diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx
index 2d89a01b9f2..61acdac26e2 100644
--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx
+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx
@@ -11,9 +11,9 @@ import {
Input,
InputGroup,
InputGroupAddon,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Select_Shadcn_,
SelectContent_Shadcn_,
SelectItem_Shadcn_,
@@ -119,8 +119,8 @@ const FormField = ({
}
>
<FormControl>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
type="outline"
className="w-full justify-start text-left font-normal px-3 py-4"
@@ -129,8 +129,8 @@ const FormField = ({
>
{field.value ? format(new Date(field.value), 'PPP') : 'Pick a date'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-auto p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start">
<Calendar
mode="single"
selected={field.value}
@@ -139,8 +139,8 @@ const FormField = ({
}}
initialFocus
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormControl>
</FormItemLayout>
)}
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx
index c04701692e0..11547172004 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx
@@ -23,9 +23,9 @@ import {
FormLabel,
FormMessage,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
RadioGroup,
RadioGroupLargeItem,
ScrollArea,
@@ -154,8 +154,8 @@ export const PolicyDetailsV2 = ({
</FormLabel>
{authContext === 'database' && (
<FormControl>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
type="default"
disabled={!canUpdatePolicies}
@@ -174,9 +174,9 @@ export const PolicyDetailsV2 = ({
</span>
</div>
</Button>
- </PopoverTrigger_Shadcn_>
+ </PopoverTrigger>
- <PopoverContent_Shadcn_
+ <PopoverContent
className="p-0"
side="bottom"
align="start"
@@ -211,8 +211,8 @@ export const PolicyDetailsV2 = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormControl>
)}
{authContext === 'realtime' && (
diff --git a/apps/studio/components/interfaces/Auth/RLSTester/UserSelector.tsx b/apps/studio/components/interfaces/Auth/RLSTester/UserSelector.tsx
index 914cc3cd07b..17daee2762c 100644
--- a/apps/studio/components/interfaces/Auth/RLSTester/UserSelector.tsx
+++ b/apps/studio/components/interfaces/Auth/RLSTester/UserSelector.tsx
@@ -12,9 +12,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
import { Admonition, GenericSkeletonLoader } from 'ui-patterns'
@@ -67,8 +67,8 @@ export const UserSelector = () => {
return (
<FormItemLayout isReactForm={false} label="Select which user to test as">
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal>
+ <PopoverTrigger asChild>
<Button
block
type="default"
@@ -80,8 +80,8 @@ export const UserSelector = () => {
>
{impersonatingUser?.email ?? 'Select a user'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ sameWidthAsTrigger className="p-0" side="bottom" align="start">
+ </PopoverTrigger>
+ <PopoverContent sameWidthAsTrigger className="p-0" side="bottom" align="start">
<Command_Shadcn_ shouldFilter={false}>
<CommandInput_Shadcn_
showResetIcon
@@ -137,8 +137,8 @@ export const UserSelector = () => {
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormItemLayout>
)
}
diff --git a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/AwsRegionSelector.tsx b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/AwsRegionSelector.tsx
index d772399542e..f6682a1b187 100644
--- a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/AwsRegionSelector.tsx
+++ b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/AwsRegionSelector.tsx
@@ -10,9 +10,9 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
FormControl,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -59,8 +59,8 @@ export const AwsRegionSelector = ({
const listboxId = useId()
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<FormControl>
<Button
type="default"
@@ -76,8 +76,8 @@ export const AwsRegionSelector = ({
{value ?? 'Select a region'}
</Button>
</FormControl>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ id={listboxId} className="p-0" sameWidthAsTrigger>
+ </PopoverTrigger>
+ <PopoverContent id={listboxId} className="p-0" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search AWS regions..." />
<CommandList_Shadcn_>
@@ -103,7 +103,7 @@ export const AwsRegionSelector = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx
index 29f8daf7159..83160919291 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx
@@ -31,9 +31,9 @@ import {
FormItem,
FormMessage,
Input,
- Popover_Shadcn_ as Popover,
- PopoverContent_Shadcn_ as PopoverContent,
- PopoverTrigger_Shadcn_ as PopoverTrigger,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { z } from 'zod'
diff --git a/apps/studio/components/interfaces/BranchManagement/BranchSelector.tsx b/apps/studio/components/interfaces/BranchManagement/BranchSelector.tsx
index a208bac22e2..7fcc00cc2e9 100644
--- a/apps/studio/components/interfaces/BranchManagement/BranchSelector.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/BranchSelector.tsx
@@ -7,9 +7,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -45,8 +45,8 @@ export const BranchSelector = ({
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<ButtonTooltip
icon={<GitMerge size={14} strokeWidth={1.5} />}
type={type}
@@ -66,8 +66,8 @@ export const BranchSelector = ({
>
{isUpdating ? 'Creating...' : 'New merge request'}
</ButtonTooltip>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-80" side="bottom" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-80" side="bottom" align="end">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Find branch to review..." />
<CommandList_Shadcn_>
@@ -99,7 +99,7 @@ export const BranchSelector = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Connect/ConnectDropdown.tsx b/apps/studio/components/interfaces/Connect/ConnectDropdown.tsx
index 9833262055f..70a25816e18 100644
--- a/apps/studio/components/interfaces/Connect/ConnectDropdown.tsx
+++ b/apps/studio/components/interfaces/Connect/ConnectDropdown.tsx
@@ -9,9 +9,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { ConnectionType } from './Connect.constants'
@@ -45,12 +45,12 @@ export const ConnectDropdown = ({
const selectedItem = items.find((item) => item.key === state)
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
<div className="flex ">
<span className="flex items-center text-foreground-lighter px-3 rounded-lg rounded-r-none text-xs border border-button border-r-0">
{label}
</span>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
size="small"
type="default"
@@ -70,9 +70,9 @@ export const ConnectDropdown = ({
{selectedItem?.label}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
+ </PopoverTrigger>
</div>
- <PopoverContent_Shadcn_ className="p-0 max-w-48" side="bottom" align="start">
+ <PopoverContent className="p-0 max-w-48" side="bottom" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search..." />
<CommandList_Shadcn_>
@@ -107,7 +107,7 @@ export const ConnectDropdown = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/ConnectSheet/FrameworkSelector.tsx b/apps/studio/components/interfaces/ConnectSheet/FrameworkSelector.tsx
index e0478b64cd4..1d372e1bdf2 100644
--- a/apps/studio/components/interfaces/ConnectSheet/FrameworkSelector.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/FrameworkSelector.tsx
@@ -9,9 +9,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { ConnectionType } from '@/components/interfaces/ConnectSheet/Connect.constants'
@@ -42,9 +42,9 @@ export const FrameworkSelector = ({
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
<div className={cn('flex', className)}>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
size={size}
type="default"
@@ -56,9 +56,9 @@ export const FrameworkSelector = ({
{selectedItem?.label}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
+ </PopoverTrigger>
</div>
- <PopoverContent_Shadcn_
+ <PopoverContent
className="p-0 w-radix-popover-trigger-width min-w-48"
side="bottom"
align="start"
@@ -87,7 +87,7 @@ export const FrameworkSelector = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx b/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx
index 8f7a3c94a3b..a0a8d24f945 100644
--- a/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx
@@ -9,9 +9,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -34,8 +34,8 @@ export const TimezoneSelection = ({
return (
<div className="w-full">
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
role="combobox"
aria-expanded={open}
@@ -49,8 +49,8 @@ export const TimezoneSelection = ({
? timezoneOptions.find((option) => option === selectedTimezone.text)
: 'Select timezone...'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ id={listboxId} className="w-[350px] p-0">
+ </PopoverTrigger>
+ <PopoverContent id={listboxId} className="w-[350px] p-0">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search timezone..." className="h-9" />
<CommandList_Shadcn_>
@@ -84,8 +84,8 @@ export const TimezoneSelection = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
)
}
diff --git a/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx b/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
index e9f5eeb8c06..4949ccf6738 100644
--- a/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
+++ b/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
@@ -11,9 +11,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Select_Shadcn_,
SelectContent_Shadcn_,
SelectItem_Shadcn_,
@@ -179,12 +179,8 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
<div className="py-6 space-y-6">
<SidePanel.Content className="space-y-6">
<FormItemLayout label="Select a schema" name="select-schema" isReactForm={false}>
- <Popover_Shadcn_
- modal={false}
- open={schemaDropdownOpen}
- onOpenChange={setSchemaDropdownOpen}
- >
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false} open={schemaDropdownOpen} onOpenChange={setSchemaDropdownOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
size={'medium'}
@@ -197,13 +193,8 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
? selectedSchema
: 'Choose a schema'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- className="p-0"
- side="bottom"
- align="start"
- sameWidthAsTrigger
- >
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="start" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_
placeholder="Find schema..."
@@ -236,8 +227,8 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormItemLayout>
<FormItemLayout
@@ -250,15 +241,8 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
}
isReactForm={false}
>
- <Popover_Shadcn_
- modal={false}
- open={tableDropdownOpen}
- onOpenChange={setTableDropdownOpen}
- >
- <PopoverTrigger_Shadcn_
- asChild
- disabled={isSelectEntityDisabled || isLoadingEntities}
- >
+ <Popover modal={false} open={tableDropdownOpen} onOpenChange={setTableDropdownOpen}>
+ <PopoverTrigger asChild disabled={isSelectEntityDisabled || isLoadingEntities}>
<Button
type="default"
size="medium"
@@ -276,13 +260,8 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
? 'No tables available in schema'
: 'Choose a table'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- className="p-0"
- side="bottom"
- align="start"
- sameWidthAsTrigger
- >
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="start" sameWidthAsTrigger>
{/* [Terry] shouldFilter context:
https://github.com/pacocoursey/cmdk/issues/267#issuecomment-2252717107 */}
<Command_Shadcn_ shouldFilter={false}>
@@ -328,8 +307,8 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</FormItemLayout>
{selectedEntity && (
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsx
index 7eb552c55be..158a21ab7b4 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsx
@@ -12,9 +12,9 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
CommandSeparator_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -48,7 +48,7 @@ export const PublicationsComboBox = ({
}, [field?.value])
return (
- <Popover_Shadcn_
+ <Popover
modal={false}
open={dropdownOpen}
onOpenChange={(open) => {
@@ -58,7 +58,7 @@ export const PublicationsComboBox = ({
}
}}
>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
type="default"
size="medium"
@@ -72,8 +72,8 @@ export const PublicationsComboBox = ({
>
{selectedPublication || 'Select publication'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ sameWidthAsTrigger className="p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent sameWidthAsTrigger className="p-0" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_
placeholder="Find publication..."
@@ -147,7 +147,7 @@ export const PublicationsComboBox = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Database/Tables/TableList.tsx b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
index 9482d574220..5eb4251e7ce 100644
--- a/apps/studio/components/interfaces/Database/Tables/TableList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
@@ -16,9 +16,9 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Table,
TableBody,
TableCell,
@@ -247,16 +247,16 @@ export const TableList = ({
onOpenChange={setSchemaSelectorOpen}
/>
</Shortcut>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
size="tiny"
type={visibleTypes.length !== 5 ? 'default' : 'dashed'}
className="px-1"
icon={<Filter />}
/>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-56" side="bottom" align="center">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-56" side="bottom" align="center">
<div className="px-3 pt-3 pb-2 flex flex-col gap-y-2">
<p className="text-xs">Show entity types</p>
<div className="flex flex-col">
@@ -291,8 +291,8 @@ export const TableList = ({
))}
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
<div className="flex grow justify-between gap-2 items-center">
<Input
diff --git a/apps/studio/components/interfaces/Home/ServiceStatus.tsx b/apps/studio/components/interfaces/Home/ServiceStatus.tsx
index 7a2b487abfa..9b99b19e969 100644
--- a/apps/studio/components/interfaces/Home/ServiceStatus.tsx
+++ b/apps/studio/components/interfaces/Home/ServiceStatus.tsx
@@ -3,13 +3,7 @@ import dayjs from 'dayjs'
import { AlertTriangle, CheckCircle2, ChevronRight, Loader2 } from 'lucide-react'
import Link from 'next/link'
import { useEffect, useState } from 'react'
-import {
- Button,
- InfoIcon,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, InfoIcon, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { InlineLink } from '@/components/ui/InlineLink'
import { useBranchesQuery } from '@/data/branches/branches-query'
@@ -306,8 +300,8 @@ export const ServiceStatus = () => {
}, [isProjectNew])
return (
- <Popover_Shadcn_ modal={false} open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false} open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
icon={
@@ -324,8 +318,8 @@ export const ServiceStatus = () => {
>
{isBranch ? 'Branch' : 'Project'} Status
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-56" side="bottom" align="center">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-56" side="bottom" align="center">
{services.map((service) => (
<Link
href={`/project/${ref}${service.logsUrl}`}
@@ -377,7 +371,7 @@ export const ServiceStatus = () => {
</div>
</div>
)}
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/EdgeFunctionSection.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/EdgeFunctionSection.tsx
index 745fea8d776..3c11ea3e4bc 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/EdgeFunctionSection.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/EdgeFunctionSection.tsx
@@ -21,9 +21,9 @@ import {
InputGroupAddon,
InputGroupInput,
InputGroupText,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Select_Shadcn_,
SelectContent_Shadcn_,
@@ -125,8 +125,8 @@ export const EdgeFunctionSection = ({ form }: HTTPRequestFieldsProps) => {
return (
<FormItem>
<FormLabel>Edge Function</FormLabel>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<FormControl>
<Button
type="default"
@@ -150,8 +150,8 @@ export const EdgeFunctionSection = ({ form }: HTTPRequestFieldsProps) => {
: 'Select which edge function to trigger'}
</Button>
</FormControl>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ id={listboxId} className="p-0" sameWidthAsTrigger>
+ </PopoverTrigger>
+ <PopoverContent id={listboxId} className="p-0" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search edge functions..." />
<CommandList_Shadcn_>
@@ -182,8 +182,8 @@ export const EdgeFunctionSection = ({ form }: HTTPRequestFieldsProps) => {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<FormMessage />
</FormItem>
)
diff --git a/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx b/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx
index 37c29c8d191..8d1fd402c40 100644
--- a/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx
@@ -4,15 +4,7 @@ import Link from 'next/link'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { useMemo, useState } from 'react'
import { toast } from 'sonner'
-import {
- Button,
- cn,
- LoadingLine,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
- Separator,
-} from 'ui'
+import { Button, cn, LoadingLine, Popover, PopoverContent, PopoverTrigger, Separator } from 'ui'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
@@ -192,17 +184,17 @@ export const QueueTab = () => {
)}
</>
) : (
- <Popover_Shadcn_
+ <Popover
modal={false}
open={openRlsPopover}
onOpenChange={() => setOpenRlsPopover(!openRlsPopover)}
>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button type={isExposed ? 'warning' : 'default'} icon={<Lock strokeWidth={1.5} />}>
RLS disabled
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-80 text-sm" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="w-80 text-sm" align="end">
<h3 className="text-xs flex items-center gap-x-2">
<Lock size={14} /> Row Level Security (RLS)
</h3>
@@ -241,8 +233,8 @@ You may opt to manage your queues via any Supabase client libraries or PostgREST
</>
)}
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
<Button type="primary" onClick={() => setSendMessageModalShown(true)}>
diff --git a/apps/studio/components/interfaces/Integrations/Vercel/OrganizationPicker.tsx b/apps/studio/components/interfaces/Integrations/Vercel/OrganizationPicker.tsx
index ce72ca94011..6cbda52b97e 100644
--- a/apps/studio/components/interfaces/Integrations/Vercel/OrganizationPicker.tsx
+++ b/apps/studio/components/interfaces/Integrations/Vercel/OrganizationPicker.tsx
@@ -10,9 +10,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { getHasInstalledObject } from '@/components/layouts/IntegrationsLayout/Integrations.utils'
@@ -58,8 +58,8 @@ const OrganizationPicker = ({
return (
<>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
ref={ref}
type="default"
@@ -83,13 +83,8 @@ const OrganizationPicker = ({
)}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- className="p-0 w-full"
- side="bottom"
- align="center"
- sameWidthAsTrigger
- >
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-full" side="bottom" align="center" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search organizations..." />
<CommandList_Shadcn_>
@@ -123,8 +118,8 @@ const OrganizationPicker = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</>
)
}
diff --git a/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx
index 0d43f41bc82..f08401a8858 100644
--- a/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx
+++ b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx
@@ -14,9 +14,9 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
CommandSeparator_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
@@ -296,11 +296,11 @@ const ProjectLinker = ({
{integrationIcon}
</div>
- <Popover_Shadcn_
+ <Popover
open={openForeignProjectsComboBox}
onOpenChange={setOpenForeignProjectsComboBox}
>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
type="default"
block
@@ -322,13 +322,8 @@ const ProjectLinker = ({
>
{(selectedForeignProject && selectedForeignProject.name) ?? choosePrompt}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- className="p-0"
- side="bottom"
- align="center"
- sameWidthAsTrigger
- >
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="center" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search for a project" />
<CommandList_Shadcn_ className="max-h-[170px]!">
@@ -372,8 +367,8 @@ const ProjectLinker = ({
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</Panel>
</div>
)}
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsx
index 3451caf89b9..e258d44edc6 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsx
@@ -30,9 +30,9 @@ import {
FormItem,
FormLabel,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -134,8 +134,8 @@ export const ColumnType = ({
<FormLabel className="text-foreground flex gap-2 items-center wrap-break-word">
Type
</FormLabel>
- <Popover_Shadcn_ modal open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
role="combobox"
size={'small'}
@@ -157,13 +157,8 @@ export const ColumnType = ({
'Choose a column type...'
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- id={listboxId}
- className="w-[460px] p-0"
- side="bottom"
- align="center"
- >
+ </PopoverTrigger>
+ <PopoverContent id={listboxId} className="w-[460px] p-0" side="bottom" align="center">
<Command_Shadcn_>
<CommandInput_Shadcn_
placeholder="Search types..."
@@ -259,8 +254,8 @@ export const ColumnType = ({
</ScrollArea>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
{showRecommendation && recommendation !== undefined && (
<Alert variant="warning" className="mt-2">
<CriticalIcon />
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsx
index 17795f29020..4f11efb5c26 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsx
@@ -23,9 +23,9 @@ import {
FormField,
Input,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Select_Shadcn_,
SelectContent_Shadcn_,
@@ -118,8 +118,8 @@ const WrapperTableEditor = ({
<Label_Shadcn_ className="text-foreground-light">
Select a target the table will point to
</Label_Shadcn_>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
role="combobox"
@@ -136,8 +136,8 @@ const WrapperTableEditor = ({
>
{!!selectedTableIndex ? tables[Number(selectedTableIndex)].label : '---'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ id={listboxId} className="p-0" sameWidthAsTrigger>
+ </PopoverTrigger>
+ <PopoverContent id={listboxId} className="p-0" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Find a table..." />
<CommandList_Shadcn_>
@@ -170,8 +170,8 @@ const WrapperTableEditor = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
{selectedTable && (
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx
index fb4e7d52898..a91acb83ca6 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx
@@ -20,9 +20,9 @@ import {
FormField,
FormMessage,
Input,
- Popover_Shadcn_ as Popover,
- PopoverContent_Shadcn_ as PopoverContent,
- PopoverTrigger_Shadcn_ as PopoverTrigger,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Tooltip,
TooltipContent,
TooltipTrigger,
diff --git a/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsx b/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsx
index 3532bf5c994..1128f408b19 100644
--- a/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsx
+++ b/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsx
@@ -12,9 +12,9 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Sheet,
SheetContent,
@@ -190,12 +190,12 @@ export function CreateAppSheet({ visible, onClose, onCreated }: CreateAppSheetPr
disabled={isLoading}
/>
)}
- <Popover_Shadcn_
+ <Popover
open={permissionSearchOpen}
onOpenChange={setPermissionSearchOpen}
modal
>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
type="default"
size="tiny"
@@ -204,8 +204,8 @@ export function CreateAppSheet({ visible, onClose, onCreated }: CreateAppSheetPr
>
Add permission
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[400px] p-0" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="w-[400px] p-0" align="end">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search permissions..." />
<CommandList_Shadcn_>
@@ -236,8 +236,8 @@ export function CreateAppSheet({ visible, onClose, onCreated }: CreateAppSheetPr
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
</div>
diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/LanguageSelector.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/LanguageSelector.tsx
index 05468575b79..ca77123d885 100644
--- a/apps/studio/components/interfaces/ProjectAPIDocs/LanguageSelector.tsx
+++ b/apps/studio/components/interfaces/ProjectAPIDocs/LanguageSelector.tsx
@@ -6,9 +6,9 @@ import {
CommandGroup_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { BASE_PATH } from '@/lib/constants'
@@ -32,8 +32,8 @@ const LanguageSelector = ({ simplifiedVersion = false }: LanguageSelectorProps)
return (
<div className="flex items-center gap-x-2">
- <Popover_Shadcn_ modal={false} open={showLanguage} onOpenChange={setShowLanguage}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false} open={showLanguage} onOpenChange={setShowLanguage}>
+ <PopoverTrigger asChild>
<Button
type="default"
className={simplifiedVersion ? 'px-1' : ''}
@@ -56,8 +56,8 @@ const LanguageSelector = ({ simplifiedVersion = false }: LanguageSelectorProps)
? `Language: ${snap.docsLanguage === 'js' ? 'Javascript' : 'Bash'}`
: undefined}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-24" side="bottom" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-24" side="bottom" align="end">
<Command_Shadcn_>
<CommandList_Shadcn_>
<CommandGroup_Shadcn_>
@@ -78,8 +78,8 @@ const LanguageSelector = ({ simplifiedVersion = false }: LanguageSelectorProps)
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
)
}
diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsx
index 478e8521347..85991d8d16b 100644
--- a/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsx
+++ b/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsx
@@ -6,9 +6,9 @@ import {
AlertTitle,
Button,
cn,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { navigateToSection } from './Content/Content.utils'
@@ -113,8 +113,8 @@ const ResourcePicker = ({ category, resource, renderResourceList }: ResourcePick
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
type="default"
size="small"
@@ -123,15 +123,15 @@ const ResourcePicker = ({ category, resource, renderResourceList }: ResourcePick
>
<span className="truncate">{resource ?? 'Select a resource'}</span>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-64" side="bottom" align="center">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-64" side="bottom" align="center">
{renderResourceList({
selectedResource: resource,
onSelect: handleSelect,
closePopover: () => setOpen(false),
})}
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationFooter.tsx b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationFooter.tsx
index 790bdf4afc5..ff1bf50028a 100644
--- a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationFooter.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationFooter.tsx
@@ -4,7 +4,7 @@ import { UseFormReturn } from 'react-hook-form'
import {
Badge,
Button,
- PopoverSeparator_Shadcn_,
+ PopoverSeparator,
Table,
TableBody,
TableCell,
@@ -135,7 +135,7 @@ export const ProjectCreationFooter = ({
</TableRow>
</TableBody>
</Table>
- <PopoverSeparator_Shadcn_ />
+ <PopoverSeparator />
<Table>
<TableHeader className="[&_th]:h-7">
<TableRow>
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx b/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx
index d239d593e9f..609514a2763 100644
--- a/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx
+++ b/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx
@@ -12,9 +12,9 @@ import {
FormItem,
FormLabel,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Switch,
} from 'ui'
import * as z from 'zod'
@@ -81,8 +81,8 @@ export const ChooseChannelPopover = ({ config, onChangeConfig }: ChooseChannelPo
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={onOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={onOpen}>
+ <PopoverTrigger asChild>
<Button className="rounded-r-none" type="default" size="tiny" iconRight={<ChevronDown />}>
<p
className="max-w-[120px] truncate"
@@ -91,8 +91,8 @@ export const ChooseChannelPopover = ({ config, onChangeConfig }: ChooseChannelPo
{config.channelName.length > 0 ? `Channel: ${config.channelName}` : 'Join a channel'}
</p>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-[320px]" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-[320px]" align="start">
<div className="p-4 flex flex-col text-sm">
{config.channelName.length === 0 ? (
<>
@@ -203,7 +203,7 @@ export const ChooseChannelPopover = ({ config, onChangeConfig }: ChooseChannelPo
</div>
)}
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx
index 4915dff9f99..b6ed1cb238f 100644
--- a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx
+++ b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx
@@ -12,9 +12,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -76,8 +76,8 @@ const TableSelector = ({
return (
<div className={className}>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
size={size}
type="outline"
@@ -99,8 +99,8 @@ const TableSelector = ({
<p className="flex text-xs text-light">Loading tables...</p>
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-64" side="bottom" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-64" side="bottom" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_
placeholder="Find table..."
@@ -177,8 +177,8 @@ const TableSelector = ({
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
)
}
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx
index 317b13560fb..f47d91b8a5d 100644
--- a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx
+++ b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx
@@ -10,9 +10,9 @@ import {
IconDatabaseChanges,
IconPresence,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Switch,
} from 'ui'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
@@ -69,8 +69,8 @@ export const RealtimeFilterPopover = ({ config, onChangeConfig }: RealtimeFilter
return (
<>
- <Popover_Shadcn_ open={open} onOpenChange={onOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={onOpen}>
+ <PopoverTrigger asChild>
<Button
icon={<PlusCircle size="16" />}
type={isFiltered ? 'primary' : 'dashed'}
@@ -86,8 +86,8 @@ export const RealtimeFilterPopover = ({ config, onChangeConfig }: RealtimeFilter
<span className="mr-1">Filter messages</span>
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-[365px]" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-[365px]" align="start">
<div className="border-b border-overlay text-xs px-4 py-3 text-foreground">
Listen to event types
</div>
@@ -229,8 +229,8 @@ export const RealtimeFilterPopover = ({ config, onChangeConfig }: RealtimeFilter
</Button>
<Button onClick={() => setApplyConfigOpen(true)}>Apply</Button>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<ConfirmationModal
title="Previously found messages will be lost"
variant="destructive"
diff --git a/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsx b/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsx
index 1b41f127e40..1d76a03b682 100644
--- a/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsx
+++ b/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsx
@@ -11,10 +11,10 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverSeparator_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverSeparator,
+ PopoverTrigger,
} from 'ui'
import { sizes } from 'ui/src/lib/commonCva'
import defaultTheme from 'ui/src/lib/theme/defaultTheme'
@@ -331,8 +331,8 @@ export const ReportFilterPopover = ({
const hasChanges = !isEqual(localFilters, filters)
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
type={filters.length > 0 ? 'link' : 'text'}
icon={<FilterIcon />}
@@ -340,8 +340,8 @@ export const ReportFilterPopover = ({
>
{displayButtonText}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-[500px]" side="bottom" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-[500px]" side="bottom" align="start">
<div className="space-y-2 py-2">
<div>
{localFilters.map((filter, index) => (
@@ -364,7 +364,7 @@ export const ReportFilterPopover = ({
</div>
)}
</div>
- <PopoverSeparator_Shadcn_ />
+ <PopoverSeparator />
<div className="px-3 flex flex-row justify-between">
<div className="flex gap-2">
<Button icon={<Plus />} type="text" onClick={onAddFilter}>
@@ -381,7 +381,7 @@ export const ReportFilterPopover = ({
</Button>
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx
index 7e5df2e25bd..286e52cd3df 100644
--- a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx
+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx
@@ -1,7 +1,7 @@
import { RoleImpersonationSelector } from '.'
import { ChevronDown, User as IconUser } from 'lucide-react'
import { useState } from 'react'
-import { Button, cn, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'
+import { Button, cn, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { getAvatarUrl, getDisplayName } from '../Auth/Users/Users.utils'
import type { User } from '@/data/auth/users-infinite-query'
@@ -29,8 +29,8 @@ export const RoleImpersonationPopover = ({
const currentRole = state.role?.role ?? serviceRoleLabel ?? 'postgres'
return (
- <Popover_Shadcn_ open={isOpen} onOpenChange={setIsOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={isOpen} onOpenChange={setIsOpen}>
+ <PopoverTrigger asChild>
<Button
size="tiny"
type="default"
@@ -59,15 +59,15 @@ export const RoleImpersonationPopover = ({
<ChevronDown className="text-muted" strokeWidth={1} size={12} />
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 overflow-hidden w-min" side="bottom" align={align}>
+ </PopoverTrigger>
+ <PopoverContent className="p-0 overflow-hidden w-min" side="bottom" align={align}>
<RoleImpersonationSelector
header={header}
serviceRoleLabel={serviceRoleLabel}
disallowAuthenticatedOption={disallowAuthenticatedOption}
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx b/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx
index 6fc52d5ac45..3435edbd4d3 100644
--- a/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx
@@ -30,9 +30,9 @@ import {
FormMessage,
Input,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
import * as z from 'zod'
@@ -230,8 +230,8 @@ export const MoveQueryModal = ({ visible, snippets = [], onClose }: MoveQueryMod
<DialogSection className="py-5 flex flex-col gap-y-4">
<div className="flex flex-col gap-y-2">
<Label_Shadcn_ className="text-foreground-light">Select a folder</Label_Shadcn_>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
block
size="small"
@@ -250,13 +250,8 @@ export const MoveQueryModal = ({ visible, snippets = [], onClose }: MoveQueryMod
{isCurrentFolder && ` (Current)`}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- className="p-0"
- side="bottom"
- align="start"
- sameWidthAsTrigger
- >
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="start" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Find folder..." />
<CommandList_Shadcn_>
@@ -328,8 +323,8 @@ export const MoveQueryModal = ({ visible, snippets = [], onClose }: MoveQueryMod
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
{selectedId === 'new-folder' && (
diff --git a/apps/studio/components/interfaces/Settings/API/ExposedFunctionSelector.tsx b/apps/studio/components/interfaces/Settings/API/ExposedFunctionSelector.tsx
index ff41cbfb55e..e7f1cee472e 100644
--- a/apps/studio/components/interfaces/Settings/API/ExposedFunctionSelector.tsx
+++ b/apps/studio/components/interfaces/Settings/API/ExposedFunctionSelector.tsx
@@ -10,9 +10,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Tooltip,
TooltipContent,
@@ -96,8 +96,8 @@ export const ExposedFunctionSelector = ({
}, [entry?.isIntersecting, hasNextPage, isFetching, isFetchingNextPage, isPending, fetchNextPage])
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
size="small"
disabled={disabled}
@@ -119,8 +119,8 @@ export const ExposedFunctionSelector = ({
</p>
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
className="p-0 min-w-[200px] pointer-events-auto"
side="bottom"
align="start"
@@ -281,8 +281,8 @@ export const ExposedFunctionSelector = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Settings/API/ExposedSchemaSelector.tsx b/apps/studio/components/interfaces/Settings/API/ExposedSchemaSelector.tsx
index 5049f4a7ca8..396ef368cfa 100644
--- a/apps/studio/components/interfaces/Settings/API/ExposedSchemaSelector.tsx
+++ b/apps/studio/components/interfaces/Settings/API/ExposedSchemaSelector.tsx
@@ -9,9 +9,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
@@ -61,8 +61,8 @@ export const ExposedSchemaSelector = ({
const selectedCount = schemas.filter((s) => selectedSet.has(s.name)).length
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
size="small"
disabled={disabled}
@@ -78,8 +78,8 @@ export const ExposedSchemaSelector = ({
</p>
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
className="p-0 min-w-[200px] pointer-events-auto"
side="bottom"
align="start"
@@ -137,7 +137,7 @@ export const ExposedSchemaSelector = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Settings/API/ExposedTableSelector.tsx b/apps/studio/components/interfaces/Settings/API/ExposedTableSelector.tsx
index ab1da9b51ae..e7ecfd3411b 100644
--- a/apps/studio/components/interfaces/Settings/API/ExposedTableSelector.tsx
+++ b/apps/studio/components/interfaces/Settings/API/ExposedTableSelector.tsx
@@ -10,9 +10,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Tooltip,
TooltipContent,
@@ -90,8 +90,8 @@ export const ExposedTableSelector = ({
}, [entry?.isIntersecting, hasNextPage, isFetching, isFetchingNextPage, isPending, fetchNextPage])
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
size="small"
disabled={disabled}
@@ -113,8 +113,8 @@ export const ExposedTableSelector = ({
</p>
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
className="p-0 min-w-[200px] pointer-events-auto"
side="bottom"
align="start"
@@ -275,8 +275,8 @@ export const ExposedTableSelector = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx
index 909fb352a9a..e76a04a69dc 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx
@@ -12,9 +12,9 @@ import {
CommandSeparator_Shadcn_,
FormControl,
FormField,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -151,8 +151,8 @@ export const GitHubRepositoryField = <TFormValues extends FieldValues>({
</Button>
</FormControl>
) : (
- <Popover_Shadcn_ open={isRepoSelectorOpen} onOpenChange={setIsRepoSelectorOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={isRepoSelectorOpen} onOpenChange={setIsRepoSelectorOpen}>
+ <PopoverTrigger asChild>
<FormControl>
<Button
type="default"
@@ -172,13 +172,8 @@ export const GitHubRepositoryField = <TFormValues extends FieldValues>({
(isLoading ? 'Loading GitHub repositories...' : placeholder)}
</Button>
</FormControl>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- className="p-0"
- side="bottom"
- align="start"
- sameWidthAsTrigger
- >
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="start" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search repositories..." />
<CommandList_Shadcn_ className="!max-h-[220px]">
@@ -250,8 +245,8 @@ export const GitHubRepositoryField = <TFormValues extends FieldValues>({
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</FormItemLayout>
)}
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
index 1120614d7f9..c0c2226ca9a 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
@@ -11,9 +11,9 @@ import {
cn,
copyToClipboard,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { LOGS_LARGE_DATE_RANGE_DAYS_THRESHOLD } from './Logs.constants'
@@ -93,7 +93,7 @@ interface LogsDatePickerProps {
helpers: DatetimeHelper[]
onSubmit: (value: DatePickerValue) => void
buttonTriggerProps?: ButtonProps
- popoverContentProps?: typeof PopoverContent_Shadcn_
+ popoverContentProps?: typeof PopoverContent
hideWarnings?: boolean
align?: 'start' | 'end' | 'center'
}
@@ -317,15 +317,15 @@ export const LogsDatePicker = ({
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button type="default" icon={<Clock size={12} />} {...buttonTriggerProps}>
{value.isHelper
? value.text
: `${dayjs(value.from).format('DD MMM, HH:mm')} - ${dayjs(value.to || new Date()).format('DD MMM, HH:mm')}`}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
className="flex w-full p-0"
side="bottom"
align={align}
@@ -458,7 +458,7 @@ export const LogsDatePicker = ({
<Button onClick={handleApply}>Apply</Button>
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx b/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
index 9c20fb4bebd..b52a483ec68 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
@@ -19,9 +19,9 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
SidePanel,
Switch,
Tooltip,
@@ -266,8 +266,8 @@ const LogsQueryPanel = ({
<SidePanel.Separator />
<div className="px-4 pb-4 flex flex-col gap-4">
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
role="combobox"
@@ -278,8 +278,8 @@ const LogsQueryPanel = ({
>
{value ? selectedSchema?.name : 'Select source...'}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0" sameWidthAsTrigger>
+ </PopoverTrigger>
+ <PopoverContent className="p-0" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search source..." />
<CommandList_Shadcn_>
@@ -306,8 +306,8 @@ const LogsQueryPanel = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<Table
head={[
<Table.th className="text-xs p-2!" key="path">
diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx
index 83c801298e0..1000795a3f2 100644
--- a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx
+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx
@@ -12,9 +12,9 @@ import {
CommandGroup_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Sheet,
SheetContent,
SheetHeader,
@@ -212,8 +212,8 @@ const result = await index.putVectors({
</p>
<div className="flex flex-col gap-2">
<div className="flex justify-between">
- <Popover_Shadcn_ modal={false} open={showLanguage} onOpenChange={onShowLanguageChange}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false} open={showLanguage} onOpenChange={onShowLanguageChange}>
+ <PopoverTrigger asChild>
<div className="flex cursor-pointer">
<span className="flex items-center text-foreground-lighter px-3 rounded-lg rounded-r-none text-xs border border-button border-r-0">
Language
@@ -226,8 +226,8 @@ const result = await index.putVectors({
{language === 'javascript' ? 'JavaScript' : 'SQL'}
</Button>
</div>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-32" side="bottom" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-32" side="bottom" align="end">
<Command_Shadcn_>
<CommandList_Shadcn_>
<CommandGroup_Shadcn_>
@@ -248,8 +248,8 @@ const result = await index.putVectors({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<DocsButton
href={`${DOCS_URL}/guides/storage/vector/storing-vectors?queryGroups=language&language=${language}#basic-vector-insertion`}
diff --git a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
index b25642dc292..ec2f3368266 100644
--- a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
@@ -14,9 +14,9 @@ import {
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Tooltip,
TooltipContent,
TooltipTrigger,
@@ -265,13 +265,13 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
)}
</>
) : tableHasLints ? (
- <Popover_Shadcn_ modal={false} open={showWarning} onOpenChange={setShowWarning}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false} open={showWarning} onOpenChange={setShowWarning}>
+ <PopoverTrigger asChild>
<Button type="danger" icon={<Lock strokeWidth={1.5} />}>
RLS disabled
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-80 text-sm" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="w-80 text-sm" align="end">
<h4 className="flex items-center gap-2">
<Lock size={16} /> Row Level Security (RLS)
</h4>
@@ -294,8 +294,8 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
</Button>
)}
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
) : null
) : null}
@@ -313,13 +313,13 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
)}
{isForeignTable && table.schema === 'public' && (
- <Popover_Shadcn_ modal={false} open={showWarning} onOpenChange={setShowWarning}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false} open={showWarning} onOpenChange={setShowWarning}>
+ <PopoverTrigger asChild>
<Button type="warning" icon={<Unlock strokeWidth={1.5} />}>
Unprotected Data API access
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="min-w-[395px] text-sm" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="min-w-[395px] text-sm" align="end">
<h3 className="flex items-center gap-2">
<Unlock size={16} /> Secure Foreign table
</h3>
@@ -341,8 +341,8 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
</Button>
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
<RoleImpersonationPopover header="View data as a role" align="center" />
diff --git a/apps/studio/components/interfaces/TableGridEditor/IndexAdvisorPopover.tsx b/apps/studio/components/interfaces/TableGridEditor/IndexAdvisorPopover.tsx
index 0f96f06c698..e96a5cb6d11 100644
--- a/apps/studio/components/interfaces/TableGridEditor/IndexAdvisorPopover.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/IndexAdvisorPopover.tsx
@@ -1,17 +1,17 @@
import { Lightbulb } from 'lucide-react'
-import { Button, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'
+import { Button, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { EnableIndexAdvisorButton } from '../QueryPerformance/IndexAdvisor/EnableIndexAdvisorButton'
export const IndexAdvisorPopover = () => {
return (
- <Popover_Shadcn_ modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false}>
+ <PopoverTrigger asChild>
<Button type="default" icon={<Lightbulb strokeWidth={1.5} />}>
Index Advisor
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-80 text-sm" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="w-80 text-sm" align="end">
<h4 className="flex items-center gap-2">
<Lightbulb size={16} /> Index Advisor
</h4>
@@ -22,7 +22,7 @@ export const IndexAdvisorPopover = () => {
<EnableIndexAdvisorButton />
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/TableGridEditor/SecurityDefinerViewPopover.tsx b/apps/studio/components/interfaces/TableGridEditor/SecurityDefinerViewPopover.tsx
index d512c231dce..a5f911f8bb5 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SecurityDefinerViewPopover.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SecurityDefinerViewPopover.tsx
@@ -1,7 +1,7 @@
import { useParams } from 'common'
import { Unlock } from 'lucide-react'
import Link from 'next/link'
-import { Button, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'
+import { Button, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { type Lint } from '@/data/lint/lint-query'
@@ -15,13 +15,13 @@ export const SecurityDefinerViewPopover = ({
const { ref } = useParams()
return (
- <Popover_Shadcn_ modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false}>
+ <PopoverTrigger asChild>
<Button type="warning" icon={<Unlock strokeWidth={1.5} />}>
Security Definer view
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="min-w-[395px] text-sm" align="end">
+ </PopoverTrigger>
+ <PopoverContent className="min-w-[395px] text-sm" align="end">
<h4 className="flex items-center gap-2">
<Unlock size={14} /> Secure your view
</h4>
@@ -50,7 +50,7 @@ export const SecurityDefinerViewPopover = ({
</Button>
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx
index e0cec443f61..3f6007587cc 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx
@@ -30,9 +30,9 @@ import {
InputGroupAddon,
InputGroupInput,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Tooltip,
TooltipContent,
@@ -186,8 +186,8 @@ const ColumnType = ({
return (
<div className={cn('flex flex-col gap-y-2', className)}>
{showLabel && <Label_Shadcn_ className="text-foreground-light">Type</Label_Shadcn_>}
- <Popover_Shadcn_ modal open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type={error ? 'danger' : 'default'}
role="combobox"
@@ -207,13 +207,8 @@ const ColumnType = ({
'Choose a column type...'
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
- id={listboxId}
- className="w-[460px] p-0"
- side="bottom"
- align="center"
- >
+ </PopoverTrigger>
+ <PopoverContent id={listboxId} className="w-[460px] p-0" side="bottom" align="center">
<Command_Shadcn_>
<CommandInput_Shadcn_
placeholder="Search types..."
@@ -301,8 +296,8 @@ const ColumnType = ({
</ScrollArea>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
{showRecommendation && recommendation !== undefined && (
<Alert variant="warning" className="mt-2">
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx
index 1f4b16ccd3f..9bb7473f3b3 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx
@@ -13,9 +13,9 @@ import {
CommandList_Shadcn_,
CommandSeparator_Shadcn_,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -153,13 +153,13 @@ export const Column = ({
<Link size={12} />
</Button>
) : (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button type="default" className="rounded-l-none h-[30px] py-0 px-2">
<Link size={12} />
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
className={cn('p-0', hasChangesInRelations ? 'w-96' : 'w-72')}
side="bottom"
align="center"
@@ -233,8 +233,8 @@ export const Column = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</div>
</div>
@@ -298,8 +298,8 @@ export const Column = ({
<div className={`${hasImportContent ? 'w-[10%]' : 'w-[0%]'}`} />
<div className="flex w-[5%] justify-end">
{(!column.isPrimaryKey || column.format.includes('int')) && (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_
+ <Popover>
+ <PopoverTrigger
data-testid={`${column.name}-extra-options`}
className="group flex items-center -space-x-1"
>
@@ -311,8 +311,8 @@ export const Column = ({
<div className="text-foreground-light transition-colors group-hover:text-foreground">
<Settings size={16} strokeWidth={1} />
</div>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ align="end" className="w-80 p-0">
+ </PopoverTrigger>
+ <PopoverContent align="end" className="w-80 p-0">
<div className="flex items-center justify-center bg-surface-200 gap-y-1 py-1.5 px-3 border-b border-overlay">
<h5 className="text-foreground">Extra options</h5>
</div>
@@ -387,8 +387,8 @@ export const Column = ({
</FormItemLayout>
)}
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</div>
{!hasImportContent && (
diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/TruncatedTextWithPopover.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/TruncatedTextWithPopover.tsx
index 0b93858b239..809f06a994e 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/TruncatedTextWithPopover.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/TruncatedTextWithPopover.tsx
@@ -1,5 +1,5 @@
import { useState } from 'react'
-import { Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'
+import { Popover, PopoverContent, PopoverTrigger } from 'ui'
interface TruncatedTextWithPopoverProps {
text: string
@@ -25,13 +25,13 @@ export const TruncatedTextWithPopover = ({
// If truncated, render with popover
return (
- <Popover_Shadcn_ open={isOpen} onOpenChange={setIsOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={isOpen} onOpenChange={setIsOpen}>
+ <PopoverTrigger asChild>
<span className={`cursor-help ${className}`}>{children || truncatedText}</span>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="max-w-md p-3 wrap-break-word" side="top">
+ </PopoverTrigger>
+ <PopoverContent className="max-w-md p-3 wrap-break-word" side="top">
<div className="text-sm font-mono whitespace-pre-wrap">{text}</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/layouts/AppLayout/AppLayoutDropdown.tsx b/apps/studio/components/layouts/AppLayout/AppLayoutDropdown.tsx
index c1c2a68ac47..a82f21b72d6 100644
--- a/apps/studio/components/layouts/AppLayout/AppLayoutDropdown.tsx
+++ b/apps/studio/components/layouts/AppLayout/AppLayoutDropdown.tsx
@@ -1,7 +1,7 @@
import { AlertCircle, ChevronsUpDown } from 'lucide-react'
import Link from 'next/link'
import { forwardRef, type ReactNode } from 'react'
-import { Button, cn, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'
+import { Button, cn, Popover, PopoverContent, PopoverTrigger } from 'ui'
interface AppLayoutDropdownErrorProps {
message: string
@@ -55,18 +55,18 @@ export function AppLayoutDropdownWithPopover({
triggerButtonClassName,
}: AppLayoutDropdownWithPopoverProps) {
return (
- <Popover_Shadcn_ open={open} onOpenChange={onOpenChange} modal={false}>
+ <Popover open={open} onOpenChange={onOpenChange} modal={false}>
<div className="flex items-center shrink-0">
<Link href={linkHref} className={linkClassName}>
{linkContent}
</Link>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<AppLayoutDropdownTriggerButton className={triggerButtonClassName} />
- </PopoverTrigger_Shadcn_>
+ </PopoverTrigger>
</div>
- <PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">
+ <PopoverContent className="p-0" side="bottom" align="start">
{commandContent}
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
index 180f2d46fb6..823aa5f44dc 100644
--- a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
+++ b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
@@ -19,9 +19,9 @@ import {
HoverCardTrigger,
NavMenu,
NavMenuItem,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Separator,
} from 'ui'
import { TimestampInfo } from 'ui-patterns'
@@ -330,13 +330,13 @@ const EdgeFunctionDetailsLayout = ({
<PageHeaderAside>
<div className="flex items-center space-x-2">
<DocsButton href={`${DOCS_URL}/guides/functions`} />
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button type="default" icon={<Download />}>
Download
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ align="end" className="p-0">
+ </PopoverTrigger>
+ <PopoverContent align="end" className="p-0">
{IS_PLATFORM && (
<>
<div className="p-3 flex flex-col gap-y-2">
@@ -363,8 +363,8 @@ const EdgeFunctionDetailsLayout = ({
Download as ZIP
</Button>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
{!!functionSlug && (
<Button
type="default"
diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx
index d4c8a50ba0b..7ab9411ca3f 100644
--- a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx
+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx
@@ -2,13 +2,7 @@ import { IS_PLATFORM } from 'common'
import { Lightbulb, TriangleAlert } from 'lucide-react'
import { useRouter } from 'next/router'
import { useState } from 'react'
-import {
- Button,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverSeparator_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, Popover, PopoverContent, PopoverSeparator, PopoverTrigger } from 'ui'
import { FeedbackWidget } from './FeedbackWidget'
import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
@@ -39,7 +33,7 @@ export const FeedbackDropdown = ({ className }: { className?: string }) => {
)
return (
- <Popover_Shadcn_
+ <Popover
modal={false}
open={isOpen}
onOpenChange={(e) => {
@@ -48,7 +42,7 @@ export const FeedbackDropdown = ({ className }: { className?: string }) => {
if (!e) setStage('select')
}}
>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
asChild
onClick={() => {
@@ -60,8 +54,8 @@ export const FeedbackDropdown = ({ className }: { className?: string }) => {
>
<span className={className}>Feedback</span>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
side="bottom"
align="end"
className="p-0 flex flex-col w-96"
@@ -108,7 +102,7 @@ export const FeedbackDropdown = ({ className }: { className?: string }) => {
onSupportClick={() => setIsOpen(false)}
/>
</div>
- <PopoverSeparator_Shadcn_ />
+ <PopoverSeparator />
<div className="px-4 pt-4 pb-4">
<Button type="default" size="tiny" onClick={() => setStage('widget')}>
Leave feedback instead
@@ -122,7 +116,7 @@ export const FeedbackDropdown = ({ className }: { className?: string }) => {
onSwitchToIssueOptions={() => setStage('issue-options')}
/>
)}
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx
index 7756dda8d86..dc081564b68 100644
--- a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx
+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx
@@ -14,7 +14,7 @@ import {
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
- PopoverSeparator_Shadcn_,
+ PopoverSeparator,
TextArea,
} from 'ui'
import { Admonition } from 'ui-patterns'
@@ -180,7 +180,7 @@ export const FeedbackWidget = ({ onClose, onSwitchToIssueOptions }: FeedbackWidg
</p>
</div>
</div>
- <PopoverSeparator_Shadcn_ />
+ <PopoverSeparator />
<div className="px-4 pt-4 pb-4 flex flex-row items-center justify-between">
<Button type="default" size="tiny" onClick={onSwitchToIssueOptions}>
Get help
@@ -236,7 +236,7 @@ export const FeedbackWidget = ({ onClose, onSwitchToIssueOptions }: FeedbackWidg
)}
</AnimatePresence>
- <PopoverSeparator_Shadcn_ />
+ <PopoverSeparator />
<div className="px-4 pt-4 pb-4 flex flex-row items-center justify-between">
<Button type="default" size="tiny" onClick={onSwitchToIssueOptions}>
diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx
index ed4d13185d8..28d7343bdb2 100644
--- a/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx
+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx
@@ -8,10 +8,10 @@ import {
DialogSection,
DialogTitle,
DialogTrigger,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverSeparator_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverSeparator,
+ PopoverTrigger,
Tabs_Shadcn_,
TabsContent_Shadcn_,
TabsList_Shadcn_,
@@ -50,17 +50,17 @@ export const LocalVersionPopover = () => {
if (!isSuccess || !currentCliVersion) return null
return (
- <Popover_Shadcn_
+ <Popover
onOpenChange={(open) => {
if (open) track('header_local_version_popover_opened')
}}
>
- <PopoverTrigger_Shadcn_ className="flex items-center">
+ <PopoverTrigger className="flex items-center">
<Badge variant={isBeta ? 'warning' : hasUpdate ? 'success' : 'default'}>
{isBeta ? 'Beta' : hasUpdate ? 'Update available' : 'Latest'}
</Badge>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ align="end" className="w-80 px-0">
+ </PopoverTrigger>
+ <PopoverContent align="end" className="w-80 px-0">
{hasLatestCLIVersion ? (
!isBeta && hasUpdate ? (
<div className="px-4 mb-3">
@@ -182,7 +182,7 @@ export const LocalVersionPopover = () => {
</a>
</Button>
</div>
- <PopoverSeparator_Shadcn_ className="my-4" />
+ <PopoverSeparator className="my-4" />
<div className="flex items-center gap-x-4 px-4">
<div className="flex flex-col gap-y-1">
<p className="text-xs">Current version:</p>
@@ -195,7 +195,7 @@ export const LocalVersionPopover = () => {
</div>
)}
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
index d36060ef005..d6a9f12c618 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
@@ -11,9 +11,9 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
CommandSeparator_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
SidebarMenu,
SidebarMenuButton,
@@ -104,9 +104,9 @@ export function OrgSelector() {
return (
<SidebarMenu>
<SidebarMenuItem>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>{triggerButton}</PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>{triggerButton}</PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Find organization..." />
<CommandList_Shadcn_>
@@ -164,8 +164,8 @@ export function OrgSelector() {
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</SidebarMenuItem>
</SidebarMenu>
)
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx
index 5cdb3e75d26..e5b106f8b2a 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx
@@ -2,9 +2,9 @@ import { useBreakpoint, useParams } from 'common'
import { useRouter } from 'next/router'
import { useState } from 'react'
import {
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
SidebarMenu,
SidebarMenuButton,
SidebarMenuItem,
@@ -103,14 +103,14 @@ export function ProjectBranchSelector() {
return (
<SidebarMenu>
<SidebarMenuItem>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<ProjectBranchSelectorTrigger {...triggerProps} />
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-[780px]" side="bottom" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-[780px]" side="bottom" align="start">
<ProjectBranchSelectorPopover onClose={() => setOpen(false)} />
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</SidebarMenuItem>
</SidebarMenu>
)
diff --git a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
index 0505eb54d19..3fecc4f5488 100644
--- a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
+++ b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
@@ -3,14 +3,7 @@ import { keepPreviousData } from '@tanstack/react-query'
import { useParams } from 'common'
import { Filter, Plus } from 'lucide-react'
import { useCallback, useEffect, useMemo, useState } from 'react'
-import {
- Button,
- Checkbox,
- Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
-} from 'ui'
+import { Button, Checkbox, Label_Shadcn_, Popover, PopoverContent, PopoverTrigger } from 'ui'
import {
InnerSideBarEmptyPanel,
InnerSideBarFilters,
@@ -224,15 +217,15 @@ export const TableEditorMenu = () => {
</InnerSideBarFilterSortDropdownItem>
</InnerSideBarFilterSortDropdown>
</InnerSideBarFilterSearchInput>
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<Button
type={visibleTypes.length !== 5 ? 'default' : 'dashed'}
className="h-[32px] md:h-[28px] px-1.5"
icon={<Filter />}
/>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-56" side="bottom" align="center">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-56" side="bottom" align="center">
<div className="px-3 pt-3 pb-2 flex flex-col gap-y-2">
<p className="text-xs">Show entity types</p>
<div className="flex flex-col">
@@ -267,8 +260,8 @@ export const TableEditorMenu = () => {
))}
</div>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</InnerSideBarFilters>
{isLoading && <EditorMenuListSkeleton />}
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsx
index b460fff5326..07d5faca509 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsx
@@ -11,9 +11,9 @@ import {
CommandList_Shadcn_,
CommandSeparator_Shadcn_,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -85,8 +85,8 @@ export const AIAssistantChatSelector = ({ disabled = false }: AIAssistantChatSel
}
return (
- <Popover_Shadcn_ open={chatSelectorOpen} onOpenChange={setChatSelectorOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={chatSelectorOpen} onOpenChange={setChatSelectorOpen}>
+ <PopoverTrigger asChild>
<Button
type="text"
size="tiny"
@@ -95,8 +95,8 @@ export const AIAssistantChatSelector = ({ disabled = false }: AIAssistantChatSel
>
{currentChat}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[250px] p-0" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-[250px] p-0" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_ className="text-xs" placeholder="Search chats..." />
<CommandList_Shadcn_>
@@ -211,7 +211,7 @@ export const AIAssistantChatSelector = ({ disabled = false }: AIAssistantChatSel
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx
index 184935fdb5c..e65e5f58381 100644
--- a/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx
@@ -8,9 +8,9 @@ import {
Form,
FormControl,
FormField,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
TextArea,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -151,8 +151,8 @@ function MessageActionsThumbsDown({
}, [form.formState.isSubmitSuccessful])
return (
- <Popover_Shadcn_ open={open} onOpenChange={handleOpenChange}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={handleOpenChange}>
+ <PopoverTrigger asChild>
<Button
type="text"
disabled={disabled}
@@ -174,8 +174,8 @@ function MessageActionsThumbsDown({
)}
/>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-80" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="w-80" align="start">
{form.formState.isSubmitSuccessful ? (
<p className="text-sm">We appreciate your feedback!</p>
) : (
@@ -206,8 +206,8 @@ function MessageActionsThumbsDown({
</form>
</Form>
)}
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
MessageActions.ThumbsDown = MessageActionsThumbsDown
diff --git a/apps/studio/components/ui/AIAssistantPanel/ModelSelector.tsx b/apps/studio/components/ui/AIAssistantPanel/ModelSelector.tsx
index 819745a92dc..f9c4740b9a0 100644
--- a/apps/studio/components/ui/AIAssistantPanel/ModelSelector.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/ModelSelector.tsx
@@ -8,9 +8,9 @@ import {
CommandGroup_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Tooltip,
TooltipContent,
TooltipTrigger,
@@ -53,8 +53,8 @@ export const ModelSelector = ({ selectedModel, onSelectModel }: ModelSelectorPro
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
className="text-foreground-light"
@@ -62,8 +62,8 @@ export const ModelSelector = ({ selectedModel, onSelectModel }: ModelSelectorPro
>
{selectedModel}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-44" align="start" side="top">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-44" align="start" side="top">
<Command_Shadcn_>
<CommandList_Shadcn_>
<CommandGroup_Shadcn_>
@@ -99,7 +99,7 @@ export const ModelSelector = ({ selectedModel, onSelectModel }: ModelSelectorPro
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx b/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx
index 4cba9a12f44..c83218cfde5 100644
--- a/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx
@@ -8,9 +8,9 @@ import {
CommandInput_Shadcn_ as CommandInput,
CommandItem_Shadcn_ as CommandItem,
CommandList_Shadcn_ as CommandList,
- Popover_Shadcn_ as Popover,
- PopoverContent_Shadcn_ as PopoverContent,
- PopoverTrigger_Shadcn_ as PopoverTrigger,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { ButtonTooltip } from '../ButtonTooltip'
diff --git a/apps/studio/components/ui/DatabaseSelector.tsx b/apps/studio/components/ui/DatabaseSelector.tsx
index c02aa78e69a..59796bb70e7 100644
--- a/apps/studio/components/ui/DatabaseSelector.tsx
+++ b/apps/studio/components/ui/DatabaseSelector.tsx
@@ -13,9 +13,9 @@ import {
CommandGroup_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Tooltip,
TooltipContent,
@@ -81,8 +81,8 @@ export const DatabaseSelector = ({
}, [_selectedDatabaseId])
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<div className={cn('flex cursor-pointer', className)}>
{!isForm && (
<span className="flex items-center text-foreground-lighter px-3 rounded-lg rounded-r-none text-xs border border-button border-r-0">
@@ -121,8 +121,8 @@ export const DatabaseSelector = ({
)}
</Button>
</div>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-64" side="bottom" align={align}>
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-64" side="bottom" align={align}>
<Command_Shadcn_>
<CommandList_Shadcn_>
{additionalOptions.length > 0 && (
@@ -240,7 +240,7 @@ export const DatabaseSelector = ({
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/ui/DatePicker/index.tsx b/apps/studio/components/ui/DatePicker/index.tsx
index 3295fcca0b7..f67e55de27a 100644
--- a/apps/studio/components/ui/DatePicker/index.tsx
+++ b/apps/studio/components/ui/DatePicker/index.tsx
@@ -6,9 +6,9 @@ import {
Button,
Calendar as CalendarPicker,
Popover,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ PopoverContent,
+ PopoverSeparator,
+ PopoverTrigger,
} from 'ui'
import { ButtonProps } from 'ui/src/components/Button/Button'
@@ -210,8 +210,8 @@ export function DatePicker({
}
return (
- <Popover_Shadcn_ modal open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
title={triggerButtonTitle}
type={triggerButtonType}
@@ -240,8 +240,8 @@ export function DatePicker({
</>
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ align="center" side={contentSide} className="p-0">
+ </PopoverTrigger>
+ <PopoverContent align="center" side={contentSide} className="p-0">
<>
{hideTime ? null : (
<>
@@ -307,7 +307,7 @@ export function DatePicker({
from: startDate?.toISOString() || null,
to: endDate?.toISOString() || null,
})}
- <Popover.Separator />
+ <PopoverSeparator />
<div className="flex items-center justify-end gap-2 py-2 px-3 pb-4">
{!hideClear && (
<Button type="default" onClick={() => handleClear()}>
@@ -317,7 +317,7 @@ export function DatePicker({
<Button onClick={() => handleSubmit()}>Apply</Button>
</div>
</>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/ui/EditorPanel/EditorPanel.tsx b/apps/studio/components/ui/EditorPanel/EditorPanel.tsx
index 416fad3c0e9..a249bf05528 100644
--- a/apps/studio/components/ui/EditorPanel/EditorPanel.tsx
+++ b/apps/studio/components/ui/EditorPanel/EditorPanel.tsx
@@ -29,9 +29,9 @@ import {
HoverCardContent_Shadcn_,
HoverCardTrigger_Shadcn_,
KeyboardShortcut,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
SQL_ICON,
} from 'ui'
import { Admonition } from 'ui-patterns/admonition'
@@ -310,8 +310,8 @@ export const EditorPanel = () => {
onClick={() => editorPanelState.openAsNew()}
/>
)}
- <Popover_Shadcn_ open={isSnippetsOpen} onOpenChange={setIsSnippetsOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={isSnippetsOpen} onOpenChange={setIsSnippetsOpen}>
+ <PopoverTrigger asChild>
<ButtonTooltip
size="tiny"
type="text"
@@ -326,8 +326,8 @@ export const EditorPanel = () => {
},
}}
></ButtonTooltip>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ align="end" className="w-[300px] p-0">
+ </PopoverTrigger>
+ <PopoverContent align="end" className="w-[300px] p-0">
<Command_Shadcn_ shouldFilter={false}>
<CommandInput_Shadcn_
placeholder="Search snippets..."
@@ -360,11 +360,11 @@ export const EditorPanel = () => {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
{templates.length > 0 && (
- <Popover_Shadcn_ open={isTemplatesOpen} onOpenChange={setIsTemplatesOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={isTemplatesOpen} onOpenChange={setIsTemplatesOpen}>
+ <PopoverTrigger asChild>
<Button
size="tiny"
type="default"
@@ -375,8 +375,8 @@ export const EditorPanel = () => {
>
Templates
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ align="end" className="w-[300px] p-0">
+ </PopoverTrigger>
+ <PopoverContent align="end" className="w-[300px] p-0">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search templates..." />
<CommandList_Shadcn_>
@@ -419,8 +419,8 @@ export const EditorPanel = () => {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
<ButtonTooltip
type="text"
diff --git a/apps/studio/components/ui/FilterPopover.tsx b/apps/studio/components/ui/FilterPopover.tsx
index 80244acb7be..51f69db5b79 100644
--- a/apps/studio/components/ui/FilterPopover.tsx
+++ b/apps/studio/components/ui/FilterPopover.tsx
@@ -7,9 +7,9 @@ import {
Checkbox,
cn,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
import { Input } from 'ui-patterns/DataInputs/Input'
@@ -177,8 +177,8 @@ export const FilterPopover = <T extends Record<string, any>>({
])
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
asChild
disabled={disabled}
@@ -205,8 +205,8 @@ export const FilterPopover = <T extends Record<string, any>>({
)}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
className={cn('p-0', search !== undefined ? 'w-64' : 'w-44', className)}
align="start"
>
@@ -295,7 +295,7 @@ export const FilterPopover = <T extends Record<string, any>>({
Save
</Button>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/ui/FunctionSelector.tsx b/apps/studio/components/ui/FunctionSelector.tsx
index 53c9eee9714..bb99e250b85 100644
--- a/apps/studio/components/ui/FunctionSelector.tsx
+++ b/apps/studio/components/ui/FunctionSelector.tsx
@@ -16,9 +16,9 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
CommandSeparator_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -99,8 +99,8 @@ const FunctionSelector = ({
)}
{isSuccess && (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
size={size}
disabled={!!disabled}
@@ -121,8 +121,8 @@ const FunctionSelector = ({
</div>
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0" side="bottom" align="start" sameWidthAsTrigger>
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="start" sameWidthAsTrigger>
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search functions..." />
<CommandList_Shadcn_
@@ -186,8 +186,8 @@ const FunctionSelector = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</div>
)
diff --git a/apps/studio/components/ui/OrganizationProjectSelector.tsx b/apps/studio/components/ui/OrganizationProjectSelector.tsx
index cadf884ad58..62e5fc72fa0 100644
--- a/apps/studio/components/ui/OrganizationProjectSelector.tsx
+++ b/apps/studio/components/ui/OrganizationProjectSelector.tsx
@@ -9,9 +9,9 @@ import {
CommandGroup_Shadcn_,
CommandInput_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Tooltip,
TooltipContent,
@@ -260,8 +260,8 @@ export const OrganizationProjectSelector = ({
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={modal}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={modal}>
+ <PopoverTrigger asChild>
{renderTrigger ? (
renderTrigger({
isLoading: isLoadingProjects || isFetching,
@@ -287,8 +287,8 @@ export const OrganizationProjectSelector = ({
)}
</Button>
)}
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
id={listboxId}
sameWidthAsTrigger={sameWidthAsTrigger}
className="p-0"
@@ -296,7 +296,7 @@ export const OrganizationProjectSelector = ({
align="start"
>
{commandContent}
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/ui/QueryBlock/BlockViewConfiguration.tsx b/apps/studio/components/ui/QueryBlock/BlockViewConfiguration.tsx
index 2da070cd55e..1b28d4aeef8 100644
--- a/apps/studio/components/ui/QueryBlock/BlockViewConfiguration.tsx
+++ b/apps/studio/components/ui/QueryBlock/BlockViewConfiguration.tsx
@@ -2,9 +2,9 @@ import { BarChart2, Settings2, Table } from 'lucide-react'
import {
Checkbox,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Select_Shadcn_,
SelectContent_Shadcn_,
SelectGroup_Shadcn_,
@@ -37,8 +37,8 @@ export const BlockViewConfiguration = ({
updateChartConfig,
}: BlockViewConfigurationProps) => {
return (
- <Popover_Shadcn_ modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover modal={false}>
+ <PopoverTrigger asChild>
<ButtonTooltip
id="help-popover-button"
type="text"
@@ -46,8 +46,8 @@ export const BlockViewConfiguration = ({
icon={<Settings2 size={14} strokeWidth={1.5} />}
tooltip={{ content: { side: 'bottom', text: 'View data' } }}
/>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ side="bottom" align="center" className="w-[240px] p-3">
+ </PopoverTrigger>
+ <PopoverContent side="bottom" align="center" className="w-[240px] p-3">
<form className="grid gap-2">
<ToggleGroup
type="single"
@@ -138,7 +138,7 @@ export const BlockViewConfiguration = ({
</>
)}
</form>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/studio/components/ui/SchemaComboBox.tsx b/apps/studio/components/ui/SchemaComboBox.tsx
index dbc6b79e51f..673f41754ac 100644
--- a/apps/studio/components/ui/SchemaComboBox.tsx
+++ b/apps/studio/components/ui/SchemaComboBox.tsx
@@ -11,9 +11,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
} from 'ui'
@@ -91,8 +91,8 @@ export const SchemaComboBox = ({
)}
{isSchemasSuccess && (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
size={size}
disabled={disabled}
@@ -106,8 +106,8 @@ export const SchemaComboBox = ({
<p className="text-foreground">{label}</p>
</div>
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="p-0 w-56" side="bottom" align="start">
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-56" side="bottom" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Find schema..." />
<CommandList_Shadcn_>
@@ -131,8 +131,8 @@ export const SchemaComboBox = ({
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</div>
)
diff --git a/apps/studio/components/ui/SchemaSelector.tsx b/apps/studio/components/ui/SchemaSelector.tsx
index a248575bae5..8426adf79e1 100644
--- a/apps/studio/components/ui/SchemaSelector.tsx
+++ b/apps/studio/components/ui/SchemaSelector.tsx
@@ -13,9 +13,9 @@ import {
CommandItem_Shadcn_,
CommandList_Shadcn_,
CommandSeparator_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
ScrollArea,
Skeleton,
} from 'ui'
@@ -117,8 +117,8 @@ export const SchemaSelector = forwardRef<HTMLDivElement, SchemaSelectorProps>(
)}
{isSchemasSuccess && (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
+ <PopoverTrigger asChild>
<Button
size={size}
disabled={disabled}
@@ -142,8 +142,8 @@ export const SchemaSelector = forwardRef<HTMLDivElement, SchemaSelectorProps>(
</div>
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverTrigger>
+ <PopoverContent
className="p-0 min-w-[200px] pointer-events-auto"
side="bottom"
align={align}
@@ -220,8 +220,8 @@ export const SchemaSelector = forwardRef<HTMLDivElement, SchemaSelectorProps>(
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</div>
)
diff --git a/apps/studio/pages/project/[ref]/functions/new.tsx b/apps/studio/pages/project/[ref]/functions/new.tsx
index 5827e0515a7..1e06b605f29 100644
--- a/apps/studio/pages/project/[ref]/functions/new.tsx
+++ b/apps/studio/pages/project/[ref]/functions/new.tsx
@@ -22,9 +22,9 @@ import {
FormItem,
Input,
Label_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Tooltip,
TooltipContent,
TooltipTrigger,
@@ -299,8 +299,8 @@ const NewFunctionPage = () => {
]}
primaryActions={
<>
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
size="tiny"
type="default"
@@ -311,8 +311,8 @@ const NewFunctionPage = () => {
>
Templates
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ id={templatesListboxId} className="w-[300px] p-0" align="end">
+ </PopoverTrigger>
+ <PopoverContent id={templatesListboxId} className="w-[300px] p-0" align="end">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search templates..." />
<CommandList_Shadcn_>
@@ -348,8 +348,8 @@ const NewFunctionPage = () => {
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<Button
size="tiny"
type="default"
diff --git a/apps/studio/pages/project/[ref]/logs/explorer/templates.tsx b/apps/studio/pages/project/[ref]/logs/explorer/templates.tsx
index 89d121dcbf7..54f214961e6 100644
--- a/apps/studio/pages/project/[ref]/logs/explorer/templates.tsx
+++ b/apps/studio/pages/project/[ref]/logs/explorer/templates.tsx
@@ -1,7 +1,7 @@
import { useParams } from 'common'
import { CodeIcon } from 'lucide-react'
import { useState } from 'react'
-import { Button, cn, Popover } from 'ui'
+import { Button, cn, Popover, PopoverContent, PopoverTrigger } from 'ui'
import { TEMPLATES } from '@/components/interfaces/Settings/Logs/Logs.constants'
import type { LogTemplate } from '@/components/interfaces/Settings/Logs/Logs.types'
@@ -75,27 +75,24 @@ const Template = ({ projectRef, template }: { projectRef?: string; template: Log
description={template.description}
footer={
<div className="flex flex-row justify-end">
- <Popover
- onOpenChange={setShowPreview}
- open={showPreview}
- className="rounded-lg bg-alternative"
- size="content"
- overlay={
+ <Popover onOpenChange={setShowPreview} open={showPreview}>
+ <PopoverTrigger asChild>
+ <Button
+ asChild
+ type="default"
+ onClick={(e) => {
+ e.preventDefault()
+ setShowPreview(!showPreview)
+ }}
+ >
+ <span>Preview</span>
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="rounded-lg bg-alternative p-0">
<pre className="whitespace-pre-line wrap-break-word rounded-lg bg-alternative p-4 text-sm">
{template.searchString}
</pre>
- }
- >
- <Button
- asChild
- type="default"
- onClick={(e) => {
- e.preventDefault()
- setShowPreview(!showPreview)
- }}
- >
- <span>Preview</span>
- </Button>
+ </PopoverContent>
</Popover>
</div>
}
diff --git a/apps/ui-library/components/tanstack-db-generator/ComboBox.tsx b/apps/ui-library/components/tanstack-db-generator/ComboBox.tsx
index b8e3d32a9a2..208ab15dc9c 100644
--- a/apps/ui-library/components/tanstack-db-generator/ComboBox.tsx
+++ b/apps/ui-library/components/tanstack-db-generator/ComboBox.tsx
@@ -11,9 +11,9 @@ import {
CommandInput_Shadcn_ as CommandInput,
CommandItem_Shadcn_ as CommandItem,
CommandList_Shadcn_ as CommandList,
- Popover_Shadcn_ as Popover,
- PopoverContent_Shadcn_ as PopoverContent,
- PopoverTrigger_Shadcn_ as PopoverTrigger,
+ Popover as Popover,
+ PopoverContent as PopoverContent,
+ PopoverTrigger as PopoverTrigger,
ScrollArea,
} from 'ui'
import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
diff --git a/apps/www/components/Contribute/FilterPopover.tsx b/apps/www/components/Contribute/FilterPopover.tsx
index 557b9deb3f8..2fa3baa7efe 100644
--- a/apps/www/components/Contribute/FilterPopover.tsx
+++ b/apps/www/components/Contribute/FilterPopover.tsx
@@ -3,14 +3,7 @@
import { X } from 'lucide-react'
import { parseAsArrayOf, parseAsString, useQueryState } from 'nuqs'
import { useState } from 'react'
-import {
- Button,
- cn,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
- ScrollArea,
-} from 'ui'
+import { Button, cn, Popover, PopoverContent, PopoverTrigger, ScrollArea } from 'ui'
interface FilterPopoverProps {
allProductAreas: string[]
@@ -57,9 +50,9 @@ export function FilterPopover({ allProductAreas, allStacks, trigger }: FilterPop
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>{trigger}</PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>{trigger}</PopoverTrigger>
+ <PopoverContent
className="w-[calc(100vw-2rem)] sm:w-[500px] md:w-[600px] p-0"
align="end"
sideOffset={8}
@@ -141,7 +134,7 @@ export function FilterPopover({ allProductAreas, allStacks, trigger }: FilterPop
</div>
</ScrollArea>
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/apps/www/components/Contribute/UnansweredThreadsTable.tsx b/apps/www/components/Contribute/UnansweredThreadsTable.tsx
index 0e3f69a80b4..a4c91c5ccd4 100644
--- a/apps/www/components/Contribute/UnansweredThreadsTable.tsx
+++ b/apps/www/components/Contribute/UnansweredThreadsTable.tsx
@@ -1,5 +1,6 @@
'use client'
+import type { ThreadRow } from '~/types/contribute'
import { Filter, MessageSquareReply, Search, X } from 'lucide-react'
import Link from 'next/link'
import { parseAsString, useQueryState } from 'nuqs'
@@ -11,9 +12,9 @@ import {
Card,
cn,
Input,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Table,
TableBody,
TableCaption,
@@ -23,7 +24,6 @@ import {
TableRow,
} from 'ui'
-import type { ThreadRow } from '~/types/contribute'
import { FilterPopover } from './FilterPopover'
import { ChannelIcon, DiscordIcon, GitHubIcon, RedditIcon } from './Icons'
@@ -507,8 +507,8 @@ function ThreadRow({
)
})}
{filteredStack.length > 5 && (
- <Popover_Shadcn_>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover>
+ <PopoverTrigger asChild>
<button
type="button"
onClick={(e) => {
@@ -534,8 +534,8 @@ function ThreadRow({
+ {filteredStack.length - 5}
</Badge>
</button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="max-w-[300px] p-3">
+ </PopoverTrigger>
+ <PopoverContent className="max-w-[300px] p-3">
<div className="flex flex-wrap gap-2">
{overflowStacks.map((tech: string) => {
const isActive = currentStack === tech
@@ -559,8 +559,8 @@ function ThreadRow({
)
})}
</div>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)}
</>
)
diff --git a/apps/www/components/Pricing/UpgradePlan.tsx b/apps/www/components/Pricing/UpgradePlan.tsx
index 56dfb70a48e..d0371567367 100644
--- a/apps/www/components/Pricing/UpgradePlan.tsx
+++ b/apps/www/components/Pricing/UpgradePlan.tsx
@@ -25,9 +25,9 @@ import {
DialogSection,
DialogTitle,
DialogTrigger,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import { Organization } from '~/data/organizations'
@@ -58,8 +58,8 @@ const UpgradePlan = ({ organizations = [], onClick, size = 'large', planId }: Up
</DialogHeader>
<DialogSection className="py-2">
- <Popover_Shadcn_ open={open} onOpenChange={setOpen}>
- <PopoverTrigger_Shadcn_ asChild>
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
<Button
type="default"
role="combobox"
@@ -79,8 +79,8 @@ const UpgradePlan = ({ organizations = [], onClick, size = 'large', planId }: Up
'Select an organization...'
)}
</Button>
- </PopoverTrigger_Shadcn_>
- <PopoverContent_Shadcn_ className="w-[300px] p-0">
+ </PopoverTrigger>
+ <PopoverContent className="w-[300px] p-0">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Select organization..." />
<CommandList_Shadcn_>
@@ -127,8 +127,8 @@ const UpgradePlan = ({ organizations = [], onClick, size = 'large', planId }: Up
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</DialogSection>
<DialogSection>
diff --git a/packages/ui-patterns/src/FilterBar/FilterCondition.tsx b/packages/ui-patterns/src/FilterBar/FilterCondition.tsx
index f217bb8ce0d..63bf814e574 100644
--- a/packages/ui-patterns/src/FilterBar/FilterCondition.tsx
+++ b/packages/ui-patterns/src/FilterBar/FilterCondition.tsx
@@ -2,14 +2,7 @@
import { X } from 'lucide-react'
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import {
- Button,
- cn,
- Input,
- Popover_Shadcn_,
- PopoverAnchor_Shadcn_,
- PopoverContent_Shadcn_,
-} from 'ui'
+import { Button, cn, Input, Popover, PopoverAnchor, PopoverContent } from 'ui'
import { DefaultCommandList } from './DefaultCommandList'
import { useFilterBar } from './FilterBarContext'
@@ -272,8 +265,8 @@ export function FilterCondition({
data-testid={`filter-condition-${property.name}`}
data-highlighted={isHighlighted}
>
- <Popover_Shadcn_ open={isPropertyActive && !isLoading && propertyItems.length > 0}>
- <PopoverAnchor_Shadcn_ asChild>
+ <Popover open={isPropertyActive && !isLoading && propertyItems.length > 0}>
+ <PopoverAnchor asChild>
<div ref={propertyLabelRef} className="relative inline-flex items-center shrink-0">
{isPropertyActive ? (
<Input
@@ -304,8 +297,8 @@ export function FilterCondition({
{property.label}
</span>
</div>
- </PopoverAnchor_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverAnchor>
+ <PopoverContent
className="min-w-[220px] p-0"
align="start"
side="bottom"
@@ -324,10 +317,10 @@ export function FilterCondition({
onSelect={(item) => handlePropertyChange(path, item.value)}
includeIcon={false}
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
- <Popover_Shadcn_ open={isOperatorActive && !isLoading && operatorItems.length > 0}>
- <PopoverAnchor_Shadcn_ asChild>
+ </PopoverContent>
+ </Popover>
+ <Popover open={isOperatorActive && !isLoading && operatorItems.length > 0}>
+ <PopoverAnchor asChild>
<div className="relative inline-block">
<Input
ref={operatorRef}
@@ -354,8 +347,8 @@ export function FilterCondition({
{(isOperatorActive ? localOperator : conditionOperator) || ' '}
</span>
</div>
- </PopoverAnchor_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverAnchor>
+ <PopoverContent
className="min-w-[220px] p-0"
align="start"
side="bottom"
@@ -375,10 +368,10 @@ export function FilterCondition({
includeIcon={false}
grouped
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
- <Popover_Shadcn_ open={isActive && !isLoading && (showValueCustom || valueItems.length > 0)}>
- <PopoverAnchor_Shadcn_ asChild>
+ </PopoverContent>
+ </Popover>
+ <Popover open={isActive && !isLoading && (showValueCustom || valueItems.length > 0)}>
+ <PopoverAnchor asChild>
<div className="relative inline-block max-w-[180px]">
<Input
ref={valueRef}
@@ -400,8 +393,8 @@ export function FilterCondition({
/>
<span className="invisible whitespace-pre text-xs block px-1">{localValue || ' '}</span>
</div>
- </PopoverAnchor_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverAnchor>
+ <PopoverContent
className="min-w-[220px] w-fit p-0"
align="start"
side="bottom"
@@ -439,8 +432,8 @@ export function FilterCondition({
includeIcon
/>
)}
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
<Button
type="text"
size="tiny"
diff --git a/packages/ui-patterns/src/FilterBar/FilterGroup.tsx b/packages/ui-patterns/src/FilterBar/FilterGroup.tsx
index 83facf70718..8582c02379c 100644
--- a/packages/ui-patterns/src/FilterBar/FilterGroup.tsx
+++ b/packages/ui-patterns/src/FilterBar/FilterGroup.tsx
@@ -1,7 +1,7 @@
'use client'
import React, { useEffect, useMemo, useRef, useState } from 'react'
-import { cn, Input, Popover_Shadcn_, PopoverAnchor_Shadcn_, PopoverContent_Shadcn_ } from 'ui'
+import { cn, Input, Popover, PopoverAnchor, PopoverContent } from 'ui'
import { DefaultCommandList } from './DefaultCommandList'
import { useFilterBar } from './FilterBarContext'
@@ -176,10 +176,8 @@ export function FilterGroup({ group, path }: FilterGroupProps) {
</React.Fragment>
)
})}
- <Popover_Shadcn_
- open={isActive && !isLoading && items.length > 0 && !highlightedConditionPath}
- >
- <PopoverAnchor_Shadcn_ asChild>
+ <Popover open={isActive && !isLoading && items.length > 0 && !highlightedConditionPath}>
+ <PopoverAnchor asChild>
{isRootGroup ? (
<Input
ref={freeformInputRef}
@@ -223,8 +221,8 @@ export function FilterGroup({ group, path }: FilterGroupProps) {
</span>
</div>
)}
- </PopoverAnchor_Shadcn_>
- <PopoverContent_Shadcn_
+ </PopoverAnchor>
+ <PopoverContent
className="min-w-[220px] p-0"
align="start"
side="bottom"
@@ -243,8 +241,8 @@ export function FilterGroup({ group, path }: FilterGroupProps) {
onSelect={handleSelectMenuItem}
includeIcon
/>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
</div>
</div>
)
diff --git a/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx b/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx
index a2f0c220766..288d14726f1 100644
--- a/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx
+++ b/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx
@@ -11,9 +11,9 @@ import {
CommandInput_Shadcn_,
CommandItem_Shadcn_,
CommandList_Shadcn_,
- Popover_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from 'ui'
import type { McpClient } from '../types'
@@ -76,12 +76,12 @@ export const ClientSelectDropdown = ({
}
return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
+ <Popover open={open} onOpenChange={setOpen} modal={false}>
<div className="flex">
<span className="flex items-center text-foreground-lighter px-3 rounded-lg rounded-r-none text-xs border border-button border-r-0">
{label}
</span>
- <PopoverTrigger_Shadcn_ asChild>
+ <PopoverTrigger asChild>
<Button
size="small"
type="default"
@@ -106,9 +106,9 @@ export const ClientSelectDropdown = ({
{selectedClient?.label}
</div>
</Button>
- </PopoverTrigger_Shadcn_>
+ </PopoverTrigger>
</div>
- <PopoverContent_Shadcn_ className="mt-0 p-0 max-w-48" side="bottom" align="start">
+ <PopoverContent className="mt-0 p-0 max-w-48" side="bottom" align="start">
<Command_Shadcn_>
<CommandInput_Shadcn_ placeholder="Search..." />
<CommandList_Shadcn_>
@@ -124,7 +124,7 @@ export const ClientSelectDropdown = ({
)}
</CommandList_Shadcn_>
</Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
+ </PopoverContent>
+ </Popover>
)
}
diff --git a/packages/ui-patterns/src/multi-select/multi-select.tsx b/packages/ui-patterns/src/multi-select/multi-select.tsx
index fcdc6baff5a..52152d27ec1 100644
--- a/packages/ui-patterns/src/multi-select/multi-select.tsx
+++ b/packages/ui-patterns/src/multi-select/multi-select.tsx
@@ -5,14 +5,7 @@ import { Check, ChevronsUpDown, X as RemoveIcon } from 'lucide-react'
// @ts-ignore Required to avoid TS error: The inferred type of MultiSelectorContent cannot be named without a reference to @radix-ui
import type { Popover as PopoverPrimitive } from 'radix-ui'
import React, { useEffect } from 'react'
-import {
- Badge,
- cn,
- Popover_Shadcn_ as Popover,
- PopoverAnchor_Shadcn_ as PopoverAnchor,
- PopoverContent_Shadcn_ as PopoverContent,
- PopoverContentProps_Shadcn_ as PopoverContentProps,
-} from 'ui'
+import { Badge, cn, Popover, PopoverAnchor, PopoverContent, PopoverContentProps } from 'ui'
import {
Command,
CommandEmpty,
diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx
index d98a1c03e81..5a0145b8060 100644
--- a/packages/ui/index.tsx
+++ b/packages/ui/index.tsx
@@ -17,7 +17,6 @@ export * from './src/components/NavMenu'
export * from './src/components/Modal'
export * from './src/components/SidePanel'
-export * from './src/components/Popover'
// HTML
@@ -87,14 +86,7 @@ export * from './src/components/shadcn/ui/field'
export * from './src/components/shadcn/ui/form'
-export {
- Popover as Popover_Shadcn_,
- PopoverTrigger as PopoverTrigger_Shadcn_,
- PopoverContent as PopoverContent_Shadcn_,
- PopoverAnchor as PopoverAnchor_Shadcn_,
- PopoverSeparator as PopoverSeparator_Shadcn_,
- type PopoverContentProps as PopoverContentProps_Shadcn_,
-} from './src/components/shadcn/ui/popover'
+export * from './src/components/shadcn/ui/popover'
export {
Accordion as Accordion_Shadcn_,
diff --git a/packages/ui/src/components/Popover/Popover.module.css b/packages/ui/src/components/Popover/Popover.module.css
deleted file mode 100644
index 670513d55e3..00000000000
--- a/packages/ui/src/components/Popover/Popover.module.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.sbui-popover__content {
- @apply bg-background p-0;
- @apply border;
- @apply rounded-sm;
- @apply shadow-sm;
- border-style: solid;
- border-width: 1px;
-}
-
-/* @keyframes fadeIn {
- from {
- transform: scale(0.95);
- opacity: 0;
- }
- to {
- transform: scale(1);
- opacity: 1;
- }
-}
-
-@keyframes fadeOut {
- from {
- transform: scale(1);
- opacity: 1;
- }
- to {
- transform: scale(0.95);
- opacity: 0;
- }
-} */
-
-/* .sbui-popover__content {
- transform-origin: var(--radix-popover-menu-content-transform-origin);
-}
-
-.sbui-popover__content[data-state='open'] {
- animation: fadeIn 50ms ease-out;
-}
-
-.sbui-popover__content[data-state='closed'] {
- animation: fadeOut 50ms ease-in;
-} */
-
-/* .sbui-popover__trigger {
- @apply border-none bg-transparent p-0 focus:ring-0;
-} */
-
-.sbui-popover__arrow {
- @apply fill-current text-background;
- @apply border-0 border-t;
- border-style: solid;
-}
-
-.sbui-popover__close {
- @apply absolute top-1 right-0;
- @apply bg-transparent cursor-pointer border-none;
-
- @apply text-background-surface-100;
- @apply hover:text-background-surface-200;
-
- @apply dark:text-background-surface-200;
- @apply dark:hover:text-background-surface-00;
-}
diff --git a/packages/ui/src/components/Popover/Popover.tsx b/packages/ui/src/components/Popover/Popover.tsx
deleted file mode 100644
index 3c1d916594e..00000000000
--- a/packages/ui/src/components/Popover/Popover.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-'use client'
-
-import { X } from 'lucide-react'
-import { Popover as RadixPopover } from 'radix-ui'
-import * as React from 'react'
-
-import styleHandler from '../../lib/theme/styleHandler'
-
-interface RootProps {
- align?: RadixPopover.PopoverContentProps['align']
- ariaLabel?: string
- arrow?: boolean
- children?: React.ReactNode
- className?: string
- defaultOpen?: boolean
- disabled?: boolean
- modal?: boolean
- onOpenChange?: RadixPopover.PopoverProps['onOpenChange']
- open?: boolean
- overlay?: React.ReactNode
- showClose?: boolean
- side?: RadixPopover.PopoverContentProps['side']
- sideOffset?: RadixPopover.PopoverContentProps['sideOffset']
- style?: React.CSSProperties
- header?: React.ReactNode
- footer?: React.ReactNode
- size?: 'tiny' | 'small' | 'medium' | 'large' | 'xlarge' | 'content'
- 'data-testid'?: string
-}
-
-/**
- * @deprecated Use `import { Popover_shadcn_ } from "ui"` instead
- */
-function Popover({
- align = 'center',
- ariaLabel,
- arrow = false,
- children,
- className,
- defaultOpen = false,
- modal,
- onOpenChange,
- open,
- overlay,
- side = 'bottom',
- sideOffset = 6,
- style,
- header,
- footer,
- size = 'content',
- disabled,
- 'data-testid': dataTestId,
-}: RootProps) {
- const __styles = styleHandler('popover')
-
- let classes = [__styles.content, __styles.size[size]]
- if (className) {
- classes.push(className)
- }
-
- return (
- <RadixPopover.Root
- defaultOpen={defaultOpen}
- modal={modal}
- onOpenChange={onOpenChange}
- open={open}
- >
- <RadixPopover.Trigger
- // className={DropdownStyles['sbui-popover__trigger']}
- disabled={disabled}
- className={__styles.trigger}
- aria-label={ariaLabel}
- data-testid={dataTestId}
- >
- {children}
- </RadixPopover.Trigger>
-
- <RadixPopover.Portal>
- <RadixPopover.Content
- sideOffset={sideOffset}
- side={side}
- align={align}
- className={classes.join(' ')}
- style={style}
- >
- {arrow && (
- <RadixPopover.Arrow
- // className={DropdownStyles['sbui-popover__arrow']}
- offset={10}
- ></RadixPopover.Arrow>
- )}
- {header && <div className={__styles.header}>{header}</div>}
- {overlay}
- {footer && <div className={__styles.footer}>{footer}</div>}
- </RadixPopover.Content>
- </RadixPopover.Portal>
- </RadixPopover.Root>
- )
-}
-
-/**
- * @deprecated Use ./Popover_shadcn_ instead
- */
-function Close() {
- const __styles = styleHandler('popover')
-
- return (
- <RadixPopover.Close className={__styles.close}>
- <X size={14} strokeWidth={2} />
- </RadixPopover.Close>
- )
-}
-
-/**
- * @deprecated Use ./PopoverSeparator_Shadcn_ instead
- */
-function Separator() {
- const __styles = styleHandler('popover')
-
- return <div className={__styles.separator}></div>
-}
-
-Popover.Separator = Separator
-Popover.Close = Close
-export default Popover
diff --git a/packages/ui/src/components/Popover/index.tsx b/packages/ui/src/components/Popover/index.tsx
deleted file mode 100644
index c6e06a314a2..00000000000
--- a/packages/ui/src/components/Popover/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Popover } from './Popover'
diff --git a/packages/ui/src/lib/theme/defaultTheme.ts b/packages/ui/src/lib/theme/defaultTheme.ts
index 1d76ff3763f..97387a3aeb6 100644
--- a/packages/ui/src/lib/theme/defaultTheme.ts
+++ b/packages/ui/src/lib/theme/defaultTheme.ts
@@ -531,67 +531,6 @@ export default {
},
},
- /*
- * Popover
- */
-
- popover: {
- trigger: `
- flex
- border-none
- rounded-sm
- bg-transparent
- p-0
- outline-hidden
- outline-offset-1
- transition-all
- focus:outline-4
- focus:outline-border-control
- `,
- content: `
- z-40
- bg-overlay
- border border-overlay
- rounded-sm
- shadow-lg
- data-open:animate-dropdown-content-show
- data-closed:animate-dropdown-content-hide
- min-w-fit
-
- origin-popover
- data-open:animate-dropdown-content-show
- data-closed:animate-dropdown-content-hide
- `,
- size: {
- tiny: `w-40`,
- small: `w-48`,
- medium: `w-64`,
- large: `w-80`,
- xlarge: `w-96`,
- content: `w-auto`,
- },
- header: `
- bg-surface-200
- space-y-1 py-1.5 px-3
- border-b border-overlay
- `,
- footer: `
- bg-surface-200
- py-1.5 px-3
- border-t border-overlay
- `,
- close: `
- transition
- text-foreground-lighter
- `,
- separator: `
- w-full
- h-px
- my-2
- bg-border-overlay
- `,
- },
-
/*
* Menu
*/