@danielgindi/selectbox 1.0.79 → 1.0.81

package/dist/lib.cjs.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 1.0.79
+ * @danielgindi/selectbox 1.0.81
  * git://github.com/danielgindi/selectbox.git
  */
 'use strict';
@@ -7790,7 +7790,6 @@ var DropList = /*#__PURE__*/function () {
       var p = this._p;
 
       p.sink.add(p.el, 'keydown', function (evt) {return _this9._keydown(evt);});
-      p.sink.add(p.el, 'keypress', function (evt) {return _this9._keydown(evt);});
     } }, { key: "_keydown", value:
 
     function _keydown(event) {
@@ -11393,9 +11392,7 @@ var SelectBox = /*#__PURE__*/function () {
       if (!dropList) return;
 
       var avoidToggleFromClick = false,
-        currentTouchId = null,
-        suppressKeyPress = false,
-        suppressKeyPressRepeat = false;
+        currentTouchId = null;
 
       var keyEventsTarget = p.multi || p.searchable ? p.input : p.el;
 
@@ -11404,8 +11401,10 @@ var SelectBox = /*#__PURE__*/function () {
         if ( /**@type HTMLInputElement*/evt.currentTarget.readOnly)
         return;
 
-        suppressKeyPress = false;
-        suppressKeyPressRepeat = false;
+        var suppressEnterSpaceToggle = false;
+        var lastKeyAllowsNonTypeKeys = p.lastKeyAllowsNonTypeKeys;
+        p.lastKeyAllowsNonTypeKeys = false;
+        var hasInputText = p.input && p.input.value.length > 0;
 
         switch (evt.key) {
           case keycodeJs.VALUE_PAGE_UP:
@@ -11415,14 +11414,13 @@ var SelectBox = /*#__PURE__*/function () {
           case keycodeJs.VALUE_HOME:
           case keycodeJs.VALUE_END:
             if ((evt.key === keycodeJs.VALUE_HOME || evt.key === keycodeJs.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) {
@@ -11460,10 +11458,11 @@ var SelectBox = /*#__PURE__*/function () {
             break;
 
           case keycodeJs.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);
@@ -11474,8 +11473,7 @@ var SelectBox = /*#__PURE__*/function () {
 
           case keycodeJs.VALUE_ENTER:
             if (dropList.isVisible() && dropList.hasFocusedItem()) {
-              suppressKeyPress = true;
-              suppressKeyPressRepeat = true;
+              suppressEnterSpaceToggle = true;
               evt.preventDefault();
               dropList.triggerItemSelection(evt);
             }
@@ -11496,39 +11494,21 @@ var SelectBox = /*#__PURE__*/function () {
             break;
 
           default:
-            suppressKeyPressRepeat = true;
             dropList._keydownFreeType(evt);
             break;}
 
 
-        p.lastKeyAllowsNonTypeKeys = evt.key === keycodeJs.VALUE_UP ||
-        evt.key === keycodeJs.VALUE_DOWN ||
-        evt.key === keycodeJs.VALUE_PAGE_UP ||
-        evt.key === keycodeJs.VALUE_PAGE_DOWN ||
-        evt.key === keycodeJs.VALUE_HOME ||
-        evt.key === keycodeJs.VALUE_END ||
-        evt.key === keycodeJs.VALUE_SPACE && !!p.lastKeyAllowsNonTypeKeys;
-      }).
-      add(keyEventsTarget, 'keypress.dropdown', function (evt) {
-        if (suppressKeyPress) {
-          suppressKeyPress = false;
-          evt.preventDefault();
-          return;
-        }
-
-        if (suppressKeyPressRepeat)
-        return;
-
-        if (evt.key === keycodeJs.VALUE_ENTER ||
-        evt.key === keycodeJs.VALUE_SPACE &&
-        p.lastKeyAllowsNonTypeKeys &&
-        !p.multi &&
-        !dropList.hasFocusedItem())
-
-        {
-          _this6.toggleList();
-          evt.preventDefault();
-          evt.stopPropagation();
+        if (!suppressEnterSpaceToggle) {
+          if (evt.key === keycodeJs.VALUE_ENTER ||
+          evt.key === keycodeJs.VALUE_SPACE &&
+          p.lastKeyAllowsNonTypeKeys &&
+          !p.multi &&
+          !dropList.hasFocusedItem())
+          {
+            _this6.toggleList();
+            evt.preventDefault();
+            evt.stopPropagation();
+          }
         }
       });