There was an error while loading. Please reload this page.
2 parents 55d69c1 + a2d4f33 commit 587e6a1Copy full SHA for 587e6a1
1 file changed
components/ui/combobox.tsx
@@ -481,8 +481,12 @@ function MultiComboboxInner({
481
const safeValues = React.useMemo(() => (Array.isArray(values) ? values : []), [values]);
482
483
// Get selected items for displaying chips
484
+ // Preserve the order of safeValues (selection order) rather than safeItems (dropdown order)
485
const selectedItems = React.useMemo(
- () => safeItems.filter((item) => safeValues.includes(item.value)),
486
+ () =>
487
+ safeValues
488
+ .map((val) => safeItems.find((item) => item.value === val))
489
+ .filter(Boolean) as ComboboxItem[],
490
[safeItems, safeValues]
491
);
492
0 commit comments