diff --git a/src/components/common/mode-toggle.tsx b/src/components/common/mode-toggle.tsx index 5bf20ce..bb952bd 100644 --- a/src/components/common/mode-toggle.tsx +++ b/src/components/common/mode-toggle.tsx @@ -1,6 +1,5 @@ 'use client' -import { MoonIcon, SunIcon } from 'lucide-react' import { useTheme } from 'next-themes' import * as React from 'react' @@ -12,6 +11,8 @@ import { DropdownMenuTrigger, } from '@/components/ui/dropdown-menu' +import { Icon } from '@/icon' + export function ModeToggle() { const { setTheme } = useTheme() @@ -19,8 +20,14 @@ export function ModeToggle() { diff --git a/src/components/ui/accordion.tsx b/src/components/ui/accordion.tsx index e1a78fe..095fb05 100644 --- a/src/components/ui/accordion.tsx +++ b/src/components/ui/accordion.tsx @@ -1,10 +1,11 @@ -import { ChevronDown } from 'lucide-react' import * as React from 'react' import * as AccordionPrimitive from '@radix-ui/react-accordion' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + const Accordion = AccordionPrimitive.Root const AccordionItem = React.forwardRef< @@ -33,7 +34,10 @@ const AccordionTrigger = React.forwardRef< {...props} > {children} - + )) diff --git a/src/components/ui/calendar.tsx b/src/components/ui/calendar.tsx index 637a114..c9e6fd2 100644 --- a/src/components/ui/calendar.tsx +++ b/src/components/ui/calendar.tsx @@ -1,4 +1,3 @@ -import { ChevronLeft, ChevronRight } from 'lucide-react' import * as React from 'react' import { DayPicker } from 'react-day-picker' @@ -6,6 +5,8 @@ import { buttonVariants } from '@/components/ui/button' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + export type CalendarProps = React.ComponentProps function Calendar({ @@ -51,8 +52,8 @@ function Calendar({ ...classNames, }} components={{ - IconLeft: ({ ...props }) => , - IconRight: ({ ...props }) => , + IconLeft: () => , + IconRight: () => , }} {...props} /> diff --git a/src/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsx index 8c8d7fb..c1af98e 100644 --- a/src/components/ui/checkbox.tsx +++ b/src/components/ui/checkbox.tsx @@ -1,10 +1,11 @@ -import { Check } from 'lucide-react' import * as React from 'react' import * as CheckboxPrimitive from '@radix-ui/react-checkbox' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + const Checkbox = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef @@ -20,7 +21,7 @@ const Checkbox = React.forwardRef< - + )) diff --git a/src/components/ui/command.tsx b/src/components/ui/command.tsx index f4aa5e3..3534cf0 100644 --- a/src/components/ui/command.tsx +++ b/src/components/ui/command.tsx @@ -1,5 +1,4 @@ import { Command as CommandPrimitive } from 'cmdk' -import { Search } from 'lucide-react' import * as React from 'react' import { Dialog, DialogContent } from '@/components/ui/dialog' @@ -8,6 +7,8 @@ import { DialogProps } from '@radix-ui/react-dialog' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + const Command = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef @@ -42,7 +43,7 @@ const CommandInput = React.forwardRef< React.ComponentPropsWithoutRef >(({ className, ...props }, ref) => (
- + {children} - + )) ContextMenuSubTrigger.displayName = ContextMenuPrimitive.SubTrigger.displayName @@ -103,7 +104,7 @@ const ContextMenuCheckboxItem = React.forwardRef< > - + {children} @@ -126,7 +127,7 @@ const ContextMenuRadioItem = React.forwardRef< > - + {children} diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx index a98c6c2..8e1c47e 100644 --- a/src/components/ui/dialog.tsx +++ b/src/components/ui/dialog.tsx @@ -1,10 +1,11 @@ -import { X } from 'lucide-react' import * as React from 'react' import * as DialogPrimitive from '@radix-ui/react-dialog' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + const Dialog = DialogPrimitive.Root const DialogTrigger = DialogPrimitive.Trigger @@ -45,7 +46,7 @@ const DialogContent = React.forwardRef< > {children} - + Close diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx index 12d13bf..f7ca631 100644 --- a/src/components/ui/dropdown-menu.tsx +++ b/src/components/ui/dropdown-menu.tsx @@ -1,10 +1,11 @@ -import { Check, ChevronRight, Circle } from 'lucide-react' import * as React from 'react' import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + const DropdownMenu = DropdownMenuPrimitive.Root const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger @@ -33,7 +34,7 @@ const DropdownMenuSubTrigger = React.forwardRef< {...props} > {children} - + )) DropdownMenuSubTrigger.displayName = @@ -106,7 +107,7 @@ const DropdownMenuCheckboxItem = React.forwardRef< > - + {children} @@ -129,7 +130,7 @@ const DropdownMenuRadioItem = React.forwardRef< > - + {children} diff --git a/src/components/ui/menubar.tsx b/src/components/ui/menubar.tsx index aab4385..4b7c82d 100644 --- a/src/components/ui/menubar.tsx +++ b/src/components/ui/menubar.tsx @@ -1,10 +1,11 @@ -import { Check, ChevronRight, Circle } from 'lucide-react' import * as React from 'react' import * as MenubarPrimitive from '@radix-ui/react-menubar' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + const MenubarMenu = MenubarPrimitive.Menu const MenubarGroup = MenubarPrimitive.Group @@ -61,7 +62,7 @@ const MenubarSubTrigger = React.forwardRef< {...props} > {children} - + )) MenubarSubTrigger.displayName = MenubarPrimitive.SubTrigger.displayName @@ -139,7 +140,7 @@ const MenubarCheckboxItem = React.forwardRef< > - + {children} @@ -161,7 +162,7 @@ const MenubarRadioItem = React.forwardRef< > - + {children} diff --git a/src/components/ui/navigation-menu.tsx b/src/components/ui/navigation-menu.tsx index 884a48f..94ffe18 100644 --- a/src/components/ui/navigation-menu.tsx +++ b/src/components/ui/navigation-menu.tsx @@ -1,11 +1,12 @@ import { cva } from 'class-variance-authority' -import { ChevronDown } from 'lucide-react' import * as React from 'react' import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu' import { cn } from '@/utils/cn' +import { Icon } from '@/icon' + const NavigationMenu = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef @@ -55,7 +56,8 @@ const NavigationMenuTrigger = React.forwardRef< {...props} > {children}{' '} -