Merge branch 'fix-handling-data-disabled' of https://github.com/jhngu…

…yen521/ui into fix-handling-data-disabled # Conflicts: # apps/www/app/(app)/examples/playground/components/model-selector.tsx
shadcn-ui · Jun 6, 2024 · 6e71912 · 6e71912
2 parents 4386a5f + 61dc3cd
commit 6e71912
Show file tree

Hide file tree

Showing 4 changed files with 2,794 additions and 3,334 deletions.
diff --git a/apps/www/package.json b/apps/www/package.json
@@ -55,7 +55,7 @@
     "@vercel/og": "^0.0.21",
     "class-variance-authority": "^0.7.0",
     "clsx": "^1.2.1",
-    "cmdk": "^0.2.0",
+    "cmdk": "^1.0.0",
     "contentlayer": "0.3.4",
     "date-fns": "^2.30.0",
     "embla-carousel-autoplay": "8.0.0-rc15",

diff --git a/apps/www/registry/default/example/combobox-demo.tsx b/apps/www/registry/default/example/combobox-demo.tsx
@@ -12,6 +12,7 @@ import {
   CommandGroup,
   CommandInput,
   CommandItem,
+  CommandList,
 } from "@/registry/default/ui/command"
 import {
   Popover,

diff --git a/apps/www/registry/new-york/example/combobox-demo.tsx b/apps/www/registry/new-york/example/combobox-demo.tsx
@@ -12,6 +12,7 @@ import {
   CommandGroup,
   CommandInput,
   CommandItem,
+  CommandList,
 } from "@/registry/new-york/ui/command"
 import {
   Popover,