The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
chore: remove `_Shadcn_` suffix from `ui` tabs components (#47628)
Gildas Garciacabe14e5ca49
diff --git a/apps/design-system/components/component-example.tsx b/apps/design-system/components/component-example.tsxindex 608d2482687..8447963453b 100644--- a/apps/design-system/components/component-example.tsx+++ b/apps/design-system/components/component-example.tsx@@ -1,13 +1,7 @@'use client'import * as React from 'react'-import {- cn,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,-} from 'ui'+import { cn, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import {// CopyButton,diff --git a/apps/design-system/components/mdx-components.tsx b/apps/design-system/components/mdx-components.tsxindex 0e78f045e92..c7b5f7cfae1 100644--- a/apps/design-system/components/mdx-components.tsx+++ b/apps/design-system/components/mdx-components.tsx@@ -16,10 +16,10 @@ import {AlertTitle,AspectRatio,cn,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { Admonition } from 'ui-patterns/admonition'diff --git a/apps/design-system/registry/default/example/tabs-demo.tsx b/apps/design-system/registry/default/example/tabs-demo.tsxindex c0e4951f5d6..edf748e9718 100644--- a/apps/design-system/registry/default/example/tabs-demo.tsx+++ b/apps/design-system/registry/default/example/tabs-demo.tsx@@ -8,20 +8,20 @@ import {CardTitle,Input,Label,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'export default function TabsDemo() {return (- <Tabs_Shadcn_ defaultValue="account" className="w-[400px]">- <TabsList_Shadcn_ className="grid w-full grid-cols-2">- <TabsTrigger_Shadcn_ value="account">Account</TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ value="password">Password</TabsTrigger_Shadcn_>- </TabsList_Shadcn_>- <TabsContent_Shadcn_ value="account">+ <Tabs defaultValue="account" className="w-[400px]">+ <TabsList className="grid w-full grid-cols-2">+ <TabsTrigger value="account">Account</TabsTrigger>+ <TabsTrigger value="password">Password</TabsTrigger>+ </TabsList>+ <TabsContent value="account"><Card><CardHeader><CardTitle>Account</CardTitle>@@ -43,8 +43,8 @@ export default function TabsDemo() {<Button>Save changes</Button></CardFooter></Card>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="password">+ </TabsContent>+ <TabsContent value="password"><Card><CardHeader><CardTitle>Password</CardTitle>@@ -66,7 +66,7 @@ export default function TabsDemo() {<Button>Save password</Button></CardFooter></Card>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs>)}diff --git a/apps/docs/features/docs/Reference.sections.tsx b/apps/docs/features/docs/Reference.sections.tsxindex 0a98ec56b68..98654285c45 100644--- a/apps/docs/features/docs/Reference.sections.tsx+++ b/apps/docs/features/docs/Reference.sections.tsx@@ -26,14 +26,7 @@ import { CodeBlock } from '~/features/ui/CodeBlock/CodeBlock'import { isFeatureEnabled } from 'common'import { Fragment } from 'react'import ReactMarkdown from 'react-markdown'-import {- Badge,- cn,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,-} from 'ui'+import { Badge, cn, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { type IApiEndPoint } from './Reference.api.utils'import { RefInternalLink } from './Reference.navigation.client'@@ -234,10 +227,10 @@ async function CliCommandSection({ link, section }: CliCommandSectionProps) {{'examples' in command &&Array.isArray(command.examples) &&command.examples.length > 0 && (- <Tabs_Shadcn_ defaultValue={command.examples[0].id}>- <TabsList_Shadcn_ className="flex-wrap gap-2 border-0">+ <Tabs defaultValue={command.examples[0].id}>+ <TabsList className="flex-wrap gap-2 border-0">{command.examples.map((example) => (- <TabsTrigger_Shadcn_+ <TabsTriggerkey={example.id}value={example.id}className={cn(@@ -251,19 +244,19 @@ async function CliCommandSection({ link, section }: CliCommandSectionProps) {)}>{example.name}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>{command.examples.map((example) => (- <TabsContent_Shadcn_ key={example.id} value={example.id}>+ <TabsContent key={example.id} value={example.id}><CodeBlock lang="bash" className="mb-6">{example.code}</CodeBlock><h3 className="text-foreground-lighter text-sm mb-2">Response</h3><CodeBlock lang="txt">{example.response}</CodeBlock>- </TabsContent_Shadcn_>+ </TabsContent>))}- </Tabs_Shadcn_>+ </Tabs>)}</div></RefSubLayout.Section>@@ -536,10 +529,10 @@ async function FunctionSection({if (examples.length === 0) return nullreturn (- <Tabs_Shadcn_ defaultValue={examples[0].id}>- <TabsList_Shadcn_ className="flex-wrap gap-2 border-0">+ <Tabs defaultValue={examples[0].id}>+ <TabsList className="flex-wrap gap-2 border-0">{examples.map((example) => (- <TabsTrigger_Shadcn_+ <TabsTriggerkey={example.id}value={example.id}className={cn(@@ -553,11 +546,11 @@ async function FunctionSection({)}>{example.name}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>{examples.map((example) => (- <TabsContent_Shadcn_ key={example.id} value={example.id}>+ <TabsContent key={example.id} value={example.id}><MDXRemoteRefs source={example.code} /><div className="flex flex-col gap-2 mt-2">{'data' in example && !!example.data?.sql && (@@ -573,9 +566,9 @@ async function FunctionSection({/>)}</div>- </TabsContent_Shadcn_>+ </TabsContent>))}- </Tabs_Shadcn_>+ </Tabs>)})()}</div>diff --git a/apps/learn/components/command.tsx b/apps/learn/components/command.tsxindex b7142400870..fdc4064c4fa 100644--- a/apps/learn/components/command.tsx+++ b/apps/learn/components/command.tsx@@ -1,7 +1,8 @@'use client'import { motion } from 'framer-motion'-import { Tabs_Shadcn_, TabsContent_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'+import { CommandCopyButton } from './command-copy-button'import { useLocalStorage } from './use-local-storage'@@ -57,7 +58,7 @@ export function Command({ name, highlight, framework = 'react' }: CommandCopyPro}return (- <Tabs_Shadcn_ value={value} onValueChange={setValue} className="w-full">+ <Tabs value={value} onValueChange={setValue} className="w-full"><div className="w-full group relative rounded-lg bg-surface-200 dark:bg-surface-100 px-4 py-2 overflow-hidden">{highlight && (<motion.div@@ -74,16 +75,16 @@ export function Command({ name, highlight, framework = 'react' }: CommandCopyPro)}<div className="flex flex-col">- <TabsList_Shadcn_ className="gap-2 relative mb-2 z-10">+ <TabsList className="gap-2 relative mb-2 z-10">{(Object.keys(commands) as PackageManager[]).map((manager) => (- <TabsTrigger_Shadcn_ key={manager} value={manager} className="text-xs">+ <TabsTrigger key={manager} value={manager} className="text-xs">{manager}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>{(Object.keys(commands) as PackageManager[]).map((manager) => (- <TabsContent_Shadcn_ key={manager} value={manager} className="m-0">+ <TabsContent key={manager} value={manager} className="m-0"><div className="flex items-center"><div className="flex-1 font-mono text-sm text-foreground relative z-10"><span className="mr-2 text-[#888] select-none">$</span>@@ -93,10 +94,10 @@ export function Command({ name, highlight, framework = 'react' }: CommandCopyPro<CommandCopyButton command={commands[manager]} /></div></div>- </TabsContent_Shadcn_>+ </TabsContent>))}</div></div>- </Tabs_Shadcn_>+ </Tabs>)}diff --git a/apps/lite-studio/app/routes/projects.$ref.tsx b/apps/lite-studio/app/routes/projects.$ref.tsxindex 2fc27badfef..3605a8f0224 100644--- a/apps/lite-studio/app/routes/projects.$ref.tsx+++ b/apps/lite-studio/app/routes/projects.$ref.tsx@@ -9,10 +9,10 @@ import {Label,Separator,Switch,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { Admonition } from 'ui-patterns/admonition'import {diff --git a/apps/studio/components/grid/components/header/ExportDialog.tsx b/apps/studio/components/grid/components/header/ExportDialog.tsxindex 1c91ff9fa68..2553eefde32 100644--- a/apps/studio/components/grid/components/header/ExportDialog.tsx+++ b/apps/studio/components/grid/components/header/ExportDialog.tsx@@ -10,10 +10,10 @@ import {DialogSection,DialogSectionSeparator,DialogTitle,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { Admonition } from 'ui-patterns/admonition'import { CodeBlock } from 'ui-patterns/CodeBlock'@@ -100,12 +100,12 @@ pg_dump -h ${db_host} -p ${db_port} -d ${db_name} -U ${db_user} --table="${tabledone via the following command that you can run in your terminal:</p>- <Tabs_Shadcn_ value={selectedTab} onValueChange={setSelectedTab}>- <TabsList_Shadcn_ className="gap-x-3">- <TabsTrigger_Shadcn_ value="csv">As CSV</TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ value="sql">As SQL</TabsTrigger_Shadcn_>- </TabsList_Shadcn_>- <TabsContent_Shadcn_ value="csv">+ <Tabs value={selectedTab} onValueChange={setSelectedTab}>+ <TabsList className="gap-x-3">+ <TabsTrigger value="csv">As CSV</TabsTrigger>+ <TabsTrigger value="sql">As SQL</TabsTrigger>+ </TabsList>+ <TabsContent value="csv"><CodeBlockhideLineNumberswrapperClassName={cn('[&_pre]:px-4 [&_pre]:py-3')}@@ -113,8 +113,8 @@ pg_dump -h ${db_host} -p ${db_port} -d ${db_name} -U ${db_user} --table="${tablevalue={csvExportCommand}className="[&_code]:text-[12px] [&_code]:text-foreground"/>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="sql">+ </TabsContent>+ <TabsContent value="sql"><CodeBlockhideLineNumberswrapperClassName={cn('[&_pre]:px-4 [&_pre]:py-3')}@@ -128,8 +128,8 @@ pg_dump -h ${db_host} -p ${db_port} -d ${db_name} -U ${db_user} --table="${tabletitle="Filters are not supported when exporting as SQL via pg_dump"description="If you'd like to export as SQL, we recommend creating a view first then exporting the data from there via pg_dump instead"/>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs><p className="text-sm">You will be prompted for your database password, and the output file{' '}diff --git a/apps/studio/components/interfaces/Auth/Users/UserPanel.tsx b/apps/studio/components/interfaces/Auth/Users/UserPanel.tsxindex be3636aaa4e..5e9723437f0 100644--- a/apps/studio/components/interfaces/Auth/Users/UserPanel.tsx+++ b/apps/studio/components/interfaces/Auth/Users/UserPanel.tsx@@ -7,10 +7,10 @@ import {Input,ResizableHandle,ResizablePanel,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import { SimpleCodeBlock } from 'ui-patterns/SimpleCodeBlock'@@ -64,7 +64,7 @@ export const UserPanel = () => {icon={<X />}onClick={() => setSelectedId(null)}/>- <Tabs_Shadcn_+ <Tabsvalue={view}className="flex flex-col h-full"onValueChange={(value) => setView(value as 'overview' | 'raw' | 'logs')}@@ -78,39 +78,36 @@ export const UserPanel = () => {</div>) : !!selectedUser ? (<>- <TabsList_Shadcn_ className="px-5 flex gap-x-4 min-h-[46px]">- <TabsTrigger_Shadcn_+ <TabsList className="px-5 flex gap-x-4 min-h-[46px]">+ <TabsTriggervalue="overview"className="px-0 pb-0 h-full text-xs data-[state=active]:bg-transparent shadow-none!">Overview- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_+ </TabsTrigger>+ <TabsTriggervalue="logs"className="px-0 pb-0 h-full text-xs data-[state=active]:bg-transparent shadow-none!">Logs- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_+ </TabsTrigger>+ <TabsTriggervalue="raw"className="px-0 pb-0 h-full text-xs data-[state=active]:bg-transparent shadow-none!">Raw JSON- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>+ </TabsTrigger>+ </TabsList>- <TabsContent_Shadcn_- value="overview"- className={cn('mt-0 grow min-h-0 overflow-y-auto')}- >+ <TabsContent value="overview" className={cn('mt-0 grow min-h-0 overflow-y-auto')}>{selectedUser && (<UserOverview user={selectedUser} onDeleteSuccess={() => setSelectedId(null)} />)}- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="logs" className={cn('mt-0 grow min-h-0 overflow-y-auto')}>+ </TabsContent>+ <TabsContent value="logs" className={cn('mt-0 grow min-h-0 overflow-y-auto')}>{selectedUser && <UserLogs user={selectedUser} />}- </TabsContent_Shadcn_>- <TabsContent_Shadcn_+ </TabsContent>+ <TabsContentvalue="raw"className={cn('mt-0 grow min-h-0 overflow-y-auto', PANEL_PADDING)}>@@ -135,7 +132,7 @@ export const UserPanel = () => {<SimpleCodeBlock className="javascript" parentClassName="[&>*>span]:text-xs">{JSON.stringify(filteredProperties, null, 2)}</SimpleCodeBlock>- </TabsContent_Shadcn_>+ </TabsContent></>) : (<div className="flex items-center justify-center w-full h-full flex-col gap-y-2">@@ -145,7 +142,7 @@ export const UserPanel = () => {<p className="text-foreground-lighter text-xs">ID: {selectedId}</p></div>)}- </Tabs_Shadcn_>+ </Tabs></ResizablePanel></>)diff --git a/apps/studio/components/interfaces/ConnectSheet/content/server/install/content.tsx b/apps/studio/components/interfaces/ConnectSheet/content/server/install/content.tsxindex 0d768dd1741..5758dbd183a 100644--- a/apps/studio/components/interfaces/ConnectSheet/content/server/install/content.tsx+++ b/apps/studio/components/interfaces/ConnectSheet/content/server/install/content.tsx@@ -1,4 +1,4 @@-import { Tabs_Shadcn_, TabsContent_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import CopyButton from '@/components/ui/CopyButton'@@ -11,20 +11,20 @@ const INSTALL_OPTIONS = [function ServerInstallContent() {return (- <Tabs_Shadcn_ defaultValue="npm" className="overflow-hidden rounded-lg border">- <TabsList_Shadcn_ className="gap-5 border-0 border-b bg-surface-75 px-4">+ <Tabs defaultValue="npm" className="overflow-hidden rounded-lg border">+ <TabsList className="gap-5 border-0 border-b bg-surface-75 px-4">{INSTALL_OPTIONS.map((option) => (- <TabsTrigger_Shadcn_+ <TabsTriggerkey={option.name}value={option.name}className="px-0 py-2.5 text-xs data-[state=active]:bg-transparent">{option.name}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>{INSTALL_OPTIONS.map((option) => (- <TabsContent_Shadcn_+ <TabsContentkey={option.name}value={option.name}className="m-0 data-[state=inactive]:hidden"@@ -41,9 +41,9 @@ function ServerInstallContent() {aria-label={`Copy ${option.name} command`}/></div>- </TabsContent_Shadcn_>+ </TabsContent>))}- </Tabs_Shadcn_>+ </Tabs>)}diff --git a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsxindex 872acd61db3..66bd6aab286 100644--- a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx+++ b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx@@ -26,10 +26,10 @@ import {Sheet,SheetContent,SheetFooter,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import * as z from 'zod'@@ -553,18 +553,18 @@ export const PolicyEditorPanel = memo(function ({'bg-studio overflow-auto')}>- <Tabs_Shadcn_ defaultValue="templates" className="flex flex-col h-full w-full">- <TabsList_Shadcn_ className="flex gap-4 px-content pt-2">- <TabsTrigger_Shadcn_+ <Tabs defaultValue="templates" className="flex flex-col h-full w-full">+ <TabsList className="flex gap-4 px-content pt-2">+ <TabsTriggerkey="templates"value="templates"className="px-0 data-[state=active]:bg-transparent">Templates- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>+ </TabsTrigger>+ </TabsList>- <TabsContent_Shadcn_+ <TabsContentvalue="templates"className={cn('mt-0! overflow-y-auto',@@ -614,8 +614,8 @@ export const PolicyEditorPanel = memo(function ({}}/></ScrollArea>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></div>)}</SheetContent>diff --git a/apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.tsx b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.tsxindex 12d2a2b8f22..5391c6318f8 100644--- a/apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.tsx+++ b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.tsx@@ -1,11 +1,4 @@-import {- Badge,- cn,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,-} from 'ui'+import { Badge, cn, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { Results } from '../../SQLEditor/UtilityPanel/Results'@@ -56,15 +49,15 @@ export const RLSTesterResults = ({)}</div>- <Tabs_Shadcn_ defaultValue="policies">- <TabsList_Shadcn_ className="gap-x-3">- <TabsTrigger_Shadcn_ value="policies" className="px-2">+ <Tabs defaultValue="policies">+ <TabsList className="gap-x-3">+ <TabsTrigger value="policies" className="px-2">Policies applied- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ value="data" className="px-2" disabled={operation !== 'SELECT'}>+ </TabsTrigger>+ <TabsTrigger value="data" className="px-2" disabled={operation !== 'SELECT'}>Data preview- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>+ </TabsTrigger>+ </TabsList>{!!parseQueryResults && (<div className="border rounded-sm flex items-center justify-between px-3 py-1.5 mt-3">@@ -88,7 +81,7 @@ export const RLSTesterResults = ({</div>)}- <TabsContent_Shadcn_ value="policies" className="mt-0">+ <TabsContent value="policies" className="mt-0">{!isServiceRole &&(!!tableWithRLSEnabledButNoPolicies ? (<Admonition showIcon={false} type="default" className="rounded-sm mt-2">@@ -181,8 +174,8 @@ export const RLSTesterResults = ({</div>)}</div>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="data" className="mt-2">+ </TabsContent>+ <TabsContent value="data" className="mt-2"><divclassName={cn('grow flex flex-col border overflow-hidden',@@ -197,8 +190,8 @@ export const RLSTesterResults = ({{autoLimit && results.length >= limit && ` (Limited to only ${limit} rows)`}</p>)}- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></div>)}diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsxindex 324eda55ee6..91b698429e3 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx@@ -20,10 +20,10 @@ import {FormControl,FormField,Switch,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'import { Input } from 'ui-patterns/DataInputs/Input'diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsxindex 9f4126eebff..250f5096474 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx@@ -25,10 +25,10 @@ import {SheetFooter,SheetHeader,SheetTitle,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,Textarea,} from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'diff --git a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet/InstallationOverview.tsx b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet/InstallationOverview.tsxindex 541989a7ebe..e4f210c30e0 100644--- a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet/InstallationOverview.tsx+++ b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet/InstallationOverview.tsx@@ -4,10 +4,10 @@ import {CardContent,cn,SheetSection,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'@@ -76,26 +76,26 @@ export const InstallationOverview = ({<Card><CardContent className="px-0 pt-1.5 pb-0">- <Tabs_Shadcn_ defaultValue="extensions">- <TabsList_Shadcn_ className="px-4 space-x-4">+ <Tabs defaultValue="extensions">+ <TabsList className="px-4 space-x-4">{involvesExtensions && (<>- <TabsTrigger_Shadcn_ value="extensions" className="font-mono uppercase text-xs">+ <TabsTrigger value="extensions" className="font-mono uppercase text-xs">Extensions- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ value="sql" className="font-mono uppercase text-xs">+ </TabsTrigger>+ <TabsTrigger value="sql" className="font-mono uppercase text-xs">SQL- </TabsTrigger_Shadcn_>+ </TabsTrigger></>)}{involvesEdgeFunctions && (- <TabsTrigger_Shadcn_ value="edge_functions" className="font-mono uppercase text-xs">+ <TabsTrigger value="edge_functions" className="font-mono uppercase text-xs">Edge Functions- </TabsTrigger_Shadcn_>+ </TabsTrigger>)}- </TabsList_Shadcn_>+ </TabsList>- <TabsContent_Shadcn_ value="extensions" className="mt-0 divide-y">+ <TabsContent value="extensions" className="mt-0 divide-y">{requiredExtensionNames.map((extName) => {const ext = extensions.find((x) => x.name === extName)return (@@ -111,8 +111,8 @@ export const InstallationOverview = ({</div>)})}- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="sql" className="mt-0">+ </TabsContent>+ <TabsContent value="sql" className="mt-0"><CodeBlockhideCopyhideLineNumbers@@ -121,11 +121,11 @@ export const InstallationOverview = ({wrapperClassName={cn('[&_pre]:px-4 [&_pre]:py-3')}className="border-0 rounded-none [&_code]:text-[12px] [&_code]:text-foreground max-h-80"/>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="edge_functions" className="mt-0">+ </TabsContent>+ <TabsContent value="edge_functions" className="mt-0">TBD- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></CardContent></Card></SheetSection>diff --git a/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/MessageDetailsPanel.tsx b/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/MessageDetailsPanel.tsxindex ef5215d7303..70899d0594f 100644--- a/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/MessageDetailsPanel.tsx+++ b/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/MessageDetailsPanel.tsx@@ -4,15 +4,7 @@ import dayjs from 'dayjs'import { isNil } from 'lodash'import { Archive, Clock12, Trash2, X } from 'lucide-react'import { useState } from 'react'-import {- Button,- ResizablePanel,- Separator,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,-} from 'ui'+import { Button, ResizablePanel, Separator, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { RowAction, RowData } from '@/components/interfaces/Auth/Users/UserOverview'import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'@@ -95,22 +87,22 @@ export const MessageDetailsPanel = ({onClick={() => setSelectedMessage(null)}/>- <Tabs_Shadcn_+ <Tabsvalue={view}className="flex flex-col h-full"onValueChange={(value: any) => {setView(value)}}>- <TabsList_Shadcn_ className="px-5 flex gap-x-4 min-h-[46px]">- <TabsTrigger_Shadcn_+ <TabsList className="px-5 flex gap-x-4 min-h-[46px]">+ <TabsTriggervalue="details"className="px-0 pb-0 h-full text-xs data-[state=active]:bg-transparent shadow-none!">Overview- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>- <TabsContent_Shadcn_ value="details" className="w-full mt-0 overflow-y-auto grow">+ </TabsTrigger>+ </TabsList>+ <TabsContent value="details" className="w-full mt-0 overflow-y-auto grow"><div className="flex flex-col px-4 py-4 text-sm"><RowData property="Message ID" value={`${selectedMessage.msg_id}`} /><RowData@@ -220,8 +212,8 @@ export const MessageDetailsPanel = ({</>) : null}</div>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></ResizablePanel>)}diff --git a/apps/studio/components/interfaces/Linter/LintPageTabs.tsx b/apps/studio/components/interfaces/Linter/LintPageTabs.tsxindex a8615c71fc7..65dafad567b 100644--- a/apps/studio/components/interfaces/Linter/LintPageTabs.tsx+++ b/apps/studio/components/interfaces/Linter/LintPageTabs.tsx@@ -1,15 +1,7 @@import { InformationCircleIcon } from '@heroicons/react/16/solid'import { MessageSquareMore } from 'lucide-react'import { useRouter } from 'next/router'-import {- cn,- Tabs_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,- Tooltip,- TooltipContent,- TooltipTrigger,-} from 'ui'+import { cn, Tabs, TabsList, TabsTrigger, Tooltip, TooltipContent, TooltipTrigger } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'import { LINT_TABS, LINTER_LEVELS } from '@/components/interfaces/Linter/Linter.constants'@@ -61,7 +53,7 @@ const LintPageTabs = ({ currentTab, setCurrentTab, isLoading, activeLints }: Lin}return (- <Tabs_Shadcn_+ <Tabsvalue={currentTab}onValueChange={(value) => {setCurrentTab(value as LINTER_LEVELS)@@ -69,7 +61,7 @@ const LintPageTabs = ({ currentTab, setCurrentTab, isLoading, activeLints }: Linrouter.push({ ...router, query: { ...rest, preset: value, id: null } })}}>- <TabsList_Shadcn_ className={cn('flex gap-0 border-0 items-end z-10 relative')}>+ <TabsList className={cn('flex gap-0 border-0 items-end z-10 relative')}>{LINT_TABS.map((tab) => (<ShortcutTooltipkey={tab.id}@@ -78,7 +70,7 @@ const LintPageTabs = ({ currentTab, setCurrentTab, isLoading, activeLints }: Linside="top"align="start">- <TabsTrigger_Shadcn_+ <TabsTriggervalue={tab.id}className={cn('group relative',@@ -116,11 +108,11 @@ const LintPageTabs = ({ currentTab, setCurrentTab, isLoading, activeLints }: Lin</Tooltip></div><LintCountLabel tab={tab} />- </TabsTrigger_Shadcn_>+ </TabsTrigger></ShortcutTooltip>))}- </TabsList_Shadcn_>- </Tabs_Shadcn_>+ </TabsList>+ </Tabs>)}diff --git a/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsx b/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsxindex 2084eceff3d..1b29683eb6d 100644--- a/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsx+++ b/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsx@@ -8,10 +8,10 @@ import {FormItem,FormMessage,Input,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -65,20 +65,20 @@ export const SSOMetadata = ({className="gap-1"><div className=" w-96">- <Tabs_Shadcn_+ <Tabsvalue={tab}onValueChange={(value: string) => setTab(value as 'url' | 'file')}className="max-w-2xl">- <TabsList_Shadcn_ className="mx-auto gap-5 w-auto">- <TabsTrigger_Shadcn_ className=" " value="url">+ <TabsList className="mx-auto gap-5 w-auto">+ <TabsTrigger className=" " value="url">URL- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ className=" " value="file">+ </TabsTrigger>+ <TabsTrigger className=" " value="file">Upload file- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>- <TabsContent_Shadcn_ value="url">+ </TabsTrigger>+ </TabsList>+ <TabsContent value="url"><FormFieldname="metadataXmlUrl"render={({ field }) => (@@ -94,8 +94,8 @@ export const SSOMetadata = ({</FormItem>)}/>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="file">+ </TabsContent>+ <TabsContent value="file"><FormFieldname="metadataXmlUrl"render={() => (@@ -121,8 +121,8 @@ export const SSOMetadata = ({</div>)}/>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></div></FormItemLayout>)diff --git a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsx b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsxindex 0c8096bcfb0..2b5657945ff 100644--- a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsx+++ b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsx@@ -11,10 +11,10 @@ import {SheetHeader,SheetSection,SheetTitle,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { TimestampInfo } from 'ui-patterns/TimestampInfo'diff --git a/apps/studio/components/interfaces/QueryInsights/QueryInsightsChart/QueryInsightsChart.tsx b/apps/studio/components/interfaces/QueryInsights/QueryInsightsChart/QueryInsightsChart.tsxindex 448eef47dae..ef6267c18b2 100644--- a/apps/studio/components/interfaces/QueryInsights/QueryInsightsChart/QueryInsightsChart.tsx+++ b/apps/studio/components/interfaces/QueryInsights/QueryInsightsChart/QueryInsightsChart.tsx@@ -10,7 +10,7 @@ import {XAxis,YAxis,} from 'recharts'-import { cn, Tabs_Shadcn_, TabsContent_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { cn, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import type { ChartDataPoint } from '../QueryInsights.types'import { CHART_TABS, CHART_TYPE, LEGEND_ITEMS, SEL_COLOR } from './QueryInsightsChart.constants'@@ -84,20 +84,20 @@ export const QueryInsightsChart = ({return (<div className="bg-surface-100 border-b min-h-[320px]">- <Tabs_Shadcn_ value={selectedMetric} onValueChange={setSelectedMetric} className="w-full">- <TabsList_Shadcn_ className="flex justify-start rounded-none gap-x-4 border-b mt-0! pt-0 px-6">+ <Tabs value={selectedMetric} onValueChange={setSelectedMetric} className="w-full">+ <TabsList className="flex justify-start rounded-none gap-x-4 border-b mt-0! pt-0 px-6">{CHART_TABS.map((tab) => (- <TabsTrigger_Shadcn_+ <TabsTriggerkey={tab.id}value={tab.id}className="flex items-center gap-2 text-xs py-3 border-b font-mono uppercase">{tab.label}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>- <TabsContent_Shadcn_ value={selectedMetric} className="bg-surface-100 mt-0">+ <TabsContent value={selectedMetric} className="bg-surface-100 mt-0"><div className="w-full gap-4 mt-4 px-6 flex items-center justify-end">{legendItems.map((item: { dataKey: string; label: string; color: string }) => (<button@@ -253,8 +253,8 @@ export const QueryInsightsChart = ({</div>)}</div>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></div>)}diff --git a/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsDetailSheet.tsx b/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsDetailSheet.tsxindex e1442415d8b..8f735a8baaa 100644--- a/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsDetailSheet.tsx+++ b/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsDetailSheet.tsx@@ -6,10 +6,10 @@ import {SheetContent,SheetDescription,SheetTitle,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { QueryDetail } from '../../QueryPerformance/QueryDetail'@@ -67,36 +67,36 @@ export const QueryInsightsDetailSheet = ({}}}>- <Tabs_Shadcn_+ <Tabsvalue={sheetView}className="flex flex-col h-full"onValueChange={(v) => onSheetViewChange(v as 'details' | 'indexes' | 'explain')}><div className="px-5 border-b">- <TabsList_Shadcn_ className="px-0 flex gap-x-4 min-h-[46px] border-b-0 [&>button]:h-[47px]">- <TabsTrigger_Shadcn_+ <TabsList className="px-0 flex gap-x-4 min-h-[46px] border-b-0 [&>button]:h-[47px]">+ <TabsTriggervalue="details"className="px-0 pb-0 data-[state=active]:bg-transparent shadow-none!">Query details- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_+ </TabsTrigger>+ <TabsTriggervalue="indexes"className="px-0 pb-0 data-[state=active]:bg-transparent shadow-none!">Indexes- </TabsTrigger_Shadcn_>+ </TabsTrigger>{activeSheetRow?.issueType !== 'error' && (- <TabsTrigger_Shadcn_+ <TabsTriggervalue="explain"className="px-0 pb-0 data-[state=active]:bg-transparent shadow-none!">Explain- </TabsTrigger_Shadcn_>+ </TabsTrigger>)}- </TabsList_Shadcn_>+ </TabsList></div>- <TabsContent_Shadcn_ value="details" className="mt-0 grow min-h-0 overflow-y-auto">+ <TabsContent value="details" className="mt-0 grow min-h-0 overflow-y-auto">{activeSheetRow && (<QueryDetailselectedRow={activeSheetRow}@@ -104,14 +104,11 @@ export const QueryInsightsDetailSheet = ({onClose={onClose}/>)}- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="indexes" className="mt-0 grow min-h-0 overflow-y-auto">+ </TabsContent>+ <TabsContent value="indexes" className="mt-0 grow min-h-0 overflow-y-auto">{activeSheetRow && <QueryIndexes selectedRow={activeSheetRow} />}- </TabsContent_Shadcn_>- <TabsContent_Shadcn_- value="explain"- className="mt-0 grow min-h-0 flex flex-col overflow-hidden"- >+ </TabsContent>+ <TabsContent value="explain" className="mt-0 grow min-h-0 flex flex-col overflow-hidden">{explainLoadingQuery ? (<div className="px-6 py-4 flex items-center gap-2 text-sm text-foreground-light"><Loader2 size={14} className="animate-spin" /> Running EXPLAIN ANALYZE...@@ -154,8 +151,8 @@ export const QueryInsightsDetailSheet = ({No explain results available.</div>)}- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></SheetContent></Sheet>)diff --git a/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsTable.tsx b/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsTable.tsxindex 5d01dd41047..ff176209edb 100644--- a/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsTable.tsx+++ b/apps/studio/components/interfaces/QueryInsights/QueryInsightsTable/QueryInsightsTable.tsx@@ -6,7 +6,7 @@ import { useRouter } from 'next/router'import { parseAsArrayOf, parseAsString, useQueryStates } from 'nuqs'import { useCallback, useEffect, useMemo, useRef, useState } from 'react'import DataGrid, { DataGridHandle, Row } from 'react-data-grid'-import { Button, cn, Tabs_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Button, cn, Tabs, TabsList, TabsTrigger } from 'ui'import { Input } from 'ui-patterns/DataInputs/Input'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'@@ -364,34 +364,22 @@ export const QueryInsightsTable = ({<div className="flex items-center">{mode === 'triage' ? (- <Tabs_Shadcn_ value={filter} onValueChange={(v) => setFilter(v as IssueFilter)}>- <TabsList_Shadcn_ className="flex gap-x-4 rounded-none mt-0! pt-0 border-none!">- <TabsTrigger_Shadcn_- value="all"- className="text-xs py-3 border-b font-mono uppercase"- >+ <Tabs value={filter} onValueChange={(v) => setFilter(v as IssueFilter)}>+ <TabsList className="flex gap-x-4 rounded-none mt-0! pt-0 border-none!">+ <TabsTrigger value="all" className="text-xs py-3 border-b font-mono uppercase">All{triageItems.length > 0 && ` (${triageItems.length})`}- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_- value="error"- className="text-xs py-3 border-b font-mono uppercase"- >+ </TabsTrigger>+ <TabsTrigger value="error" className="text-xs py-3 border-b font-mono uppercase">Errors{errorCount > 0 && ` (${errorCount})`}- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_- value="index"- className="text-xs py-3 border-b font-mono uppercase"- >+ </TabsTrigger>+ <TabsTrigger value="index" className="text-xs py-3 border-b font-mono uppercase">Index{indexCount > 0 && ` (${indexCount})`}- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_- value="slow"- className="text-xs py-3 border-b font-mono uppercase"- >+ </TabsTrigger>+ <TabsTrigger value="slow" className="text-xs py-3 border-b font-mono uppercase">Slow{slowCount > 0 && ` (${slowCount})`}- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>- </Tabs_Shadcn_>+ </TabsTrigger>+ </TabsList>+ </Tabs>) : (<Inputsize="tiny"diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsxindex b8e92898f03..487d5d85a91 100644--- a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx@@ -14,10 +14,10 @@ import {SheetContent,SheetDescription,SheetTitle,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { Admonition } from 'ui-patterns/admonition'import { CodeBlock } from 'ui-patterns/CodeBlock'@@ -604,31 +604,31 @@ export const QueryPerformanceGrid = ({}}}>- <Tabs_Shadcn_+ <Tabsvalue={view}className="flex flex-col h-full"onValueChange={(value: any) => setView(value)}><div className="px-5 border-b">- <TabsList_Shadcn_ className="px-0 flex gap-x-4 min-h-[46px] border-b-0 [&>button]:h-[47px]">- <TabsTrigger_Shadcn_+ <TabsList className="px-0 flex gap-x-4 min-h-[46px] border-b-0 [&>button]:h-[47px]">+ <TabsTriggervalue="details"className="px-0 pb-0 data-[state=active]:bg-transparent shadow-none!">Query details- </TabsTrigger_Shadcn_>+ </TabsTrigger>{selectedRow !== undefined && canShowIndexesTab && (- <TabsTrigger_Shadcn_+ <TabsTriggervalue="suggestion"className="px-0 pb-0 data-[state=active]:bg-transparent shadow-none!">Indexes- </TabsTrigger_Shadcn_>+ </TabsTrigger>)}- </TabsList_Shadcn_>+ </TabsList></div>- <TabsContent_Shadcn_ value="details" className="mt-0 grow min-h-0 overflow-y-auto">+ <TabsContent value="details" className="mt-0 grow min-h-0 overflow-y-auto">{selectedRow !== undefined && (<QueryDetailselectedRow={reportData[selectedRow]}@@ -636,13 +636,13 @@ export const QueryPerformanceGrid = ({onClose={() => setSelectedRow(undefined)}/>)}- </TabsContent_Shadcn_>+ </TabsContent>{selectedRow !== undefined && canShowIndexesTab && (- <TabsContent_Shadcn_ value="suggestion" className="mt-0 grow min-h-0 overflow-y-auto">+ <TabsContent value="suggestion" className="mt-0 grow min-h-0 overflow-y-auto"><QueryIndexes selectedRow={reportData[selectedRow]} />- </TabsContent_Shadcn_>+ </TabsContent>)}- </Tabs_Shadcn_>+ </Tabs></SheetContent></Sheet></div>diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsxindex 8b6240caf8a..01ce9af2de2 100644--- a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx@@ -18,10 +18,10 @@ import {InputGroupInput,ScrollArea,Switch,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { InfoTooltip } from 'ui-patterns/info-tooltip'@@ -218,19 +218,19 @@ export const UserImpersonationSelector = () => {)}{!impersonatingUser && !isExternalAuthImpersonating && (- <Tabs_Shadcn_ value={selectedTab} onValueChange={(value: any) => setSelectedTab(value)}>- <TabsList_Shadcn_ className="gap-x-3">- <TabsTrigger_Shadcn_ value="user">Project user</TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ value="external" className="gap-x-1.5">+ <Tabs value={selectedTab} onValueChange={(value: any) => setSelectedTab(value)}>+ <TabsList className="gap-x-3">+ <TabsTrigger value="user">Project user</TabsTrigger>+ <TabsTrigger value="external" className="gap-x-1.5">External user<InfoTooltip side="bottom" className="flex flex-col gap-1 max-w-96">Test RLS policies with external auth providers like Clerk or Auth0 by providing auser ID and optional claims.</InfoTooltip>- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>+ </TabsTrigger>+ </TabsList>- <TabsContent_Shadcn_ value="user">+ <TabsContent value="user"><div className="flex flex-col gap-y-2"><InputGroup><InputGroupInput@@ -347,9 +347,9 @@ export const UserImpersonationSelector = () => {)}</></div>- </TabsContent_Shadcn_>+ </TabsContent>- <TabsContent_Shadcn_ value="external">+ <TabsContent value="external"><div className="flex flex-col gap-y-4"><FormItemLayoutlayout="horizontal"@@ -387,8 +387,8 @@ export const UserImpersonationSelector = () => {</Button></div></div>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs>)}</div>diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsxindex 60697aa58b1..125905c3b97 100644--- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx+++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx@@ -1,6 +1,6 @@import { useParams } from 'common'import { toast } from 'sonner'-import { Tabs_Shadcn_, TabsContent_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { ChartConfig } from './ChartConfig'import { UtilityActions } from './UtilityActions'@@ -130,24 +130,20 @@ export const UtilityPanel = ({}return (- <Tabs_Shadcn_- value={activeTab}- onValueChange={handleTabChange}- className="w-full h-full flex flex-col"- >- <TabsList_Shadcn_ className="flex justify-between gap-2 px-4 overflow-x-auto min-h-[42px]">+ <Tabs value={activeTab} onValueChange={handleTabChange} className="w-full h-full flex flex-col">+ <TabsList className="flex justify-between gap-2 px-4 overflow-x-auto min-h-[42px]"><div className="flex items-center gap-4">- <TabsTrigger_Shadcn_ className="py-3 text-xs" value="results">+ <TabsTrigger className="py-3 text-xs" value="results"><span className="translate-y-px">Results</span>- </TabsTrigger_Shadcn_>+ </TabsTrigger>{showExplainTab && (- <TabsTrigger_Shadcn_ className="py-3 text-xs" value="explain">+ <TabsTrigger className="py-3 text-xs" value="explain"><span className="translate-y-px">Explain</span>- </TabsTrigger_Shadcn_>+ </TabsTrigger>)}- <TabsTrigger_Shadcn_ className="py-3 text-xs" value="chart">+ <TabsTrigger className="py-3 text-xs" value="chart"><span className="translate-y-px">Chart</span>- </TabsTrigger_Shadcn_>+ </TabsTrigger>{result?.rows && (<DownloadResultsButton@@ -170,9 +166,9 @@ export const UtilityPanel = ({prettifyQuery={prettifyQuery}executeQuery={executeQuery}/>- </TabsList_Shadcn_>+ </TabsList>- <TabsContent_Shadcn_ asChild value="results" className="mt-0 grow">+ <TabsContent asChild value="results" className="mt-0 grow"><UtilityTabResultsid={id}isExecuting={isExecuting}@@ -181,17 +177,17 @@ export const UtilityPanel = ({buildDebugPrompt={buildDebugPrompt}isDebugging={isDebugging}/>- </TabsContent_Shadcn_>+ </TabsContent>{showExplainTab && (- <TabsContent_Shadcn_ asChild value="explain" className="mt-0 grow">+ <TabsContent asChild value="explain" className="mt-0 grow"><UtilityTabExplain id={id} isExecuting={isExplainExecuting} />- </TabsContent_Shadcn_>+ </TabsContent>)}- <TabsContent_Shadcn_ asChild value="chart" className="mt-0 grow">+ <TabsContent asChild value="chart" className="mt-0 grow"><ChartConfig results={result} config={chartConfig} onConfigChange={onConfigChange} />- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs>)}diff --git a/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx b/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsxindex e7ee13084a4..344ed4c94f9 100644--- a/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx+++ b/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx@@ -1,14 +1,6 @@import { Check, Copy, MousePointerClick, X } from 'lucide-react'import { useEffect, useState } from 'react'-import {- Button,- cn,- copyToClipboard,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,-} from 'ui'+import { Button, cn, copyToClipboard, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'@@ -99,14 +91,14 @@ const LogSelection = ({ log, onClose, queryType, isLoading, error }: LogSelectioreturn (<div className="relative flex h-full grow flex-col overflow-y-scroll bg-surface-100 border-t"><div className="relative grow flex flex-col h-full">- <Tabs_Shadcn_ defaultValue="details" className="flex flex-col h-full">- <TabsList_Shadcn_ className="px-2 pt-2 relative">- <TabsTrigger_Shadcn_ className="px-3" value="details">+ <Tabs defaultValue="details" className="flex flex-col h-full">+ <TabsList className="px-2 pt-2 relative">+ <TabsTrigger className="px-3" value="details">Details- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ disabled={!log} className="px-3" value="raw">+ </TabsTrigger>+ <TabsTrigger disabled={!log} className="px-3" value="raw">Raw- </TabsTrigger_Shadcn_>+ </TabsTrigger><div className="*:px-1.5 *:text-foreground-lighter ml-auto flex gap-1 absolute right-2 top-2"><ButtonTooltip@@ -129,7 +121,7 @@ const LogSelection = ({ log, onClose, queryType, isLoading, error }: LogSelectio<X size={14} strokeWidth={2} /></Button></div>- </TabsList_Shadcn_>+ </TabsList><div className="flex-1 h-full">{isLoading ? (<div className="p-4">@@ -137,10 +129,10 @@ const LogSelection = ({ log, onClose, queryType, isLoading, error }: LogSelectio</div>) : (<>- <TabsContent_Shadcn_ className="space-y-6 h-full" value="details">+ <TabsContent className="space-y-6 h-full" value="details"><LogDetails />- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ value="raw">+ </TabsContent>+ <TabsContent value="raw"><CodeBlockhideLineNumberslanguage="json"@@ -148,11 +140,11 @@ const LogSelection = ({ log, onClose, queryType, isLoading, error }: LogSelectio>{JSON.stringify(log, null, 2)}</CodeBlock>- </TabsContent_Shadcn_>+ </TabsContent></>)}</div>- </Tabs_Shadcn_>+ </Tabs></div></div>)diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsxindex ebd6b5c413d..943b701dc8c 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsx@@ -2,13 +2,7 @@ import type { PGTable } from '@supabase/pg-meta'import { noop } from 'lodash'import { useCallback, type ChangeEvent, type DragEvent } from 'react'import { toast } from 'sonner'-import {- SidePanel,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,-} from 'ui'+import { SidePanel, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { ActionBar } from '../ActionBar'import type { ImportContent } from '../TableEditor/TableEditor.types'diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsxindex 150af15064b..0404cc71aee 100644--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx@@ -7,10 +7,10 @@ import {ResizableHandle,ResizablePanel,Skeleton,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsxindex 7e350395491..428fe5b0083 100644--- a/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx@@ -12,10 +12,10 @@ import {PopoverContent,PopoverSeparator,PopoverTrigger,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { Admonition } from 'ui-patterns/admonition'import { SimpleCodeBlock } from 'ui-patterns/SimpleCodeBlock'@@ -67,42 +67,42 @@ export const LocalVersionPopover = () => {!isBeta && hasUpdate ? (<div className="px-4 mb-3"><p className="text-sm mb-2">A new version of Supabase CLI is available:</p>- <Tabs_Shadcn_ defaultValue="macos">- <TabsList_Shadcn_ className="mt-2">- <TabsTrigger_Shadcn_ className="px-2 text-xs" value="macos">+ <Tabs defaultValue="macos">+ <TabsList className="mt-2">+ <TabsTrigger className="px-2 text-xs" value="macos">macOS- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ className="px-2 text-xs" value="windows">+ </TabsTrigger>+ <TabsTrigger className="px-2 text-xs" value="windows">Windows- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ className="px-2 text-xs" value="linux">+ </TabsTrigger>+ <TabsTrigger className="px-2 text-xs" value="linux">Linux- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ className="px-2 text-xs" value="npm">+ </TabsTrigger>+ <TabsTrigger className="px-2 text-xs" value="npm">npm / Bun- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>- <TabsContent_Shadcn_ className="mt-2 text-xs" value="macos">+ </TabsTrigger>+ </TabsList>+ <TabsContent className="mt-2 text-xs" value="macos"><SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">brew upgrade supabase</SimpleCodeBlock>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ className="mt-2 text-xs" value="windows">+ </TabsContent>+ <TabsContent className="mt-2 text-xs" value="windows"><SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">scoop update supabase</SimpleCodeBlock>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ className="mt-2 text-xs" value="linux">+ </TabsContent>+ <TabsContent className="mt-2 text-xs" value="linux"><SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">brew upgrade supabase</SimpleCodeBlock>- </TabsContent_Shadcn_>- <TabsContent_Shadcn_ className="mt-2 text-xs" value="npm">+ </TabsContent>+ <TabsContent className="mt-2 text-xs" value="npm"><SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">npm update supabase --save-dev</SimpleCodeBlock>- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></div>) : (<div className="px-4 mb-3">diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelectorSheet.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelectorSheet.tsxindex dc4be78d268..dc568074039 100644--- a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelectorSheet.tsx+++ b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelectorSheet.tsx@@ -1,12 +1,5 @@import { Boxes } from 'lucide-react'-import {- SheetHeader,- SheetTitle,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,-} from 'ui'+import { SheetHeader, SheetTitle, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import MobileSheetNav from 'ui-patterns/MobileSheetNav/MobileSheetNav'import { OrganizationDropdown } from '@/components/layouts/AppLayout/OrganizationDropdown'@@ -38,14 +31,14 @@ export function OrgSelectorSheet({onOpenChange={onOpenChange}className="flex flex-col overflow-hidden h-[85dvh] md:max-h-[500px]">- <Tabs_Shadcn_+ <TabsdefaultValue="organization"className="flex flex-col flex-1 min-h-0 overflow-hidden p-0"><SheetHeader className="border-0 border-default p-0 shrink-0"><SheetTitle className="sr-only">Switch organization</SheetTitle>- <TabsList_Shadcn_ className="w-full grid grid-cols-1 shrink-0">- <TabsTrigger_Shadcn_+ <TabsList className="w-full grid grid-cols-1 shrink-0">+ <TabsTriggervalue="organization"className="text-xs flex flex-col items-center gap-1.5 px-4 py-3 data-[state=active]:border-0">@@ -53,16 +46,16 @@ export function OrgSelectorSheet({<span className="truncate max-w-full text-xs leading-tight" title={orgLabel}>{orgLabel}</span>- </TabsTrigger_Shadcn_>- </TabsList_Shadcn_>+ </TabsTrigger>+ </TabsList></SheetHeader>- <TabsContent_Shadcn_+ <TabsContentvalue="organization"className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 p-0 data-[state=inactive]:hidden"><OrganizationDropdown embedded className={embeddedClassName} onClose={onClose} />- </TabsContent_Shadcn_>- </Tabs_Shadcn_>+ </TabsContent>+ </Tabs></MobileSheetNav>)}diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheet.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheet.tsxindex 3eb616f9048..0c356df248b 100644--- a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheet.tsx+++ b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheet.tsx@@ -1,12 +1,5 @@import { Box, Boxes, GitBranch } from 'lucide-react'-import {- cn,- SheetHeader,- SheetTitle,- Tabs_Shadcn_,- TabsContent_Shadcn_,- TabsList_Shadcn_,-} from 'ui'+import { cn, SheetHeader, SheetTitle, Tabs, TabsContent, TabsList } from 'ui'import MobileSheetNav from 'ui-patterns/MobileSheetNav/MobileSheetNav'import { ProjectBranchSelectorSheetTabTrigger } from './ProjectBranchSelectorSheetTabTrigger'@@ -87,13 +80,10 @@ export function ProjectBranchSelectorSheet({onOpenChange={onOpenChange}className="flex flex-col overflow-hidden h-[85dvh] md:max-h-[500px]">- <Tabs_Shadcn_- defaultValue={defaultTab}- className="flex flex-col flex-1 min-h-0 overflow-hidden p-0"- >+ <Tabs defaultValue={defaultTab} className="flex flex-col flex-1 min-h-0 overflow-hidden p-0"><SheetHeader className="border-0 border-default p-0 shrink-0"><SheetTitle className="sr-only">Switch organization, project or branch</SheetTitle>- <TabsList_Shadcn_+ <TabsListclassName={cn('w-full grid gap-0 shrink-0',tabs.length === 1 && 'grid-cols-1',@@ -111,33 +101,33 @@ export function ProjectBranchSelectorSheet({isLast={index === tabs.length - 1}/>))}- </TabsList_Shadcn_>+ </TabsList></SheetHeader>{tabs.some((t) => t.value === 'organization') && (- <TabsContent_Shadcn_+ <TabsContentvalue="organization"className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 p-0 data-[state=inactive]:hidden"><OrganizationDropdown embedded className={EMBEDDED_CLASSNAME} onClose={onClose} />- </TabsContent_Shadcn_>+ </TabsContent>)}{tabs.some((t) => t.value === 'project') && (- <TabsContent_Shadcn_+ <TabsContentvalue="project"className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 py-0 data-[state=inactive]:hidden"><ProjectDropdown embedded className={EMBEDDED_CLASSNAME} onClose={onClose} />- </TabsContent_Shadcn_>+ </TabsContent>)}{tabs.some((t) => t.value === 'branch') && (- <TabsContent_Shadcn_+ <TabsContentvalue="branch"className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 p-0 data-[state=inactive]:hidden"><BranchDropdown embedded className={EMBEDDED_CLASSNAME} onClose={onClose} />- </TabsContent_Shadcn_>+ </TabsContent>)}- </Tabs_Shadcn_>+ </Tabs></MobileSheetNav>)}diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheetTabTrigger.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheetTabTrigger.tsxindex 6453a4eb5c8..738b1f7baf6 100644--- a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheetTabTrigger.tsx+++ b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorSheetTabTrigger.tsx@@ -1,5 +1,5 @@import type { LucideIcon } from 'lucide-react'-import { cn, TabsTrigger_Shadcn_ } from 'ui'+import { cn, TabsTrigger } from 'ui'export interface ProjectBranchSelectorSheetTabTriggerProps {value: 'organization' | 'project' | 'branch'@@ -20,7 +20,7 @@ export function ProjectBranchSelectorSheetTabTrigger({const isProductionBranch = isBranch && isMainBranchreturn (- <TabsTrigger_Shadcn_+ <TabsTriggervalue={value}className={cn('group relative text-xs flex flex-col items-center gap-1.5 px-4 py-3 data-[state=active]:bg-surface-200 data-[state=active]:border-foreground-light border-b duration-0',@@ -50,6 +50,6 @@ export function ProjectBranchSelectorSheetTabTrigger({<path d="M0.493652 0L5.49365 31L0.493652 62" stroke="var(--border-default)" /></svg>)}- </TabsTrigger_Shadcn_>+ </TabsTrigger>)}diff --git a/apps/studio/components/layouts/Tabs/SortableTab.tsx b/apps/studio/components/layouts/Tabs/SortableTab.tsxindex d2914ce8d9c..80cc206197a 100644--- a/apps/studio/components/layouts/Tabs/SortableTab.tsx+++ b/apps/studio/components/layouts/Tabs/SortableTab.tsx@@ -3,7 +3,7 @@ import { CSS } from '@dnd-kit/utilities'import { AnimatePresence, motion } from 'framer-motion'import { X } from 'lucide-react'import { useMemo } from 'react'-import { cn, TabsTrigger_Shadcn_ } from 'ui'+import { cn, TabsTrigger } from 'ui'import { useEditorType } from '../editors/EditorsLayout.hooks'import { EntityTypeIcon } from '@/components/ui/EntityTypeIcon'@@ -50,7 +50,7 @@ export const SortableTab = ({}, [openTabs, currentSchema, editor])// Create a motion version of TabsTrigger while preserving all functionality- // const MotionTabsTrigger = motion(TabsTrigger_Shadcn_)+ // const MotionTabsTrigger = motion(TabsTrigger)return (<motion.div@@ -62,7 +62,7 @@ export const SortableTab = ({animate={{ opacity: isDragging ? 0 : 1 }}className={cn('flex items-center h-(--header-height) first-of-type:border-l')}>- <TabsTrigger_Shadcn_+ <TabsTriggervalue={tab.id}onAuxClick={(e) => {// Middle click closes tab@@ -121,7 +121,7 @@ export const SortableTab = ({<X size={12} className="text-foreground-light" /></span><div className="absolute w-full top-0 left-0 right-0 h-px bg-foreground opacity-0 group-data-[state=active]:opacity-100" />- </TabsTrigger_Shadcn_>+ </TabsTrigger>{index < openTabs.length && (<div role="separator" className="h-full w-px bg-border" key={`separator-${tab.id}`} />)}diff --git a/apps/studio/components/layouts/Tabs/Tabs.tsx b/apps/studio/components/layouts/Tabs/Tabs.tsxindex 1f9892fa543..7ca8624837a 100644--- a/apps/studio/components/layouts/Tabs/Tabs.tsx+++ b/apps/studio/components/layouts/Tabs/Tabs.tsx@@ -17,9 +17,9 @@ import {ContextMenuContent,ContextMenuItem,ContextMenuTrigger,- Tabs_Shadcn_,- TabsList_Shadcn_,- TabsTrigger_Shadcn_,+ Tabs,+ TabsList,+ TabsTrigger,} from 'ui'import { useEditorType } from '../editors/EditorsLayout.hooks'@@ -137,13 +137,13 @@ export const EditorTabs = () => {return (<DndContext sensors={sensors} onDragEnd={handleDragEnd}>- <Tabs_Shadcn_+ <TabsclassName="w-full flex"value={hasNewTab ? 'new' : (tabs.activeTab ?? undefined)}onValueChange={handleTabChange}><CollapseButton hideTabs={false} />- <TabsList_Shadcn_+ <TabsListref={tabsListRef}className={cn('rounded-b-none gap-0 min-h-(--header-height) flex items-center w-full z-1',@@ -181,7 +181,7 @@ export const EditorTabs = () => {{/* Non-draggable new tab */}{hasNewTab && (- <TabsTrigger_Shadcn_+ <TabsTriggervalue="new"className={cn('flex items-center gap-2 px-3 text-xs',@@ -215,7 +215,7 @@ export const EditorTabs = () => {<X size={12} className="text-foreground-light" /></span>{' '}<div className="absolute w-full -bottom-px left-0 right-0 h-px bg-dash-sidebar dark:bg-surface-100 opacity-0 group-data-[state=active]:opacity-100" />- </TabsTrigger_Shadcn_>+ </TabsTrigger>)}<AnimatePresence initial={false}>@@ -240,8 +240,8 @@ export const EditorTabs = () => {)}</AnimatePresence><div className="grow h-full border-b pr-6" />- </TabsList_Shadcn_>- </Tabs_Shadcn_>+ </TabsList>+ </Tabs><DragOverlay dropAnimation={null}>{tabs.activeTab ? <TabPreview tab={tabs.activeTab} /> : null}diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsx b/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsxindex 156a37411b0..7a15ddf8dfd 100644--- a/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsx+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsx@@ -1,5 +1,5 @@import { X } from 'lucide-react'-import { Tabs_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Tabs, TabsList, TabsTrigger } from 'ui'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { FilterPopover } from '@/components/ui/FilterPopover'@@ -40,27 +40,24 @@ export const AdvisorFilters = ({return (<div className="border-b overflow-x-auto"><div className="flex items-center justify-between gap-x-4 h-[calc(var(--header-height)-1px)]">- <Tabs_Shadcn_ value={activeTab} onValueChange={onTabChange} className="h-full pl-4">- <TabsList_Shadcn_ className="border-b-0 gap-4 h-full">- <TabsTrigger_Shadcn_ value="all" className="h-full text-xs">+ <Tabs value={activeTab} onValueChange={onTabChange} className="h-full pl-4">+ <TabsList className="border-b-0 gap-4 h-full">+ <TabsTrigger value="all" className="h-full text-xs">All- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ value="security" className="h-full text-xs">+ </TabsTrigger>+ <TabsTrigger value="security" className="h-full text-xs">Security- </TabsTrigger_Shadcn_>- <TabsTrigger_Shadcn_ value="performance" className="h-full text-xs">+ </TabsTrigger>+ <TabsTrigger value="performance" className="h-full text-xs">Performance- </TabsTrigger_Shadcn_>+ </TabsTrigger>{isPlatform && (- <TabsTrigger_Shadcn_- value="messages"- className="h-full text-xs flex items-center gap-2"- >+ <TabsTrigger value="messages" className="h-full text-xs flex items-center gap-2">Messages- </TabsTrigger_Shadcn_>+ </TabsTrigger>)}- </TabsList_Shadcn_>- </Tabs_Shadcn_>+ </TabsList>+ </Tabs><div className="flex items-center gap-x-2 pr-3">{isPlatform && (<FilterPopoverdiff --git a/apps/ui-library/components/command.tsx b/apps/ui-library/components/command.tsxindex 6ab0cdc06d6..fdc4064c4fa 100644--- a/apps/ui-library/components/command.tsx+++ b/apps/ui-library/components/command.tsx@@ -1,7 +1,7 @@'use client'import { motion } from 'framer-motion'-import { Tabs_Shadcn_, TabsContent_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { CommandCopyButton } from './command-copy-button'import { useLocalStorage } from './use-local-storage'@@ -58,7 +58,7 @@ export function Command({ name, highlight, framework = 'react' }: CommandCopyPro}return (- <Tabs_Shadcn_ value={value} onValueChange={setValue} className="w-full">+ <Tabs value={value} onValueChange={setValue} className="w-full"><div className="w-full group relative rounded-lg bg-surface-200 dark:bg-surface-100 px-4 py-2 overflow-hidden">{highlight && (<motion.div@@ -75,16 +75,16 @@ export function Command({ name, highlight, framework = 'react' }: CommandCopyPro)}<div className="flex flex-col">- <TabsList_Shadcn_ className="gap-2 relative mb-2 z-10">+ <TabsList className="gap-2 relative mb-2 z-10">{(Object.keys(commands) as PackageManager[]).map((manager) => (- <TabsTrigger_Shadcn_ key={manager} value={manager} className="text-xs">+ <TabsTrigger key={manager} value={manager} className="text-xs">{manager}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>{(Object.keys(commands) as PackageManager[]).map((manager) => (- <TabsContent_Shadcn_ key={manager} value={manager} className="m-0">+ <TabsContent key={manager} value={manager} className="m-0"><div className="flex items-center"><div className="flex-1 font-mono text-sm text-foreground relative z-10"><span className="mr-2 text-[#888] select-none">$</span>@@ -94,10 +94,10 @@ export function Command({ name, highlight, framework = 'react' }: CommandCopyPro<CommandCopyButton command={commands[manager]} /></div></div>- </TabsContent_Shadcn_>+ </TabsContent>))}</div></div>- </Tabs_Shadcn_>+ </Tabs>)}diff --git a/apps/ui-library/components/tanstack-db-generator/index.tsx b/apps/ui-library/components/tanstack-db-generator/index.tsxindex 8890b0df15f..3c72fefe83c 100644--- a/apps/ui-library/components/tanstack-db-generator/index.tsx+++ b/apps/ui-library/components/tanstack-db-generator/index.tsx@@ -3,15 +3,7 @@import { useIsLoggedIn, useIsUserLoading } from 'common'import { Check, Copy, Loader2 } from 'lucide-react'import { useCallback, useState } from 'react'-import {- Button,- cn,- copyToClipboard,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,-} from 'ui'+import { Button, cn, copyToClipboard, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { useLocalStorage } from '../use-local-storage'import { ProjectPicker } from './ProjectPicker'diff --git a/apps/www/components/Charts/PGCharts.tsx b/apps/www/components/Charts/PGCharts.tsxindex c2a45dc280e..ac9f269e9cb 100644--- a/apps/www/components/Charts/PGCharts.tsx+++ b/apps/www/components/Charts/PGCharts.tsx@@ -4,11 +4,7 @@ import { useState } from 'react'import ReactMarkdown from 'react-markdown'import { Bar, BarChart, Legend, ResponsiveContainer, XAxis, YAxis } from 'recharts'import remarkGfm from 'remark-gfm'-import {- Tabs_Shadcn_ as Tabs,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,-} from 'ui'+import { Tabs, TabsList, TabsTrigger } from 'ui'import * as data from '@/data/blog/PostgresFTSComparison'diff --git a/apps/www/components/Realtime/realtime-showcase.tsx b/apps/www/components/Realtime/realtime-showcase.tsxindex 7fae08c1cc0..d284c1d3bd9 100644--- a/apps/www/components/Realtime/realtime-showcase.tsx+++ b/apps/www/components/Realtime/realtime-showcase.tsx@@ -12,7 +12,7 @@ import iframeAnnotationExample from './examples/iframe-annotation-example'import logViewerExample from './examples/log-viewer-example'import formPresenceExample from './examples/form-presence-example'import cursorTrackingExample from './examples/cursor-tracking-example'-import { Tabs_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Tabs, TabsList, TabsTrigger } from 'ui'import {Users,MessageSquare,@@ -134,7 +134,7 @@ export default function RealtimeShowcase() {return (<div className="bg-surface-75/50 border border-muted rounded-lg h-auto lg:h-[600px]">- <Tabs_Shadcn_+ <Tabsvalue={currentExample.value}onValueChange={handleTabChange}className="w-full h-full flex flex-col lg:flex-row border-b border-muted h-full items-stretch"@@ -142,34 +142,34 @@ export default function RealtimeShowcase() {{/* Desktop sidebar tabs - hidden on mobile */}<div className="hidden lg:block w-48 px-6 py-8 border-r border-muted h-full"><h2 className="text-xs uppercase text-foreground-light font-mono mb-4">Examples</h2>- <TabsList_Shadcn_ className="border-none flex flex-col h-auto justify-start items-stretch gap-2 bg-transparent">+ <TabsList className="border-none flex flex-col h-auto justify-start items-stretch gap-2 bg-transparent">{EXAMPLES.map((example) => (- <TabsTrigger_Shadcn_+ <TabsTriggerkey={example.value}value={example.value}className="justify-start px-2 py-2 h-auto data-[state=active]:bg-transparent data-[state=active]:border-none border-none p-0 data-[state=active]:text-foreground"><example.icon strokeWidth={1.5} size={16} className="mr-3" />{example.label}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList></div>{/* Mobile horizontal tabs - shown only on mobile */}<div className="lg:hidden px-2 py-2 border-b border-muted w-full overflow-x-auto">- <TabsList_Shadcn_ className="border-none flex flex-row h-auto justify-start items-center gap-2 bg-transparent w-max">+ <TabsList className="border-none flex flex-row h-auto justify-start items-center gap-2 bg-transparent w-max">{EXAMPLES.map((example) => (- <TabsTrigger_Shadcn_+ <TabsTriggerkey={example.value}value={example.value}className="whitespace-nowrap justify-start px-3 py-2 h-auto data-[state=active]:bg-surface-100 data-[state=active]:border-none rounded-md"><example.icon strokeWidth={1.5} size={14} className="mr-2" />{example.label}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList></div>{/* Tab Content - render ExampleLayout with props from current example */}@@ -183,7 +183,7 @@ export default function RealtimeShowcase() {/></div></div>- </Tabs_Shadcn_>+ </Tabs></div>)}diff --git a/apps/www/components/Tabs/Tabs.tsx b/apps/www/components/Tabs/Tabs.tsxindex 18c4fe77ca4..89641dcd876 100644--- a/apps/www/components/Tabs/Tabs.tsx+++ b/apps/www/components/Tabs/Tabs.tsx@@ -1,7 +1,7 @@'use client'-import { useState, useEffect } from 'react'-import { cn, Tabs_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_, TabsContent_Shadcn_ } from 'ui'+import { useEffect, useState } from 'react'+import { cn, TabsContent, TabsList, TabsTrigger, Tabs as UITabs } from 'ui'export interface TabsProps {children: React.ReactNode@@ -39,28 +39,24 @@ function Tabs({ children, className, defaultActiveId, listClassNames }: TabsPropreturn (<div className={cn('not-prose', className)}>- <Tabs_Shadcn_+ <UITabsvalue={currentActiveTab}onValueChange={setActiveTab}className="w-full flex flex-col gap-4 [&_.ch-codeblock]:mt-0!">- <TabsList_Shadcn_ className={cn('shiki-wrapper flex', listClassNames)}>+ <TabsList className={cn('shiki-wrapper flex', listClassNames)}>{validTabPanels.map((panel) => (- <TabsTrigger_Shadcn_- key={panel.props.id}- value={panel.props.id}- className="text-xs px-2.5"- >+ <TabsTrigger key={panel.props.id} value={panel.props.id} className="text-xs px-2.5">{panel.props.label}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>{validTabPanels.map((panel) => (- <TabsContent_Shadcn_ key={panel.props.id} value={panel.props.id} className="mt-0">+ <TabsContent key={panel.props.id} value={panel.props.id} className="mt-0">{panel.props.children}- </TabsContent_Shadcn_>+ </TabsContent>))}- </Tabs_Shadcn_>+ </UITabs></div>)}diff --git a/packages/dev-tools/DevToolbar.tsx b/packages/dev-tools/DevToolbar.tsxindex 06e807e426c..413d9649e33 100644--- a/packages/dev-tools/DevToolbar.tsx+++ b/packages/dev-tools/DevToolbar.tsx@@ -26,9 +26,9 @@ import {SheetHeader,SheetTitle,Switch,- Tabs_Shadcn_ as Tabs,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsList,+ TabsTrigger,Tooltip,TooltipContent,TooltipTrigger,diff --git a/packages/ui-patterns/src/MultipleCodeBlock/index.tsx b/packages/ui-patterns/src/MultipleCodeBlock/index.tsxindex 9e0223d7098..76030116265 100644--- a/packages/ui-patterns/src/MultipleCodeBlock/index.tsx+++ b/packages/ui-patterns/src/MultipleCodeBlock/index.tsx@@ -1,5 +1,5 @@import { useEffect, useState } from 'react'-import { Tabs_Shadcn_, TabsContent_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'+import { Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'import { CodeBlock, type CodeBlockLang } from 'ui-patterns/CodeBlock'interface MultipleCodeBlockFile {@@ -125,25 +125,25 @@ export const MultipleCodeBlock = ({ files, value, onValueChange }: MultipleCodeB}return (- <Tabs_Shadcn_+ <Tabsvalue={activeValue}onValueChange={handleValueChange}className="border rounded-lg gap-0 space-y-0 overflow-hidden">- <TabsList_Shadcn_ className="bg-surface-75 px-5 gap-5 overflow-x-auto border-0 border-b">+ <TabsList className="bg-surface-75 px-5 gap-5 overflow-x-auto border-0 border-b">{files.map((file) => (- <TabsTrigger_Shadcn_+ <TabsTriggerkey={file.name}value={file.name}className="flex items-center gap-1 text-xs px-0 data-[state=active]:bg-transparent py-2.5">{file.name}- </TabsTrigger_Shadcn_>+ </TabsTrigger>))}- </TabsList_Shadcn_>+ </TabsList>{trimmedFiles.map((file) => (- <TabsContent_Shadcn_+ <TabsContentkey={file.name}value={file.name}forceMount@@ -156,8 +156,8 @@ export const MultipleCodeBlock = ({ files, value, onValueChange }: MultipleCodeBlanguage={resolveLanguage(file.language, file.name)}className="min-h-72 !bg-surface-75 rounded-none border-0"/>- </TabsContent_Shadcn_>+ </TabsContent>))}- </Tabs_Shadcn_>+ </Tabs>)}diff --git a/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsx b/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsxindex 5d51aa6fabf..23b57101cf0 100644--- a/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsx+++ b/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsx@@ -34,10 +34,10 @@ import {Collapsible,CollapsibleContent,CollapsibleTrigger,- Tabs_Shadcn_ as Tabs,- TabsContent_Shadcn_ as TabsContent,- TabsList_Shadcn_ as TabsList,- TabsTrigger_Shadcn_ as TabsTrigger,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,} from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'diff --git a/packages/ui/index.tsx b/packages/ui/index.tsxindex 26e3060c5b2..941829f92c7 100644--- a/packages/ui/index.tsx+++ b/packages/ui/index.tsx@@ -107,12 +107,7 @@ export * from './src/components/ShadowScrollArea'export * from './src/components/shadcn/ui/collapsible'-export {- Tabs as Tabs_Shadcn_,- TabsContent as TabsContent_Shadcn_,- TabsList as TabsList_Shadcn_,- TabsTrigger as TabsTrigger_Shadcn_,-} from './src/components/shadcn/ui/tabs'+export * from './src/components/shadcn/ui/tabs'export * from './src/components/shadcn/ui/tooltip'