From b94dd57fd7e44b7d1748116dd33a0dbe69d35194 Mon Sep 17 00:00:00 2001 From: SonTT19 Date: Sat, 13 Apr 2024 14:55:28 +0700 Subject: [PATCH 1/2] fix(VTextField): add theme class to text field --- packages/vuetify/src/components/VTextField/VTextField.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/vuetify/src/components/VTextField/VTextField.tsx b/packages/vuetify/src/components/VTextField/VTextField.tsx index 139b7ef2d72..191627440a0 100644 --- a/packages/vuetify/src/components/VTextField/VTextField.tsx +++ b/packages/vuetify/src/components/VTextField/VTextField.tsx @@ -10,6 +10,7 @@ import { makeVInputProps, VInput } from '@/components/VInput/VInput' import { useFocus } from '@/composables/focus' import { forwardRefs } from '@/composables/forwardRefs' import { useProxiedModel } from '@/composables/proxiedModel' +import { makeThemeProps, provideTheme } from '@/composables/theme' // Directives import Intersect from '@/directives/intersect' @@ -42,6 +43,7 @@ export const makeVTextFieldProps = propsFactory({ }, modelModifiers: Object as PropType>, + ...makeThemeProps(), ...makeVInputProps(), ...makeVFieldProps(), }, 'VTextField') @@ -69,6 +71,7 @@ export const VTextField = genericComponent()({ setup (props, { attrs, emit, slots }) { const model = useProxiedModel(props, 'modelValue') + const { themeClasses } = provideTheme(props) const { isFocused, focus, blur } = useFocus(props) const counterValue = computed(() => { return typeof props.counterValue === 'function' ? props.counterValue(model.value) @@ -172,6 +175,7 @@ export const VTextField = genericComponent()({ 'v-input--plain-underlined': isPlainOrUnderlined.value, }, props.class, + themeClasses.value, ]} style={ props.style } { ...rootAttrs } From 6513ed8650d307728685c574a191b50ef8ec0bcb Mon Sep 17 00:00:00 2001 From: SonTT19 Date: Sat, 13 Apr 2024 22:21:29 +0700 Subject: [PATCH 2/2] fix(VInput): add theme class --- packages/vuetify/src/components/VInput/VInput.tsx | 4 ++++ packages/vuetify/src/components/VTextField/VTextField.tsx | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vuetify/src/components/VInput/VInput.tsx b/packages/vuetify/src/components/VInput/VInput.tsx index 7b79f1f4180..fe95b64fee4 100644 --- a/packages/vuetify/src/components/VInput/VInput.tsx +++ b/packages/vuetify/src/components/VInput/VInput.tsx @@ -10,6 +10,7 @@ import { makeComponentProps } from '@/composables/component' import { makeDensityProps, useDensity } from '@/composables/density' import { IconValue } from '@/composables/icons' import { useRtl } from '@/composables/locale' +import { makeThemeProps, provideTheme } from '@/composables/theme' import { makeValidationProps, useValidation } from '@/composables/validation' // Utilities @@ -62,6 +63,7 @@ export const makeVInputProps = propsFactory({ ...makeComponentProps(), ...makeDensityProps(), + ...makeThemeProps(), ...makeValidationProps(), }, 'VInput') @@ -92,6 +94,7 @@ export const VInput = genericComponent( setup (props, { attrs, slots, emit }) { const { densityClasses } = useDensity(props) + const { themeClasses } = provideTheme(props) const { rtlClasses } = useRtl() const { InputIcon } = useInputIcon(props) @@ -156,6 +159,7 @@ export const VInput = genericComponent( 'v-input--hide-spin-buttons': props.hideSpinButtons, }, densityClasses.value, + themeClasses.value, rtlClasses.value, validationClasses.value, props.class, diff --git a/packages/vuetify/src/components/VTextField/VTextField.tsx b/packages/vuetify/src/components/VTextField/VTextField.tsx index 191627440a0..139b7ef2d72 100644 --- a/packages/vuetify/src/components/VTextField/VTextField.tsx +++ b/packages/vuetify/src/components/VTextField/VTextField.tsx @@ -10,7 +10,6 @@ import { makeVInputProps, VInput } from '@/components/VInput/VInput' import { useFocus } from '@/composables/focus' import { forwardRefs } from '@/composables/forwardRefs' import { useProxiedModel } from '@/composables/proxiedModel' -import { makeThemeProps, provideTheme } from '@/composables/theme' // Directives import Intersect from '@/directives/intersect' @@ -43,7 +42,6 @@ export const makeVTextFieldProps = propsFactory({ }, modelModifiers: Object as PropType>, - ...makeThemeProps(), ...makeVInputProps(), ...makeVFieldProps(), }, 'VTextField') @@ -71,7 +69,6 @@ export const VTextField = genericComponent()({ setup (props, { attrs, emit, slots }) { const model = useProxiedModel(props, 'modelValue') - const { themeClasses } = provideTheme(props) const { isFocused, focus, blur } = useFocus(props) const counterValue = computed(() => { return typeof props.counterValue === 'function' ? props.counterValue(model.value) @@ -175,7 +172,6 @@ export const VTextField = genericComponent()({ 'v-input--plain-underlined': isPlainOrUnderlined.value, }, props.class, - themeClasses.value, ]} style={ props.style } { ...rootAttrs }