haya-select 1.0.43 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haya-select",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/select/index.jsx

@@ -39,6 +39,7 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     multiple: PropTypes.bool.isRequired,
     name: PropTypes.string,
     onChange: PropTypes.func,
+    onChangeValue: PropTypes.func,
     onOptionsClosed: PropTypes.func,
     options: PropTypes.oneOfType([PropTypes.array, PropTypes.func]).isRequired,
     placeholder: PropTypes.node,
@@ -125,7 +126,9 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
   getValues = () => ("values" in this.props) ? this.p.values : this.s.currentOptions.map((currentOption) => currentOption.value)
   getCurrentOptions = () => {
     if ("values" in this.props && typeof this.props.values != "undefined") {
-      if (this.s.loadedOptions || typeof this.props.options == "function" && this.props.values) {
+      if (Array.isArray(this.props.options)) {
+        return this.p.values.map((value) => this.p.options.find((option) => option.value == value))
+      } else if (this.s.loadedOptions || typeof this.props.options == "function" && this.props.values) {
         if (this.s.loadedOptions) {
           const result = this.p.values.map((value) => {
             let foundOption = this.s.loadedOptions.find((option) => option.value == value)
@@ -134,7 +137,10 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
               foundOption = this.s.currentOptions.find((option) => option.value == value)
 
               if (!foundOption) {
-                throw new Error(`Couldn't find option: ${value} in loadedOptions or state currentOptions`)
+                console.error(
+                  `Couldn't find option: ${value} in loadedOptions or state currentOptions`,
+                  {stateLoadedOptions: this.s.loadedOptions, stateCurrentOptions: this.s.currentOptions, propsOptions: this.props.options}
+                )
               }
             }
 
@@ -145,8 +151,6 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
         } else {
           this.setCurrentFromGivenValues()
         }
-      } else if (Array.isArray(this.props.options)) {
-        return this.p.values.map((value) => this.p.options.find((option) => option.value == value))
       } else {
         return this.p.values.map((value) => ({value}))
       }
@@ -634,7 +638,6 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
 
       if (toggleOptions) {
         // Set fresh toggle
-
         newToggled[loadedOption.value] = toggleOptions[0].value
         newState.toggled = newToggled
       }
@@ -646,14 +649,28 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
       }
     }
 
+    const options = newState.currentOptions || currentOptions
+
     if (onChange) {
       onChange({
         event,
-        options: newState.currentOptions || currentOptions,
+        options,
         toggles: newToggled
       })
     }
 
+    if (this.props.onChangeValue) {
+      let optionValue
+
+      if (multiple) {
+        optionValue = options.map((option) => option.value)
+      } else {
+        optionValue = dig(options, 0, "value")
+      }
+
+      this.p.onChangeValue(optionValue)
+    }
+
     if (!multiple) this.closeOptions()
     this.setState(newState)
   }