@danielgindi/selectbox 1.0.120 → 1.0.122

package/dist/lib.es6.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 1.0.120
+ * @danielgindi/selectbox 1.0.122
  * git://github.com/danielgindi/selectbox.git
  */
 import { createElement, closestUntil, setElementAttrs, next, prev } from '@danielgindi/dom-utils/lib/Dom';
@@ -1745,53 +1745,49 @@ class DropList {
 
         let regex = new RegExp(`^${escapeRegex(keyword)}`, 'i');
 
-        let matchIndices = [];
+        let matchIndex = -1;
         let item;
 
-        // These are all the possible matches
+        let focusItemIndex = p.focusItemIndex;
+
+        // These are all the possible matches for the text typed in so far
         for (let i = 0, count = p.items.length; i < count; i++) {
+            if (matchIndex !== -1 && i < focusItemIndex)
+                continue; // We are only interested in first match + match after the focused item
+
             item = p.items[i];
             if (regex.test(item.label)) {
-                matchIndices.push(i);
+                matchIndex = i;
+                if (focusItemIndex === -1 || i >= focusItemIndex)
+                    break;
             }
         }
 
         // Did we find anything?
-        if (!matchIndices.length) {
+        if (matchIndex === -1) {
             // No... So start over with this character as the only one.
             keyword = character;
             regex = new RegExp(`^${escapeRegex(keyword)}`, 'i');
 
             for (let i = 0, count = p.items.length; i < count; i++) {
+                if (matchIndex !== -1 && i < focusItemIndex)
+                    continue; // We are only interested in first match + match after the focused item
+
                 item = p.items[i];
                 if (regex.test(item.label)) {
-                    matchIndices.push(i);
+                    matchIndex = i;
+                    if (focusItemIndex === -1 || i >= focusItemIndex)
+                        break;
                 }
             }
         }
 
-        let focusItemIndex = p.focusItemIndex;
-        let matchIndex = -1;
-
-        // Find a match *after* the focused item
-        for (let i = 0, count = matchIndices.length; i < count; i++) {
-            if (matchIndices[i] >= focusItemIndex) {
-                matchIndex = matchIndices[i];
-                break;
-            }
-        }
-
-        // Find a match from the beginning.
-        if (matchIndex === -1 && matchIndices.length) {
-            matchIndex = matchIndices[0];
-        }
-
         if (matchIndex > -1) {
             let next = p.virtualListHelper.getItemElementAt(matchIndex);
             this._focus(evt, next || null, matchIndex);
 
             if (!this.isVisible()) {
-                this.triggerItemSelection(null, evt);
+                this.triggerItemSelection(next ? null : p.items[matchIndex], evt);
             }
 
             // Record the last filter used