haya-select 1.0.60 → 1.0.61

package/package.json

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

package/src/select/index.jsx

@@ -114,6 +114,14 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
         this.setOptionsPositionAboveIfOutsideScreen()
       }
     }, [this.tt.callOptionsPositionAboveIfOutsideScreen, this.s.optionsContainerLayout])
+
+    useEffect(() => {
+      const currentOptionIds = this.s.currentOptions?.map((currentOption) => currentOption.value)
+
+      if (this.props.values && anythingDifferent(currentOptionIds, this.props.values)) {
+        this.setCurrentFromGivenValues()
+      }
+    }, [this.props.values])
   }
 
   defaultCurrentOptions() {
@@ -166,7 +174,7 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
           return foundOption
         })
       } else if (typeof this.props.options == "function" && this.props.values) {
-        this.setCurrentFromGivenValues()
+        // Options haven't been loaded yet.
       } else if (this.props.values) {
         return this.p.values.map((value) => ({value}))
       }

package/src/select/option.jsx

@@ -26,7 +26,7 @@ export default memo(shapeComponent(class Option extends ShapeComponent {
   render() {
     const {currentOptionValues, option} = this.p
     const disabled = Boolean(option.disabled)
-    const selected = Boolean(currentOptionValues.find((currentOptionValue) => currentOptionValue == option.value))
+    const selected = Boolean(currentOptionValues?.find((currentOptionValue) => currentOptionValue == option.value))
     const style = {
       paddingTop: 4,
       paddingRight: 8,