-
Notifications
You must be signed in to change notification settings - Fork 199
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.
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
[Feature]: Make custom filter-function for CommandDialog Component #284
Draft
romanhrynevych
wants to merge
7
commits into
radix-vue:dev
Choose a base branch
from
romanhrynevych:feature/command-custom-filter
base: dev
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a906ca1
feat(command-dialog): add filter-function prop for CommandDialog comp…
romanhrynevych 070a516
feat(command-dialog-fuse): add new Demo component for custom filter-s…
romanhrynevych f1f7f4b
feat: update
sadeghbarati 099b740
Merge branch 'dev' into feature/command-custom-filter
sadeghbarati 36a6668
chore: fresh lockfile
sadeghbarati 6ac1fef
fix(command-dialog-fuse): fix command.md code preview
romanhrynevych f9c7e15
Merge branch 'dev' into feature/command-custom-filter
sadeghbarati File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
apps/www/src/lib/registry/default/example/CommandDialogUseFuseDemo.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
<script setup lang="ts"> | ||
import { useMagicKeys } from '@vueuse/core' | ||
|
||
import { ref, watch } from 'vue' | ||
import { useFuse } from '@vueuse/integrations/useFuse' | ||
import { | ||
CommandDialog, | ||
CommandEmpty, | ||
CommandGroup, | ||
CommandInput, | ||
CommandItem, | ||
CommandList, | ||
CommandSeparator, | ||
} from '@/lib/registry/default/ui/command' | ||
|
||
const open = ref(false) | ||
|
||
const { Meta_M, Ctrl_M } = useMagicKeys({ | ||
passive: false, | ||
onEventFired(e) { | ||
if (e.key === 'm' && (e.metaKey || e.ctrlKey)) | ||
e.preventDefault() | ||
}, | ||
}) | ||
|
||
watch([Meta_M, Ctrl_M], (v) => { | ||
if (v[0] || v[1]) | ||
handleOpenChange() | ||
}) | ||
|
||
function handleOpenChange() { | ||
open.value = !open.value | ||
} | ||
|
||
function customFiltering(val: string[], term: string) { | ||
const { results } = useFuse(term, val, { | ||
matchAllWhenSearchEmpty: true, | ||
fuseOptions: { | ||
shouldSort: false, | ||
}, | ||
}) | ||
|
||
return results.value?.map(v => v.item) | ||
} | ||
</script> | ||
|
||
<template> | ||
<div> | ||
<p class="text-sm text-muted-foreground"> | ||
Press | ||
<kbd | ||
class="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium text-muted-foreground opacity-100" | ||
> | ||
<span class="text-xs">⌘</span>M | ||
</kbd> | ||
</p> | ||
<CommandDialog v-model:open="open" :filter-function="customFiltering"> | ||
<CommandInput placeholder="Type a command or search..." /> | ||
<CommandList> | ||
<CommandEmpty>No results found.</CommandEmpty> | ||
<CommandGroup heading="Suggestions"> | ||
<CommandItem value="calendar"> | ||
Calendar | ||
</CommandItem> | ||
<CommandItem value="search-emoji"> | ||
Search Emoji | ||
</CommandItem> | ||
<CommandItem value="calculator"> | ||
Calculator | ||
</CommandItem> | ||
</CommandGroup> | ||
<CommandSeparator /> | ||
<CommandGroup heading="Settings"> | ||
<CommandItem value="profile"> | ||
Profile | ||
</CommandItem> | ||
<CommandItem value="billing"> | ||
Billing | ||
</CommandItem> | ||
<CommandItem value="settings"> | ||
Settings | ||
</CommandItem> | ||
</CommandGroup> | ||
</CommandList> | ||
</CommandDialog> | ||
</div> | ||
</template> |
20 changes: 16 additions & 4 deletions
20
apps/www/src/lib/registry/default/ui/command/CommandDialog.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
apps/www/src/lib/registry/new-york/example/CommandDialogUseFuseDemo.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
<script setup lang="ts"> | ||
import { useMagicKeys } from '@vueuse/core' | ||
|
||
import { ref, watch } from 'vue' | ||
import { useFuse } from '@vueuse/integrations/useFuse' | ||
import { | ||
CommandDialog, | ||
CommandEmpty, | ||
CommandGroup, | ||
CommandInput, | ||
CommandItem, | ||
CommandList, | ||
CommandSeparator, | ||
} from '@/lib/registry/default/ui/command' | ||
|
||
const open = ref(false) | ||
|
||
const { Meta_M, Ctrl_M } = useMagicKeys({ | ||
passive: false, | ||
onEventFired(e) { | ||
if (e.key === 'm' && (e.metaKey || e.ctrlKey)) | ||
e.preventDefault() | ||
}, | ||
}) | ||
|
||
watch([Meta_M, Ctrl_M], (v) => { | ||
if (v[0] || v[1]) | ||
handleOpenChange() | ||
}) | ||
|
||
function handleOpenChange() { | ||
open.value = !open.value | ||
} | ||
|
||
function customFiltering(val: string[], term: string) { | ||
const { results } = useFuse(term, val, { | ||
matchAllWhenSearchEmpty: true, | ||
fuseOptions: { | ||
shouldSort: false, | ||
}, | ||
}) | ||
|
||
return results.value?.map(v => v.item) | ||
} | ||
</script> | ||
|
||
<template> | ||
<div> | ||
<p class="text-sm text-muted-foreground"> | ||
Press | ||
<kbd | ||
class="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium text-muted-foreground opacity-100" | ||
> | ||
<span class="text-xs">⌘</span>M | ||
</kbd> | ||
</p> | ||
<CommandDialog v-model:open="open" :filter-function="customFiltering"> | ||
<CommandInput placeholder="Type a command or search..." /> | ||
<CommandList> | ||
<CommandEmpty>No results found.</CommandEmpty> | ||
<CommandGroup heading="Suggestions"> | ||
<CommandItem value="calendar"> | ||
Calendar | ||
</CommandItem> | ||
<CommandItem value="search-emoji"> | ||
Search Emoji | ||
</CommandItem> | ||
<CommandItem value="calculator"> | ||
Calculator | ||
</CommandItem> | ||
</CommandGroup> | ||
<CommandSeparator /> | ||
<CommandGroup heading="Settings"> | ||
<CommandItem value="profile"> | ||
Profile | ||
</CommandItem> | ||
<CommandItem value="billing"> | ||
Billing | ||
</CommandItem> | ||
<CommandItem value="settings"> | ||
Settings | ||
</CommandItem> | ||
</CommandGroup> | ||
</CommandList> | ||
</CommandDialog> | ||
</div> | ||
</template> |
22 changes: 17 additions & 5 deletions
22
apps/www/src/lib/registry/new-york/ui/command/CommandDialog.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@romanhrynevych can you check this line, it has TypeScript error