fix(types): don't omit properties from forwarded DOM elements

fixes #15930
vuetifyjs · Oct 21, 2022 · f164fbf · f164fbf
1 parent 191de2e
commit f164fbf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/vuetify/src/composables/forwardRefs.ts b/packages/vuetify/src/composables/forwardRefs.ts
@@ -4,12 +4,12 @@ import type { UnionToIntersection } from '@/util'
 const Refs = Symbol('Forwarded refs')
 
 /** Omit properties starting with P */
-type OmitPrefix<T, P extends string> = Omit<T, keyof T extends `${P}${any}` ? keyof T : never>
+type OmitPrefix<T, P extends string> = [Extract<keyof T, `${P}${any}`>] extends [never] ? T : Omit<T, `${P}${any}`>
 
 export function forwardRefs<T extends {}, U extends Ref<HTMLElement | Omit<ComponentPublicInstance, '$emit'> | undefined>[]> (
   target: T,
   ...refs: U
-): T & OmitPrefix<UnwrapRef<UnionToIntersection<U[number]>>, '$'> {
+): T & UnionToIntersection<{ [K in keyof U]: OmitPrefix<NonNullable<UnwrapRef<U[K]>>, '$'> }[number]> {
   (target as any)[Refs] = refs
 
   return new Proxy(target, {