From bc85d70924eee6cbcfa01735b9abff9324926ca5 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Thu, 4 Apr 2024 12:07:59 +0200
Subject: [PATCH] chore(DropdownMenu): move slots type to parent

---
 src/runtime/components/DropdownMenu.vue        | 11 ++++++++---
 src/runtime/components/DropdownMenuContent.vue | 15 ++++-----------
 src/runtime/types/index.d.ts                   |  1 -
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/runtime/components/DropdownMenu.vue b/src/runtime/components/DropdownMenu.vue
index 04640fce..809e6b0c 100644
--- a/src/runtime/components/DropdownMenu.vue
+++ b/src/runtime/components/DropdownMenu.vue
@@ -4,7 +4,7 @@ import type { DropdownMenuRootProps, DropdownMenuRootEmits, DropdownMenuContentP
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/dropdown-menu'
-import type { AvatarProps, IconProps, KbdProps, LinkProps, DropdownMenuContentSlots } from '#ui/types'
+import type { AvatarProps, IconProps, KbdProps, LinkProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { dropdownMenu: Partial<typeof theme> } }
 
@@ -37,8 +37,13 @@ export interface DropdownMenuProps<T> extends Omit<DropdownMenuRootProps, 'dir'>
 
 export interface DropdownMenuEmits extends DropdownMenuRootEmits {}
 
-export interface DropdownMenuSlots<T> extends DropdownMenuContentSlots<T> {
-  default (): any
+type SlotProps<T> = (props: { item: T, active?: boolean }) => any
+
+export interface DropdownMenuSlots<T> {
+  default(): any
+  leading: SlotProps<T>
+  label: SlotProps<T>
+  trailing: SlotProps<T>
 }
 </script>
 
diff --git a/src/runtime/components/DropdownMenuContent.vue b/src/runtime/components/DropdownMenuContent.vue
index e06145da..a502d63b 100644
--- a/src/runtime/components/DropdownMenuContent.vue
+++ b/src/runtime/components/DropdownMenuContent.vue
@@ -1,8 +1,8 @@
 <script lang="ts">
 import type { DropdownMenuContentProps as RadixDropdownMenuContentProps, DropdownMenuContentEmits as RadixDropdownMenuContentEmits } from 'radix-vue'
-import type { DropdownMenuItem } from '#ui/types'
+import type { DropdownMenuItem, DropdownMenuSlots } from '#ui/types'
 
-export interface DropdownMenuContentProps<T> extends Omit<RadixDropdownMenuContentProps, 'asChild' | 'forceMount'> {
+interface DropdownMenuContentProps<T> extends Omit<RadixDropdownMenuContentProps, 'asChild' | 'forceMount'> {
   items?: T[] | T[][]
   portal?: boolean
   sub?: boolean
@@ -10,16 +10,9 @@ export interface DropdownMenuContentProps<T> extends Omit<RadixDropdownMenuConte
   ui: any
 }
 
-export interface DropdownMenuContentEmits extends RadixDropdownMenuContentEmits {}
+interface DropdownMenuContentEmits extends RadixDropdownMenuContentEmits {}
 
-type SlotProps<T> = (props: { item: T, active?: boolean }) => any
-
-export interface DropdownMenuContentSlots<T> {
-  default(): any
-  leading: SlotProps<T>
-  label: SlotProps<T>
-  trailing: SlotProps<T>
-}
+interface DropdownMenuContentSlots<T> extends DropdownMenuSlots<T> {}
 </script>
 
 <script setup lang="ts" generic="T extends DropdownMenuItem">
diff --git a/src/runtime/types/index.d.ts b/src/runtime/types/index.d.ts
index 5f3474f2..8cd855ac 100644
--- a/src/runtime/types/index.d.ts
+++ b/src/runtime/types/index.d.ts
@@ -9,7 +9,6 @@ export * from '../components/Chip.vue'
 export * from '../components/Collapsible.vue'
 export * from '../components/Container.vue'
 export * from '../components/DropdownMenu.vue'
-export * from '../components/DropdownMenuContent.vue'
 export * from '../components/Form.vue'
 export * from '../components/FormField.vue'
 export * from '../components/Icon.vue'