perf: format code with better style (#5283)

packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue

@@ -1,16 +1,17 @@
 <script setup lang="ts">
-import type { ClassType } from '@vben-core/typings';
 import type {
   AvatarFallbackProps,
   AvatarImageProps,
   AvatarRootProps,
 } from 'radix-vue';
 
+import type { ClassType } from '@vben-core/typings';
+
 import { computed } from 'vue';
 
 import { Avatar, AvatarFallback, AvatarImage } from '../../ui';
 
-interface Props extends AvatarRootProps, AvatarFallbackProps, AvatarImageProps {
+interface Props extends AvatarFallbackProps, AvatarImageProps, AvatarRootProps {
   alt?: string;
   class?: ClassType;
   dot?: boolean;

packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-view.vue

@@ -3,8 +3,8 @@ import type { BreadcrumbProps } from './types';
 
 import { useForwardPropsEmits } from 'radix-vue';
 
-import Breadcrumb from './breadcrumb.vue';
 import BreadcrumbBackground from './breadcrumb-background.vue';
+import Breadcrumb from './breadcrumb.vue';
 
 interface Props extends BreadcrumbProps {
   class?: any;

packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/types.ts

@@ -1,7 +1,7 @@
-import type { BreadcrumbStyleType } from '@vben-core/typings';
-
 import type { Component } from 'vue';
 
+import type { BreadcrumbStyleType } from '@vben-core/typings';
+
 export interface IBreadcrumb {
   icon?: Component | string;
   isHome?: boolean;

packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts

@@ -1,9 +1,9 @@
 import type { AsTag } from 'radix-vue';
 
-import type { ButtonVariants, ButtonVariantSize } from '../../ui';
-
 import type { Component } from 'vue';
 
+import type { ButtonVariants, ButtonVariantSize } from '../../ui';
+
 export interface VbenButtonProps {
   /**
    * The element or component this component should render as. Can be overwrite by `asChild`

packages/@core/ui-kit/shadcn-ui/src/components/context-menu/context-menu.vue

@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import type { ClassType } from '@vben-core/typings';
 import type {
   ContextMenuContentProps,
   ContextMenuRootEmits,
   ContextMenuRootProps,
 } from 'radix-vue';
 
+import type { ClassType } from '@vben-core/typings';
+
 import type { IContextMenuItem } from './interface';
 
 import { computed } from 'vue';
@@ -22,14 +23,14 @@ import {
 } from '../../ui/context-menu';
 
 const props = defineProps<
-  {
+  ContextMenuRootProps & {
     class?: ClassType;
     contentClass?: ClassType;
     contentProps?: ContextMenuContentProps;
     handlerData?: Record<string, any>;
     itemClass?: ClassType;
     menus: (data: any) => IContextMenuItem[];
-  } & ContextMenuRootProps
+  }
 >();
 
 const emits = defineEmits<ContextMenuRootEmits>();

packages/@core/ui-kit/shadcn-ui/src/components/hover-card/hover-card.vue

@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import type { ClassType } from '@vben-core/typings';
 import type {
   HoverCardContentProps,
   HoverCardRootEmits,
   HoverCardRootProps,
 } from 'radix-vue';
 
+import type { ClassType } from '@vben-core/typings';
+
 import { computed } from 'vue';
 
 import { useForwardPropsEmits } from 'radix-vue';

packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { type Component, computed } from 'vue';
+import type { Component } from 'vue';
+
+import { computed } from 'vue';
 
 import { IconDefault, IconifyIcon } from '@vben-core/icons';
 import {

packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue

@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import type { ClassType } from '@vben-core/typings';
 import type {
   PopoverContentProps,
   PopoverRootEmits,
   PopoverRootProps,
 } from 'radix-vue';
 
+import type { ClassType } from '@vben-core/typings';
+
 import { computed } from 'vue';
 
 import { useForwardPropsEmits } from 'radix-vue';

packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue

@@ -1,5 +1,6 @@
 <script lang="ts">
 import type { Component, PropType } from 'vue';
+
 import { defineComponent, h } from 'vue';
 
 import { isFunction, isObject } from '@vben-core/shared/utils';

packages/@core/ui-kit/shadcn-ui/src/components/segmented/tabs-indicator.vue

@@ -7,7 +7,7 @@ import { cn } from '@vben-core/shared/utils';
 
 import { TabsIndicator, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & TabsIndicatorProps>();
+const props = defineProps<TabsIndicatorProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/components/tooltip/tooltip.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
-import type { ClassType } from '@vben-core/typings';
 import type { TooltipContentProps } from 'radix-vue';
 
 import type { StyleValue } from 'vue';
 
+import type { ClassType } from '@vben-core/typings';
+
 import {
   Tooltip,
   TooltipContent,

packages/@core/ui-kit/shadcn-ui/src/ui/accordion/Accordion.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  AccordionRoot,
-  type AccordionRootEmits,
-  type AccordionRootProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import type { AccordionRootEmits, AccordionRootProps } from 'radix-vue';
+
+import { AccordionRoot, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<AccordionRootProps>();
 const emits = defineEmits<AccordionRootEmits>();

packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionContent.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { AccordionContentProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { AccordionContent, type AccordionContentProps } from 'radix-vue';
+import { AccordionContent } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & AccordionContentProps>();
+const props = defineProps<AccordionContentProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionItem.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
+import type { AccordionItemProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  AccordionItem,
-  type AccordionItemProps,
-  useForwardProps,
-} from 'radix-vue';
+import { AccordionItem, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & AccordionItemProps>();
+const props = defineProps<AccordionItemProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionTrigger.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { AccordionTriggerProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronDown } from 'lucide-vue-next';
-import {
-  AccordionHeader,
-  AccordionTrigger,
-  type AccordionTriggerProps,
-} from 'radix-vue';
+import { AccordionHeader, AccordionTrigger } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & AccordionTriggerProps>();
+const props = defineProps<AccordionTriggerProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/avatar/Avatar.vue

@@ -1,9 +1,11 @@
 <script setup lang="ts">
+import type { AvatarVariants } from './avatar';
+
 import { cn } from '@vben-core/shared/utils';
 
 import { AvatarRoot } from 'radix-vue';
 
-import { avatarVariant, type AvatarVariants } from './avatar';
+import { avatarVariant } from './avatar';
 
 const props = withDefaults(
   defineProps<{

packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarFallback.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { AvatarFallback, type AvatarFallbackProps } from 'radix-vue';
+import type { AvatarFallbackProps } from 'radix-vue';
+
+import { AvatarFallback } from 'radix-vue';
 
 const props = defineProps<AvatarFallbackProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarImage.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { AvatarImage, type AvatarImageProps } from 'radix-vue';
+import type { AvatarImageProps } from 'radix-vue';
+
+import { AvatarImage } from 'radix-vue';
 
 const props = defineProps<AvatarImageProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/avatar/avatar.ts

@@ -1,4 +1,6 @@
-import { cva, type VariantProps } from 'class-variance-authority';
+import type { VariantProps } from 'class-variance-authority';
+
+import { cva } from 'class-variance-authority';
 
 export const avatarVariant = cva(
   'inline-flex items-center justify-center font-normal text-foreground select-none shrink-0 bg-secondary overflow-hidden',

packages/@core/ui-kit/shadcn-ui/src/ui/badge/Badge.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
+import type { BadgeVariants } from './badge';
+
 import { cn } from '@vben-core/shared/utils';
 
-import { type BadgeVariants, badgeVariants } from './badge';
+import { badgeVariants } from './badge';
 
 const props = defineProps<{
   class?: any;

packages/@core/ui-kit/shadcn-ui/src/ui/badge/badge.ts

@@ -1,4 +1,6 @@
-import { cva, type VariantProps } from 'class-variance-authority';
+import type { VariantProps } from 'class-variance-authority';
+
+import { cva } from 'class-variance-authority';
 
 export const badgeVariants = cva(
   'inline-flex items-center rounded-md border border-border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',

packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbLink.vue

@@ -1,9 +1,11 @@
 <script lang="ts" setup>
+import type { PrimitiveProps } from 'radix-vue';
+
 import { cn } from '@vben-core/shared/utils';
 
-import { Primitive, type PrimitiveProps } from 'radix-vue';
+import { Primitive } from 'radix-vue';
 
-const props = withDefaults(defineProps<{ class?: any } & PrimitiveProps>(), {
+const props = withDefaults(defineProps<PrimitiveProps & { class?: any }>(), {
   as: 'a',
 });
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/button/Button.vue

@@ -1,9 +1,11 @@
 <script setup lang="ts">
+import type { PrimitiveProps } from 'radix-vue';
+
 import type { ButtonVariants, ButtonVariantSize } from './types';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { Primitive, type PrimitiveProps } from 'radix-vue';
+import { Primitive } from 'radix-vue';
 
 import { buttonVariants } from './button';
 

packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue

@@ -12,7 +12,7 @@ import {
   useForwardPropsEmits,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & CheckboxRootProps>();
+const props = defineProps<CheckboxRootProps & { class?: any }>();
 const emits = defineEmits<CheckboxRootEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuCheckboxItem.vue

@@ -1,4 +1,9 @@
 <script setup lang="ts">
+import type {
+  ContextMenuCheckboxItemEmits,
+  ContextMenuCheckboxItemProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -6,13 +11,11 @@ import { cn } from '@vben-core/shared/utils';
 import { Check } from 'lucide-vue-next';
 import {
   ContextMenuCheckboxItem,
-  type ContextMenuCheckboxItemEmits,
-  type ContextMenuCheckboxItemProps,
   ContextMenuItemIndicator,
   useForwardPropsEmits,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & ContextMenuCheckboxItemProps>();
+const props = defineProps<ContextMenuCheckboxItemProps & { class?: any }>();
 const emits = defineEmits<ContextMenuCheckboxItemEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuContent.vue

@@ -1,17 +1,20 @@
 <script setup lang="ts">
+import type {
+  ContextMenuContentEmits,
+  ContextMenuContentProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import {
   ContextMenuContent,
-  type ContextMenuContentEmits,
-  type ContextMenuContentProps,
   ContextMenuPortal,
   useForwardPropsEmits,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & ContextMenuContentProps>();
+const props = defineProps<ContextMenuContentProps & { class?: any }>();
 const emits = defineEmits<ContextMenuContentEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuGroup.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { ContextMenuGroup, type ContextMenuGroupProps } from 'radix-vue';
+import type { ContextMenuGroupProps } from 'radix-vue';
+
+import { ContextMenuGroup } from 'radix-vue';
 
 const props = defineProps<ContextMenuGroupProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuItem.vue

@@ -1,17 +1,14 @@
 <script setup lang="ts">
+import type { ContextMenuItemEmits, ContextMenuItemProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  ContextMenuItem,
-  type ContextMenuItemEmits,
-  type ContextMenuItemProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { ContextMenuItem, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<
-  { class?: any; inset?: boolean } & ContextMenuItemProps
+  ContextMenuItemProps & { class?: any; inset?: boolean }
 >();
 const emits = defineEmits<ContextMenuItemEmits>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuLabel.vue

@@ -1,12 +1,14 @@
 <script setup lang="ts">
+import type { ContextMenuLabelProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { ContextMenuLabel, type ContextMenuLabelProps } from 'radix-vue';
+import { ContextMenuLabel } from 'radix-vue';
 
 const props = defineProps<
-  { class?: any; inset?: boolean } & ContextMenuLabelProps
+  ContextMenuLabelProps & { class?: any; inset?: boolean }
 >();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuPortal.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { ContextMenuPortal, type ContextMenuPortalProps } from 'radix-vue';
+import type { ContextMenuPortalProps } from 'radix-vue';
+
+import { ContextMenuPortal } from 'radix-vue';
 
 const props = defineProps<ContextMenuPortalProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioGroup.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import {
-  ContextMenuRadioGroup,
-  type ContextMenuRadioGroupEmits,
-  type ContextMenuRadioGroupProps,
-  useForwardPropsEmits,
+import type {
+  ContextMenuRadioGroupEmits,
+  ContextMenuRadioGroupProps,
 } from 'radix-vue';
 
+import { ContextMenuRadioGroup, useForwardPropsEmits } from 'radix-vue';
+
 const props = defineProps<ContextMenuRadioGroupProps>();
 const emits = defineEmits<ContextMenuRadioGroupEmits>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioItem.vue

@@ -1,4 +1,9 @@
 <script setup lang="ts">
+import type {
+  ContextMenuRadioItemEmits,
+  ContextMenuRadioItemProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -7,12 +12,10 @@ import { Circle } from 'lucide-vue-next';
 import {
   ContextMenuItemIndicator,
   ContextMenuRadioItem,
-  type ContextMenuRadioItemEmits,
-  type ContextMenuRadioItemProps,
   useForwardPropsEmits,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & ContextMenuRadioItemProps>();
+const props = defineProps<ContextMenuRadioItemProps & { class?: any }>();
 const emits = defineEmits<ContextMenuRadioItemEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSeparator.vue

@@ -1,14 +1,13 @@
 <script setup lang="ts">
+import type { ContextMenuSeparatorProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  ContextMenuSeparator,
-  type ContextMenuSeparatorProps,
-} from 'radix-vue';
+import { ContextMenuSeparator } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & ContextMenuSeparatorProps>();
+const props = defineProps<ContextMenuSeparatorProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSub.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  ContextMenuSub,
-  type ContextMenuSubEmits,
-  type ContextMenuSubProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import type { ContextMenuSubEmits, ContextMenuSubProps } from 'radix-vue';
+
+import { ContextMenuSub, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<ContextMenuSubProps>();
 const emits = defineEmits<ContextMenuSubEmits>();

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSubContent.vue

@@ -1,16 +1,16 @@
 <script setup lang="ts">
+import type {
+  DropdownMenuSubContentEmits,
+  DropdownMenuSubContentProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  ContextMenuSubContent,
-  type DropdownMenuSubContentEmits,
-  type DropdownMenuSubContentProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { ContextMenuSubContent, useForwardPropsEmits } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DropdownMenuSubContentProps>();
+const props = defineProps<DropdownMenuSubContentProps & { class?: any }>();
 const emits = defineEmits<DropdownMenuSubContentEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSubTrigger.vue

@@ -1,20 +1,18 @@
 <script setup lang="ts">
+import type { ContextMenuSubTriggerProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronRight } from 'lucide-vue-next';
-import {
-  ContextMenuSubTrigger,
-  type ContextMenuSubTriggerProps,
-  useForwardProps,
-} from 'radix-vue';
+import { ContextMenuSubTrigger, useForwardProps } from 'radix-vue';
 
 const props = defineProps<
-  {
+  ContextMenuSubTriggerProps & {
     class?: any;
     inset?: boolean;
-  } & ContextMenuSubTriggerProps
+  }
 >();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuTrigger.vue

@@ -1,9 +1,7 @@
 <script setup lang="ts">
-import {
-  ContextMenuTrigger,
-  type ContextMenuTriggerProps,
-  useForwardProps,
-} from 'radix-vue';
+import type { ContextMenuTriggerProps } from 'radix-vue';
+
+import { ContextMenuTrigger, useForwardProps } from 'radix-vue';
 
 const props = defineProps<ContextMenuTriggerProps>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/Dialog.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  DialogRoot,
-  type DialogRootEmits,
-  type DialogRootProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import type { DialogRootEmits, DialogRootProps } from 'radix-vue';
+
+import { DialogRoot, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<DialogRootProps>();
 const emits = defineEmits<DialogRootEmits>();

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogClose.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { DialogClose, type DialogCloseProps } from 'radix-vue';
+import type { DialogCloseProps } from 'radix-vue';
+
+import { DialogClose } from 'radix-vue';
 
 const props = defineProps<DialogCloseProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { DialogContentEmits, DialogContentProps } from 'radix-vue';
+
 import type { ClassType } from '@vben-core/typings';
 
 import { computed, ref } from 'vue';
@@ -9,8 +11,6 @@ import { X } from 'lucide-vue-next';
 import {
   DialogClose,
   DialogContent,
-  type DialogContentEmits,
-  type DialogContentProps,
   DialogPortal,
   useForwardPropsEmits,
 } from 'radix-vue';
@@ -19,7 +19,7 @@ import DialogOverlay from './DialogOverlay.vue';
 
 const props = withDefaults(
   defineProps<
-    {
+    DialogContentProps & {
       appendTo?: HTMLElement | string;
       class?: ClassType;
       closeClass?: ClassType;
@@ -27,12 +27,12 @@ const props = withDefaults(
       open?: boolean;
       showClose?: boolean;
       zIndex?: number;
-    } & DialogContentProps
+    }
   >(),
   { appendTo: 'body', showClose: true, zIndex: 1000 },
 );
 const emits = defineEmits<
-  { close: []; closed: []; opened: [] } & DialogContentEmits
+  DialogContentEmits & { close: []; closed: []; opened: [] }
 >();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogDescription.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
+import type { DialogDescriptionProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  DialogDescription,
-  type DialogDescriptionProps,
-  useForwardProps,
-} from 'radix-vue';
+import { DialogDescription, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DialogDescriptionProps>();
+const props = defineProps<DialogDescriptionProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { DialogContentEmits, DialogContentProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -7,15 +9,13 @@ import { X } from 'lucide-vue-next';
 import {
   DialogClose,
   DialogContent,
-  type DialogContentEmits,
-  type DialogContentProps,
   DialogOverlay,
   DialogPortal,
   useForwardPropsEmits,
 } from 'radix-vue';
 
 const props = withDefaults(
-  defineProps<{ class?: any; zIndex?: number } & DialogContentProps>(),
+  defineProps<DialogContentProps & { class?: any; zIndex?: number }>(),
   { zIndex: 1000 },
 );
 const emits = defineEmits<DialogContentEmits>();

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogTitle.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { DialogTitleProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { DialogTitle, type DialogTitleProps, useForwardProps } from 'radix-vue';
+import { DialogTitle, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DialogTitleProps>();
+const props = defineProps<DialogTitleProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogTrigger.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { DialogTrigger, type DialogTriggerProps } from 'radix-vue';
+import type { DialogTriggerProps } from 'radix-vue';
+
+import { DialogTrigger } from 'radix-vue';
 
 const props = defineProps<DialogTriggerProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenu.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  DropdownMenuRoot,
-  type DropdownMenuRootEmits,
-  type DropdownMenuRootProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import type { DropdownMenuRootEmits, DropdownMenuRootProps } from 'radix-vue';
+
+import { DropdownMenuRoot, useForwardPropsEmits } from 'radix-vue';
 
 const props = withDefaults(defineProps<DropdownMenuRootProps>(), {
   modal: false,

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuCheckboxItem.vue

@@ -1,4 +1,9 @@
 <script setup lang="ts">
+import type {
+  DropdownMenuCheckboxItemEmits,
+  DropdownMenuCheckboxItemProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -6,13 +11,11 @@ import { cn } from '@vben-core/shared/utils';
 import { Check } from 'lucide-vue-next';
 import {
   DropdownMenuCheckboxItem,
-  type DropdownMenuCheckboxItemEmits,
-  type DropdownMenuCheckboxItemProps,
   DropdownMenuItemIndicator,
   useForwardPropsEmits,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DropdownMenuCheckboxItemProps>();
+const props = defineProps<DropdownMenuCheckboxItemProps & { class?: any }>();
 const emits = defineEmits<DropdownMenuCheckboxItemEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuContent.vue

@@ -1,18 +1,21 @@
 <script setup lang="ts">
+import type {
+  DropdownMenuContentEmits,
+  DropdownMenuContentProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import {
   DropdownMenuContent,
-  type DropdownMenuContentEmits,
-  type DropdownMenuContentProps,
   DropdownMenuPortal,
   useForwardPropsEmits,
 } from 'radix-vue';
 
 const props = withDefaults(
-  defineProps<{ class?: any } & DropdownMenuContentProps>(),
+  defineProps<DropdownMenuContentProps & { class?: any }>(),
   {
     sideOffset: 4,
   },

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuGroup.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { DropdownMenuGroup, type DropdownMenuGroupProps } from 'radix-vue';
+import type { DropdownMenuGroupProps } from 'radix-vue';
+
+import { DropdownMenuGroup } from 'radix-vue';
 
 const props = defineProps<DropdownMenuGroupProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuItem.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { DropdownMenuItemProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  DropdownMenuItem,
-  type DropdownMenuItemProps,
-  useForwardProps,
-} from 'radix-vue';
+import { DropdownMenuItem, useForwardProps } from 'radix-vue';
 
 const props = defineProps<
-  { class?: any; inset?: boolean } & DropdownMenuItemProps
+  DropdownMenuItemProps & { class?: any; inset?: boolean }
 >();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuLabel.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { DropdownMenuLabelProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  DropdownMenuLabel,
-  type DropdownMenuLabelProps,
-  useForwardProps,
-} from 'radix-vue';
+import { DropdownMenuLabel, useForwardProps } from 'radix-vue';
 
 const props = defineProps<
-  { class?: any; inset?: boolean } & DropdownMenuLabelProps
+  DropdownMenuLabelProps & { class?: any; inset?: boolean }
 >();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuRadioGroup.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import {
-  DropdownMenuRadioGroup,
-  type DropdownMenuRadioGroupEmits,
-  type DropdownMenuRadioGroupProps,
-  useForwardPropsEmits,
+import type {
+  DropdownMenuRadioGroupEmits,
+  DropdownMenuRadioGroupProps,
 } from 'radix-vue';
 
+import { DropdownMenuRadioGroup, useForwardPropsEmits } from 'radix-vue';
+
 const props = defineProps<DropdownMenuRadioGroupProps>();
 const emits = defineEmits<DropdownMenuRadioGroupEmits>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuRadioItem.vue

@@ -1,4 +1,9 @@
 <script setup lang="ts">
+import type {
+  DropdownMenuRadioItemEmits,
+  DropdownMenuRadioItemProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -7,12 +12,10 @@ import { Circle } from 'lucide-vue-next';
 import {
   DropdownMenuItemIndicator,
   DropdownMenuRadioItem,
-  type DropdownMenuRadioItemEmits,
-  type DropdownMenuRadioItemProps,
   useForwardPropsEmits,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DropdownMenuRadioItemProps>();
+const props = defineProps<DropdownMenuRadioItemProps & { class?: any }>();
 
 const emits = defineEmits<DropdownMenuRadioItemEmits>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSeparator.vue

@@ -1,17 +1,16 @@
 <script setup lang="ts">
+import type { DropdownMenuSeparatorProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  DropdownMenuSeparator,
-  type DropdownMenuSeparatorProps,
-} from 'radix-vue';
+import { DropdownMenuSeparator } from 'radix-vue';
 
 const props = defineProps<
-  {
+  DropdownMenuSeparatorProps & {
     class?: any;
-  } & DropdownMenuSeparatorProps
+  }
 >();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSub.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  DropdownMenuSub,
-  type DropdownMenuSubEmits,
-  type DropdownMenuSubProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import type { DropdownMenuSubEmits, DropdownMenuSubProps } from 'radix-vue';
+
+import { DropdownMenuSub, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<DropdownMenuSubProps>();
 const emits = defineEmits<DropdownMenuSubEmits>();

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSubContent.vue

@@ -1,16 +1,16 @@
 <script setup lang="ts">
+import type {
+  DropdownMenuSubContentEmits,
+  DropdownMenuSubContentProps,
+} from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  DropdownMenuSubContent,
-  type DropdownMenuSubContentEmits,
-  type DropdownMenuSubContentProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { DropdownMenuSubContent, useForwardPropsEmits } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DropdownMenuSubContentProps>();
+const props = defineProps<DropdownMenuSubContentProps & { class?: any }>();
 const emits = defineEmits<DropdownMenuSubContentEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSubTrigger.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { DropdownMenuSubTriggerProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronRight } from 'lucide-vue-next';
-import {
-  DropdownMenuSubTrigger,
-  type DropdownMenuSubTriggerProps,
-  useForwardProps,
-} from 'radix-vue';
+import { DropdownMenuSubTrigger, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DropdownMenuSubTriggerProps>();
+const props = defineProps<DropdownMenuSubTriggerProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuTrigger.vue

@@ -1,9 +1,7 @@
 <script setup lang="ts">
-import {
-  DropdownMenuTrigger,
-  type DropdownMenuTriggerProps,
-  useForwardProps,
-} from 'radix-vue';
+import type { DropdownMenuTriggerProps } from 'radix-vue';
+
+import { DropdownMenuTrigger, useForwardProps } from 'radix-vue';
 
 const props = defineProps<DropdownMenuTriggerProps>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/form/FormLabel.vue

@@ -6,7 +6,7 @@ import { cn } from '@vben-core/shared/utils';
 import { Label } from '../label';
 import { useFormField } from './useFormField';
 
-const props = defineProps<{ class?: any } & LabelProps>();
+const props = defineProps<LabelProps & { class?: any }>();
 
 const { formItemId } = useFormField();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/form/index.ts

@@ -5,7 +5,7 @@ export { default as FormLabel } from './FormLabel.vue';
 export { default as FormMessage } from './FormMessage.vue';
 export { FORM_ITEM_INJECTION_KEY } from './injectionKeys';
 export {
+  Form,
   Field as FormField,
   FieldArray as FormFieldArray,
-  Form,
 } from 'vee-validate';

packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCard.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  HoverCardRoot,
-  type HoverCardRootEmits,
-  type HoverCardRootProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import type { HoverCardRootEmits, HoverCardRootProps } from 'radix-vue';
+
+import { HoverCardRoot, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<HoverCardRootProps>();
 const emits = defineEmits<HoverCardRootEmits>();

packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCardContent.vue

@@ -1,17 +1,14 @@
 <script setup lang="ts">
+import type { HoverCardContentProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  HoverCardContent,
-  type HoverCardContentProps,
-  HoverCardPortal,
-  useForwardProps,
-} from 'radix-vue';
+import { HoverCardContent, HoverCardPortal, useForwardProps } from 'radix-vue';
 
 const props = withDefaults(
-  defineProps<{ class?: any } & HoverCardContentProps>(),
+  defineProps<HoverCardContentProps & { class?: any }>(),
   {
     sideOffset: 4,
   },

packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCardTrigger.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { HoverCardTrigger, type HoverCardTriggerProps } from 'radix-vue';
+import type { HoverCardTriggerProps } from 'radix-vue';
+
+import { HoverCardTrigger } from 'radix-vue';
 
 const props = defineProps<HoverCardTriggerProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/label/Label.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { LabelProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { Label, type LabelProps } from 'radix-vue';
+import { Label } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & LabelProps>();
+const props = defineProps<LabelProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberField.vue

@@ -7,7 +7,7 @@ import { cn } from '@vben-core/shared/utils';
 
 import { NumberFieldRoot, useForwardPropsEmits } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & NumberFieldRootProps>();
+const props = defineProps<NumberFieldRootProps & { class?: any }>();
 const emits = defineEmits<NumberFieldRootEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldDecrement.vue

@@ -8,7 +8,7 @@ import { cn } from '@vben-core/shared/utils';
 import { Minus } from 'lucide-vue-next';
 import { NumberFieldDecrement, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & NumberFieldDecrementProps>();
+const props = defineProps<NumberFieldDecrementProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldIncrement.vue

@@ -8,7 +8,7 @@ import { cn } from '@vben-core/shared/utils';
 import { Plus } from 'lucide-vue-next';
 import { NumberFieldIncrement, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & NumberFieldIncrementProps>();
+const props = defineProps<NumberFieldIncrementProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationEllipsis.vue

@@ -1,12 +1,14 @@
 <script setup lang="ts">
+import type { PaginationEllipsisProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { MoreHorizontal } from 'lucide-vue-next';
-import { PaginationEllipsis, type PaginationEllipsisProps } from 'radix-vue';
+import { PaginationEllipsis } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & PaginationEllipsisProps>();
+const props = defineProps<PaginationEllipsisProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationFirst.vue

@@ -1,15 +1,17 @@
 <script setup lang="ts">
+import type { PaginationFirstProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronsLeft } from 'lucide-vue-next';
-import { PaginationFirst, type PaginationFirstProps } from 'radix-vue';
+import { PaginationFirst } from 'radix-vue';
 
 import { Button } from '../button';
 
 const props = withDefaults(
-  defineProps<{ class?: any } & PaginationFirstProps>(),
+  defineProps<PaginationFirstProps & { class?: any }>(),
   {
     asChild: true,
   },

packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationLast.vue

@@ -1,15 +1,17 @@
 <script setup lang="ts">
+import type { PaginationLastProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronsRight } from 'lucide-vue-next';
-import { PaginationLast, type PaginationLastProps } from 'radix-vue';
+import { PaginationLast } from 'radix-vue';
 
 import { Button } from '../button';
 
 const props = withDefaults(
-  defineProps<{ class?: any } & PaginationLastProps>(),
+  defineProps<PaginationLastProps & { class?: any }>(),
   {
     asChild: true,
   },

packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationNext.vue

@@ -1,15 +1,17 @@
 <script setup lang="ts">
+import type { PaginationNextProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronRight } from 'lucide-vue-next';
-import { PaginationNext, type PaginationNextProps } from 'radix-vue';
+import { PaginationNext } from 'radix-vue';
 
 import { Button } from '../button';
 
 const props = withDefaults(
-  defineProps<{ class?: any } & PaginationNextProps>(),
+  defineProps<PaginationNextProps & { class?: any }>(),
   {
     asChild: true,
   },

packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationPrev.vue

@@ -1,15 +1,17 @@
 <script setup lang="ts">
+import type { PaginationPrevProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronLeft } from 'lucide-vue-next';
-import { PaginationPrev, type PaginationPrevProps } from 'radix-vue';
+import { PaginationPrev } from 'radix-vue';
 
 import { Button } from '../button';
 
 const props = withDefaults(
-  defineProps<{ class?: any } & PaginationPrevProps>(),
+  defineProps<PaginationPrevProps & { class?: any }>(),
   {
     asChild: true,
   },

packages/@core/ui-kit/shadcn-ui/src/ui/pagination/index.ts

@@ -4,7 +4,7 @@ export { default as PaginationLast } from './PaginationLast.vue';
 export { default as PaginationNext } from './PaginationNext.vue';
 export { default as PaginationPrev } from './PaginationPrev.vue';
 export {
+  PaginationRoot as Pagination,
   PaginationList,
   PaginationListItem,
-  PaginationRoot as Pagination,
 } from 'radix-vue';

packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInput.vue

@@ -1,16 +1,13 @@
 <script setup lang="ts">
+import type { PinInputRootEmits, PinInputRootProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  PinInputRoot,
-  type PinInputRootEmits,
-  type PinInputRootProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { PinInputRoot, useForwardPropsEmits } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & PinInputRootProps>();
+const props = defineProps<PinInputRootProps & { class?: any }>();
 const emits = defineEmits<PinInputRootEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputGroup.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { PrimitiveProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { Primitive, type PrimitiveProps, useForwardProps } from 'radix-vue';
+import { Primitive, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & PrimitiveProps>();
+const props = defineProps<PrimitiveProps & { class?: any }>();
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;
   return delegated;

packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputInput.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
+import type { PinInputInputProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  PinInputInput,
-  type PinInputInputProps,
-  useForwardProps,
-} from 'radix-vue';
+import { PinInputInput, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & PinInputInputProps>();
+const props = defineProps<PinInputInputProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputSeparator.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import type { PrimitiveProps } from 'radix-vue';
+
 import { Dot } from 'lucide-vue-next';
-import { Primitive, type PrimitiveProps, useForwardProps } from 'radix-vue';
+import { Primitive, useForwardProps } from 'radix-vue';
 
 const props = defineProps<PrimitiveProps>();
 const forwardedProps = useForwardProps(props);

packages/@core/ui-kit/shadcn-ui/src/ui/popover/PopoverContent.vue

@@ -1,22 +1,18 @@
 <script setup lang="ts">
+import type { PopoverContentEmits, PopoverContentProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  PopoverContent,
-  type PopoverContentEmits,
-  type PopoverContentProps,
-  PopoverPortal,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { PopoverContent, PopoverPortal, useForwardPropsEmits } from 'radix-vue';
 
 defineOptions({
   inheritAttrs: false,
 });
 
 const props = withDefaults(
-  defineProps<{ class?: any } & PopoverContentProps>(),
+  defineProps<PopoverContentProps & { class?: any }>(),
   {
     align: 'center',
     sideOffset: 4,

packages/@core/ui-kit/shadcn-ui/src/ui/popover/PopoverTrigger.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { PopoverTrigger, type PopoverTriggerProps } from 'radix-vue';
+import type { PopoverTriggerProps } from 'radix-vue';
+
+import { PopoverTrigger } from 'radix-vue';
 
 const props = defineProps<PopoverTriggerProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroup.vue

@@ -1,16 +1,13 @@
 <script setup lang="ts">
+import type { RadioGroupRootEmits, RadioGroupRootProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  RadioGroupRoot,
-  type RadioGroupRootEmits,
-  type RadioGroupRootProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { RadioGroupRoot, useForwardPropsEmits } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & RadioGroupRootProps>();
+const props = defineProps<RadioGroupRootProps & { class?: any }>();
 const emits = defineEmits<RadioGroupRootEmits>();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroupItem.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { RadioGroupItemProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -7,11 +9,10 @@ import { Circle } from 'lucide-vue-next';
 import {
   RadioGroupIndicator,
   RadioGroupItem,
-  type RadioGroupItemProps,
   useForwardProps,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & RadioGroupItemProps>();
+const props = defineProps<RadioGroupItemProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/resizable/ResizableHandle.vue

@@ -1,21 +1,23 @@
 <script setup lang="ts">
-import { computed, type HTMLAttributes } from 'vue';
+import type {
+  SplitterResizeHandleEmits,
+  SplitterResizeHandleProps,
+} from 'radix-vue';
+
+import type { HTMLAttributes } from 'vue';
+
+import { computed } from 'vue';
 
 import { GripVertical } from '@vben-core/icons';
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  SplitterResizeHandle,
-  type SplitterResizeHandleEmits,
-  type SplitterResizeHandleProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { SplitterResizeHandle, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<
-  {
+  SplitterResizeHandleProps & {
     class?: HTMLAttributes['class'];
     withHandle?: boolean;
-  } & SplitterResizeHandleProps
+  }
 >();
 const emits = defineEmits<SplitterResizeHandleEmits>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/resizable/ResizablePanelGroup.vue

@@ -1,17 +1,16 @@
 <script setup lang="ts">
-import { computed, type HTMLAttributes } from 'vue';
+import type { SplitterGroupEmits, SplitterGroupProps } from 'radix-vue';
+
+import type { HTMLAttributes } from 'vue';
+
+import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  SplitterGroup,
-  type SplitterGroupEmits,
-  type SplitterGroupProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { SplitterGroup, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<
-  { class?: HTMLAttributes['class'] } & SplitterGroupProps
+  SplitterGroupProps & { class?: HTMLAttributes['class'] }
 >();
 const emits = defineEmits<SplitterGroupEmits>();
 

packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { ScrollAreaRootProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -6,7 +8,6 @@ import { cn } from '@vben-core/shared/utils';
 import {
   ScrollAreaCorner,
   ScrollAreaRoot,
-  type ScrollAreaRootProps,
   ScrollAreaViewport,
 } from 'radix-vue';
 
@@ -14,11 +15,11 @@ import ScrollBar from './ScrollBar.vue';
 
 const props = withDefaults(
   defineProps<
-    {
+    ScrollAreaRootProps & {
       class?: any;
       onScroll?: (event: Event) => void;
       viewportProps?: { onScroll: (event: Event) => void };
-    } & ScrollAreaRootProps
+    }
   >(),
   {
     onScroll: () => {},

packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollBar.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { ScrollAreaScrollbarProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  ScrollAreaScrollbar,
-  type ScrollAreaScrollbarProps,
-  ScrollAreaThumb,
-} from 'radix-vue';
+import { ScrollAreaScrollbar, ScrollAreaThumb } from 'radix-vue';
 
 const props = withDefaults(
-  defineProps<{ class?: any } & ScrollAreaScrollbarProps>(),
+  defineProps<ScrollAreaScrollbarProps & { class?: any }>(),
   {
     orientation: 'vertical',
   },

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectContent.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
+import type { SelectContentEmits, SelectContentProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import {
   SelectContent,
-  type SelectContentEmits,
-  type SelectContentProps,
   SelectPortal,
   SelectViewport,
   useForwardPropsEmits,
@@ -20,7 +20,7 @@ defineOptions({
 });
 
 const props = withDefaults(
-  defineProps<{ class?: any } & SelectContentProps>(),
+  defineProps<SelectContentProps & { class?: any }>(),
   {
     position: 'popper',
   },

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectGroup.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { SelectGroupProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { SelectGroup, type SelectGroupProps } from 'radix-vue';
+import { SelectGroup } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & SelectGroupProps>();
+const props = defineProps<SelectGroupProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectItem.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { SelectItemProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
@@ -7,12 +9,11 @@ import { Check } from 'lucide-vue-next';
 import {
   SelectItem,
   SelectItemIndicator,
-  type SelectItemProps,
   SelectItemText,
   useForwardProps,
 } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & SelectItemProps>();
+const props = defineProps<SelectItemProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectItemText.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { SelectItemText, type SelectItemTextProps } from 'radix-vue';
+import type { SelectItemTextProps } from 'radix-vue';
+
+import { SelectItemText } from 'radix-vue';
 
 const props = defineProps<SelectItemTextProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectLabel.vue

@@ -1,9 +1,11 @@
 <script setup lang="ts">
+import type { SelectLabelProps } from 'radix-vue';
+
 import { cn } from '@vben-core/shared/utils';
 
-import { SelectLabel, type SelectLabelProps } from 'radix-vue';
+import { SelectLabel } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & SelectLabelProps>();
+const props = defineProps<SelectLabelProps & { class?: any }>();
 </script>
 
 <template>

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollDownButton.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { SelectScrollDownButtonProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronDown } from 'lucide-vue-next';
-import {
-  SelectScrollDownButton,
-  type SelectScrollDownButtonProps,
-  useForwardProps,
-} from 'radix-vue';
+import { SelectScrollDownButton, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & SelectScrollDownButtonProps>();
+const props = defineProps<SelectScrollDownButtonProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollUpButton.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { SelectScrollUpButtonProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronUp } from 'lucide-vue-next';
-import {
-  SelectScrollUpButton,
-  type SelectScrollUpButtonProps,
-  useForwardProps,
-} from 'radix-vue';
+import { SelectScrollUpButton, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & SelectScrollUpButtonProps>();
+const props = defineProps<SelectScrollUpButtonProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectSeparator.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { SelectSeparatorProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { SelectSeparator, type SelectSeparatorProps } from 'radix-vue';
+import { SelectSeparator } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & SelectSeparatorProps>();
+const props = defineProps<SelectSeparatorProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectTrigger.vue

@@ -1,17 +1,14 @@
 <script setup lang="ts">
+import type { SelectTriggerProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
 import { ChevronDown } from 'lucide-vue-next';
-import {
-  SelectIcon,
-  SelectTrigger,
-  type SelectTriggerProps,
-  useForwardProps,
-} from 'radix-vue';
+import { SelectIcon, SelectTrigger, useForwardProps } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & SelectTriggerProps>();
+const props = defineProps<SelectTriggerProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectValue.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { SelectValue, type SelectValueProps } from 'radix-vue';
+import type { SelectValueProps } from 'radix-vue';
+
+import { SelectValue } from 'radix-vue';
 
 const props = defineProps<SelectValueProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/separator/Separator.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { SeparatorProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { Separator, type SeparatorProps } from 'radix-vue';
+import { Separator } from 'radix-vue';
 
-const props = defineProps<{ class?: any; label?: string } & SeparatorProps>();
+const props = defineProps<SeparatorProps & { class?: any; label?: string }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/sheet/Sheet.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  DialogRoot,
-  type DialogRootEmits,
-  type DialogRootProps,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import type { DialogRootEmits, DialogRootProps } from 'radix-vue';
+
+import { DialogRoot, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<DialogRootProps>();
 const emits = defineEmits<DialogRootEmits>();

packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetClose.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { DialogClose, type DialogCloseProps } from 'radix-vue';
+import type { DialogCloseProps } from 'radix-vue';
+
+import { DialogClose } from 'radix-vue';
 
 const props = defineProps<DialogCloseProps>();
 </script>

packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue

@@ -1,17 +1,15 @@
 <script setup lang="ts">
+import type { DialogContentEmits, DialogContentProps } from 'radix-vue';
+
+import type { SheetVariants } from './sheet';
+
 import { computed, ref } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import {
-  DialogContent,
-  type DialogContentEmits,
-  type DialogContentProps,
-  DialogPortal,
-  useForwardPropsEmits,
-} from 'radix-vue';
+import { DialogContent, DialogPortal, useForwardPropsEmits } from 'radix-vue';
 
-import { type SheetVariants, sheetVariants } from './sheet';
+import { sheetVariants } from './sheet';
 import SheetOverlay from './SheetOverlay.vue';
 
 interface SheetContentProps extends DialogContentProps {
@@ -33,7 +31,7 @@ const props = withDefaults(defineProps<SheetContentProps>(), {
 });
 
 const emits = defineEmits<
-  { close: []; closed: []; opened: [] } & DialogContentEmits
+  DialogContentEmits & { close: []; closed: []; opened: [] }
 >();
 
 const delegatedProps = computed(() => {

packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetDescription.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { DialogDescriptionProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { DialogDescription, type DialogDescriptionProps } from 'radix-vue';
+import { DialogDescription } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DialogDescriptionProps>();
+const props = defineProps<DialogDescriptionProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;

packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetTitle.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
+import type { DialogTitleProps } from 'radix-vue';
+
 import { computed } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { DialogTitle, type DialogTitleProps } from 'radix-vue';
+import { DialogTitle } from 'radix-vue';
 
-const props = defineProps<{ class?: any } & DialogTitleProps>();
+const props = defineProps<DialogTitleProps & { class?: any }>();
 
 const delegatedProps = computed(() => {
   const { class: _, ...delegated } = props;