Focus wrapper element once gets closed. (#374)

Co-authored-by: José Rio <[email protected]>
sa-si-dev · Dec 16, 2024 · bdbbbca · bdbbbca
1 parent d2e0f5e
commit bdbbbca
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/dist-archive/virtual-select-1.0.46.min.js b/dist-archive/virtual-select-1.0.46.min.js
diff --git a/dist/virtual-select.js b/dist/virtual-select.js
@@ -981,7 +981,6 @@ var VirtualSelect = /*#__PURE__*/function () {
           this.$dropboxContainerTop.focus();
         } else {
           this.closeDropbox();
-          this.$wrapper.focus();
         }
         return;
       }
@@ -995,7 +994,6 @@ var VirtualSelect = /*#__PURE__*/function () {
         var wrapper = this.showAsPopup ? this.$wrapper : this.$dropboxWrapper;
         if ((document.activeElement === wrapper || wrapper.contains(document.activeElement)) && !this.keepAlwaysOpen) {
           this.closeDropbox();
-          this.$wrapper.focus();
           return;
         }
       }
@@ -2740,6 +2738,7 @@ var VirtualSelect = /*#__PURE__*/function () {
       } else {
         this.afterHidePopper();
       }
+      this.$wrapper.focus();
     }
   }, {
     key: "afterHidePopper",

diff --git a/dist/virtual-select.min.js b/dist/virtual-select.min.js
diff --git a/docs/assets/virtual-select.js b/docs/assets/virtual-select.js
@@ -981,7 +981,6 @@ var VirtualSelect = /*#__PURE__*/function () {
           this.$dropboxContainerTop.focus();
         } else {
           this.closeDropbox();
-          this.$wrapper.focus();
         }
         return;
       }
@@ -995,7 +994,6 @@ var VirtualSelect = /*#__PURE__*/function () {
         var wrapper = this.showAsPopup ? this.$wrapper : this.$dropboxWrapper;
         if ((document.activeElement === wrapper || wrapper.contains(document.activeElement)) && !this.keepAlwaysOpen) {
           this.closeDropbox();
-          this.$wrapper.focus();
           return;
         }
       }
@@ -2740,6 +2738,7 @@ var VirtualSelect = /*#__PURE__*/function () {
       } else {
         this.afterHidePopper();
       }
+      this.$wrapper.focus();
     }
   }, {
     key: "afterHidePopper",

diff --git a/docs/assets/virtual-select.min.js b/docs/assets/virtual-select.min.js
diff --git a/src/virtual-select.js b/src/virtual-select.js
@@ -528,10 +528,10 @@ export class VirtualSelect {
         this.$dropboxContainerTop.focus();
       } else {
         this.closeDropbox();
-        this.$wrapper.focus();
       }
       return;
     }
+
     if (document.activeElement === this.$searchInput && key === 9) {
       e.preventDefault();
       this.focusFirstVisibleOption();
@@ -542,7 +542,6 @@ export class VirtualSelect {
       const wrapper = this.showAsPopup ? this.$wrapper : this.$dropboxWrapper;
       if ((document.activeElement === wrapper || wrapper.contains(document.activeElement)) && !this.keepAlwaysOpen) {
         this.closeDropbox();
-        this.$wrapper.focus();
         return;
       }
     }
@@ -2363,6 +2362,8 @@ export class VirtualSelect {
     } else {
       this.afterHidePopper();
     }
+
+    this.$wrapper.focus();
   }
 
   afterHidePopper() {