fix: use vue-component-type-helpers to fix the generic component type…

… issue
vue-final · Oct 30, 2023 · 7a9f4e9 · 7a9f4e9
1 parent 30dc595
commit 7a9f4e9
Show file tree

Hide file tree

Showing 2 changed files with 364 additions and 315 deletions.
diff --git a/packages/vue-final-modal/src/Modal.ts b/packages/vue-final-modal/src/Modal.ts
@@ -1,6 +1,5 @@
-import type { App, CSSProperties, Component, ComponentPublicInstance, ComputedRef, Raw, Ref, VNodeProps } from 'vue'
-
-export type ComponentProps = ComponentPublicInstance['$props']
+import type { App, CSSProperties, Component, ComputedRef, Raw, Ref, VNodeProps } from 'vue'
+import type { ComponentProps } from 'vue-component-type-helpers'
 
 export type ModalId = number | string | symbol
 export type StyleValue = string | CSSProperties | (string | CSSProperties)[]
@@ -26,7 +25,7 @@ export type UseModalOptions<P> = {
   defaultModelValue?: boolean
   keepAlive?: boolean
   component?: Constructor<P>
-  attrs?: (RawProps & P) | ({} extends P ? null : never)
+  attrs?: ComponentProps<Component<P>>
   slots?: {
     [key: string]: ModalSlot
   }