slim-select 2.3.3 → 2.4.1

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 = {};
@@ -349,6 +348,7 @@ class Render {
         this.main = this.mainDiv();
         this.content = this.contentDiv();
         this.updateClassStyles();
+        this.updateAriaAttributes();
         this.settings.contentLocation.appendChild(this.content.main);
     }
     enable() {
@@ -362,6 +362,7 @@ class Render {
     open() {
         this.main.arrow.path.setAttribute('d', this.classes.arrowOpen);
         this.main.main.classList.add(this.settings.openPosition === 'up' ? this.classes.openAbove : this.classes.openBelow);
+        this.main.main.setAttribute('aria-expanded', 'true');
         this.moveContent();
         const selectedOptions = this.store.getSelectedOptions();
         if (selectedOptions.length) {
@@ -375,6 +376,7 @@ class Render {
     close() {
         this.main.main.classList.remove(this.classes.openAbove);
         this.main.main.classList.remove(this.classes.openBelow);
+        this.main.main.setAttribute('aria-expanded', 'false');
         this.content.main.classList.remove(this.classes.openAbove);
         this.content.main.classList.remove(this.classes.openBelow);
         this.main.arrow.path.setAttribute('d', this.classes.arrowClose);
@@ -401,15 +403,18 @@ class Render {
             this.content.main.classList.add('ss-' + this.settings.contentPosition);
         }
     }
+    updateAriaAttributes() {
+        this.main.main.role = 'combobox';
+        this.main.main.setAttribute('aria-haspopup', 'listbox');
+        this.main.main.setAttribute('aria-controls', this.content.main.id);
+        this.main.main.setAttribute('aria-expanded', 'false');
+        this.content.main.setAttribute('role', 'listbox');
+    }
     mainDiv() {
         const main = document.createElement('div');
         main.dataset.id = this.settings.id;
+        main.id = this.settings.id;
         main.tabIndex = 0;
-        main.onfocus = () => {
-            if (this.settings.triggerFocus && this.settings.isWindowFocused) {
-                this.callbacks.open();
-            }
-        };
         main.onkeydown = (e) => {
             switch (e.key) {
                 case 'ArrowUp':
@@ -421,6 +426,8 @@ class Render {
                     this.callbacks.close();
                     return true;
                 case 'Enter':
+                case ' ':
+                    this.callbacks.open();
                     const highlighted = this.content.list.querySelector('.' + this.classes.highlighted);
                     if (highlighted) {
                         highlighted.click();
@@ -497,12 +504,10 @@ class Render {
             },
         };
     }
-    mainFocus(trigger) {
-        if (!trigger) {
-            this.settings.triggerFocus = false;
+    mainFocus(eventType) {
+        if (eventType !== 'click') {
+            this.main.main.focus({ preventScroll: true });
         }
-        this.main.main.focus({ preventScroll: true });
-        this.settings.triggerFocus = true;
     }
     placeholder() {
         const placeholderOption = this.store.filter((o) => o.placeholder, false);
@@ -678,6 +683,7 @@ class Render {
     contentDiv() {
         const main = document.createElement('div');
         main.dataset.id = this.settings.id;
+        main.id = this.settings.id;
         const search = this.searchDiv();
         main.appendChild(search.main);
         const list = this.listDiv();
@@ -735,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':
@@ -745,6 +750,7 @@ class Render {
                     this.callbacks.close();
                     return false;
                 case 'Enter':
+                case ' ':
                     if (this.callbacks.addable && e.ctrlKey) {
                         addable.click();
                     }
@@ -757,12 +763,6 @@ class Render {
                     return false;
             }
         };
-        input.onfocus = () => {
-            if (this.settings.isOpen) {
-                return;
-            }
-            this.callbacks.open();
-        };
         main.appendChild(input);
         if (this.callbacks.addable) {
             addable.classList.add(this.classes.addable);
@@ -835,12 +835,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;
@@ -896,7 +892,6 @@ class Render {
     listDiv() {
         const options = document.createElement('div');
         options.classList.add(this.classes.list);
-        options.setAttribute('role', 'listbox');
         return options;
     }
     renderError(error) {
@@ -1041,6 +1036,7 @@ class Render {
         }
         const optionEl = document.createElement('div');
         optionEl.dataset.id = option.id;
+        optionEl.id = option.id;
         optionEl.classList.add(this.classes.option);
         optionEl.setAttribute('role', 'option');
         if (option.class) {
@@ -1074,9 +1070,12 @@ class Render {
         }
         if (option.selected) {
             optionEl.classList.add(this.classes.selected);
+            optionEl.setAttribute('aria-selected', 'true');
+            this.main.main.setAttribute('aria-activedescendant', optionEl.id);
         }
         else {
             optionEl.classList.remove(this.classes.selected);
+            optionEl.setAttribute('aria-selected', 'false');
         }
         optionEl.addEventListener('click', (e) => {
             e.preventDefault();
@@ -1494,13 +1493,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();
@@ -1510,19 +1509,13 @@ class SlimSelect {
                 return;
             }
             if (e.target && !hasClassInTree(e.target, this.settings.id)) {
-                this.close();
+                this.close(e.type);
             }
         };
         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) {
@@ -1595,6 +1588,14 @@ class SlimSelect {
         this.render = new Render(this.settings, this.store, callbacks);
         this.render.renderValues();
         this.render.renderOptions(this.store.getData());
+        const selectAriaLabel = this.selectEl.getAttribute('aria-label');
+        const selectAriaLabelledBy = this.selectEl.getAttribute('aria-labelledby');
+        if (selectAriaLabel) {
+            this.render.main.main.setAttribute('aria-label', selectAriaLabel);
+        }
+        else if (selectAriaLabelledBy) {
+            this.render.main.main.setAttribute('aria-labelledby', selectAriaLabelledBy);
+        }
         if (this.selectEl.parentNode) {
             this.selectEl.parentNode.insertBefore(this.render.main.main, this.selectEl.nextSibling);
         }
@@ -1684,13 +1685,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) {
@@ -1699,7 +1703,7 @@ class SlimSelect {
             this.settings.intervalMove = setInterval(this.render.moveContent.bind(this.render), 500);
         }
     }
-    close() {
+    close(eventType = null) {
         if (!this.settings.isOpen || this.settings.alwaysOpen) {
             return;
         }
@@ -1710,12 +1714,13 @@ class SlimSelect {
         if (this.render.content.search.input.value !== '') {
             this.search('');
         }
-        this.render.mainFocus(false);
+        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;
@@ -243,15 +241,16 @@ declare const _default: import("vue").DefineComponent<{
             open: () => void;
             close: () => void;
             updateClassStyles: () => void;
+            updateAriaAttributes: () => void;
             mainDiv: () => import("../slim-select/render").Main;
-            mainFocus: (trigger: boolean) => 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;
@@ -285,7 +284,7 @@ declare const _default: import("vue").DefineComponent<{
         setSelected: (value: string | string[], runAfterChange?: boolean) => void;
         addOption: (option: import("../slim-select/store").OptionOptional) => void;
         open: () => void;
-        close: () => void;
+        close: (eventType?: string | null) => void;
         search: (value: string) => void;
         destroy: () => void;
     } | null;

package/src/vue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@slim-select/vue",
   "private": false,
-  "version": "1.3.3",
+  "version": "1.4.1",
   "description": "Vue integration",
   "repository": {
     "type": "git",
@@ -16,6 +16,7 @@
   "bugs": {
     "url": "https://github.com/brianvoe/slim-select/issues"
   },
+  "type": "module",
   "main": "dist/slimselectvue.ssr.js",
   "browser": "dist/slimselect.global.js",
   "module": "dist/slimselectvue.es.js",