haya-select 1.0.46 → 1.0.48

package/package.json

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

package/src/select/index.jsx

@@ -1,6 +1,5 @@
 import {anythingDifferent} from "set-state-compare/src/diff-utils"
-import config from "../config.js"
-import {dig, digg, digs} from "diggerize"
+import {dig, digg} from "diggerize"
 import debounce from "debounce"
 import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
 import idForComponent from "@kaspernj/api-maker/src/inputs/id-for-component.mjs"
@@ -10,6 +9,7 @@ import OptionGroup from "./option-group"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import RenderHtml from "react-native-render-html"
+import {Portal} from "react-native-portalize"
 import {memo, useEffect, useRef} from "react"
 import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component.js"
 import {Platform, Pressable, Text, TextInput, View} from "react-native"
@@ -26,6 +26,7 @@ const nameForComponentWithMultiple = (component) => {
 export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
   static defaultProps = {
     multiple: false,
+    optionsAbsolute: true,
     optionsWidth: null,
     search: false
   }
@@ -45,6 +46,7 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     onChangeValue: PropTypes.func,
     onOptionsClosed: PropTypes.func,
     options: PropTypes.oneOfType([PropTypes.array, PropTypes.func]).isRequired,
+    optionsAbsolute: PropTypes.bool.isRequired,
     optionsWidth: PropTypes.number,
     placeholder: PropTypes.node,
     search: PropTypes.bool.isRequired,
@@ -79,6 +81,7 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
       endOfSelectRef: useRef(),
       optionsContainerRef: useRef(),
       searchTextInputRef: useRef(),
+      selectContainerRef: useRef(),
       t
     })
     this.useStates({
@@ -144,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}))
       }
@@ -212,8 +211,6 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
     const {className, placeholder, toggleOptions} = this.props
     const {opened, optionsPlacement} = this.s
     const currentOptions = this.getCurrentOptions()
-    const BodyPortal = config.getBodyPortal()
-
     const selectContainerStyleActual = this.stylingFor("selectContainer", {
       display: "flex",
       flexDirection: "row",
@@ -266,15 +263,11 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
         }}
         style={this.stylingFor("main")}
       >
-        {opened &&
-          <BodyPortal>
-            {this.optionsContainer()}
-          </BodyPortal>
-        }
         <Pressable
           dataSet={{class: "select-container"}}
           onLayout={this.tt.onSelectContainerLayout}
           onPress={this.tt.onSelectClicked}
+          ref={this.tt.selectContainerRef}
           style={selectContainerStyleActual}
         >
           <View
@@ -364,7 +357,12 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
             </Text>
           </View>
         </Pressable>
-        <View onLayout={this.tt.onEndOfSelectLayout} ref={endOfSelectRef} />
+        <View dataSet={{class: "end-of-select"}} onLayout={this.tt.onEndOfSelectLayout} ref={endOfSelectRef} />
+        {opened &&
+          <Portal dataSet={{class: "haya-select-portal"}}>
+            {this.optionsContainer()}
+          </Portal>
+        }
       </View>
     )
   }
@@ -573,24 +571,14 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
 
   optionsContainer() {
     const {optionsContainerRef} = this.tt
+    const {optionsAbsolute} = this.p
     const {selectContainerLayout, loadedOptions, endOfSelectLayout, optionsContainerLayout, optionsPlacement, optionsVisibility} = this.s
-    let left, top
-
-    if (optionsPlacement == "below") {
-      left = this.s.endOfSelectLayout.left
-      top = this.s.endOfSelectLayout.top - 2
-    } else if (optionsPlacement == "above") {
-      left = endOfSelectLayout.left
-      top = selectContainerLayout.top - optionsContainerLayout.height + 1
-    } else {
-      throw new Error(`Unkonwn options placement: ${optionsPlacement}`)
-    }
+    let top
 
     const style = this.stylingFor("optionsContainer", {
       position: "absolute",
-      left,
-      top,
       zIndex: 99999,
+      elevation: 99999,
       visibility: optionsVisibility,
       width: this.p.optionsWidth || this.s.optionsWidth,
       backgroundColor: "#fff",
@@ -599,10 +587,37 @@ export default memo(shapeComponent(class HayaSelect extends ShapeComponent {
       overflowY: "auto"
     })
 
+    if (!optionsAbsolute) {
+      style.left = 0
+      style.bottom = 0
+    } 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")
+      } else {
+        top = selectContainerLayout.top
+      }
+
+      style.left = this.s.endOfSelectLayout.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")
+      } else {
+        top = selectContainerLayout.top
+      }
+
+      style.left = endOfSelectLayout.left
+      style.top = top - optionsContainerLayout.height + 1
+    } else {
+      throw new Error(`Unkonwn options placement: ${optionsPlacement}`)
+    }
+
     return (
       <View
         dataSet={{class: "options-container", id: idForComponent(this)}}
-        onLayout={this.onOptionsContainerLayout}
+        onLayout={this.tt.onOptionsContainerLayout}
         ref={optionsContainerRef}
         style={style}
       >