@danielgindi/selectbox 1.0.137 → 1.0.139

package/dist/lib.es6.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 1.0.137
+ * @danielgindi/selectbox 1.0.139
  * git://github.com/danielgindi/selectbox.git
  */
 import { createElement, closestUntil, setElementAttrs, next, prev } from '@danielgindi/dom-utils/lib/Dom';
@@ -1561,7 +1561,7 @@ class DropList {
             let itemPos, previousPos = -1;
             let maxIterations = 30; // Some zoom/scroll issues can make it so that it takes almost forever
 
-            // eslint-disable-next-line no-constant-condition
+
             while (maxIterations-- > 0) {
                 itemPos = p.virtualListHelper.getItemPosition(itemIndex);
 
@@ -1803,11 +1803,12 @@ class DropList {
                 setTimeout(() => {
                     if (this[DestroyedSymbol$1]) return;
 
-                    if (!document.activeElement ||
-                        !this.elContains(document.activeElement, true)) {
-                        this._delayBlurItemOnBlur();
-                        this._trigger('blur', event);
+                    if (document.activeElement && this.elContains(document.activeElement, true)) {
+                        return;
                     }
+
+                    this._delayBlurItemOnBlur();
+                    this._trigger('blur', event);
                 });
             });
     }
@@ -2099,7 +2100,7 @@ class DropList {
                     let base = getElementOffset(p.focusItemEl).top;
                     let height = getElementHeight(p.el, true);
 
-                    while (true) { // eslint-disable-line no-constant-condition
+                    while (true) {
                         next = p.focusItemEl.nextElementSibling;
                         if (!next) return;
                         if (next.tagName !== 'LI') continue;
@@ -2919,6 +2920,20 @@ class SelectBox {
         return this._p.el;
     }
 
+    get droplistInstance() {
+        return this._p.dropList;
+    }
+
+    /**
+     * Returns true if other is an inclusive descendant of droplist node, false otherwise, and undefined if the droplist is not initiated.
+     * @param {Node} other
+     * @param {boolean} [considerSubmenus=true]
+     * @returns {boolean|undefined}
+     */
+    droplistElContains(other, considerSubmenus = true) {
+        return this._p.dropList?.elContains(other, considerSubmenus);
+    }
+
     /**
      * Enables the control
      * @param {boolean=true} enabled Should the control be enabled?
@@ -4413,6 +4428,9 @@ class SelectBox {
                         }
                     }
                         break;
+
+                    case 'blur':
+                        this._handleOnBlur();
                 }
             },
         });
@@ -4427,6 +4445,27 @@ class SelectBox {
         this._registerDropdownEvents();
     }
 
+    _handleOnBlur() {
+        const p = this._p;
+
+        setTimeout(() => {
+            if (p.disabled) return;
+
+            this._trigger('search:blur');
+
+            if (this[DestroyedSymbol]) return; // destroyed by event handler
+
+            if (document.activeElement &&
+                (p.input && p.input.contains(document.activeElement) ||
+                    p.dropList && this.droplistElContains(document.activeElement, true))) {
+                return;
+            }
+            if (p.throttledUpdateListItems)
+                p.throttledUpdateListItems.cancel();
+            this.closeList();
+        });
+    }
+
     _unregisterDropdownEvents() {
         const p = this._p;
 
@@ -4596,18 +4635,7 @@ class SelectBox {
                     avoidToggleFromClick = true;
                     setTimeout(() => { avoidToggleFromClick = false; }, 10);
                 })
-                .add(p.input, 'blur.dropdown', () => {
-                    if (p.disabled) return;
-
-                    this._trigger('search:blur');
-
-                    if (this[DestroyedSymbol]) return; // destroyed by event handler
-
-                    if (p.throttledUpdateListItems)
-                        p.throttledUpdateListItems.cancel();
-
-                    this.closeList();
-                });
+                .add(p.input, 'blur.dropdown', () => this._handleOnBlur());
         }
 
         p.sink