fix: update types, emits not behaving correctly

unovue · Aug 21, 2023 · a943661 · a943661
1 parent 82d4fa1
commit a943661
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/packages/radix-vue/src/NavigationMenu/NavigationMenuContent.vue b/packages/radix-vue/src/NavigationMenu/NavigationMenuContent.vue
@@ -3,20 +3,19 @@ import { computed, inject } from 'vue'
 import { NAVIGATION_MENU_INJECTION_KEY } from './NavigationMenuRoot.vue'
 import { NAVIGATION_MENU_ITEM_INJECTION_KEY } from './NavigationMenuItem.vue'
 import { getOpenState } from './utils'
-import NavigationMenuContentImpl from './NavigationMenuContentImpl.vue'
 import { Presence } from '@/Presence'
-import {
-  type DismissableLayerEmits,
-  type DismissableLayerProps,
-  type PointerDownOutsideEvent,
-} from '@/DismissableLayer'
+import { type PointerDownOutsideEvent } from '@/DismissableLayer'
+import NavigationMenuContentImpl, { type NavigationMenuContentImplEmits, type NavigationMenuContentImplProps } from './NavigationMenuContentImpl.vue'
+import { useEmitAsProps } from '@/shared'
 
-export interface NavigationMenuContentProps extends DismissableLayerProps {}
-export type NavigationMenuContentEmits = DismissableLayerEmits
+export interface NavigationMenuContentProps extends NavigationMenuContentImplProps {}
+export type NavigationMenuContentEmits = NavigationMenuContentImplEmits
 
 const props = defineProps<NavigationMenuContentProps>()
 const emits = defineEmits<NavigationMenuContentEmits>()
 
+const emitsAsProps = useEmitAsProps(emits)
+
 const context = inject(NAVIGATION_MENU_INJECTION_KEY)
 const itemContext = inject(NAVIGATION_MENU_ITEM_INJECTION_KEY)
 
@@ -51,7 +50,7 @@ export default {
         :style="{
           pointerEvents: !open && context?.isRootMenu ? 'none' : undefined,
         }"
-        v-bind="{ ...$attrs, ...props }"
+        v-bind="{ ...$attrs, ...props, ...emitsAsProps }"
         @pointerenter="context?.onContentEnter(itemContext!.value)"
         @pointerleave="context?.onContentLeave()"
         @pointerdown="handlePointerDown"

diff --git a/packages/radix-vue/src/NavigationMenu/NavigationMenuContentImpl.vue b/packages/radix-vue/src/NavigationMenu/NavigationMenuContentImpl.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 type MotionAttribute = 'to-start' | 'to-end' | 'from-start' | 'from-end'
 
-interface NavigationMenuContentImplProps extends DismissableLayerProps {}
+export interface NavigationMenuContentImplProps extends DismissableLayerProps {}
+export type NavigationMenuContentImplEmits = DismissableLayerEmits
 </script>
 
 <script setup lang="ts">
@@ -28,7 +29,7 @@ import type { PointerDownOutsideEvent } from '@/DismissableLayer/utils'
 import { NAVIGATION_MENU_ITEM_INJECTION_KEY } from './NavigationMenuItem.vue'
 
 const props = defineProps<NavigationMenuContentImplProps>()
-const emits = defineEmits<DismissableLayerEmits>()
+const emits = defineEmits<NavigationMenuContentImplEmits>()
 
 const { injectCollection } = useCollection('nav')
 const collectionItems = injectCollection()