()
return (
-
-
+
+
-
-
+
+
setDate(addDays(new Date(), parseInt(value)))}>
@@ -50,7 +50,7 @@ export default function DatePickerWithPresets() {
-
-
+
+
)
}
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 (
-
-
+
+
-
-
+
+
-
-
+
+
Dimensions
@@ -38,7 +31,7 @@ export default function PopoverDemo() {
-
-
+
+
)
}
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 }) {
{schema[resource].block.attributes[attribute].type ?? (
-
-
+
+
-
-
+
+
{Object.keys(
schema[resource].block.attributes[attribute].nested_type.attributes
@@ -178,8 +178,8 @@ function Resources({ schema }: { schema: any }) {
))}
-
-
+
+
)}
|
@@ -267,14 +267,14 @@ function DataSources({ schema }: { schema: any }) {
|
{schema[dataSource].block.attributes[attribute].type ?? (
-
-
+
+
-
-
+
+
{schema[dataSource].block.attributes[attribute].nested_type
.nesting_mode === 'set' && 'Array of:'}
@@ -307,8 +307,8 @@ function DataSources({ schema }: { schema: any }) {
))}
-
-
+
+
)}
|
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 (
- {
@@ -110,7 +110,7 @@ function ProjectSelector({
) : (
-
+
-
+
)}
-
+
-
-
+
+
)
}
@@ -205,13 +205,13 @@ function PlatformSelector({
const [open, setOpen] = useState(false)
return (
-
+
Platform
-
+
-
+
-
+
@@ -257,8 +257,8 @@ function PlatformSelector({
-
-
+
+
)
}
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({
}, [])
return (
-
-
+
+
{value === null ? 'NULL' : value}
-
-
+
+
({
)}
-
-
+
+
)
}
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 = ({
}
return (
-
- {}}
- width={`${column.width}px`}
- value={value ?? ''}
- language="markdown"
- />
+
+
+ setIsPopoverOpen(!isPopoverOpen)}
+ >
+ {value === null || value === '' ? : jsonString}
+
+
+
+ {isTruncated && !isSuccess ? (
+
+ {}} value={value ?? ''} language="markdown" />
) : (
({
- )
- }
- >
- setIsPopoverOpen(!isPopoverOpen)}
- >
- {value === null || value === '' ? : jsonString}
-
+ )}
+
)
}
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 = ({
return (
<>
-
- {}}
- width={`${column.width}px`}
- value={value ?? ''}
- language="markdown"
- />
+
+
+ setIsPopoverOpen(!isPopoverOpen)}
+ >
+ {value === null ? : value === '' ? : value}
+
+
+
+ {isTruncated && !isSuccess ? (
+
+ {}} value={value ?? ''} language="markdown" />
) : (
@@ -133,12 +139,7 @@ export const TextEditor = ({
onEnter={saveChanges}
ignoreOutsideClicks={isConfirmNextModalOpen}
>
-
+
{isEditable && (
@@ -189,18 +190,8 @@ export const TextEditor = ({
)}
- )
- }
- >
- setIsPopoverOpen(!isPopoverOpen)}
- >
- {value === null ? : value === '' ? : value}
-
+
{
)}
{!isLoadingTargetTable && targetTable !== undefined && (
-
-
+
+
{
onClick={(e) => e.stopPropagation()}
tooltip={{ content: { side: 'bottom', text: 'View referencing record' } }}
/>
-
-
+ {
@@ -100,8 +100,8 @@ export const ForeignKeyFormatter = (props: Props) => {
column={relationship.target_column_name}
value={formattedValue}
/>
-
-
+
+
)}
)}
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 (
-
-
+
+
-
-
+
+
{localFilters.map((filter, index) => (
@@ -114,7 +108,7 @@ export const FilterPopoverPrimitive = ({
)}
-
+
} type="dashed" onClick={onAddFilter}>
Add filter
@@ -128,7 +122,7 @@ export const FilterPopoverPrimitive = ({
-
-
+
+
)
}
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 (
<>
-
-
+
+
-
-
+
+
)}
-
+
{dropdownOptions && dropdownOptions.length > 0 ? (
-
-
+
+
-
+
+
}>
Add permission
-
-
+
+
@@ -84,7 +84,7 @@ export const PermissionResourceSelector =
-
-
+
+
)
}
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 =
{selectedResource && (
-
-
+
+
-
+
+
{sortActions(selectedResource.actions).map((action) => (
-
-
+
+
)}
-
-
+
+
-
-
+
+
@@ -84,8 +84,8 @@ export const TimezoneSelection = ({
-
-
+
+
-
-
+
+
-
+
+
-
-
+
+
-
-
+
+
-
+
+
{/* [Terry] shouldFilter context:
https://github.com/pacocoursey/cmdk/issues/267#issuecomment-2252717107 */}
@@ -328,8 +307,8 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
-
-
+
+
{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 (
- {
@@ -58,7 +58,7 @@ export const PublicationsComboBox = ({
}
}}
>
-
+
-
-
+
+
-
-
+
+
)
}
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}
/>
-
-
+
+
}
/>
-
-
+
+
Show entity types
@@ -291,8 +291,8 @@ export const TableList = ({
))}
-
-
+
+
)}
-
-
+
+
)
}
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 (
Edge Function
-
-
+
+
-
-
+
+
@@ -182,8 +182,8 @@ export const EdgeFunctionSection = ({ form }: HTTPRequestFieldsProps) => {
-
-
+
+
)
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 = () => {
)}
) : (
- setOpenRlsPopover(!openRlsPopover)}
>
-
+
}>
RLS disabled
-
-
+
+
Row Level Security (RLS)
@@ -241,8 +233,8 @@ You may opt to manage your queues via any Supabase client libraries or PostgREST
)}
-
-
+
+
)}
|