@@ -24,7 +24,7 @@ const messages = i18n("entitySelect", {
24
24
actionCreateNew : params ( 'Create new "{value}"' ) ,
25
25
} ) ;
26
26
27
- export function EntitySelect < T extends { id : number } > ( { value, onChange, data, labelKey : inputKey , onAddNew, ...rest } : Props < T > ) {
27
+ export function EntitySelect < T extends { id : number } > ( { value, onChange, data, labelKey, onAddNew, ...rest } : Props < T > ) {
28
28
const t = useStore ( messages ) ;
29
29
30
30
const combobox = useCombobox ( {
@@ -33,23 +33,23 @@ export function EntitySelect<T extends { id: number }>({ value, onChange, data,
33
33
34
34
const [ searchValue , setSearchValue ] = useState ( "" ) ;
35
35
36
- const shouldFilterOptions = ! data ?. some ( ( item ) => item [ inputKey ] === searchValue ) ;
36
+ const shouldFilterOptions = ! data ?. some ( ( item ) => item [ labelKey ] === searchValue ) ;
37
37
const filteredOptions =
38
38
( shouldFilterOptions
39
- ? data ?. filter ( ( item ) => ( item [ inputKey ] as string ) ?. toLowerCase ( ) . includes ( searchValue . toLowerCase ( ) . trim ( ) ) )
39
+ ? data ?. filter ( ( item ) => ( item [ labelKey ] as string ) ?. toLowerCase ( ) . includes ( searchValue . toLowerCase ( ) . trim ( ) ) )
40
40
: data ) ?? [ ] ;
41
41
42
42
const options = filteredOptions ?. map ( ( item ) => (
43
43
< Combobox . Option key = { item . id } value = { item . id . toString ( ) } >
44
- { item [ inputKey ] as string }
44
+ { item [ labelKey ] as string }
45
45
</ Combobox . Option >
46
46
) ) ;
47
47
48
48
useEffect ( ( ) => {
49
49
if ( value && data ) {
50
50
const index = data . findIndex ( ( item ) => item . id === value ) ;
51
51
if ( index !== - 1 ) {
52
- setSearchValue ( data [ index ] [ inputKey ] as string ) ;
52
+ setSearchValue ( data [ index ] [ labelKey ] as string ) ;
53
53
combobox . selectOption ( index ) ;
54
54
}
55
55
}
0 commit comments