Skip to content

Commit 784fbc8

Browse files
committed
Merge branch 'develop' into staging
2 parents 2b13673 + 825536c commit 784fbc8

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

src/pages/EditShelterSupply/components/SupplySearch/SupplySearch.tsx

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@ import { IUseSuppliesData } from '@/hooks/useSupplies/types';
33
import { Search, PlusCircle, X } from 'lucide-react';
44
import { useState } from 'react';
55
import { Fragment } from 'react/jsx-runtime';
6-
import {ISupplySearchProps} from './types';
6+
import { ISupplySearchProps } from './types';
77

88
export const SupplySearch = ({
99
supplyItems,
1010
limit = 10,
1111
onSearch,
1212
onSelectItem,
13-
onAddNewItem
13+
onAddNewItem,
1414
}: ISupplySearchProps) => {
1515
const [searchValue, setSearchValue] = useState<string>('');
16-
const [selectedItem, setSelectedItem] = useState<IUseSuppliesData | null>(null);
16+
const [selectedItem, setSelectedItem] = useState<IUseSuppliesData | null>(
17+
null
18+
);
1719

1820
function onChangeInputHandler(event: React.ChangeEvent<HTMLInputElement>) {
1921
setSearchValue(event.target.value);
@@ -51,21 +53,27 @@ export const SupplySearch = ({
5153
value={searchValue}
5254
onChange={onChangeInputHandler}
5355
/>
54-
<X className="h-4 w-4 ml-2 hover:cursor-pointer" onClick={onClearClickHandler} />
56+
<X
57+
className="h-4 w-4 ml-2 hover:cursor-pointer"
58+
onClick={onClearClickHandler}
59+
/>
5560
</div>
5661

5762
{!!searchValue && !selectedItem ? (
5863
<div className="flex-col items-center rounded-md border border-input p-3 bg-slate-50 mt-1">
59-
{supplyItems.slice(0, limit).map((item) => (
60-
<div
61-
key={item.id}
62-
className="h-10 flex items-center rounded-md p-2 hover:bg-slate-100 hover:cursor-pointer"
63-
onClick={() => onSelectItemHandler(item)}
64-
>
65-
<span className="text-sm">{item.name}</span>
66-
</div>
67-
))}
68-
<div
64+
{supplyItems
65+
.sort((a, b) => a.name.length - b.name.length)
66+
.slice(0, limit)
67+
.map((item) => (
68+
<div
69+
key={item.id}
70+
className="h-10 flex items-center rounded-md p-2 hover:bg-slate-100 hover:cursor-pointer"
71+
onClick={() => onSelectItemHandler(item)}
72+
>
73+
<span className="text-sm">{item.name}</span>
74+
</div>
75+
))}
76+
<div
6977
className="h-10 flex items-center rounded-md p-2 hover:bg-slate-100 hover:cursor-pointer"
7078
onClick={onAddNewItemHandler}
7179
>

0 commit comments

Comments
 (0)