@danielgindi/selectbox 1.0.133 → 1.0.135

package/dist/lib.cjs.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 1.0.133
+ * @danielgindi/selectbox 1.0.135
  * git://github.com/danielgindi/selectbox.git
  */
 'use strict';
@@ -2602,9 +2602,11 @@ Emits the following events:
 'hide:after': emitted after the hide css transition has ended, or immediately after 'hide'.
 'check' {value, item, checked: boolean, isGroup: boolean, isCheckingGroup: boolean}: item was selected (in multi mode).
 'groupcheck' {value, item, affectedItems}: item was selected (in multi mode).
+'blur' {event}: element lost focus
 'show_subitems {value, item, el, droplist: DropList}': subitems dropdown will show.
 'hide_subitems {value, item, el}': subitems dropdown did hide.
 'subitems:select' {value, item, event?, el}: item was selected (in single mode).
+'subitems:blur' {event}: subitems element lost focus
  */
 
 // noinspection JSUnusedGlobalSymbols
@@ -2862,24 +2864,6 @@ class DropList {
     return false;
   }
 
-  /**
-   * Returns true if document's active element is this droplist (or owned submenus)
-   * @param {boolean} [considerSubmenus=true]
-   * @returns {boolean}
-   */
-  hasFocus() {var _this$_p$currentSubDr2;let considerSubmenus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-    if (!document.activeElement)
-    return false;
-
-    if (document.activeElement.contains(this.el))
-    return true;
-
-    if (considerSubmenus && (_this$_p$currentSubDr2 = this._p.currentSubDropList) !== null && _this$_p$currentSubDr2 !== void 0 && (_this$_p$currentSubDr2 = _this$_p$currentSubDr2.droplist) !== null && _this$_p$currentSubDr2 !== void 0 && _this$_p$currentSubDr2.hasFocus())
-    return true;
-
-    return false;
-  }
-
   /**
    * @param {string|string[]} classes
    * @returns {DropList}
@@ -3014,8 +2998,9 @@ class DropList {
     const item = p.items[p.focusItemIndex];
     p.focusItemIndex = -1;
 
-    if (!item)
-    return;
+    if (!item) {
+      return;
+    }
 
     if (p.currentSubDropList) {
       this._hideSublist();
@@ -3392,6 +3377,8 @@ class DropList {
     // Now set the width of the dropdown
     if (positionOptions.updateWidth || typeof positionOptions.updateWidth === 'number') {
       this._updateWidth(positionOptions);
+    } else {
+      this._updateWidth();
     }
 
     // How much space is there above, and how much below?
@@ -3911,6 +3898,16 @@ class DropList {
       unrenderItem: p.unrenderItem
     });
 
+    let onBlur = (event) => {
+      if (this[DestroyedSymbol$1]) return;
+
+      if (event.relatedTarget && this.elContains(event.relatedTarget, true))
+      return;
+
+      this._delayBlurItemOnBlur();
+      this._trigger('subitems:blur', event);
+    };
+
     droplist.
     on('select', (event) => {
       this._trigger('subitems:select', event);
@@ -3918,6 +3915,8 @@ class DropList {
     on('subitems:select', (event) => {
       this._trigger('subitems:select', event);
     }).
+    on('blur', onBlur).
+    on('subitems:blur', onBlur).
     on('_back_key_pressed', () => {
       this._hideSublist();
     });
@@ -3956,7 +3955,7 @@ class DropList {
 
     const data = p.currentSubDropList;
 
-    let subHadFocus = data.droplist.hasFocus(true);
+    let subHadFocus = !!document.activeElement && data.droplist.elContains(document.activeElement, true);
 
     data.droplist.hide();
     data.droplist.destroy();
@@ -4282,12 +4281,14 @@ class DropList {
 
       this._focus(event, itemEl, null, false);
     }).
-    add(p.el, 'blur', () => {
+    add(p.el, 'blur', (event) => {
       setTimeout(() => {
         if (this[DestroyedSymbol$1]) return;
 
-        if (!p.el.contains(document.activeElement)) {
+        if (!document.activeElement ||
+        !this.elContains(document.activeElement, true)) {
           this._delayBlurItemOnBlur();
+          this._trigger('blur', event);
         }
       });
     });
@@ -4454,6 +4455,10 @@ class DropList {
   _focus(event, itemEl, itemIndex, openSubitems) {var _item$ItemSymbol6;
     const p = this._p;
 
+    if (p._isFocusingItem)
+    return;
+    p._isFocusingItem = true;
+
     if (!itemIndex && itemEl) {
       itemIndex = p.virtualListHelper.getItemIndexFromElement(itemEl);
     }
@@ -4466,11 +4471,13 @@ class DropList {
 
     let focusItemEl = itemEl || p.virtualListHelper.getItemElementAt(itemIndex);
     if (!focusItemEl || focusItemEl[ItemSymbol$1]._nointeraction) {
+      p._isFocusingItem = false;
       this.blurFocusedItem();
       return;
     }
 
     if (focusItemEl === p.focusItemEl) {
+      p._isFocusingItem = false;
       clearTimeout(p.blurTimer);
       return;
     }
@@ -4489,6 +4496,8 @@ class DropList {
       el: focusItemEl
     });
 
+    p._isFocusingItem = false;
+
     if (openSubitems)
     this._showSublist(item, focusItemEl);
   }