haya-select 1.0.47 → 1.0.49

package/package.json

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

package/src/select/index.jsx

@@ -147,29 +147,25 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     if ("values" in this.props && typeof this.props.values != "undefined") {
       if (Array.isArray(this.props.options) && this.props.values) {
         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)
+      } else if (this.s.loadedOptions && this.props.values) {
+        return this.p.values.map((value) => {
+          let foundOption = this.s.loadedOptions.find((option) => option.value == value)
 
-            if (!foundOption) {
-              foundOption = this.s.currentOptions.find((option) => option.value == value)
+          if (!foundOption) {
+            foundOption = this.s.currentOptions.find((option) => option.value == value)
 
-              if (!foundOption) {
-                console.error(
-                  `Couldn't find option: ${value} in loadedOptions or state currentOptions`,
-                  {stateLoadedOptions: this.s.loadedOptions, stateCurrentOptions: this.s.currentOptions, propsOptions: this.props.options}
-                )
-              }
+            if (!foundOption) {
+              console.error(
+                `Couldn't find option: ${value} in loadedOptions or state currentOptions`,
+                {stateLoadedOptions: this.s.loadedOptions, stateCurrentOptions: this.s.currentOptions, propsOptions: this.props.options}
+              )
             }
+          }
 
-            return foundOption
-          })
-
-          return result
-        } else {
-          this.setCurrentFromGivenValues()
-        }
+          return foundOption
+        })
+      } else if (this.props.options == "function" && this.props.values) {
+        this.setCurrentFromGivenValues()
       } else if (this.props.values) {
         return this.p.values.map((value) => ({value}))
       }
@@ -577,7 +573,7 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     const {optionsContainerRef} = this.tt
     const {optionsAbsolute} = this.p
     const {selectContainerLayout, loadedOptions, endOfSelectLayout, optionsContainerLayout, optionsPlacement, optionsVisibility} = this.s
-    let top
+    let left, top
 
     const style = this.stylingFor("optionsContainer", {
       position: "absolute",
@@ -597,22 +593,30 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     } else if (optionsPlacement == "below") {
       if (Platform.OS == "web") {
         // onLayout top value is sometimes negative so use browser JS to get it instead
-        top = digg(this.tt.endOfSelectRef.current.getBoundingClientRect(), "top")
+        top = digg(this.tt.endOfSelectRef.current.getBoundingClientRect(), "top") + document.documentElement.scrollTop + 2
+
+        // onLayout left values doesn't always update when changed
+        left = digg(this.tt.endOfSelectRef.current.getBoundingClientRect(), "left") + document.documentElement.scrollLeft + 2
       } else {
+        left = this.s.endOfSelectLayout.left
         top = selectContainerLayout.top
       }
 
-      style.left = this.s.endOfSelectLayout.left
+      style.left = left
       style.top = top - 2
     } else if (optionsPlacement == "above") {
       if (Platform.OS == "web") {
         // onLayout top value is sometimes negative so use browser JS to get it instead
-        top = digg(this.tt.selectContainerRef.current.getBoundingClientRect(), "top")
+        top = digg(this.tt.selectContainerRef.current.getBoundingClientRect(), "top") + document.documentElement.scrollTop - 1
+
+        // onLayout left values doesn't always update when changed
+        left = digg(this.tt.selectContainerRef.current.getBoundingClientRect(), "left") + document.documentElement.scrollLeft - 1
       } else {
+        left = endOfSelectLayout.left
         top = selectContainerLayout.top
       }
 
-      style.left = endOfSelectLayout.left
+      style.left = left
       style.top = top - optionsContainerLayout.height + 1
     } else {
       throw new Error(`Unkonwn options placement: ${optionsPlacement}`)