Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5e9fa29

Browse files
aaa2002J-SekKaelWD
authored
fix(VSelects): restore appendInnerIcon rendering (#22431)
Fixes#22429Co-authored-by: J-Sek <J-Sek@users.noreply.github.com>Co-authored-by: Kael <kaelwd@gmail.com>
1 parentaaae443 commit5e9fa29

File tree

4 files changed

+33
-4
lines changed

4 files changed

+33
-4
lines changed

‎packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { VChip } from '@/components/VChip'
88
import{VDefaultsProvider}from'@/components/VDefaultsProvider'
99
import{VDivider}from'@/components/VDivider'
1010
import{VIcon}from'@/components/VIcon'
11+
import{useInputIcon}from'@/components/VInput/InputIcon'
1112
import{VList,VListItem,VListSubheader}from'@/components/VList'
1213
import{VMenu}from'@/components/VMenu'
1314
import{makeSelectProps}from'@/components/VSelect/VSelect'
@@ -71,7 +72,7 @@ export const makeVAutocompleteProps = propsFactory({
7172
...omit(makeVTextFieldProps({
7273
modelValue:null,
7374
role:'combobox',
74-
}),['validationValue','dirty','appendInnerIcon']),
75+
}),['validationValue','dirty']),
7576
},'VAutocomplete')
7677

7778
typeItemType<T>=Textendsreadonly(inferU)[] ?U :never
@@ -127,6 +128,7 @@ export const VAutocomplete = genericComponent<new <
127128
const_searchLock=shallowRef<string|null>(null)
128129
const{ items, transformIn, transformOut}=useItems(props)
129130
const{ textColorClasses, textColorStyles}=useTextColor(()=>vTextFieldRef.value?.color)
131+
const{ InputIcon}=useInputIcon(props)
130132
constsearch=useProxiedModel(props,'search','')
131133
constmodel=useProxiedModel(
132134
props,
@@ -675,6 +677,13 @@ export const VAutocomplete = genericComponent<new <
675677
tabindex="-1"
676678
/>
677679
) :undefined}
680+
{props.appendInnerIcon&&(
681+
<InputIcon
682+
key="append-icon"
683+
name="appendInner"
684+
color={args[0].iconColor.value}
685+
/>
686+
)}
678687
</>
679688
),
680689
}}

‎packages/vuetify/src/components/VCombobox/VCombobox.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { VChip } from '@/components/VChip'
88
import{VDefaultsProvider}from'@/components/VDefaultsProvider'
99
import{VDivider}from'@/components/VDivider'
1010
import{VIcon}from'@/components/VIcon'
11+
import{useInputIcon}from'@/components/VInput/InputIcon'
1112
import{VList,VListItem,VListSubheader}from'@/components/VList'
1213
import{VMenu}from'@/components/VMenu'
1314
import{makeSelectProps}from'@/components/VSelect/VSelect'
@@ -77,7 +78,7 @@ export const makeVComboboxProps = propsFactory({
7778
...omit(makeVTextFieldProps({
7879
modelValue:null,
7980
role:'combobox',
80-
}),['validationValue','dirty','appendInnerIcon']),
81+
}),['validationValue','dirty']),
8182
},'VCombobox')
8283

8384
typeItemType<T>=Textendsreadonly(inferU)[] ?U :never
@@ -133,6 +134,7 @@ export const VCombobox = genericComponent<new <
133134
letcleared=false
134135
const{ items, transformIn, transformOut}=useItems(props)
135136
const{ textColorClasses, textColorStyles}=useTextColor(()=>vTextFieldRef.value?.color)
137+
const{ InputIcon}=useInputIcon(props)
136138
constmodel=useProxiedModel(
137139
props,
138140
'modelValue',
@@ -738,6 +740,13 @@ export const VCombobox = genericComponent<new <
738740
tabindex="-1"
739741
/>
740742
) :undefined}
743+
{props.appendInnerIcon&&(
744+
<InputIcon
745+
key="append-icon"
746+
name="appendInner"
747+
color={args[0].iconColor.value}
748+
/>
749+
)}
741750
</>
742751
),
743752
}}

‎packages/vuetify/src/components/VField/VField.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
}from'@/util'
3333

3434
// Types
35-
importtype{PropType,Ref}from'vue'
35+
importtype{ComputedRef,PropType,Ref}from'vue'
3636
importtype{LoaderSlotProps}from'@/composables/loader'
3737
importtype{GenericProps}from'@/util'
3838

@@ -42,6 +42,7 @@ type Variant = typeof allowedVariants[number]
4242
exportinterfaceDefaultInputSlot{
4343
isActive:Ref<boolean>
4444
isFocused:Ref<boolean>
45+
iconColor:ComputedRef<string|undefined>
4546
controlRef:Ref<HTMLElement|undefined>
4647
focus:()=>void
4748
blur:()=>void
@@ -210,6 +211,7 @@ export const VField = genericComponent<new <T>(
210211
isActive,
211212
isFocused,
212213
controlRef,
214+
iconColor,
213215
blur,
214216
focus,
215217
}))

‎packages/vuetify/src/components/VSelect/VSelect.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { VChip } from '@/components/VChip'
99
import{VDefaultsProvider}from'@/components/VDefaultsProvider'
1010
import{VDivider}from'@/components/VDivider'
1111
import{VIcon}from'@/components/VIcon'
12+
import{useInputIcon}from'@/components/VInput/InputIcon'
1213
import{VList,VListItem,VListSubheader}from'@/components/VList'
1314
import{VMenu}from'@/components/VMenu'
1415
import{makeVTextFieldProps,VTextField}from'@/components/VTextField/VTextField'
@@ -95,7 +96,7 @@ export const makeVSelectProps = propsFactory({
9596
...omit(makeVTextFieldProps({
9697
modelValue:null,
9798
role:'combobox',
98-
}),['validationValue','dirty','appendInnerIcon']),
99+
}),['validationValue','dirty']),
99100
...makeTransitionProps({transition:{component:VDialogTransitionasComponent}}),
100101
},'VSelect')
101102

@@ -165,6 +166,7 @@ export const VSelect = genericComponent<new <
165166
constselectedValues=computed(()=>model.value.map(selection=>selection.value))
166167
constisFocused=shallowRef(false)
167168
constclosableChips=toRef(()=>props.closableChips&&!form.isReadonly.value&&!form.isDisabled.value)
169+
const{ InputIcon}=useInputIcon(props)
168170

169171
letkeyboardLookupPrefix=''
170172
letkeyboardLookupIndex=0
@@ -630,6 +632,13 @@ export const VSelect = genericComponent<new <
630632
aria-hidden
631633
/>
632634
) :undefined}
635+
{props.appendInnerIcon&&(
636+
<InputIcon
637+
key="append-icon"
638+
name="appendInner"
639+
color={args[0].iconColor.value}
640+
/>
641+
)}
633642
</>
634643
),
635644
}}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp