haya-select 1.0.21 → 1.0.23

package/package.json

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

package/src/select/index.jsx

@@ -141,7 +141,7 @@ export default class HayaSelect extends React.PureComponent {
   }
 
   render() {
-    const {currentSelectedRef, endOfSelectRef} = this.t
+    const {currentSelectedRef, endOfSelectRef, onSelectClicked, onSearchTextInputChangedDebounced} = this.t
     const {
       attribute,
       className,
@@ -178,13 +178,13 @@ export default class HayaSelect extends React.PureComponent {
           className="haya-select-current-selected"
           data-opened={opened}
           data-options-placement={optionsPlacement}
-          onClick={this.t.onSelectClicked}
+          onClick={onSelectClicked}
           ref={currentSelectedRef}
         >
           {opened &&
             <input
               className="haya-select-search-text-input"
-              onChange={this.tonSearchTextInputChangedDebounced}
+              onChange={onSearchTextInputChangedDebounced}
               placeholder={I18n.t("haya_select.search_dot_dot_dot")} type="text"
               ref={this.t.searchTextInputRef}
             />
@@ -240,6 +240,14 @@ export default class HayaSelect extends React.PureComponent {
     }
   }
 
+  isActive() {
+    if (this.t.endOfSelectRef.current) {
+      return true
+    }
+
+    return false
+  }
+
   async loadDefaultValuesFromOptionsCallback() {
     const defaultValues = this.defaultValues()
 
@@ -329,6 +337,8 @@ export default class HayaSelect extends React.PureComponent {
   focusTextInput = () => digg(this.t.searchTextInputRef, "current").focus()
 
   setOptionsPosition() {
+    if (!this.isActive()) return // Debounce after un-mount handeling.
+
     this.setOptionsPositionBelow()
     this.setOptionsPositionAboveIfOutsideScreen()
   }
@@ -348,7 +358,7 @@ export default class HayaSelect extends React.PureComponent {
   }
 
   setOptionsPositionAbove() {
-    const {optionsContainerRef, currentSelectedRef} = this.t
+    const {optionsContainerRef, currentSelectedRef, searchTextInputRef} = this.t
     const optionsHeight = digg(optionsContainerRef, "current", "offsetHeight")
     const position = currentSelectedRef.current.getBoundingClientRect()
     const {left, top, width} = digs(position, "left", "top", "width")
@@ -365,12 +375,12 @@ export default class HayaSelect extends React.PureComponent {
         scrollLeft: document.documentElement.scrollLeft,
         scrollTop: document.documentElement.scrollTop
       },
-      () => digg(this.t.searchTextInputRef, "current").focus()
+      () => searchTextInputRef.current.focus()
     )
   }
 
   setOptionsPositionBelow() {
-    const {endOfSelectRef} = this.t
+    const {endOfSelectRef, searchTextInputRef} = this.t
     const position = endOfSelectRef.current.getBoundingClientRect()
     const {left, top, width} = digs(position, "left", "top", "width")
 
@@ -385,7 +395,7 @@ export default class HayaSelect extends React.PureComponent {
         scrollLeft: document.documentElement.scrollLeft,
         scrollTop: document.documentElement.scrollTop
       },
-      () => digg(this.t.searchTextInputRef, "current").focus()
+      () => searchTextInputRef.current.focus()
     )
   }
 
@@ -447,9 +457,9 @@ export default class HayaSelect extends React.PureComponent {
     )
   }
 
-  onOptionClicked = (e, loadedOption) => {
-    e.preventDefault()
-    e.stopPropagation()
+  onOptionClicked = (event, loadedOption) => {
+    event.preventDefault()
+    event.stopPropagation()
 
     const {onChange, toggleOptions} = this.props
     const {multiple} = this.p
@@ -500,6 +510,7 @@ export default class HayaSelect extends React.PureComponent {
       }
 
       onChange({
+        event,
         options: this.shape.currentOptions,
         toggles
       })