@vuu-ui/vuu-filters 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,19 +10,19 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "3.5.16",
-    "@vuu-ui/vuu-protocol-types": "3.5.16",
-    "@vuu-ui/vuu-table-types": "3.5.16",
-    "@vuu-ui/vuu-filter-types": "3.5.16"
+    "@vuu-ui/vuu-data-types": "3.5.18-beta.1",
+    "@vuu-ui/vuu-protocol-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"
   },
   "dependencies": {
-    "@vuu-ui/vuu-context-menu": "3.5.16",
-    "@vuu-ui/vuu-data-react": "3.5.16",
-    "@vuu-ui/vuu-filter-parser": "3.5.16",
-    "@vuu-ui/vuu-popups": "3.5.16",
-    "@vuu-ui/vuu-ui-controls": "3.5.16",
-    "@vuu-ui/vuu-table": "3.5.16",
-    "@vuu-ui/vuu-utils": "3.5.16",
+    "@vuu-ui/vuu-context-menu": "3.5.18-beta.1",
+    "@vuu-ui/vuu-data-react": "3.5.18-beta.1",
+    "@vuu-ui/vuu-filter-parser": "3.5.18-beta.1",
+    "@vuu-ui/vuu-popups": "3.5.18-beta.1",
+    "@vuu-ui/vuu-ui-controls": "3.5.18-beta.1",
+    "@vuu-ui/vuu-table": "3.5.18-beta.1",
+    "@vuu-ui/vuu-utils": "3.5.18-beta.1",
     "@salt-ds/core": "1.54.1",
     "@salt-ds/lab": "1.0.0-alpha.83",
     "@salt-ds/styles": "0.2.1",

package/src/FilterAggregator.js

@@ -1,4 +1,4 @@
-import { EpochTimestamp, getTemporalInfo, getTypedValueForDescriptor, isAndFilter, isBetweenFilter, isBetweenOperator, isExtendedFilter, isMultiClauseFilter, isSingleValueFilter } from "@vuu-ui/vuu-utils";
+import { DataValidationError, EpochTimestamp, getScaledDecimalFilterOptions, getTemporalInfo, getTypedValueForDescriptor, isAndFilter, isBetweenFilter, isBetweenOperator, isExtendedFilter, isMultiClauseFilter, isScaledDecimalFilterOptions, isSingleValueFilter, isValidDecimalString } from "@vuu-ui/vuu-utils";
 import { ExtendedSingleValueFilterClause } from "./filter-container/ExtendedSingleValueFilterClause.js";
 function installExtendedFilters(filter, throwIfUndefined = false) {
     if (void 0 !== filter) if (isExtendedFilter(filter)) {
@@ -12,7 +12,9 @@ function installExtendedFilters(filter, throwIfUndefined = false) {
     else return filter;
     if (throwIfUndefined) throw Error("filter is undefined");
 }
-const getExtendedFilterOptions = (temporalInfo, extendedFilterOptions)=>{
+const getExtendedFilterOptions = (column, temporalInfo, extendedFilterOptions)=>{
+    const scaledDecimalOptions = getScaledDecimalFilterOptions(column);
+    if (scaledDecimalOptions) return scaledDecimalOptions;
     if (temporalInfo?.kind === "time") return {
         type: "TimeString",
         date: "today",
@@ -28,8 +30,13 @@ const getFilterValue = (column, value, temporalInfo, options, throwIfInvalid)=>{
         return;
     }
     if (options?.type === "TimeString") return asFilterTimeString(value, temporalInfo, throwIfInvalid);
+    if (isScaledDecimalFilterOptions(options)) return asFilterDecimalString(value, throwIfInvalid);
     return getTypedValueForDescriptor(value, column, throwIfInvalid);
 };
+const asFilterDecimalString = (value, throwIfInvalid)=>{
+    if (isValidDecimalString(value)) return value;
+    if (throwIfInvalid) throw new DataValidationError(`value ${value} is not a valid decimal`, "decimal", "string");
+};
 const timeOfDayPattern = /^\d{2}:\d{2}(?::\d{2}(?:\.\d{1,9})?)?$/;
 const asFilterTimeString = (value, temporalInfo, throwIfInvalid)=>{
     if (timeOfDayPattern.test(value)) return 5 === value.length ? `${value}:00` : value;
@@ -70,7 +77,7 @@ class FilterAggregator {
     }
     add(column, value, op = "=", extendedFilterOptions) {
         const temporalInfo = getTemporalInfo(column);
-        const options = getExtendedFilterOptions(temporalInfo, extendedFilterOptions);
+        const options = getExtendedFilterOptions(column, temporalInfo, extendedFilterOptions);
         const isInclusive = "between-inclusive" === op;
         const createClause = (op, value)=>options ? new ExtendedSingleValueFilterClause(column.name, op, value, options) : {
                 column: column.name,

package/src/column-filter/ColumnFilter.js

@@ -61,7 +61,11 @@ const ColumnFilter_ColumnFilter = /*#__PURE__*/ external_react_forwardRef(functi
                 onSelect: (event, operator)=>{
                     onOperatorSelect(event, operator);
                     requestAnimationFrame(()=>{
-                        rootRef.current?.querySelector("input:not(:disabled)")?.focus();
+                        const root = rootRef.current;
+                        if (!root) return;
+                        const { activeElement, body } = root.ownerDocument;
+                        if (activeElement && activeElement !== body && !root.contains(activeElement)) return;
+                        root.querySelector("input:not(:disabled)")?.focus();
                     });
                 },
                 value: operator,

package/src/filter-container/ExtendedSingleValueFilterClause.js

@@ -1,4 +1,4 @@
-import { getDefaultTimeZone, isValidTimeString, temporalFilterAsQuery } from "@vuu-ui/vuu-utils";
+import { getDefaultTimeZone, isScaledDecimalFilterOptions, isValidTimeString, scaledDecimalFilterAsQuery, temporalFilterAsQuery } from "@vuu-ui/vuu-utils";
 const isTimeToday = (options)=>"TimeString" === options.type && "today" === options.date;
 const timeStringWithFraction = /^\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?$/;
 class ExtendedSingleValueFilterClause {
@@ -18,22 +18,30 @@ class ExtendedSingleValueFilterClause {
     }
     asQuery() {
         const { column, op, value } = this;
-        const { date, encoding = "epochMillis", timeZone } = this.#options;
-        if ("TimeString" === this.#options.type) if ("string" == typeof value && (isValidTimeString(value) || timeStringWithFraction.test(value))) {
-            const temporalInfo = {
-                kind: "time",
-                encoding,
-                precision: "epochNanos" === encoding ? "ns" : "ms",
-                timeZone: timeZone ?? getDefaultTimeZone()
-            };
-            return temporalFilterAsQuery({
-                column,
-                op,
-                value
-            }, temporalInfo, {
-                date: date
-            });
-        } else throw Error(`[ExtendedSingleValueFilterClause] invalid TimeString ${value}`);
+        if (isScaledDecimalFilterOptions(this.#options)) return scaledDecimalFilterAsQuery({
+            column,
+            op,
+            value
+        }, this.#options);
+        if ("TimeString" === this.#options.type) {
+            const { date, encoding = "epochMillis", timeZone } = this.#options;
+            if ("string" == typeof value && (isValidTimeString(value) || timeStringWithFraction.test(value))) {
+                const temporalInfo = {
+                    kind: "time",
+                    encoding,
+                    precision: "epochNanos" === encoding ? "ns" : "ms",
+                    timeZone: timeZone ?? getDefaultTimeZone()
+                };
+                return temporalFilterAsQuery({
+                    column,
+                    op,
+                    value
+                }, temporalInfo, {
+                    date: date
+                });
+            }
+            throw Error(`[ExtendedSingleValueFilterClause] invalid TimeString ${value}`);
+        }
         throw Error("[ExtendedSingleValueFilterClause] unhandled extended filter type");
     }
     toJSON() {

package/src/filter-context-menu/useFilterContextMenu.js

@@ -1,4 +1,4 @@
-import { filtersAreEqual, getTemporalCellFilter, getTemporalInfo, withDateTimePattern } from "@vuu-ui/vuu-utils";
+import { filtersAreEqual, getScaledDecimalCellFilter, getTemporalCellFilter, getTemporalInfo, withDateTimePattern } from "@vuu-ui/vuu-utils";
 import { useCallback, useMemo, useRef } from "react";
 import { useColumnFilterRegistry, useSavedFilters } from "../filter-provider/FilterContext.js";
 import { FilterAggregator } from "../FilterAggregator.js";
@@ -23,6 +23,11 @@ const useFilterContextMenu = ({ filterColumns = "*", filterPatterns, filterProvi
                 ...temporalCellFilter
             };
         }
+        const scaledDecimalCellFilter = getScaledDecimalCellFilter(column, value);
+        if (scaledDecimalCellFilter) return {
+            column,
+            ...scaledDecimalCellFilter
+        };
         return {
             column,
             label: `${value}`,

package/types/filter-container/ExtendedSingleValueFilterClause.d.ts

@@ -5,9 +5,12 @@ export interface SerializableFilter {
     asQuery: () => string;
 }
 /**
- * A filter clause on a time of day value (TimeString). The time is resolved
- * against a date ('today' by default) only when the query is created, so a
- * persisted filter remains relative.
+ * A filter clause whose query depends on options beyond the column, op and value:
+ * - a time of day value (TimeString). The time is resolved against a date
+ *   ('today' by default) only when the query is created, so a persisted filter
+ *   remains relative.
+ * - a scaled decimal value, matched at the precision with which the column
+ *   displays values (see scaledDecimalFilterAsQuery).
  */
 export declare class ExtendedSingleValueFilterClause implements SerializableSingleValueFilterClause {
     #private;