Skip to content

Commit 422eec5

Browse files
authored
Merge pull request #175 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents ea2184e + 639d687 commit 422eec5

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/components/CippComponents/CippAutocomplete.jsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,12 @@ export const CippAutoComplete = (props) => {
166166
addedFields,
167167
};
168168
});
169-
setUsedOptions(convertedOptions);
169+
170+
if (api?.dataFilter) {
171+
setUsedOptions(api.dataFilter(convertedOptions));
172+
} else {
173+
setUsedOptions(convertedOptions);
174+
}
170175
}
171176
}
172177

@@ -199,9 +204,7 @@ export const CippAutoComplete = (props) => {
199204
// Dedicated effect for handling preselected value
200205
useEffect(() => {
201206
if (preselectedValue && !defaultValue && !value && memoizedOptions.length > 0) {
202-
const preselectedOption = memoizedOptions.find(
203-
(option) => option.value === preselectedValue
204-
);
207+
const preselectedOption = memoizedOptions.find((option) => option.value === preselectedValue);
205208

206209
if (preselectedOption) {
207210
const newValue = multiple ? [preselectedOption] : preselectedOption;
@@ -219,9 +222,9 @@ export const CippAutoComplete = (props) => {
219222
JSON.stringify(defaultValue),
220223
JSON.stringify(preselectedValue),
221224
api?.url,
222-
currentTenant
225+
currentTenant,
223226
];
224-
return keyParts.join('-');
227+
return keyParts.join("-");
225228
}, [defaultValue, preselectedValue, api?.url, currentTenant]);
226229

227230
return (

0 commit comments

Comments
 (0)