@@ -24,7 +24,7 @@ const messages = i18n("entitySelect", {
2424 actionCreateNew : params ( 'Create new "{value}"' ) ,
2525} ) ;
2626
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 > ) {
2828 const t = useStore ( messages ) ;
2929
3030 const combobox = useCombobox ( {
@@ -33,23 +33,23 @@ export function EntitySelect<T extends { id: number }>({ value, onChange, data,
3333
3434 const [ searchValue , setSearchValue ] = useState ( "" ) ;
3535
36- const shouldFilterOptions = ! data ?. some ( ( item ) => item [ inputKey ] === searchValue ) ;
36+ const shouldFilterOptions = ! data ?. some ( ( item ) => item [ labelKey ] === searchValue ) ;
3737 const filteredOptions =
3838 ( 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 ( ) ) )
4040 : data ) ?? [ ] ;
4141
4242 const options = filteredOptions ?. map ( ( item ) => (
4343 < Combobox . Option key = { item . id } value = { item . id . toString ( ) } >
44- { item [ inputKey ] as string }
44+ { item [ labelKey ] as string }
4545 </ Combobox . Option >
4646 ) ) ;
4747
4848 useEffect ( ( ) => {
4949 if ( value && data ) {
5050 const index = data . findIndex ( ( item ) => item . id === value ) ;
5151 if ( index !== - 1 ) {
52- setSearchValue ( data [ index ] [ inputKey ] as string ) ;
52+ setSearchValue ( data [ index ] [ labelKey ] as string ) ;
5353 combobox . selectOption ( index ) ;
5454 }
5555 }
0 commit comments