@danielgindi/selectbox 1.0.79 → 1.0.81

package/dist/lib.umd.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 1.0.79
+ * @danielgindi/selectbox 1.0.81
  * git://github.com/danielgindi/selectbox.git
  */
 (function (global, factory) {
@@ -7786,7 +7786,6 @@
         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) {
@@ -11389,9 +11388,7 @@
         if (!dropList) return;
 
         var avoidToggleFromClick = false,
-          currentTouchId = null,
-          suppressKeyPress = false,
-          suppressKeyPressRepeat = false;
+          currentTouchId = null;
 
         var keyEventsTarget = p.multi || p.searchable ? p.input : p.el;
 
@@ -11400,8 +11397,10 @@
           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:
@@ -11411,14 +11410,13 @@
             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) {
@@ -11456,10 +11454,11 @@
               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);
@@ -11470,8 +11469,7 @@
 
             case keycodeJs.VALUE_ENTER:
               if (dropList.isVisible() && dropList.hasFocusedItem()) {
-                suppressKeyPress = true;
-                suppressKeyPressRepeat = true;
+                suppressEnterSpaceToggle = true;
                 evt.preventDefault();
                 dropList.triggerItemSelection(evt);
               }
@@ -11492,39 +11490,21 @@
               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();
+            }
           }
         });