@danielgindi/selectbox 2.0.3 → 2.0.5

package/dist/lib.umd.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 2.0.3
+ * @danielgindi/selectbox 2.0.5
  * git://github.com/danielgindi/selectbox.git
  */
 (function (global, factory) {
@@ -678,7 +678,8 @@
         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;
@@ -746,7 +747,7 @@
         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;
@@ -1211,11 +1212,10 @@
           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;
@@ -1256,7 +1256,7 @@
           p.filteredItems = null;
         }
 
-        this.needsRefilter = false;
+        p.needsRefilter = false;
 
         const items = p.filteredItems ?? p.items;
         p.hasNoResultsItem = items.length === 0 && !!p.noResultsText;
@@ -1277,11 +1277,17 @@
         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;
@@ -1483,6 +1489,8 @@
 
         // 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();
         }
 
@@ -1727,6 +1735,8 @@
       setCheckedValues(values) {
         const p = this._p;
 
+        this.rushRefilter();
+
         let groupIndexes = [];
 
         for (let i = 0, count = p.items.length; i < count; i++) {
@@ -1790,7 +1800,7 @@
 
         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];
@@ -1831,9 +1841,7 @@
           }
         });
 
-        if (p.needsRefilter) {
-          this._refilterItems();
-        }
+        this.rushRefilter();
 
         const el = p.el;
         el.style.position = 'absolute';
@@ -2041,6 +2049,8 @@
       setFocusedItemAtIndex(itemIndex) {
         const p = this._p;
 
+        this.rushRefilter();
+
         if (p.filteredItems) {
           const item = p.items[itemIndex];
           itemIndex = p.items.indexOf(item);
@@ -2238,6 +2248,8 @@
       setSingleSelectedItemAtIndex(itemIndex) {
         const p = this._p;
 
+        this.rushRefilter();
+
         let itemEl = null;
 
         if (itemIndex > -1 && !p.items[itemIndex]._nointeraction) {
@@ -2997,7 +3009,7 @@
           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++) {
@@ -3040,7 +3052,7 @@
             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;
 
@@ -3066,7 +3078,7 @@
         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;
@@ -3192,7 +3204,7 @@
       _determineVirtualMode(targetItemCount) {
         const p = this._p;
 
-        let items = p.filteredItems ?? p.items;
+        const items = p.filteredItems ?? p.items;
         if (targetItemCount === undefined) {
           targetItemCount = items.length;
         }
@@ -3640,7 +3652,6 @@
           p.resizeObserver.observe(p.el);
         }
 
-        if (o.filterFn)
         this.setFilterFn(o.filterFn);
 
         this.setItems(o.items);
@@ -4434,6 +4445,10 @@
         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) => {
@@ -4447,7 +4462,6 @@
             });
           };
         }
-        p.filterFn = fn;
         p.dropList?.setFilterFn(fn);
         return this;
       }
@@ -5566,6 +5580,7 @@
             p.splitListCheckedGroups);
           }
           dropList.setItems(items);
+          dropList.invokeRefilter();
           p.itemsChanged = false;
           p.selectionChanged = true;
           p.resortBySelectionNeeded = false;