@danielgindi/selectbox 1.0.79 → 1.0.81

package/lib/DropList.js

@@ -1625,7 +1625,6 @@ class DropList {
         const p = this._p;
 
         p.sink.add(p.el, 'keydown', evt => this._keydown(evt));
-        p.sink.add(p.el, 'keypress', evt => this._keydown(evt));
     }
 
     _keydown(event) {

package/lib/SelectBox.js

@@ -1917,9 +1917,7 @@ class SelectBox {
         if (!dropList) return;
 
         let avoidToggleFromClick = false,
-            currentTouchId = null,
-            suppressKeyPress = false,
-            suppressKeyPressRepeat = false;
+            currentTouchId = null;
 
         const keyEventsTarget = p.multi || p.searchable ? p.input : p.el;
 
@@ -1928,8 +1926,10 @@ class SelectBox {
                 if ((/**@type HTMLInputElement*/evt.currentTarget).readOnly)
                     return;
 
-                suppressKeyPress = false;
-                suppressKeyPressRepeat = false;
+                let suppressEnterSpaceToggle = false;
+                let lastKeyAllowsNonTypeKeys = p.lastKeyAllowsNonTypeKeys;
+                p.lastKeyAllowsNonTypeKeys = false;
+                let hasInputText = p.input && p.input.value.length > 0;
 
                 switch (evt.key) {
                     case VALUE_PAGE_UP:
@@ -1939,14 +1939,13 @@ class SelectBox {
                     case VALUE_HOME:
                     case VALUE_END:
                         if ((evt.key === VALUE_HOME || evt.key === VALUE_END) &&
-                            p.input && p.input.value.length > 0 && !p.lastKeyAllowsNonTypeKeys) {
+                            hasInputText && !lastKeyAllowsNonTypeKeys) {
                             // Allow using HOME/END button within the textbox
-                            suppressKeyPressRepeat = true;
                             dropList._keydownFreeType(evt);
                             break;
                         }
 
-                        suppressKeyPress = true;
+                        p.lastKeyAllowsNonTypeKeys = true;
                         evt.preventDefault();
 
                         switch (evt.key) {
@@ -1984,10 +1983,11 @@ class SelectBox {
                         break;
 
                     case VALUE_SPACE:
-                        if (p.lastKeyAllowsNonTypeKeys) {
+                        if (lastKeyAllowsNonTypeKeys) {
+                            p.lastKeyAllowsNonTypeKeys = true;
+
                             if (dropList.isVisible() && dropList.hasFocusedItem()) {
-                                suppressKeyPress = true;
-                                suppressKeyPressRepeat = true;
+                                suppressEnterSpaceToggle = true;
                                 if (p.multi)
                                     dropList.toggleFocusedItem(evt);
                                 else dropList.triggerItemSelection(evt);
@@ -1998,8 +1998,7 @@ class SelectBox {
 
                     case VALUE_ENTER:
                         if (dropList.isVisible() && dropList.hasFocusedItem()) {
-                            suppressKeyPress = true;
-                            suppressKeyPressRepeat = true;
+                            suppressEnterSpaceToggle = true;
                             evt.preventDefault();
                             dropList.triggerItemSelection(evt);
                         }
@@ -2020,39 +2019,21 @@ class SelectBox {
                         break;
 
                     default:
-                        suppressKeyPressRepeat = true;
                         dropList._keydownFreeType(evt);
                         break;
                 }
 
-                p.lastKeyAllowsNonTypeKeys = evt.key === VALUE_UP ||
-                    evt.key === VALUE_DOWN ||
-                    evt.key === VALUE_PAGE_UP ||
-                    evt.key === VALUE_PAGE_DOWN ||
-                    evt.key === VALUE_HOME ||
-                    evt.key === VALUE_END ||
-                    (evt.key === VALUE_SPACE && !!p.lastKeyAllowsNonTypeKeys);
-            })
-            .add(keyEventsTarget, 'keypress.dropdown', evt => {
-                if (suppressKeyPress) {
-                    suppressKeyPress = false;
-                    evt.preventDefault();
-                    return;
-                }
-
-                if (suppressKeyPressRepeat)
-                    return;
-
-                if (evt.key === VALUE_ENTER || (
-                    evt.key === VALUE_SPACE &&
-                    p.lastKeyAllowsNonTypeKeys &&
-                    !p.multi &&
-                    !dropList.hasFocusedItem()
-                )
-                ) {
-                    this.toggleList();
-                    evt.preventDefault();
-                    evt.stopPropagation();
+                if (!suppressEnterSpaceToggle) {
+                    if (evt.key === VALUE_ENTER || (
+                        evt.key === VALUE_SPACE &&
+                        p.lastKeyAllowsNonTypeKeys &&
+                        !p.multi &&
+                        !dropList.hasFocusedItem()
+                    )) {
+                        this.toggleList();
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }
                 }
             });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielgindi/selectbox",
-  "version": "1.0.79",
+  "version": "1.0.81",
   "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",