@danielgindi/selectbox 1.0.132 → 1.0.133

package/lib/DropList.js

@@ -397,6 +397,24 @@ class DropList {
         return false;
     }
 
+    /**
+     * Returns true if document's active element is this droplist (or owned submenus)
+     * @param {boolean} [considerSubmenus=true]
+     * @returns {boolean}
+     */
+    hasFocus(considerSubmenus = true) {
+        if (!document.activeElement)
+            return false;
+
+        if (document.activeElement.contains(this.el))
+            return true;
+
+        if (considerSubmenus && this._p.currentSubDropList?.droplist?.hasFocus())
+            return true;
+
+        return false;
+    }
+
     /**
      * @param {string|string[]} classes
      * @returns {DropList}
@@ -1437,9 +1455,6 @@ class DropList {
             })
             .on('_back_key_pressed', () => {
                 this._hideSublist();
-
-                if (!this[DestroyedSymbol])
-                    this.el.focus();
             });
 
         droplist.setItems(item._subitems);
@@ -1475,10 +1490,17 @@ class DropList {
             return;
 
         const data = p.currentSubDropList;
+
+        let subHadFocus = data.droplist.hasFocus(true);
+
         data.droplist.hide();
         data.droplist.destroy();
         p.currentSubDropList = null;
 
+        if (subHadFocus && !this[DestroyedSymbol]) {
+            this.el.focus();
+        }
+
         this._trigger('hide_subitems', {
             value: data.item.value,
             item: data.item,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielgindi/selectbox",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "description": "A collection of dom utilities. So you can work natively with the dom without dom frameworks.",
   "main": "dist/lib.cjs.min.js",
   "module": "lib/index.js",