@danielgindi/selectbox 2.0.3 → 2.0.5

package/dist/lib.es6.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 2.0.3
+ * @danielgindi/selectbox 2.0.5
  * git://github.com/danielgindi/selectbox.git
  */
 import { createElement, closestUntil, setElementAttrs, next, prev } from '@danielgindi/dom-utils/lib/Dom';
@@ -680,7 +680,8 @@ class DropList {
         const p = this._p;
 
         if (this.hasFocusedItem() && p.multi) {
-            let item = p.items[p.focusItemIndex];
+            const items = p.filteredItems ?? p.items;
+            let item = items[p.focusItemIndex];
             if (item._nocheck || item._nointeraction) return this;
 
             item._checked = !item._checked;
@@ -748,7 +749,7 @@ class DropList {
         const p = this._p, labelProp = p.labelProp, valueProp = p.valueProp;
 
         let isMulti = p.multi;
-        let items = p.items;
+        const items = p.items;
 
         if (atIndex == null || atIndex < 0 || atIndex >= p.items.length) {
             atIndex = -1;
@@ -1213,11 +1214,10 @@ class DropList {
             if (!Array.isArray(filteredItems)) {
                 if (term) {
                     const matcher = new RegExp(escapeRegex(term), 'i');
-                    const labelProp = p.labelProp;
 
                     filteredItems = p.items.filter(x => {
                         if (!filterGroups && x._group) return true;
-                        return matcher.test(x[labelProp]);
+                        return matcher.test(x.label);
                     });
                 } else {
                     filteredItems = null;
@@ -1258,7 +1258,7 @@ class DropList {
             p.filteredItems = null;
         }
 
-        this.needsRefilter = false;
+        p.needsRefilter = false;
 
         const items = p.filteredItems ?? p.items;
         p.hasNoResultsItem = items.length === 0 && !!p.noResultsText;
@@ -1279,11 +1279,17 @@ class DropList {
         return this;
     }
 
-    getFilteredItemCount() {
+    rushRefilter() {
         const p = this._p;
-
         if (p.needsRefilter)
             this._refilterItems();
+        return this;
+    }
+
+    getFilteredItemCount() {
+        const p = this._p;
+
+        this.rushRefilter();
 
         if (p.filteredItems)
             return p.filteredItems.length;
@@ -1485,6 +1491,8 @@ class DropList {
 
         // Calculate virtual viewport size
         if (p.virtualListHelper.isVirtual()) {
+            // Avoid extremely high size which will cause laying out the whole list
+            menuEl.style.height = Math.min(el.clientHeight, document.body.clientHeight) + 'px';
             p.virtualListHelper.render();
         }
 
@@ -1729,6 +1737,8 @@ class DropList {
     setCheckedValues(values) {
         const p = this._p;
 
+        this.rushRefilter();
+
         let groupIndexes = [];
 
         for (let i = 0, count = p.items.length; i < count; i++) {
@@ -1792,7 +1802,7 @@ class DropList {
 
         excludeGroups = excludeGroups && p.groupCount > 0;
 
-        let items = [];
+        const items = [];
 
         for (let i = 0, count = p.items.length; i < count; i++) {
             let item = p.items[i];
@@ -1833,9 +1843,7 @@ class DropList {
             }
         });
 
-        if (p.needsRefilter) {
-            this._refilterItems();
-        }
+        this.rushRefilter();
 
         const el = p.el;
         el.style.position = 'absolute';
@@ -2043,6 +2051,8 @@ class DropList {
     setFocusedItemAtIndex(itemIndex) {
         const p = this._p;
 
+        this.rushRefilter();
+
         if (p.filteredItems) {
             const item = p.items[itemIndex];
             itemIndex = p.items.indexOf(item);
@@ -2240,6 +2250,8 @@ class DropList {
     setSingleSelectedItemAtIndex(itemIndex) {
         const p = this._p;
 
+        this.rushRefilter();
+
         let itemEl = null;
 
         if (itemIndex > -1 && !p.items[itemIndex]._nointeraction) {
@@ -2999,7 +3011,7 @@ class DropList {
             let affectedItems = 0;
 
             if (p.autoCheckGroupChildren) {
-                let items = p.filteredItems ?? p.items;
+                const items = p.filteredItems ?? p.items;
                 let groupIndex = items.indexOf(item);
 
                 for (let i = groupIndex + 1, len = items.length; i < len; i++) {
@@ -3042,7 +3054,7 @@ class DropList {
                 affectedItems: affectedItems,
             });
         } else if (p.groupCount > 0 && p.autoCheckGroupChildren) {
-            let items = p.filteredItems ?? p.items;
+            const items = p.filteredItems ?? p.items;
             let itemIndex = items.indexOf(item);
             let groupIndex = -1;
 
@@ -3068,7 +3080,7 @@ class DropList {
         if (!(p.multi && p.autoCheckGroupChildren && groupIndex > -1))
             return this;
 
-        let items = p.filteredItems ?? p.items;
+        const items = p.filteredItems ?? p.items;
         let groupItem = items[groupIndex];
 
         if (!groupItem || !groupItem._group) return this;
@@ -3194,7 +3206,7 @@ class DropList {
     _determineVirtualMode(targetItemCount) {
         const p = this._p;
 
-        let items = p.filteredItems ?? p.items;
+        const items = p.filteredItems ?? p.items;
         if (targetItemCount === undefined) {
             targetItemCount = items.length;
         }
@@ -3642,8 +3654,7 @@ class SelectBox {
             p.resizeObserver.observe(p.el);
         }
 
-        if (o.filterFn)
-            this.setFilterFn(o.filterFn);
+        this.setFilterFn(o.filterFn);
 
         this.setItems(o.items);
         delete o.items; // we do not need this in memory anymore
@@ -4436,6 +4447,10 @@ class SelectBox {
         const p = this._p;
         if (p.filterFn === fn)
             return this;
+
+        // Do not keep this reference, as far as the user is concerned - he/she did not set a custom filter.
+        p.filterFn = fn;
+
         if (!fn) {
             // Add search by multi-item label
             fn = (items, term) => {
@@ -4449,7 +4464,6 @@ class SelectBox {
                 });
             };
         }
-        p.filterFn = fn;
         p.dropList?.setFilterFn(fn);
         return this;
     }
@@ -5568,6 +5582,7 @@ class SelectBox {
                     p.splitListCheckedGroups);
             }
             dropList.setItems(items);
+            dropList.invokeRefilter();
             p.itemsChanged = false;
             p.selectionChanged = true;
             p.resortBySelectionNeeded = false;