Merge pull request #1736 from creative-commoners/pulls/2.2/fix-sercha…

…bledropdownfield FIX SearchableDropdownField pass incorrect value on onChange event
silverstripe · May 13, 2024 · ca4d75b · ca4d75b
2 parents 6925ecb + 038173c
commit ca4d75b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/SearchableDropdownField/SearchableDropdownField.js b/client/src/components/SearchableDropdownField/SearchableDropdownField.js
@@ -92,7 +92,11 @@ const SearchableDropdownField = ({
       setHasChanges(true);
       setJustChanged(true);
     }
-    onChange(val);
+    if (multi) {
+      onChange(val);
+    } else {
+      onChange(val, { value: val.value });
+    }
   };
 
   /**
@@ -121,6 +125,16 @@ const SearchableDropdownField = ({
   const refProps = passRef ? { ref: selectComponentRef } : {};
 
   let val = value;
+
+  if (typeof val !== 'object' && (options && options.length > 0)) {
+    options.forEach(option => {
+      // eslint-disable-next-line eqeqeq
+      if (option.value == value) {
+        val = option;
+      }
+    });
+  }
+
   // For non-multi only the first value is needed
   if (!multi && val) {
     const keys = Object.keys(val);