fix(common): lift compare values from select promises

data-driven-forms · Mar 21, 2024 · 30d1a88 · 30d1a88
1 parent a3f8df1
commit 30d1a88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/common/src/use-select/reducer.js b/packages/common/src/use-select/reducer.js
@@ -6,7 +6,7 @@ export const init = ({ propsOptions, optionsTransformer }) => ({
  ...(optionsTransformer && { originalOptions: propsOptions }),
 });
 
-const reducer = (state, { type, payload, options = [], optionsTransformer }) => {
+const reducer = (state, { type, payload, options = [], optionsTransformer, compareValues }) => {
  switch (type) {
  case 'updateOptions':
  return {
@@ -42,14 +42,11 @@ const reducer = (state, { type, payload, options = [], optionsTransformer }) =>
  options: optionsTransformer
  ? optionsTransformer([
  ...state.options,
- ...options.filter(({ value }) => !state.options.find((option) => payload.compareValues(option.value, value))),
+ ...options.filter(({ value }) => !state.options.find((option) => compareValues(option.value, value))),
  ])
- : [...state.options, ...options.filter(({ value }) => !state.options.find((option) => payload.compareValues(option.value, value)))],
+ : [...state.options, ...options.filter(({ value }) => !state.options.find((option) => compareValues(option.value, value)))],
  ...(optionsTransformer && {
- originalOptions: [
- ...state.options,
- ...options.filter(({ value }) => !state.options.find((option) => payload.compareValues(option.value, value))),
- ],
+ originalOptions: [...state.options, ...options.filter(({ value }) => !state.options.find((option) => compareValues(option.value, value)))],
  }),
  };
  default:

diff --git a/packages/common/src/use-select/use-select.js b/packages/common/src/use-select/use-select.js
@@ -134,14 +134,15 @@ const useSelect = ({
 
  const onInputChange = (inputValue) => {
  if (inputValue && loadOptions && state.promises[inputValue] === undefined && isSearchable) {
- dispatch({ type: 'setPromises', payload: { [inputValue]: true, compareValues } });
+ dispatch({ type: 'setPromises', payload: { [inputValue]: true }, compareValues });
 
  loadOptions(inputValue)
  .then((options) => {
  if (isMounted.current) {
  dispatch({
  type: 'setPromises',
- payload: { [inputValue]: false, compareValues },
+ payload: { [inputValue]: false },
+ compareValues,
  options,
  });
  }