@svgrid/grid 2.6.1 → 2.6.3

package/dist/SvGrid.controller.svelte.js

@@ -1,4 +1,4 @@
-import { applyExcelFilter, applyGroupAggregate, normalizeForFilter, createColumnVirtualizer, createCoreRowModel, createExpandedRowModel, createFilteredRowModel, createGroupedRowModel, createTreeRowModel, createSvelteVirtualizer, createSortedRowModel, createSvGrid, getGridCellDomId, sortFns, } from "./index";
+import { applyGroupAggregate, compileExcelFilter, normalizeForFilter, createColumnVirtualizer, createCoreRowModel, createExpandedRowModel, createFilteredRowModel, createGroupedRowModel, createTreeRowModel, createSvelteVirtualizer, createSortedRowModel, createSvGrid, getGridCellDomId, sortFns, } from "./index";
 import { createRowScrollScaling, resolveMaxDomHeight, } from "./virtualization/scroll-scaling";
 import "./sv-grid-scrollbar";
 import { computeColumnStat, formatsNeedingStats, formatNeedsStats, } from "./conditional-formatting";
@@ -976,7 +976,11 @@ export function createSvGridController(rawProps, domIdBase) {
                 return value.trim().length > 0 && (valueTo ?? "").trim().length > 0;
             return value.trim().length > 0;
         };
-        const evalCond = (cellValue, columnId, op, value, valueTo) => applyExcelFilter(cellValue, { id: columnId, operator: op, value, valueTo: op === "between" ? valueTo : undefined }, { locale: (props.filterLocale ?? props.localization?.locale) });
+        // Compile a condition ONCE per filter change rather than once per row.
+        // Folding the needle, splitting `in` tokens and building a regex all
+        // depend only on the filter, so over 100k rows this used to be 100k
+        // redundant passes.
+        const compileCond = (columnId, op, value, valueTo) => compileExcelFilter({ id: columnId, operator: op, value, valueTo: op === "between" ? valueTo : undefined }, { locale: (props.filterLocale ?? props.localization?.locale) });
         // A column filter is active if either of its (up to two) conditions is.
         const menuFilters = Object.entries(filterMenuValues).filter(([_, f]) => {
             const a = condActive(f.operator, f.value, f.valueTo);
@@ -984,19 +988,27 @@ export function createSvGridController(rawProps, domIdBase) {
             return a || b;
         });
         if (menuFilters.length) {
-            rows = rows.filter((row) => menuFilters.every(([columnId, f]) => {
+            // Hoisted out of the row loop: each column's (up to two) conditions
+            // become compiled predicates before a single row is tested.
+            const compiledMenuFilters = menuFilters.map(([columnId, f]) => ({
+                columnId,
+                join: f.join,
+                a: condActive(f.operator, f.value, f.valueTo)
+                    ? compileCond(columnId, f.operator, f.value, f.valueTo)
+                    : null,
+                b: !!f.operator2 && condActive(f.operator2, f.value2 ?? "", f.valueTo2)
+                    ? compileCond(columnId, f.operator2, f.value2 ?? "", f.valueTo2)
+                    : null,
+            }));
+            rows = rows.filter((row) => compiledMenuFilters.every(({ columnId, join, a, b }) => {
                 const cellValue = getRowColumnValue(row, columnId);
-                const aActive = condActive(f.operator, f.value, f.valueTo);
-                const bActive = !!f.operator2 && condActive(f.operator2, f.value2 ?? "", f.valueTo2);
-                const ra = aActive ? evalCond(cellValue, columnId, f.operator, f.value, f.valueTo) : null;
-                const rb = bActive
-                    ? evalCond(cellValue, columnId, f.operator2, f.value2 ?? "", f.valueTo2)
-                    : null;
+                const ra = a ? a(cellValue) : null;
+                const rb = b ? b(cellValue) : null;
                 if (ra === null)
                     return rb ?? true;
                 if (rb === null)
                     return ra;
-                return f.join === "OR" ? ra || rb : ra && rb;
+                return join === "OR" ? ra || rb : ra && rb;
             }));
         }
         const valueFilterEntries = Object.entries(valueFilters);