diff --git a/examples/github-agent/packages/dashboard/components/ui/accordion.tsx b/examples/github-agent/packages/dashboard/components/ui/accordion.tsx index f537a3d9e..e59b5d02a 100644 --- a/examples/github-agent/packages/dashboard/components/ui/accordion.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/accordion.tsx @@ -1,6 +1,6 @@ "use client" -import * as AccordionPrimitive from "@radix-ui/react-accordion" +import { Accordion as AccordionPrimitive } from "radix-ui" import { ChevronDownIcon } from "lucide-react" import type * as React from "react" diff --git a/examples/github-agent/packages/dashboard/components/ui/alert-dialog.tsx b/examples/github-agent/packages/dashboard/components/ui/alert-dialog.tsx index 0ba6c035c..56869be3f 100644 --- a/examples/github-agent/packages/dashboard/components/ui/alert-dialog.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/alert-dialog.tsx @@ -1,6 +1,6 @@ "use client" -import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog" +import { AlertDialog as AlertDialogPrimitive } from "radix-ui" import type * as React from "react" import { buttonVariants } from "@/components/ui/button" diff --git a/examples/github-agent/packages/dashboard/components/ui/aspect-ratio.tsx b/examples/github-agent/packages/dashboard/components/ui/aspect-ratio.tsx index a7b5855a5..495b06cbb 100644 --- a/examples/github-agent/packages/dashboard/components/ui/aspect-ratio.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/aspect-ratio.tsx @@ -1,6 +1,6 @@ "use client" -import * as AspectRatioPrimitive from "@radix-ui/react-aspect-ratio" +import { AspectRatio as AspectRatioPrimitive } from "radix-ui" function AspectRatio({ ...props }: React.ComponentProps) { return diff --git a/examples/github-agent/packages/dashboard/components/ui/avatar.tsx b/examples/github-agent/packages/dashboard/components/ui/avatar.tsx index a1caabf34..2ccfdf5ab 100644 --- a/examples/github-agent/packages/dashboard/components/ui/avatar.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/avatar.tsx @@ -1,6 +1,6 @@ "use client" -import * as AvatarPrimitive from "@radix-ui/react-avatar" +import { Avatar as AvatarPrimitive } from "radix-ui" import type * as React from "react" import { cn } from "@/lib/utils" diff --git a/examples/github-agent/packages/dashboard/components/ui/badge.tsx b/examples/github-agent/packages/dashboard/components/ui/badge.tsx index a1043e1ce..d6ec20236 100644 --- a/examples/github-agent/packages/dashboard/components/ui/badge.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/badge.tsx @@ -1,4 +1,4 @@ -import { Slot } from "@radix-ui/react-slot" +import { Slot as SlotPrimitive } from "radix-ui" import { type VariantProps, cva } from "class-variance-authority" import type * as React from "react" @@ -29,7 +29,7 @@ function Badge({ asChild = false, ...props }: React.ComponentProps<"span"> & VariantProps & { asChild?: boolean }) { - const Comp = asChild ? Slot : "span" + const Comp = asChild ? SlotPrimitive.Slot : "span" return } diff --git a/examples/github-agent/packages/dashboard/components/ui/breadcrumb.tsx b/examples/github-agent/packages/dashboard/components/ui/breadcrumb.tsx index 4a727a1aa..ec5e8f1f0 100644 --- a/examples/github-agent/packages/dashboard/components/ui/breadcrumb.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/breadcrumb.tsx @@ -1,4 +1,4 @@ -import { Slot } from "@radix-ui/react-slot" +import { Slot as SlotPrimitive } from "radix-ui" import { ChevronRight, MoreHorizontal } from "lucide-react" import type * as React from "react" @@ -38,7 +38,7 @@ function BreadcrumbLink({ }: React.ComponentProps<"a"> & { asChild?: boolean }) { - const Comp = asChild ? Slot : "a" + const Comp = asChild ? SlotPrimitive.Slot : "a" return ( & { asChild?: boolean }) { - const Comp = asChild ? Slot : "div" + const Comp = asChild ? SlotPrimitive.Slot : "div" return ( & { asChild?: boolean }) { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" return ( ) { return diff --git a/examples/github-agent/packages/dashboard/components/ui/context-menu.tsx b/examples/github-agent/packages/dashboard/components/ui/context-menu.tsx index ab8ac24c2..5eb8dbf9f 100644 --- a/examples/github-agent/packages/dashboard/components/ui/context-menu.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/context-menu.tsx @@ -1,6 +1,6 @@ "use client" -import * as ContextMenuPrimitive from "@radix-ui/react-context-menu" +import { ContextMenu as ContextMenuPrimitive } from "radix-ui" import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react" import type * as React from "react" diff --git a/examples/github-agent/packages/dashboard/components/ui/dialog.tsx b/examples/github-agent/packages/dashboard/components/ui/dialog.tsx index b1408d16e..b81cf9387 100644 --- a/examples/github-agent/packages/dashboard/components/ui/dialog.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/dialog.tsx @@ -1,6 +1,6 @@ "use client" -import * as DialogPrimitive from "@radix-ui/react-dialog" +import { Dialog as DialogPrimitive } from "radix-ui" import { XIcon } from "lucide-react" import type * as React from "react" diff --git a/examples/github-agent/packages/dashboard/components/ui/dropdown-menu.tsx b/examples/github-agent/packages/dashboard/components/ui/dropdown-menu.tsx index 37d83f532..e1108453f 100644 --- a/examples/github-agent/packages/dashboard/components/ui/dropdown-menu.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/dropdown-menu.tsx @@ -1,6 +1,6 @@ "use client" -import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu" +import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui" import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react" import type * as React from "react" diff --git a/examples/github-agent/packages/dashboard/components/ui/form.tsx b/examples/github-agent/packages/dashboard/components/ui/form.tsx index 45d703dbf..63f7a53b1 100644 --- a/examples/github-agent/packages/dashboard/components/ui/form.tsx +++ b/examples/github-agent/packages/dashboard/components/ui/form.tsx @@ -1,7 +1,7 @@ "use client" -import type * as LabelPrimitive from "@radix-ui/react-label" -import { Slot } from "@radix-ui/react-slot" +import { type Label as LabelPrimitive, Slot as SlotPrimitive } from "radix-ui" + import * as React from "react" import { Controller, @@ -93,11 +93,11 @@ function FormLabel({ className, ...props }: React.ComponentProps) { +function FormControl({ ...props }: React.ComponentProps) { const { error, formItemId, formDescriptionId, formMessageId } = useFormField() return ( - & VariantProps & { asChild?: boolean }) { - const Comp = asChild ? Slot : "div" + const Comp = asChild ? SlotPrimitive.Slot : "div" return ( & { asChild?: boolean }) { - const Comp = asChild ? Slot : "div" + const Comp = asChild ? SlotPrimitive.Slot : "div" return ( & { asChild?: boolean }) { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" return ( } & VariantProps) { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" const { isMobile, state } = useSidebar() const button = ( @@ -533,7 +533,7 @@ function SidebarMenuAction({ asChild?: boolean showOnHover?: boolean }) { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" return ( (({ asChild, className, ...props }, ref) => { - const Comp = asChild ? Slot : "a" + const Comp = asChild ? SlotPrimitive.Slot : "a" return ( ( ({ className, variant, size, asChild = false, ...props }, ref) => { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" return ( ) diff --git a/examples/github-agent/packages/dashboard/ui/checkbox.tsx b/examples/github-agent/packages/dashboard/ui/checkbox.tsx index 74da6996b..ce79f27db 100644 --- a/examples/github-agent/packages/dashboard/ui/checkbox.tsx +++ b/examples/github-agent/packages/dashboard/ui/checkbox.tsx @@ -1,6 +1,6 @@ "use client" -import * as CheckboxPrimitive from "@radix-ui/react-checkbox" +import { Checkbox as CheckboxPrimitive } from "radix-ui" import { Check } from "lucide-react" import * as React from "react" diff --git a/examples/github-agent/packages/dashboard/ui/dropdown-menu.tsx b/examples/github-agent/packages/dashboard/ui/dropdown-menu.tsx index 832d5be0d..8b19727d0 100644 --- a/examples/github-agent/packages/dashboard/ui/dropdown-menu.tsx +++ b/examples/github-agent/packages/dashboard/ui/dropdown-menu.tsx @@ -1,6 +1,6 @@ "use client" -import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu" +import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui" import { Check, ChevronRight, Circle } from "lucide-react" import * as React from "react" diff --git a/examples/github-agent/packages/dashboard/ui/label.tsx b/examples/github-agent/packages/dashboard/ui/label.tsx index 96d9eb1f6..d85208f69 100644 --- a/examples/github-agent/packages/dashboard/ui/label.tsx +++ b/examples/github-agent/packages/dashboard/ui/label.tsx @@ -1,6 +1,6 @@ "use client" -import * as LabelPrimitive from "@radix-ui/react-label" +import { Label as LabelPrimitive } from "radix-ui" import { type VariantProps, cva } from "class-variance-authority" import * as React from "react" diff --git a/examples/github-agent/packages/dashboard/ui/select.tsx b/examples/github-agent/packages/dashboard/ui/select.tsx index f6a3c4d24..57b957de7 100644 --- a/examples/github-agent/packages/dashboard/ui/select.tsx +++ b/examples/github-agent/packages/dashboard/ui/select.tsx @@ -1,6 +1,6 @@ "use client" -import * as SelectPrimitive from "@radix-ui/react-select" +import { Select as SelectPrimitive } from "radix-ui" import { Check, ChevronDown, ChevronUp } from "lucide-react" import * as React from "react" diff --git a/examples/github-agent/packages/dashboard/ui/separator.tsx b/examples/github-agent/packages/dashboard/ui/separator.tsx index 6404fa867..5d7ffa79a 100644 --- a/examples/github-agent/packages/dashboard/ui/separator.tsx +++ b/examples/github-agent/packages/dashboard/ui/separator.tsx @@ -1,6 +1,6 @@ "use client" -import * as SeparatorPrimitive from "@radix-ui/react-separator" +import { Separator as SeparatorPrimitive } from "radix-ui" import * as React from "react" import { cn } from "@/lib/utils" diff --git a/examples/github-agent/packages/dashboard/ui/sheet.tsx b/examples/github-agent/packages/dashboard/ui/sheet.tsx index df9b1b3fb..173714bb4 100644 --- a/examples/github-agent/packages/dashboard/ui/sheet.tsx +++ b/examples/github-agent/packages/dashboard/ui/sheet.tsx @@ -1,6 +1,6 @@ "use client" -import * as SheetPrimitive from "@radix-ui/react-dialog" +import { Dialog as SheetPrimitive } from "radix-ui" import { type VariantProps, cva } from "class-variance-authority" import { X } from "lucide-react" import * as React from "react" diff --git a/examples/github-agent/packages/dashboard/ui/sidebar.tsx b/examples/github-agent/packages/dashboard/ui/sidebar.tsx index ede0bd4e1..081ec7162 100644 --- a/examples/github-agent/packages/dashboard/ui/sidebar.tsx +++ b/examples/github-agent/packages/dashboard/ui/sidebar.tsx @@ -1,6 +1,6 @@ "use client" -import { Slot } from "@radix-ui/react-slot" +import { Slot as SlotPrimitive } from "radix-ui" import { type VariantProps, cva } from "class-variance-authority" import { PanelLeft } from "lucide-react" import * as React from "react" @@ -426,7 +426,7 @@ const SidebarGroupLabel = React.forwardRef< HTMLDivElement, React.ComponentProps<"div"> & { asChild?: boolean } >(({ className, asChild = false, ...props }, ref) => { - const Comp = asChild ? Slot : "div" + const Comp = asChild ? SlotPrimitive.Slot : "div" return ( & { asChild?: boolean } >(({ className, asChild = false, ...props }, ref) => { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" return ( { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" const { isMobile, state } = useSidebar() const button = ( @@ -590,7 +590,7 @@ const SidebarMenuAction = React.forwardRef< showOnHover?: boolean } >(({ className, asChild = false, showOnHover = false, ...props }, ref) => { - const Comp = asChild ? Slot : "button" + const Comp = asChild ? SlotPrimitive.Slot : "button" return ( (({ asChild = false, size = "md", isActive, className, ...props }, ref) => { - const Comp = asChild ? Slot : "a" + const Comp = asChild ? SlotPrimitive.Slot : "a" return (