Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/silver-falcons-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@digdir/designsystemet-react": patch
---

**Suggestion**: Always call `onSelectedChange`, and return `null` instead of `undefined`
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ ControlledMultiple.play = async ({ canvasElement, step }) => {
export const ControlledIndependentLabelValue: StoryFn<SuggestionSingleProps> = (
args,
) => {
const [item, setItem] = useState<SuggestionItem | undefined>(DATA_PEOPLE[0]);
const [item, setItem] = useState<SuggestionItem | null>(DATA_PEOPLE[0]);

return (
<>
Expand Down
23 changes: 14 additions & 9 deletions packages/react/src/components/suggestion/suggestion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ type SuggestionValueProps<T extends { multiple: boolean }> = {
*
* Using this makes the component controlled and it must be used in combination with `onSelectedChange`.
*/
selected?: SuggestionValue<T>;
selected?: SuggestionValue<T> | null;
/**
* Default selected item when uncontrolled
*/
Expand All @@ -120,7 +120,7 @@ type SuggestionValueProps<T extends { multiple: boolean }> = {
onSelectedChange?: (
value: T['multiple'] extends true
? SuggestionItem[]
: SuggestionItem | undefined,
: SuggestionItem | null,
) => void;
};

Expand Down Expand Up @@ -192,12 +192,17 @@ export const Suggestion = forwardRef<UHTMLComboboxElement, SuggestionProps>(
);
const selectedItems = selected ? sanitizeItems(selected) : defaultItems;
const onSelectedChangeRef = useRef(onSelectedChange);
const selectedItemsRef = useRef(selectedItems);

// Keep the ref updated with the latest callback
useEffect(() => {
onSelectedChangeRef.current = onSelectedChange;
}, [onSelectedChange]);

useEffect(() => {
selectedItemsRef.current = selectedItems;
}, [selectedItems]);

/**
* Listerners and handling of adding/removing
*/
Expand All @@ -207,19 +212,19 @@ export const Suggestion = forwardRef<UHTMLComboboxElement, SuggestionProps>(
event.preventDefault();
const multiple = combobox?.multiple;
const data = event.detail;
const nextItem = nextItems(data, selectedItems, multiple);
const nextItem = nextItems(data, selectedItemsRef.current, multiple);

onSelectedChangeRef.current?.(
(nextItem as SuggestionItem & SuggestionItem[]) || null,
);

if (isControlled)
onSelectedChangeRef.current?.(
nextItem as SuggestionItem & SuggestionItem[],
);
else setDefaultItems(sanitizeItems(nextItem));
if (!isControlled) setDefaultItems(sanitizeItems(nextItem));
};

combobox?.addEventListener('comboboxbeforeselect', beforeChange);
return () =>
combobox?.removeEventListener('comboboxbeforeselect', beforeChange);
}, [selectedItems, isControlled]);
}, [isControlled]);

// Before match event listener
useEffect(() => {
Expand Down
Loading