slim-select 2.4.0 → 2.4.2

package/src/vue/dist/slimselectvue.global.js

@@ -60,8 +60,7 @@ var SlimSelectVue = (function (vue) {
           this.class = [];
           this.isMultiple = false;
           this.isOpen = false;
-          this.isWindowFocused = true;
-          this.triggerFocus = true;
+          this.isFullOpen = false;
           this.intervalMove = null;
           if (!settings) {
               settings = {};
@@ -504,14 +503,10 @@ var SlimSelectVue = (function (vue) {
               },
           };
       }
-      mainFocus(trigger, eventType) {
-          if (!trigger) {
-              this.settings.triggerFocus = false;
-          }
+      mainFocus(eventType) {
           if (eventType !== 'click') {
               this.main.main.focus({ preventScroll: true });
           }
-          this.settings.triggerFocus = true;
       }
       placeholder() {
           const placeholderOption = this.store.filter((o) => o.placeholder, false);
@@ -745,7 +740,6 @@ var SlimSelectVue = (function (vue) {
               switch (e.key) {
                   case 'ArrowUp':
                   case 'ArrowDown':
-                      this.callbacks.open();
                       e.key === 'ArrowDown' ? this.highlight('down') : this.highlight('up');
                       return false;
                   case 'Tab':
@@ -758,21 +752,17 @@ var SlimSelectVue = (function (vue) {
                   case ' ':
                       if (this.callbacks.addable && e.ctrlKey) {
                           addable.click();
+                          return false;
                       }
                       else {
                           const highlighted = this.content.list.querySelector('.' + this.classes.highlighted);
                           if (highlighted) {
                               highlighted.click();
+                              return false;
                           }
                       }
-                      return false;
-              }
-          };
-          input.onfocus = () => {
-              if (this.settings.isOpen) {
-                  return;
+                      return true;
               }
-              this.callbacks.open();
           };
           main.appendChild(input);
           if (this.callbacks.addable) {
@@ -846,12 +836,8 @@ var SlimSelectVue = (function (vue) {
           }
           return searchReturn;
       }
-      searchFocus(trigger) {
-          if (!trigger) {
-              this.settings.triggerFocus = false;
-          }
+      searchFocus() {
           this.content.search.input.focus();
-          this.settings.triggerFocus = true;
       }
       getOptions(notPlaceholder = false, notDisabled = false, notHidden = false) {
           let query = '.' + this.classes.option;
@@ -1508,13 +1494,13 @@ var SlimSelectVue = (function (vue) {
               afterClose: undefined,
           };
           this.windowResize = debounce(() => {
-              if (!this.settings.isOpen) {
+              if (!this.settings.isOpen && !this.settings.isFullOpen) {
                   return;
               }
               this.render.moveContent();
           });
           this.windowScroll = debounce(() => {
-              if (!this.settings.isOpen) {
+              if (!this.settings.isOpen && !this.settings.isFullOpen) {
                   return;
               }
               this.render.moveContent();
@@ -1529,14 +1515,8 @@ var SlimSelectVue = (function (vue) {
           };
           this.windowVisibilityChange = () => {
               if (document.hidden) {
-                  this.settings.isWindowFocused = false;
                   this.close();
               }
-              else {
-                  setTimeout(() => {
-                      this.settings.isWindowFocused = true;
-                  }, 20);
-              }
           };
           this.selectEl = (typeof config.select === 'string' ? document.querySelector(config.select) : config.select);
           if (!this.selectEl) {
@@ -1706,13 +1686,16 @@ var SlimSelectVue = (function (vue) {
           }
           this.render.open();
           if (this.settings.showSearch) {
-              this.render.searchFocus(false);
+              this.render.searchFocus();
           }
+          this.settings.isOpen = true;
           setTimeout(() => {
               if (this.events.afterOpen) {
                   this.events.afterOpen();
               }
-              this.settings.isOpen = true;
+              if (this.settings.isOpen) {
+                  this.settings.isFullOpen = true;
+              }
           }, this.settings.timeoutDelay);
           if (this.settings.contentPosition === 'absolute') {
               if (this.settings.intervalMove) {
@@ -1732,12 +1715,13 @@ var SlimSelectVue = (function (vue) {
           if (this.render.content.search.input.value !== '') {
               this.search('');
           }
-          this.render.mainFocus(false, eventType);
+          this.render.mainFocus(eventType);
+          this.settings.isOpen = false;
+          this.settings.isFullOpen = false;
           setTimeout(() => {
               if (this.events.afterClose) {
                   this.events.afterClose();
               }
-              this.settings.isOpen = false;
           }, this.settings.timeoutDelay);
           if (this.settings.intervalMove) {
               clearInterval(this.settings.intervalMove);

package/src/vue/dist/slimselectvue.ssr.js

@@ -61,8 +61,7 @@ class Settings {
         this.class = [];
         this.isMultiple = false;
         this.isOpen = false;
-        this.isWindowFocused = true;
-        this.triggerFocus = true;
+        this.isFullOpen = false;
         this.intervalMove = null;
         if (!settings) {
             settings = {};
@@ -505,14 +504,10 @@ class Render {
             },
         };
     }
-    mainFocus(trigger, eventType) {
-        if (!trigger) {
-            this.settings.triggerFocus = false;
-        }
+    mainFocus(eventType) {
         if (eventType !== 'click') {
             this.main.main.focus({ preventScroll: true });
         }
-        this.settings.triggerFocus = true;
     }
     placeholder() {
         const placeholderOption = this.store.filter((o) => o.placeholder, false);
@@ -746,7 +741,6 @@ class Render {
             switch (e.key) {
                 case 'ArrowUp':
                 case 'ArrowDown':
-                    this.callbacks.open();
                     e.key === 'ArrowDown' ? this.highlight('down') : this.highlight('up');
                     return false;
                 case 'Tab':
@@ -759,21 +753,17 @@ class Render {
                 case ' ':
                     if (this.callbacks.addable && e.ctrlKey) {
                         addable.click();
+                        return false;
                     }
                     else {
                         const highlighted = this.content.list.querySelector('.' + this.classes.highlighted);
                         if (highlighted) {
                             highlighted.click();
+                            return false;
                         }
                     }
-                    return false;
-            }
-        };
-        input.onfocus = () => {
-            if (this.settings.isOpen) {
-                return;
+                    return true;
             }
-            this.callbacks.open();
         };
         main.appendChild(input);
         if (this.callbacks.addable) {
@@ -847,12 +837,8 @@ class Render {
         }
         return searchReturn;
     }
-    searchFocus(trigger) {
-        if (!trigger) {
-            this.settings.triggerFocus = false;
-        }
+    searchFocus() {
         this.content.search.input.focus();
-        this.settings.triggerFocus = true;
     }
     getOptions(notPlaceholder = false, notDisabled = false, notHidden = false) {
         let query = '.' + this.classes.option;
@@ -1509,13 +1495,13 @@ class SlimSelect {
             afterClose: undefined,
         };
         this.windowResize = debounce(() => {
-            if (!this.settings.isOpen) {
+            if (!this.settings.isOpen && !this.settings.isFullOpen) {
                 return;
             }
             this.render.moveContent();
         });
         this.windowScroll = debounce(() => {
-            if (!this.settings.isOpen) {
+            if (!this.settings.isOpen && !this.settings.isFullOpen) {
                 return;
             }
             this.render.moveContent();
@@ -1530,14 +1516,8 @@ class SlimSelect {
         };
         this.windowVisibilityChange = () => {
             if (document.hidden) {
-                this.settings.isWindowFocused = false;
                 this.close();
             }
-            else {
-                setTimeout(() => {
-                    this.settings.isWindowFocused = true;
-                }, 20);
-            }
         };
         this.selectEl = (typeof config.select === 'string' ? document.querySelector(config.select) : config.select);
         if (!this.selectEl) {
@@ -1707,13 +1687,16 @@ class SlimSelect {
         }
         this.render.open();
         if (this.settings.showSearch) {
-            this.render.searchFocus(false);
+            this.render.searchFocus();
         }
+        this.settings.isOpen = true;
         setTimeout(() => {
             if (this.events.afterOpen) {
                 this.events.afterOpen();
             }
-            this.settings.isOpen = true;
+            if (this.settings.isOpen) {
+                this.settings.isFullOpen = true;
+            }
         }, this.settings.timeoutDelay);
         if (this.settings.contentPosition === 'absolute') {
             if (this.settings.intervalMove) {
@@ -1733,12 +1716,13 @@ class SlimSelect {
         if (this.render.content.search.input.value !== '') {
             this.search('');
         }
-        this.render.mainFocus(false, eventType);
+        this.render.mainFocus(eventType);
+        this.settings.isOpen = false;
+        this.settings.isFullOpen = false;
         setTimeout(() => {
             if (this.events.afterClose) {
                 this.events.afterClose();
             }
-            this.settings.isOpen = false;
         }, this.settings.timeoutDelay);
         if (this.settings.intervalMove) {
             clearInterval(this.settings.intervalMove);

package/src/vue/dist/vue/slimselect.vue.d.ts

@@ -35,8 +35,7 @@ declare const _default: import("vue").DefineComponent<{
             class: string[];
             isMultiple: boolean;
             isOpen: boolean;
-            isWindowFocused: boolean;
-            triggerFocus: boolean;
+            isFullOpen: boolean;
             intervalMove: {
                 hasRef: () => boolean;
                 refresh: () => NodeJS.Timeout;
@@ -113,8 +112,7 @@ declare const _default: import("vue").DefineComponent<{
                 class: string[];
                 isMultiple: boolean;
                 isOpen: boolean;
-                isWindowFocused: boolean;
-                triggerFocus: boolean;
+                isFullOpen: boolean;
                 intervalMove: {
                     hasRef: () => boolean;
                     refresh: () => NodeJS.Timeout;
@@ -245,14 +243,14 @@ declare const _default: import("vue").DefineComponent<{
             updateClassStyles: () => void;
             updateAriaAttributes: () => void;
             mainDiv: () => import("../slim-select/render").Main;
-            mainFocus: (trigger: boolean, eventType: string | null) => void;
+            mainFocus: (eventType: string | null) => void;
             placeholder: () => HTMLDivElement;
             renderValues: () => void;
             multipleValue: (option: Option) => HTMLDivElement;
             contentDiv: () => import("../slim-select/render").Content;
             moveContent: () => void;
             searchDiv: () => import("../slim-select/render").Search;
-            searchFocus: (trigger: boolean) => void;
+            searchFocus: () => void;
             getOptions: (notPlaceholder?: boolean, notDisabled?: boolean, notHidden?: boolean) => HTMLDivElement[];
             highlight: (dir: "up" | "down") => void;
             listDiv: () => HTMLDivElement;

package/src/vue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@slim-select/vue",
   "private": false,
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Vue integration",
   "repository": {
     "type": "git",