Skip to content

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

chore: rename `CommandMenu` internal components to avoid conflicts with base shadcn ones (#45996)

Gildas Garcia224dbb09bb8c
diff --git a/apps/design-system/registry/default/example/commandmenu-badge.tsx b/apps/design-system/registry/default/example/commandmenu-badge.tsx
index 309f8cd2afa..edeb2f3df2f 100644
--- a/apps/design-system/registry/default/example/commandmenu-badge.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-badge.tsx
@@ -1,9 +1,9 @@
import { Button } from '@ui/components/shadcn/ui/button'
import {
BadgeExperimental,
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandProvider,
useRegisterCommands,
useSetCommandMenuOpen,
@@ -34,8 +34,8 @@ export default function CommandMenuDemo() {
<CommandMenuTrigger />
<Commands />
<CommandMenu>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
</CommandProvider>
)
diff --git a/apps/design-system/registry/default/example/commandmenu-conditional.tsx b/apps/design-system/registry/default/example/commandmenu-conditional.tsx
index 4d8159b3573..2be767247be 100644
--- a/apps/design-system/registry/default/example/commandmenu-conditional.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-conditional.tsx
@@ -1,9 +1,9 @@
import { Button } from '@ui/components/shadcn/ui/button'
import { useMemo, useState } from 'react'
import {
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandMenuTrigger as CommandMenuTriggerPrimitive,
CommandProvider,
useRegisterCommands,
@@ -60,8 +60,8 @@ export default function CommandMenuDemo() {
<CommandProvider openKey="">
<div className="flex flex-col gap-2">
<CommandMenu trigger={<CommandMenuTrigger />}>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
<Commands />
</div>
diff --git a/apps/design-system/registry/default/example/commandmenu-demo.tsx b/apps/design-system/registry/default/example/commandmenu-demo.tsx
index a1cfec496cd..e4df0a43850 100644
--- a/apps/design-system/registry/default/example/commandmenu-demo.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-demo.tsx
@@ -1,8 +1,8 @@
import { Button } from '@ui/components/shadcn/ui/button'
import {
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandMenuTrigger as CommandMenuTriggerPrimitive,
CommandProvider,
useRegisterCommands,
@@ -40,8 +40,8 @@ export default function CommandMenuDemo() {
<CommandProvider openKey="j">
<Commands />
<CommandMenu trigger={<CommandMenuTrigger />}>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
</CommandProvider>
)
diff --git a/apps/design-system/registry/default/example/commandmenu-force.tsx b/apps/design-system/registry/default/example/commandmenu-force.tsx
index ac475beb238..b7f297d3ba2 100644
--- a/apps/design-system/registry/default/example/commandmenu-force.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-force.tsx
@@ -1,8 +1,8 @@
import { Button } from '@ui/components/shadcn/ui/button'
import {
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandMenuTrigger as CommandMenuTriggerPrimitive,
CommandProvider,
useRegisterCommands,
@@ -52,8 +52,8 @@ export default function CommandMenuDemo() {
<CommandProvider openKey="">
<Commands />
<CommandMenu trigger={<CommandMenuTrigger />}>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
</CommandProvider>
)
diff --git a/apps/design-system/registry/default/example/commandmenu-hidden.tsx b/apps/design-system/registry/default/example/commandmenu-hidden.tsx
index a9d60c69025..3e693b32b60 100644
--- a/apps/design-system/registry/default/example/commandmenu-hidden.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-hidden.tsx
@@ -1,8 +1,8 @@
import { Button } from '@ui/components/shadcn/ui/button'
import {
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandMenuTrigger as CommandMenuTriggerPrimitive,
CommandProvider,
useRegisterCommands,
@@ -39,8 +39,8 @@ export default function CommandMenuDemo() {
<CommandProvider openKey="">
<Commands />
<CommandMenu trigger={<CommandMenuTrigger />}>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
</CommandProvider>
)
diff --git a/apps/design-system/registry/default/example/commandmenu-icon.tsx b/apps/design-system/registry/default/example/commandmenu-icon.tsx
index c877f83e450..7de6da43f0c 100644
--- a/apps/design-system/registry/default/example/commandmenu-icon.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-icon.tsx
@@ -1,9 +1,9 @@
import { Button } from '@ui/components/shadcn/ui/button'
import { Github } from 'lucide-react'
import {
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandMenuTrigger as CommandMenuTriggerPrimitive,
CommandProvider,
useRegisterCommands,
@@ -35,8 +35,8 @@ export default function CommandMenuDemo() {
<CommandProvider openKey="">
<Commands />
<CommandMenu trigger={<CommandMenuTrigger />}>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
</CommandProvider>
)
diff --git a/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx b/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx
index 0cd74c1d7a1..93f833dbae5 100644
--- a/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx
@@ -1,10 +1,9 @@
import { Button } from '@ui/components/shadcn/ui/button'
-import { useMemo } from 'react'
import {
Breadcrumb,
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandMenuTrigger as CommandMenuTriggerPrimitive,
CommandProvider,
PageType,
@@ -57,8 +56,8 @@ export default function CommandMenuDemo() {
<CommandProvider openKey="">
<Commands />
<CommandMenu trigger={<CommandMenuTrigger />}>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
</CommandProvider>
)
diff --git a/apps/design-system/registry/default/example/commandmenu-subpage.tsx b/apps/design-system/registry/default/example/commandmenu-subpage.tsx
index ef842b43143..3bc2112c669 100644
--- a/apps/design-system/registry/default/example/commandmenu-subpage.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-subpage.tsx
@@ -1,9 +1,9 @@
import { Button } from '@ui/components/shadcn/ui/button'
import { useMemo } from 'react'
import {
- CommandInput,
- CommandList,
CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
CommandMenuTrigger as CommandMenuTriggerPrimitive,
CommandProvider,
PageType,
@@ -65,8 +65,8 @@ export default function CommandMenuDemo() {
<CommandProvider openKey="">
<Commands />
<CommandMenu trigger={<CommandMenuTrigger />}>
- <CommandInput />
- <CommandList />
+ <CommandMenuInput />
+ <CommandMenuList />
</CommandMenu>
</CommandProvider>
)
diff --git a/apps/docs/features/command/CommandMenu.tsx b/apps/docs/features/command/CommandMenu.tsx
index c2278063234..03471aada61 100644
--- a/apps/docs/features/command/CommandMenu.tsx
+++ b/apps/docs/features/command/CommandMenu.tsx
@@ -1,12 +1,17 @@
-import { CommandHeader, CommandInput, CommandList, CommandMenu } from 'ui-patterns/CommandMenu'
+import {
+ CommandHeader,
+ CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
+} from 'ui-patterns/CommandMenu'
import { useChangelogCommand } from 'ui-patterns/CommandMenu/prepackaged/Changelog'
import { useDocsAiCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsAi'
import { useDocsSearchCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsSearch'
import { useSupportCommands } from 'ui-patterns/CommandMenu/prepackaged/Support'
import { useThemeSwitcherCommands } from 'ui-patterns/CommandMenu/prepackaged/ThemeSwitcher'
-import { useQuickstartCommands } from './Quickstarts'
import { useDocsNavCommands } from '../../components/Navigation/Navigation.commands'
+import { useQuickstartCommands } from './Quickstarts'
const DocsCommandMenu = () => {
useDocsSearchCommands({
@@ -23,9 +28,9 @@ const DocsCommandMenu = () => {
return (
<CommandMenu>
<CommandHeader>
- <CommandInput />
+ <CommandMenuInput />
</CommandHeader>
- <CommandList />
+ <CommandMenuList />
</CommandMenu>
)
}
diff --git a/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx b/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx
index e35d8e1687f..41be54b5fc9 100644
--- a/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx
+++ b/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx
@@ -1,5 +1,10 @@
import { IS_PLATFORM } from 'common'
-import { CommandHeader, CommandInput, CommandList, CommandMenu } from 'ui-patterns/CommandMenu'
+import {
+ CommandHeader,
+ CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
+} from 'ui-patterns/CommandMenu'
import { useChangelogCommand } from 'ui-patterns/CommandMenu/prepackaged/Changelog'
import { useDocsAiCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsAi'
import { useDocsSearchCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsSearch'
@@ -25,9 +30,9 @@ export function CommandMenuInnerContent() {
return (
<>
<CommandHeader>
- <CommandInput />
+ <CommandMenuInput />
</CommandHeader>
- <CommandList />
+ <CommandMenuList />
</>
)
}
diff --git a/apps/studio/components/interfaces/App/CommandMenu/ContextSearchCommands.tsx b/apps/studio/components/interfaces/App/CommandMenu/ContextSearchCommands.tsx
index ea270b0a991..7e8f5718a51 100644
--- a/apps/studio/components/interfaces/App/CommandMenu/ContextSearchCommands.tsx
+++ b/apps/studio/components/interfaces/App/CommandMenu/ContextSearchCommands.tsx
@@ -7,7 +7,7 @@ import { useMemo } from 'react'
import type { ICommand } from 'ui-patterns/CommandMenu'
import {
CommandHeader,
- CommandInput,
+ CommandMenuInput,
CommandWrapper,
PageType,
useQuery,
@@ -74,7 +74,7 @@ function ContextSearchPage({
return (
<CommandWrapper>
<CommandHeader>
- <CommandInput placeholder={placeholder} />
+ <CommandMenuInput placeholder={placeholder} />
</CommandHeader>
<ContextSearchResults context={context} query={query} />
</CommandWrapper>
diff --git a/apps/studio/components/interfaces/App/CommandMenu/ContextSearchResults.shared.tsx b/apps/studio/components/interfaces/App/CommandMenu/ContextSearchResults.shared.tsx
index d2ae7fd773b..3eaf23408ef 100644
--- a/apps/studio/components/interfaces/App/CommandMenu/ContextSearchResults.shared.tsx
+++ b/apps/studio/components/interfaces/App/CommandMenu/ContextSearchResults.shared.tsx
@@ -3,8 +3,8 @@
import { cn, CommandList_Shadcn_ } from 'ui'
import { ShimmeringLoader } from 'ui-patterns'
import { TextHighlighter } from 'ui-patterns/CommandMenu'
-import { CommandItem } from 'ui-patterns/CommandMenu/internal/Command'
-import { CommandGroup } from 'ui-patterns/CommandMenu/internal/CommandGroup'
+import { CommandMenuGroup } from 'ui-patterns/CommandMenu/internal/CommandMenuGroup'
+import { CommandMenuItem } from 'ui-patterns/CommandMenu/internal/CommandMenuItem'
import type { IActionCommand, IRouteCommand } from 'ui-patterns/CommandMenu/internal/types'
export interface SearchResult {
@@ -92,9 +92,9 @@ export function ResultsList({
className
)}
>
- <CommandGroup>
+ <CommandMenuGroup>
{commands.map((command) => (
- <CommandItem key={command.id} command={command}>
+ <CommandMenuItem key={command.id} command={command}>
<div className="flex flex-col min-w-0 text-foreground-light">
<TextHighlighter>{command.name}</TextHighlighter>
{command.value && command.value !== command.name && (
@@ -103,9 +103,9 @@ export function ResultsList({
</p>
)}
</div>
- </CommandItem>
+ </CommandMenuItem>
))}
- </CommandGroup>
+ </CommandMenuGroup>
</CommandList_Shadcn_>
)
}
diff --git a/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx b/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx
index c71d2364ca0..01b5961e2c0 100644
--- a/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx
+++ b/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx
@@ -16,7 +16,7 @@ import type { CommandOptions } from 'ui-patterns/CommandMenu'
import {
Breadcrumb,
CommandHeader,
- CommandInput,
+ CommandMenuInput,
CommandWrapper,
escapeAttributeSelector,
generateCommandClassNames,
@@ -118,7 +118,7 @@ function RunSnippetPage() {
<CommandWrapper>
<CommandHeader>
<Breadcrumb />
- <CommandInput autoFocus />
+ <CommandMenuInput autoFocus />
</CommandHeader>
{isLoading && <LoadingState />}
{isError && <ErrorState />}
@@ -319,7 +319,7 @@ function TableSelector() {
<CommandWrapper>
<CommandHeader>
<Breadcrumb />
- <CommandInput autoFocus />
+ <CommandMenuInput autoFocus />
</CommandHeader>
<CommandList_Shadcn_>
{isLoading && <LoadingState />}
diff --git a/apps/www/components/CommandMenu/CommandMenu.tsx b/apps/www/components/CommandMenu/CommandMenu.tsx
index 0079aa41977..45fae07020c 100644
--- a/apps/www/components/CommandMenu/CommandMenu.tsx
+++ b/apps/www/components/CommandMenu/CommandMenu.tsx
@@ -1,4 +1,9 @@
-import { CommandHeader, CommandInput, CommandList, CommandMenu } from 'ui-patterns/CommandMenu'
+import {
+ CommandHeader,
+ CommandMenu,
+ CommandMenuInput,
+ CommandMenuList,
+} from 'ui-patterns/CommandMenu'
import { useChangelogCommand } from 'ui-patterns/CommandMenu/prepackaged/Changelog'
import { useDocsAiCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsAi'
import { useDocsSearchCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsSearch'
@@ -15,9 +20,9 @@ export default function WwwCommandMenuEager() {
return (
<CommandMenu>
<CommandHeader>
- <CommandInput />
+ <CommandMenuInput />
</CommandHeader>
- <CommandList />
+ <CommandMenuList />
</CommandMenu>
)
}
diff --git a/packages/ui-patterns/package.json b/packages/ui-patterns/package.json
index b1a9707d003..85432df4f3c 100644
--- a/packages/ui-patterns/package.json
+++ b/packages/ui-patterns/package.json
@@ -86,13 +86,13 @@
"import": "./src/CommandMenu/api/CommandHeader.tsx",
"types": "./src/CommandMenu/api/CommandHeader.tsx"
},
- "./CommandMenu/api/CommandInput": {
- "import": "./src/CommandMenu/api/CommandInput.tsx",
- "types": "./src/CommandMenu/api/CommandInput.tsx"
+ "./CommandMenu/api/CommandMenuInput": {
+ "import": "./src/CommandMenu/api/CommandMenuInput.tsx",
+ "types": "./src/CommandMenu/api/CommandMenuInput.tsx"
},
- "./CommandMenu/api/CommandList": {
- "import": "./src/CommandMenu/api/CommandList.tsx",
- "types": "./src/CommandMenu/api/CommandList.tsx"
+ "./CommandMenu/api/CommandMenuList": {
+ "import": "./src/CommandMenu/api/CommandMenuList.tsx",
+ "types": "./src/CommandMenu/api/CommandMenuList.tsx"
},
"./CommandMenu/api/CommandMenu": {
"import": "./src/CommandMenu/api/CommandMenu.tsx",
@@ -162,17 +162,17 @@
"import": "./src/CommandMenu/index.tsx",
"types": "./src/CommandMenu/index.tsx"
},
- "./CommandMenu/internal/Command": {
- "import": "./src/CommandMenu/internal/Command.tsx",
- "types": "./src/CommandMenu/internal/Command.tsx"
+ "./CommandMenu/internal/CommandMenuItem": {
+ "import": "./src/CommandMenu/internal/CommandMenuItem.tsx",
+ "types": "./src/CommandMenu/internal/CommandMenuItem.tsx"
},
- "./CommandMenu/internal/CommandEmpty": {
- "import": "./src/CommandMenu/internal/CommandEmpty.tsx",
- "types": "./src/CommandMenu/internal/CommandEmpty.tsx"
+ "./CommandMenu/internal/CommandMenuEmpty": {
+ "import": "./src/CommandMenu/internal/CommandMenuEmpty.tsx",
+ "types": "./src/CommandMenu/internal/CommandMenuEmpty.tsx"
},
- "./CommandMenu/internal/CommandGroup": {
- "import": "./src/CommandMenu/internal/CommandGroup.tsx",
- "types": "./src/CommandMenu/internal/CommandGroup.tsx"
+ "./CommandMenu/internal/CommandMenuGroup": {
+ "import": "./src/CommandMenu/internal/CommandMenuGroup.tsx",
+ "types": "./src/CommandMenu/internal/CommandMenuGroup.tsx"
},
"./CommandMenu/internal/CommandSection": {
"import": "./src/CommandMenu/internal/CommandSection.tsx",
diff --git a/packages/ui-patterns/src/CommandMenu/api/CommandInput.tsx b/packages/ui-patterns/src/CommandMenu/api/CommandMenuInput.tsx
similarity index 97%
rename from packages/ui-patterns/src/CommandMenu/api/CommandInput.tsx
rename to packages/ui-patterns/src/CommandMenu/api/CommandMenuInput.tsx
index c7fc8ceff0a..8f3c33c1a66 100644
--- a/packages/ui-patterns/src/CommandMenu/api/CommandInput.tsx
+++ b/packages/ui-patterns/src/CommandMenu/api/CommandMenuInput.tsx
@@ -41,7 +41,7 @@ function useFocusInputOnWiderScreens(ref: React.ForwardedRef<HTMLInputElement>)
return combinedRef
}
-const CommandInput = forwardRef<
+const CommandMenuInput = forwardRef<
React.ElementRef<typeof CommandInput_Shadcn_>,
React.ComponentPropsWithoutRef<typeof CommandInput_Shadcn_>
>(({ className, ...props }, ref) => {
@@ -135,6 +135,6 @@ const CommandInput = forwardRef<
)
})
-CommandInput.displayName = CommandInput_Shadcn_.displayName
+CommandMenuInput.displayName = 'CommandMenuInput'
-export { CommandInput }
+export { CommandMenuInput }
diff --git a/packages/ui-patterns/src/CommandMenu/api/CommandList.tsx b/packages/ui-patterns/src/CommandMenu/api/CommandMenuList.tsx
similarity index 68%
rename from packages/ui-patterns/src/CommandMenu/api/CommandList.tsx
rename to packages/ui-patterns/src/CommandMenu/api/CommandMenuList.tsx
index 3e9c39f3b6e..e5f239aab3f 100644
--- a/packages/ui-patterns/src/CommandMenu/api/CommandList.tsx
+++ b/packages/ui-patterns/src/CommandMenu/api/CommandMenuList.tsx
@@ -3,14 +3,14 @@
import { forwardRef, useRef } from 'react'
import { cn, CommandList_Shadcn_ } from 'ui'
-import { CommandItem } from '../internal/Command'
-import { CommandEmpty } from '../internal/CommandEmpty'
-import { CommandGroup } from '../internal/CommandGroup'
+import { CommandMenuEmpty } from '../internal/CommandMenuEmpty'
+import { CommandMenuGroup } from '../internal/CommandMenuGroup'
+import { CommandMenuItem } from '../internal/CommandMenuItem'
import { useCommands } from './hooks/commandsHooks'
import { useQuery } from './hooks/queryHooks'
import { TextHighlighter } from './TextHighlighter'
-const CommandList = forwardRef<
+const CommandMenuList = forwardRef<
React.ElementRef<typeof CommandList_Shadcn_>,
React.ComponentPropsWithoutRef<typeof CommandList_Shadcn_>
>(({ className, ...props }, ref) => {
@@ -31,25 +31,25 @@ const CommandList = forwardRef<
className={cn('max-h-[initial] overflow-y-auto overflow-x-hidden bg-transparent', className)}
{...props}
>
- <CommandEmpty listRef={innerRef}>No results found.</CommandEmpty>
+ <CommandMenuEmpty listRef={innerRef}>No results found.</CommandMenuEmpty>
{commandSections.map((section) => {
if (section.commands.every((command) => command.defaultHidden) && !query) return null
return (
- <CommandGroup key={section.id} heading={section.name} forceMount={section.forceMount}>
+ <CommandMenuGroup key={section.id} heading={section.name} forceMount={section.forceMount}>
{section.commands
.filter((command) => !command.defaultHidden || query)
.map((command) => (
- <CommandItem key={command.id} command={command}>
+ <CommandMenuItem key={command.id} command={command}>
<TextHighlighter>{command.name}</TextHighlighter>
- </CommandItem>
+ </CommandMenuItem>
))}
- </CommandGroup>
+ </CommandMenuGroup>
)
})}
</CommandList_Shadcn_>
)
})
-CommandList.displayName = CommandList_Shadcn_.displayName
+CommandMenuList.displayName = 'CommandMenuList'
-export { CommandList }
+export { CommandMenuList }
diff --git a/packages/ui-patterns/src/CommandMenu/api/utils.ts b/packages/ui-patterns/src/CommandMenu/api/utils.ts
index efbdbcb2d72..9c4486a4082 100644
--- a/packages/ui-patterns/src/CommandMenu/api/utils.ts
+++ b/packages/ui-patterns/src/CommandMenu/api/utils.ts
@@ -1,6 +1,6 @@
const escapeAttributeSelector = (str: string) => encodeURIComponent(str)
export { escapeAttributeSelector }
-export { generateCommandClassNames } from '../internal/Command'
+export { generateCommandClassNames } from '../internal/CommandMenuItem'
export { orderSectionFirst } from '../internal/state/commandsState'
export { PageType } from '../internal/state/pagesState'
diff --git a/packages/ui-patterns/src/CommandMenu/index.tsx b/packages/ui-patterns/src/CommandMenu/index.tsx
index 98e4833b493..8e9fbefa99b 100644
--- a/packages/ui-patterns/src/CommandMenu/index.tsx
+++ b/packages/ui-patterns/src/CommandMenu/index.tsx
@@ -1,7 +1,7 @@
export * from './api/Badges'
export { CommandHeader } from './api/CommandHeader'
-export { CommandInput } from './api/CommandInput'
-export { CommandList } from './api/CommandList'
+export { CommandMenuInput } from './api/CommandMenuInput'
+export { CommandMenuList } from './api/CommandMenuList'
export {
Breadcrumb,
CommandMenu,
diff --git a/packages/ui-patterns/src/CommandMenu/internal/CommandEmpty.tsx b/packages/ui-patterns/src/CommandMenu/internal/CommandMenuEmpty.tsx
similarity index 94%
rename from packages/ui-patterns/src/CommandMenu/internal/CommandEmpty.tsx
rename to packages/ui-patterns/src/CommandMenu/internal/CommandMenuEmpty.tsx
index 3933d1b0e29..f0ce9f833e9 100644
--- a/packages/ui-patterns/src/CommandMenu/internal/CommandEmpty.tsx
+++ b/packages/ui-patterns/src/CommandMenu/internal/CommandMenuEmpty.tsx
@@ -5,7 +5,7 @@ import { cn } from 'ui'
import { useQuery } from '../api/hooks/queryHooks'
-const CommandEmpty = ({
+const CommandMenuEmpty = ({
children,
className,
listRef,
@@ -37,4 +37,4 @@ const CommandEmpty = ({
)
}
-export { CommandEmpty }
+export { CommandMenuEmpty }
diff --git a/packages/ui-patterns/src/CommandMenu/internal/CommandGroup.tsx b/packages/ui-patterns/src/CommandMenu/internal/CommandMenuGroup.tsx
similarity index 84%
rename from packages/ui-patterns/src/CommandMenu/internal/CommandGroup.tsx
rename to packages/ui-patterns/src/CommandMenu/internal/CommandMenuGroup.tsx
index 425792c0a08..c100b155ef2 100644
--- a/packages/ui-patterns/src/CommandMenu/internal/CommandGroup.tsx
+++ b/packages/ui-patterns/src/CommandMenu/internal/CommandMenuGroup.tsx
@@ -3,7 +3,7 @@
import { forwardRef } from 'react'
import { cn, CommandGroup_Shadcn_ } from 'ui'
-const CommandGroup = forwardRef<
+const CommandMenuGroup = forwardRef<
React.ElementRef<typeof CommandGroup_Shadcn_>,
React.ComponentPropsWithoutRef<typeof CommandGroup_Shadcn_>
>(({ className, ...props }, ref) => {
@@ -18,6 +18,6 @@ const CommandGroup = forwardRef<
/>
)
})
-CommandGroup.displayName = CommandGroup_Shadcn_.displayName
+CommandMenuGroup.displayName = 'CommandMenuGroup'
-export { CommandGroup }
+export { CommandMenuGroup }
diff --git a/packages/ui-patterns/src/CommandMenu/internal/Command.tsx b/packages/ui-patterns/src/CommandMenu/internal/CommandMenuItem.tsx
similarity index 96%
rename from packages/ui-patterns/src/CommandMenu/internal/Command.tsx
rename to packages/ui-patterns/src/CommandMenu/internal/CommandMenuItem.tsx
index 7f113dc6033..a6cb83cdd72 100644
--- a/packages/ui-patterns/src/CommandMenu/internal/Command.tsx
+++ b/packages/ui-patterns/src/CommandMenu/internal/CommandMenuItem.tsx
@@ -49,7 +49,7 @@ interface CommandItemProps extends React.ComponentPropsWithoutRef<typeof Command
command: ICommand
}
-const CommandItem = forwardRef<
+const CommandMenuItem = forwardRef<
React.ElementRef<typeof CommandItem_Shadcn_>,
PropsWithChildren<CommandItemProps>
>(({ children, className, command: _command, ...props }, ref) => {
@@ -117,6 +117,6 @@ const CommandItem = forwardRef<
</CommandItem_Shadcn_>
)
})
-CommandItem.displayName = CommandItem_Shadcn_.displayName
+CommandMenuItem.displayName = 'CommandMenuItem'
-export { CommandItem, generateCommandClassNames }
+export { CommandMenuItem, generateCommandClassNames }
diff --git a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx
index d6cd0b738e1..0d13efe3da3 100644
--- a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx
+++ b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx
@@ -19,7 +19,7 @@ import { StatusIcon } from 'ui/src/components/StatusIcon'
import {
Breadcrumb,
CommandHeader,
- CommandInput,
+ CommandMenuInput,
CommandWrapper,
generateCommandClassNames,
useHistoryKeys,
@@ -154,7 +154,7 @@ function PromptInput({
})
return (
- <CommandInput
+ <CommandMenuInput
className={cn(
'w-full h-11',
'border-none outline-hidden bg-transparent rounded-none rounded-t-md px-4 py-7',
diff --git a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx
index d3b34ecc0d5..00bf0ab4d74 100644
--- a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx
+++ b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx
@@ -14,7 +14,7 @@ import { StatusIcon } from 'ui/src/components/StatusIcon'
import {
Breadcrumb,
CommandHeader,
- CommandInput,
+ CommandMenuInput,
CommandWrapper,
escapeAttributeSelector,
generateCommandClassNames,
@@ -191,7 +191,7 @@ const DocsSearchPage = () => {
<CommandWrapper>
<CommandHeader>
<Breadcrumb />
- <CommandInput placeholder="Search..." ref={inputRef} />
+ <CommandMenuInput placeholder="Search..." ref={inputRef} />
</CommandHeader>
<CommandList_Shadcn_ className="max-h-[initial]">
{hasResults &&