@vuu-ui/vuu-data-local 3.5.16 → 3.5.18-beta.1

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.16",
+  "version": "3.5.18-beta.1",
   "main": "./src/index.js",
   "author": "heswell",
   "license": "Apache-2.0",
@@ -10,14 +10,14 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "3.5.16",
-    "@vuu-ui/vuu-table-types": "3.5.16",
-    "@vuu-ui/vuu-filter-types": "3.5.16",
-    "@vuu-ui/vuu-protocol-types": "3.5.16"
+    "@vuu-ui/vuu-data-types": "3.5.18-beta.1",
+    "@vuu-ui/vuu-table-types": "3.5.18-beta.1",
+    "@vuu-ui/vuu-filter-types": "3.5.18-beta.1",
+    "@vuu-ui/vuu-protocol-types": "3.5.18-beta.1"
   },
   "dependencies": {
-    "@vuu-ui/vuu-filter-parser": "3.5.16",
-    "@vuu-ui/vuu-utils": "3.5.16"
+    "@vuu-ui/vuu-filter-parser": "3.5.18-beta.1",
+    "@vuu-ui/vuu-utils": "3.5.18-beta.1"
   },
   "sideEffects": false,
   "files": [

package/src/array-data-source/array-data-source.js

@@ -319,15 +319,16 @@ class ArrayDataSource extends EventEmitter {
     }
     getFilterPredicate() {
         const { filterSpec: { filter, filterStruct: rawFilterStruct } } = combineFilters(this._config);
-        const filterStruct = rawFilterStruct && filter && filterRequiresResolution(rawFilterStruct, getColumnsByNameForFilter(this.tableSchema, this.#filterColumnsByName)) ? parseFilter(filter) : rawFilterStruct;
+        const columnsByName = getColumnsByNameForFilter(this.tableSchema, this.#filterColumnsByName);
+        const filterStruct = rawFilterStruct && filter && filterRequiresResolution(rawFilterStruct, columnsByName) ? parseFilter(filter) : rawFilterStruct;
         if (filterStruct) {
             if (this.dataMap) {
                 const { count: offset } = metadataKeys;
                 const actualColumnMap = {};
                 for (const [col, idx] of Object.entries(this.dataMap))actualColumnMap[col] = offset + idx;
-                return filterPredicate(actualColumnMap, filterStruct);
+                return filterPredicate(actualColumnMap, filterStruct, columnsByName);
             }
-            return filterPredicate(this.#columnMap, filterStruct);
+            return filterPredicate(this.#columnMap, filterStruct, columnsByName);
         }
         throw Error("filter must include filterStruct");
     }
@@ -570,9 +571,10 @@ class ArrayDataSource extends EventEmitter {
                 size: data.length,
                 type: "viewport-update"
             });
+            const served = this.rangeWithBufferWithinMaxRangeEnd;
             this.lastRangeServed = {
-                from: this.#range.from,
-                to: Math.min(this.#range.to, this.#range.from + rowsWithinViewport.length)
+                from: served.from,
+                to: Math.min(served.to, data.length)
             };
         }
     }