From ea29cc238cac8e90843848b7fbd4adec49d7a8ff Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Wed, 3 Apr 2024 17:52:08 +0200
Subject: [PATCH] chore: allow `as` in `content` and `arrow` props

---
 src/runtime/components/DropdownMenu.vue        | 6 +++---
 src/runtime/components/DropdownMenuContent.vue | 2 +-
 src/runtime/components/Modal.vue               | 2 +-
 src/runtime/components/Popover.vue             | 4 ++--
 src/runtime/components/Slideover.vue           | 2 +-
 src/runtime/components/Tooltip.vue             | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/runtime/components/DropdownMenu.vue b/src/runtime/components/DropdownMenu.vue
index 4c11e60d..04640fce 100644
--- a/src/runtime/components/DropdownMenu.vue
+++ b/src/runtime/components/DropdownMenu.vue
@@ -15,7 +15,7 @@ export interface DropdownMenuItem extends Omit<LinkProps, 'type'> {
   icon?: IconProps['name']
   avatar?: AvatarProps
   disabled?: boolean
-  content?: Omit<DropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'>
+  content?: Omit<DropdownMenuContentProps, 'asChild' | 'forceMount'>
   shortcuts?: string[] | KbdProps[]
   type?: 'label' | 'item'
   slot?: string
@@ -28,8 +28,8 @@ export interface DropdownMenuItem extends Omit<LinkProps, 'type'> {
 export interface DropdownMenuProps<T> extends Omit<DropdownMenuRootProps, 'dir'> {
   items?: T[] | T[][]
   disabled?: boolean
-  content?: Omit<DropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'>
-  arrow?: boolean | Omit<DropdownMenuArrowProps, 'as' | 'asChild'>
+  content?: Omit<DropdownMenuContentProps, 'asChild' | 'forceMount'>
+  arrow?: boolean | Omit<DropdownMenuArrowProps, 'asChild'>
   portal?: boolean
   class?: any
   ui?: Partial<typeof dropdownMenu.slots>
diff --git a/src/runtime/components/DropdownMenuContent.vue b/src/runtime/components/DropdownMenuContent.vue
index 8bd80b07..e06145da 100644
--- a/src/runtime/components/DropdownMenuContent.vue
+++ b/src/runtime/components/DropdownMenuContent.vue
@@ -2,7 +2,7 @@
 import type { DropdownMenuContentProps as RadixDropdownMenuContentProps, DropdownMenuContentEmits as RadixDropdownMenuContentEmits } from 'radix-vue'
 import type { DropdownMenuItem } from '#ui/types'
 
-export interface DropdownMenuContentProps<T> extends Omit<RadixDropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'> {
+export interface DropdownMenuContentProps<T> extends Omit<RadixDropdownMenuContentProps, 'asChild' | 'forceMount'> {
   items?: T[] | T[][]
   portal?: boolean
   sub?: boolean
diff --git a/src/runtime/components/Modal.vue b/src/runtime/components/Modal.vue
index ab016f6e..3992e35b 100644
--- a/src/runtime/components/Modal.vue
+++ b/src/runtime/components/Modal.vue
@@ -13,7 +13,7 @@ const modal = tv({ extend: tv(theme), ...(appConfig.ui?.modal || {}) })
 export interface ModalProps extends DialogRootProps {
   title?: string
   description?: string
-  content?: Omit<DialogContentProps, 'as' | 'asChild' | 'forceMount'>
+  content?: Omit<DialogContentProps, 'asChild' | 'forceMount'>
   overlay?: boolean
   transition?: boolean
   fullscreen?: boolean
diff --git a/src/runtime/components/Popover.vue b/src/runtime/components/Popover.vue
index 6e6149b5..98ec4b11 100644
--- a/src/runtime/components/Popover.vue
+++ b/src/runtime/components/Popover.vue
@@ -15,8 +15,8 @@ export interface PopoverProps extends PopoverRootProps, Pick<HoverCardRootProps,
    * @defaultValue "click"
    */
   mode?: 'click' | 'hover'
-  content?: Omit<PopoverContentProps, 'as' | 'asChild' | 'forceMount'>
-  arrow?: boolean | Omit<PopoverArrowProps, 'as' | 'asChild'>
+  content?: Omit<PopoverContentProps, 'asChild' | 'forceMount'>
+  arrow?: boolean | Omit<PopoverArrowProps, 'asChild'>
   portal?: boolean
   class?: any
   ui?: Partial<typeof popover.slots>
diff --git a/src/runtime/components/Slideover.vue b/src/runtime/components/Slideover.vue
index 37f0706d..1ff8c1db 100644
--- a/src/runtime/components/Slideover.vue
+++ b/src/runtime/components/Slideover.vue
@@ -13,7 +13,7 @@ const slideover = tv({ extend: tv(theme), ...(appConfig.ui?.slideover || {}) })
 export interface SlideoverProps extends DialogRootProps {
   title?: string
   description?: string
-  content?: Omit<DialogContentProps, 'as' | 'asChild' | 'forceMount'>
+  content?: Omit<DialogContentProps, 'asChild' | 'forceMount'>
   overlay?: boolean
   transition?: boolean
   side?: 'left' | 'right' | 'top' | 'bottom'
diff --git a/src/runtime/components/Tooltip.vue b/src/runtime/components/Tooltip.vue
index 7201cecd..cf6cd592 100644
--- a/src/runtime/components/Tooltip.vue
+++ b/src/runtime/components/Tooltip.vue
@@ -13,8 +13,8 @@ const tooltip = tv({ extend: tv(theme), ...(appConfig.ui?.tooltip || {}) })
 export interface TooltipProps extends TooltipRootProps {
   text?: string
   shortcuts?: string[] | KbdProps[]
-  content?: Omit<TooltipContentProps, 'as' | 'asChild'>
-  arrow?: boolean | Omit<TooltipArrowProps, 'as' | 'asChild'>
+  content?: Omit<TooltipContentProps, 'asChild'>
+  arrow?: boolean | Omit<TooltipArrowProps, 'asChild'>
   portal?: boolean
   class?: any
   ui?: Partial<typeof tooltip.slots>