haya-select 1.0.54 → 1.0.56

package/package.json

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

package/src/select/index.jsx

@@ -145,9 +145,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 (Array.isArray(this.props.options) && 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 && this.props.values) {
+      } else if (this.s.loadedOptions) {
         return this.p.values.map((value) => {
           let foundOption = this.s.loadedOptions.find((option) => option.value == value)
 
@@ -164,9 +164,9 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
 
           return foundOption
         })
-      } else if (this.props.options == "function" && this.props.values) {
+      } else if (typeof this.props.options == "function") {
         this.setCurrentFromGivenValues()
-      } else if (this.props.values) {
+      } else {
         return this.p.values.map((value) => ({value}))
       }
     }
@@ -575,7 +575,7 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     const {selectContainerLayout, loadedOptions, endOfSelectLayout, optionsContainerLayout, optionsPlacement, optionsVisibility} = this.s
     let left, top
 
-    const style = this.stylingFor("optionsContainer", {
+    let style = {
       position: "absolute",
       zIndex: 99999,
       elevation: 99999,
@@ -585,7 +585,7 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
       border: "1px solid #999",
       maxHeight: 300,
       overflowY: "auto"
-    })
+    }
 
     if (!optionsAbsolute) {
       style.left = 0
@@ -593,10 +593,10 @@ 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") + document.documentElement.scrollTop + 2
+        top = digg(this.tt.endOfSelectRef.current.getBoundingClientRect(), "top") + document.documentElement.scrollTop + 1
 
         // onLayout left values doesn't always update when changed
-        left = digg(this.tt.endOfSelectRef.current.getBoundingClientRect(), "left") + document.documentElement.scrollLeft + 2
+        left = digg(this.tt.endOfSelectRef.current.getBoundingClientRect(), "left") + document.documentElement.scrollLeft
       } else {
         left = this.s.endOfSelectLayout.left
         top = selectContainerLayout.top
@@ -607,10 +607,10 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     } 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") + document.documentElement.scrollTop - 1
+        top = digg(this.tt.selectContainerRef.current.getBoundingClientRect(), "top") + document.documentElement.scrollTop
 
         // onLayout left values doesn't always update when changed
-        left = digg(this.tt.selectContainerRef.current.getBoundingClientRect(), "left") + document.documentElement.scrollLeft - 1
+        left = digg(this.tt.selectContainerRef.current.getBoundingClientRect(), "left") + document.documentElement.scrollLeft
       } else {
         left = endOfSelectLayout.left
         top = selectContainerLayout.top
@@ -622,6 +622,8 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
       throw new Error(`Unkonwn options placement: ${optionsPlacement}`)
     }
 
+    style = this.stylingFor("optionsContainer", style)
+
     return (
       <View
         dataSet={{class: "options-container", id: idForComponent(this)}}