From 5bdcfde6fdcaa99924b48f28d2e519f66bd15b25 Mon Sep 17 00:00:00 2001 From: Kael Date: Tue, 16 May 2023 21:30:05 +1000 Subject: [PATCH] fix(VSelect): avoid distributive conditional type with unbound generic fixes #17383 --- packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx | 2 +- packages/vuetify/src/components/VCombobox/VCombobox.tsx | 2 +- packages/vuetify/src/components/VSelect/VSelect.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx index ed81a643407..7d55158b7e3 100644 --- a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx +++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx @@ -51,7 +51,7 @@ function highlightResult (text: string, matches: FilterMatch | undefined, length type Primitive = string | number | boolean | symbol -type Val = T extends Primitive +type Val = [T] extends [Primitive] ? T : (ReturnObject extends true ? T : any) diff --git a/packages/vuetify/src/components/VCombobox/VCombobox.tsx b/packages/vuetify/src/components/VCombobox/VCombobox.tsx index 49cf01720dd..96982e28659 100644 --- a/packages/vuetify/src/components/VCombobox/VCombobox.tsx +++ b/packages/vuetify/src/components/VCombobox/VCombobox.tsx @@ -52,7 +52,7 @@ function highlightResult (text: string, matches: FilterMatch | undefined, length type Primitive = string | number | boolean | symbol -type Val = string | (T extends Primitive +type Val = string | ([T] extends [Primitive] ? T : (ReturnObject extends true ? T : any)) diff --git a/packages/vuetify/src/components/VSelect/VSelect.tsx b/packages/vuetify/src/components/VSelect/VSelect.tsx index 6c2fda4e4ba..a2477a566ac 100644 --- a/packages/vuetify/src/components/VSelect/VSelect.tsx +++ b/packages/vuetify/src/components/VSelect/VSelect.tsx @@ -35,7 +35,7 @@ import type { Component, PropType } from 'vue' type Primitive = string | number | boolean | symbol -type Val = T extends Primitive +type Val = [T] extends [Primitive] ? T : (ReturnObject extends true ? T : any)