Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(command): add generic #683

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(command): add generic #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/www/src/examples/dashboard/components/TeamSwitcher.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const selectedTeam = ref<Team>(groups[0].teams[0])
</Button>
</PopoverTrigger>
<PopoverContent class="w-[200px] p-0">
<Command :filter-function="(list, term) => list.filter(i => i.label?.toLowerCase()?.includes(term)) ">
<Command :filter-function="(list:typeof groups, term:string) => list.filter(i => i.label?.toLowerCase()?.includes(term)) ">
<CommandList>
<CommandInput placeholder="Search team..." />
<CommandEmpty>No team found.</CommandEmpty>
Expand Down
9 changes: 6 additions & 3 deletions apps/www/src/lib/registry/default/ui/command/Command.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<script setup lang="ts">
<script lang="ts">
type AcceptableValue = string | number | boolean | Record<string, any>
</script>

<script setup lang="ts" generic="T extends AcceptableValue">
import { type HTMLAttributes, computed } from 'vue'
import type { ComboboxRootEmits, ComboboxRootProps } from 'radix-vue'
import { ComboboxRoot, useForwardPropsEmits } from 'radix-vue'
import { cn } from '@/lib/utils'

const props = withDefaults(defineProps<ComboboxRootProps & { class?: HTMLAttributes['class'] }>(), {
const props = withDefaults(defineProps<ComboboxRootProps<T> & { class?: HTMLAttributes['class'] }>(), {
open: true,
modelValue: '',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we purposely set modelValue: '' to behave like a Command component

})

const emits = defineEmits<ComboboxRootEmits>()
Expand Down
9 changes: 6 additions & 3 deletions apps/www/src/lib/registry/new-york/ui/command/Command.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<script setup lang="ts">
<script lang="ts">
type AcceptableValue = string | number | boolean | Record<string, any>
</script>

<script setup lang="ts" generic="T extends AcceptableValue">
import { type HTMLAttributes, computed } from 'vue'
import type { ComboboxRootEmits, ComboboxRootProps } from 'radix-vue'
import { ComboboxRoot, useForwardPropsEmits } from 'radix-vue'
import { cn } from '@/lib/utils'

const props = withDefaults(defineProps<ComboboxRootProps & { class?: HTMLAttributes['class'] }>(), {
const props = withDefaults(defineProps<ComboboxRootProps<T> & { class?: HTMLAttributes['class'] }>(), {
open: true,
modelValue: '',
})

const emits = defineEmits<ComboboxRootEmits>()
Expand Down