@vuu-ui/vuu-table-extras 4.0.0-alpha.9 → 4.0.0-beta.1

package/src/csv-upload/session/useImportSession.js

@@ -0,0 +1,204 @@
+import { EditSession } from "@vuu-ui/vuu-data-editing";
+import { Range, buildColumnMap, isRpcError, isSessionTable, metadataKeys } from "@vuu-ui/vuu-utils";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { buildRowErrorMessage, getInlineRowErrorMessage, getRowVuuMsgError, toErrorMessage, waitForSessionErrors } from "../parse/csv-upload-utils.js";
+import { CSV_FIRST_DATA_ROW_NUMBER } from "../parse/csv-constants.js";
+const useImportSession = ({ dataSource, sessionOverrides, rowDefaults, processingPromiseRef, onImportSessionEnded })=>{
+    const sessionErrorsRef = useRef(new Map());
+    const receivedRowKeysRef = useRef(new Set());
+    const sessionRowUpdateListenersRef = useRef(new Set());
+    const importDataSource = useMemo(()=>({
+            tableSchema: dataSource.tableSchema,
+            createSessionDataSource: async (copyOption, sessionType)=>{
+                if (!dataSource.createSessionDataSource) throw Error("[useCsvUpload] dataSource does not support createSessionDataSource");
+                const sessionDs = await dataSource.createSessionDataSource(copyOption, sessionType, sessionOverrides);
+                if (!sessionDs) throw Error("[useCsvUpload] Failed to create session datasource");
+                if (!sessionDs.columns.includes("vuuMsg")) sessionDs.columns = sessionDs.columns.concat("vuuMsg");
+                const columnMap = buildColumnMap(sessionDs.columns);
+                const vuuMsgDataIndex = columnMap.vuuMsg ?? -1;
+                const vuuRowNumDataIndex = columnMap.vuuRowNum ?? -1;
+                const handleSessionMessage = (message)=>{
+                    if ("viewport-update" === message.type && message.rows) {
+                        for (const row of message.rows){
+                            const rowKey = row[metadataKeys.KEY] ?? row[metadataKeys.IDX];
+                            receivedRowKeysRef.current.add(rowKey);
+                            const error = getRowVuuMsgError(row, vuuMsgDataIndex, vuuRowNumDataIndex);
+                            if (error) sessionErrorsRef.current.set(rowKey, error);
+                        }
+                        for (const listener of sessionRowUpdateListenersRef.current)listener();
+                    } else if ("viewport-clear" === message.type) {
+                        sessionErrorsRef.current.clear();
+                        receivedRowKeysRef.current.clear();
+                    }
+                };
+                if (sessionDs.isRemote) return new Promise((resolve, reject)=>{
+                    const handleSubscribed = ()=>{
+                        sessionDs.removeListener("subscribed", handleSubscribed);
+                        resolve(sessionDs);
+                    };
+                    sessionDs.on("subscribed", handleSubscribed);
+                    try {
+                        sessionDs.subscribe({
+                            range: Range(0, 0)
+                        }, handleSessionMessage);
+                    } catch (err) {
+                        sessionDs.removeListener("subscribed", handleSubscribed);
+                        reject(err);
+                    }
+                });
+                if ("function" == typeof sessionDs.subscribe && "initialising" === sessionDs.status) try {
+                    sessionDs.subscribe({
+                        range: Range(0, 0)
+                    }, handleSessionMessage);
+                } catch  {}
+                return sessionDs;
+            }
+        }), [
+        dataSource,
+        sessionOverrides
+    ]);
+    const editSession = useMemo(()=>new EditSession({
+            dataSource: importDataSource,
+            editSessionApi: "createSessionDataSource",
+            rowDefaults
+        }), [
+        importDataSource,
+        rowDefaults
+    ]);
+    const ownsEditSessionRef = useRef(true);
+    const sessionDataSourceRef = useRef(void 0);
+    const [sessionTable, setSessionTable] = useState();
+    useEffect(()=>()=>{
+            const processingPromise = processingPromiseRef?.current;
+            (async ()=>{
+                try {
+                    await processingPromise;
+                } finally{
+                    if (ownsEditSessionRef.current) try {
+                        const sessionDs = sessionDataSourceRef.current ?? editSession.sessionDataSource;
+                        if (sessionDs?.status !== "unsubscribed") await editSession.end(false);
+                    } catch (error) {
+                        console.error("[useCsvUpload] failed to discard edit session during cleanup", error);
+                    }
+                }
+            })();
+        }, [
+        editSession,
+        processingPromiseRef
+    ]);
+    const setActiveSessionDataSource = useCallback((sessionDataSource)=>{
+        sessionDataSourceRef.current = sessionDataSource;
+        const table = sessionDataSource?.table;
+        setSessionTable(table && isSessionTable(table) ? table : void 0);
+    }, []);
+    const endEditSessionAndNotify = useCallback(async (save, reason)=>{
+        ownsEditSessionRef.current = false;
+        const sessionDataSource = sessionDataSourceRef.current;
+        if (!sessionDataSource) throw Error("CsvUpload has no active edit session.");
+        if (!sessionDataSource.endEditSession) throw Error("CsvUpload requires the session datasource to support endEditSession.");
+        const currentSessionTable = sessionDataSource.table;
+        try {
+            await editSession.end(save);
+        } finally{
+            if ("unsubscribed" !== sessionDataSource.status && "function" == typeof sessionDataSource.unsubscribe) sessionDataSource.unsubscribe();
+            setActiveSessionDataSource(void 0);
+        }
+        onImportSessionEnded?.({
+            reason,
+            sessionTable: currentSessionTable && isSessionTable(currentSessionTable) ? currentSessionTable : void 0
+        });
+    }, [
+        editSession,
+        onImportSessionEnded,
+        setActiveSessionDataSource
+    ]);
+    const beginEditSession = useCallback(async ()=>{
+        sessionErrorsRef.current.clear();
+        receivedRowKeysRef.current.clear();
+        ownsEditSessionRef.current = true;
+        const sessionDataSource = await editSession.begin("Empty", "import");
+        const sessionVuuTable = sessionDataSource?.table;
+        if (void 0 === sessionDataSource || void 0 === sessionVuuTable || !isSessionTable(sessionVuuTable)) throw Error("CsvUpload createSessionDataSource returned no session datasource.");
+        setActiveSessionDataSource(sessionDataSource);
+        return sessionDataSource;
+    }, [
+        editSession,
+        setActiveSessionDataSource
+    ]);
+    const closePendingEditSession = useCallback(async (save)=>{
+        if (void 0 === sessionDataSourceRef.current) return;
+        await endEditSessionAndNotify(save, save ? "saved" : "discarded");
+    }, [
+        endEditSessionAndNotify
+    ]);
+    const releaseEditSessionOwnership = useCallback(()=>{
+        ownsEditSessionRef.current = false;
+    }, []);
+    const addAllRows = useCallback(async (mergedValidation, isCancelled)=>{
+        const vuuMsgByRow = new Map();
+        for (const { rowNum, column, message } of mergedValidation.errors){
+            if (rowNum < CSV_FIRST_DATA_ROW_NUMBER) continue;
+            const existing = vuuMsgByRow.get(rowNum);
+            const columnError = `${column}: ${message}`;
+            vuuMsgByRow.set(rowNum, existing ? `${existing}; ${columnError}` : columnError);
+        }
+        const parsedRowCount = mergedValidation.rows.length;
+        const unparsedErrorRows = [
+            ...vuuMsgByRow.keys()
+        ].filter((rowNum)=>rowNum - CSV_FIRST_DATA_ROW_NUMBER >= parsedRowCount).map((rowNum)=>({
+                rowNum,
+                rowData: {},
+                vuuMsg: vuuMsgByRow.get(rowNum) ?? ""
+            }));
+        const allRows = [
+            ...mergedValidation.rows.map((rowData, idx)=>({
+                    rowNum: idx + CSV_FIRST_DATA_ROW_NUMBER,
+                    rowData: rowData ?? {},
+                    vuuMsg: vuuMsgByRow.get(idx + CSV_FIRST_DATA_ROW_NUMBER) ?? ""
+                })),
+            ...unparsedErrorRows
+        ];
+        const rpcErrors = [];
+        for (const { rowNum, rowData, vuuMsg } of allRows){
+            if (isCancelled()) return false;
+            try {
+                const payload = vuuMsg ? {
+                    vuuRowNum: rowNum,
+                    vuuMsg
+                } : {
+                    ...rowData,
+                    vuuRowNum: rowNum,
+                    vuuMsg
+                };
+                const result = await editSession.addRow(payload);
+                if (isRpcError(result)) throw Error(result.errorMessage);
+                if ("string" == typeof result) throw Error(result);
+                const inlineMsg = getInlineRowErrorMessage(result);
+                if (inlineMsg) sessionErrorsRef.current.set(rowNum, {
+                    rowNum,
+                    message: inlineMsg
+                });
+            } catch (error) {
+                rpcErrors.push(`${0 === rowNum ? "Header" : `Row ${rowNum}`}: ${toErrorMessage(error)}`);
+            }
+        }
+        if (rpcErrors.length > 0) throw Error(buildRowErrorMessage("Import failed", rpcErrors));
+        return allRows.length;
+    }, [
+        editSession
+    ]);
+    const checkSessionTableErrors = useCallback(async (sessionDs, expectedRowCount)=>waitForSessionErrors(sessionDs.isRemote ?? false, sessionErrorsRef.current, receivedRowKeysRef.current, expectedRowCount, sessionRowUpdateListenersRef.current), []);
+    return {
+        addAllRows,
+        beginEditSession,
+        checkSessionTableErrors,
+        closePendingEditSession,
+        editSession,
+        endEditSessionAndNotify,
+        releaseEditSessionOwnership,
+        sessionDataSourceRef,
+        sessionTable,
+        setActiveSessionDataSource
+    };
+};
+export { useImportSession };

package/src/csv-upload/useCsvUpload.js

@@ -1,205 +1,36 @@
-import { EditSession } from "@vuu-ui/vuu-data-editing";
-import { Range, isRpcError, isSessionTable, useData } from "@vuu-ui/vuu-utils";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Range, isSessionTable } from "@vuu-ui/vuu-utils";
+import { useCallback, useMemo, useRef, useState } from "react";
 import { parseCsv } from "./parse/csv-parse.js";
-import { validateCsvAgainstSchema } from "./parse/csv-schema-validation.js";
-import { buildRowErrorMessage, createUploadError, hasFileParseErrors, isCsvParseError, mergeValidationWithParseErrors, toErrorMessage } from "./parse/csv-upload-utils.js";
-import { CSV_FIRST_DATA_ROW_NUMBER } from "./parse/csv-constants.js";
-const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importTable, onImportSessionEnded, onImportSessionStarted, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, validators })=>{
-    const { getServerAPI } = useData();
+import { CsvValidationErrorEnum, validateCsvAgainstSchema } from "./parse/csv-schema-validation.js";
+import { createUploadError, hasFileParseErrors, isCsvParseError, mergeValidationWithParseErrors, toErrorMessage } from "./parse/csv-upload-utils.js";
+import { useImportSchema } from "./session/useImportSchema.js";
+import { useImportSession } from "./session/useImportSession.js";
+const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importTable, onImportSessionEnded, onImportSessionReady, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, validators })=>{
     const [validation, setValidation] = useState();
-    const [sessionTable, setSessionTable] = useState();
     const [isProcessingFile, setIsProcessingFile] = useState(false);
     const [isImporting, setIsImporting] = useState(false);
-    const [fetchedImportSchema, setFetchedImportSchema] = useState();
     const [error, setError] = useState();
+    const operationIdRef = useRef(0);
+    const processingPromiseRef = useRef(void 0);
     const handleError = useCallback((errResult)=>{
         setError(errResult);
         onError?.(errResult);
     }, [
         onError
     ]);
-    useEffect(()=>{
-        if (importSchema || void 0 === importTable) return void setFetchedImportSchema(void 0);
-        let cancelled = false;
-        (async ()=>{
-            try {
-                const server = await getServerAPI();
-                const tableSchema = await server.getTableSchema(importTable);
-                if (!cancelled) setFetchedImportSchema(tableSchema);
-            } catch (error) {
-                console.error("[useCsvUpload] failed to fetch import table schema", error);
-            }
-        })();
-        return ()=>{
-            cancelled = true;
-        };
-    }, [
-        getServerAPI,
+    const { schema, sessionOverrides } = useImportSchema({
+        dataSource,
         importSchema,
         importTable
-    ]);
-    const resolvedImportSchema = importSchema ?? fetchedImportSchema;
-    const sessionOverrides = useMemo(()=>{
-        const columns = resolvedImportSchema?.columns.map(({ name })=>name);
-        return columns || importTable ? {
-            columns,
-            table: importTable
-        } : void 0;
-    }, [
-        resolvedImportSchema,
-        importTable
-    ]);
-    const importDataSource = useMemo(()=>({
-            tableSchema: dataSource.tableSchema,
-            createSessionDataSource: async (copyOption, sessionType)=>{
-                if (!dataSource.createSessionDataSource) throw Error("[useCsvUpload] dataSource does not support createSessionDataSource");
-                const sessionDs = await dataSource.createSessionDataSource(copyOption, sessionType, sessionOverrides);
-                if (!sessionDs) throw Error("[useCsvUpload] Failed to create session datasource");
-                if (!sessionDs.columns.includes("vuuMsg")) sessionDs.columns = sessionDs.columns.concat("vuuMsg");
-                if (sessionDs.isRemote) return new Promise((resolve, reject)=>{
-                    const handleSubscribed = ()=>{
-                        sessionDs.removeListener("subscribed", handleSubscribed);
-                        resolve(sessionDs);
-                    };
-                    sessionDs.on("subscribed", handleSubscribed);
-                    try {
-                        sessionDs.subscribe({
-                            range: Range(0, 0)
-                        }, ()=>{});
-                    } catch (err) {
-                        sessionDs.removeListener("subscribed", handleSubscribed);
-                        reject(err);
-                    }
-                });
-                return sessionDs;
-            }
-        }), [
+    });
+    const { addAllRows, beginEditSession, checkSessionTableErrors, closePendingEditSession, editSession, endEditSessionAndNotify, releaseEditSessionOwnership, sessionDataSourceRef, sessionTable, setActiveSessionDataSource } = useImportSession({
         dataSource,
-        sessionOverrides
-    ]);
-    const editSession = useMemo(()=>new EditSession({
-            dataSource: importDataSource,
-            editSessionApi: "createSessionDataSource",
-            rowDefaults
-        }), [
-        importDataSource,
-        rowDefaults
-    ]);
-    const ownsEditSessionRef = useRef(true);
-    const operationIdRef = useRef(0);
-    const processingPromiseRef = useRef(void 0);
-    const sessionDataSourceRef = useRef(void 0);
-    useEffect(()=>()=>{
-            operationIdRef.current++;
-            const processingPromise = processingPromiseRef.current;
-            (async ()=>{
-                try {
-                    await processingPromise;
-                } finally{
-                    if (ownsEditSessionRef.current) try {
-                        await editSession.end(false);
-                    } catch (error) {
-                        console.error("[useCsvUpload] failed to discard edit session during cleanup", error);
-                    }
-                }
-            })();
-        }, [
-        editSession
-    ]);
-    const setActiveSessionDataSource = useCallback((sessionDataSource)=>{
-        sessionDataSourceRef.current = sessionDataSource;
-        const table = sessionDataSource?.table;
-        setSessionTable(table && isSessionTable(table) ? table : void 0);
-    }, []);
-    const endEditSessionAndNotify = useCallback(async (save, reason)=>{
-        const sessionDataSource = sessionDataSourceRef.current;
-        if (!sessionDataSource) throw Error("CsvUpload has no active edit session.");
-        if (!sessionDataSource.endEditSession) throw Error("CsvUpload requires the session datasource to support endEditSession.");
-        const currentSessionTable = sessionDataSource.table;
-        try {
-            await editSession.end(save);
-        } finally{
-            if ("unsubscribed" !== sessionDataSource.status) sessionDataSource.unsubscribe();
-            setActiveSessionDataSource(void 0);
-        }
-        onImportSessionEnded?.({
-            reason,
-            sessionTable: currentSessionTable && isSessionTable(currentSessionTable) ? currentSessionTable : void 0
-        });
-    }, [
-        editSession,
-        onImportSessionEnded,
-        setActiveSessionDataSource
-    ]);
+        sessionOverrides,
+        rowDefaults,
+        processingPromiseRef,
+        onImportSessionEnded
+    });
     const table = dataSource.table;
-    const schema = importTable ? resolvedImportSchema : resolvedImportSchema ?? dataSource.tableSchema;
-    const addAllRows = useCallback(async (mergedValidation, operationId)=>{
-        const vuuMsgByRow = new Map();
-        for (const { rowNum, column, message } of mergedValidation.errors){
-            if (rowNum < CSV_FIRST_DATA_ROW_NUMBER) continue;
-            const existing = vuuMsgByRow.get(rowNum);
-            const columnError = `${column}: ${message}`;
-            vuuMsgByRow.set(rowNum, existing ? `${existing}; ${columnError}` : `${0 === rowNum ? "Header" : `Row ${rowNum}`}: ${columnError}`);
-        }
-        const parsedRowCount = mergedValidation.rows.length;
-        const unparsedErrorRows = [
-            ...vuuMsgByRow.keys()
-        ].filter((rowNum)=>rowNum - CSV_FIRST_DATA_ROW_NUMBER >= parsedRowCount).map((rowNum)=>({
-                rowNum,
-                rowData: {},
-                vuuMsg: vuuMsgByRow.get(rowNum) ?? ""
-            }));
-        const allRows = [
-            ...mergedValidation.rows.map((rowData, idx)=>({
-                    rowNum: idx + CSV_FIRST_DATA_ROW_NUMBER,
-                    rowData: rowData ?? {},
-                    vuuMsg: vuuMsgByRow.get(idx + CSV_FIRST_DATA_ROW_NUMBER) ?? ""
-                })),
-            ...unparsedErrorRows
-        ];
-        const rpcErrors = [];
-        for (const { rowNum, rowData, vuuMsg } of allRows){
-            if (operationId !== operationIdRef.current) return false;
-            try {
-                const payload = vuuMsg ? {
-                    vuuRowNum: rowNum,
-                    vuuMsg
-                } : {
-                    ...rowData,
-                    vuuRowNum: rowNum,
-                    vuuMsg
-                };
-                const result = await editSession.addRow(payload);
-                if (isRpcError(result)) throw Error(result.errorMessage);
-                if ("string" == typeof result) throw Error(result);
-            } catch (error) {
-                rpcErrors.push(`${0 === rowNum ? "Header" : `Row ${rowNum}`}: ${toErrorMessage(error)}`);
-            }
-        }
-        if (rpcErrors.length > 0) throw Error(buildRowErrorMessage("Import failed", rpcErrors));
-        return true;
-    }, [
-        editSession
-    ]);
-    const beginEditSession = useCallback(async ()=>{
-        const sessionDataSource = await editSession.begin("Empty", "import");
-        const sessionVuuTable = sessionDataSource?.table;
-        if (void 0 === sessionDataSource || void 0 === sessionVuuTable || !isSessionTable(sessionVuuTable)) throw Error("CsvUpload createSessionDataSource returned no session datasource.");
-        setActiveSessionDataSource(sessionDataSource);
-        onImportSessionStarted?.(sessionDataSource);
-        return sessionDataSource;
-    }, [
-        editSession,
-        onImportSessionStarted,
-        setActiveSessionDataSource
-    ]);
-    const closePendingEditSession = useCallback(async (save)=>{
-        if (void 0 === sessionDataSourceRef.current) return;
-        await endEditSessionAndNotify(save, save ? "saved" : "discarded");
-    }, [
-        endEditSessionAndNotify
-    ]);
     const cancelImport = useCallback(async ()=>{
         operationIdRef.current++;
         processingPromiseRef.current = void 0;
@@ -245,13 +76,10 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         });
         if (Object.keys(schemaValidation.errorMap.fileErrors).length > 0) {
             setValidation(schemaValidation);
+            const detailedMessage = `CSV validation failed: ${schemaValidation.errors.map((e)=>"*" === e.column ? e.message : `${e.column}: ${e.message}`).join("; ")}`;
             handleError({
                 errors: {
-                    schemaError: createUploadError("schema", "CSV validation failed.", parsedCsv.error, {
-                        errorMap: schemaValidation.errorMap,
-                        errors: schemaValidation.errors,
-                        message: "CSV validation failed."
-                    })
+                    schemaError: createUploadError("schema", detailedMessage, parsedCsv.error, schemaValidation)
                 }
             });
             return;
@@ -259,10 +87,31 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         const mergedValidation = mergeValidationWithParseErrors(schemaValidation, parsedCsv.error);
         setValidation(mergedValidation);
         if (mergedValidation.rows.length > 0) try {
-            await beginEditSession();
+            const sessionDataSource = await beginEditSession();
             if (operationId !== operationIdRef.current) return;
-            const rowsAdded = await addAllRows(mergedValidation, operationId);
-            if (!rowsAdded) return;
+            const rowsAddedCount = await addAllRows(mergedValidation, ()=>operationId !== operationIdRef.current);
+            if (false === rowsAddedCount) return;
+            const expectedRowCount = rowsAddedCount;
+            sessionDataSource.range = Range(0, expectedRowCount);
+            const sessionErrors = await checkSessionTableErrors(sessionDataSource, expectedRowCount);
+            if (operationId !== operationIdRef.current) return;
+            if (sessionErrors.length > 0) {
+                const serverValidationErrors = sessionErrors.map(({ rowNum, message })=>({
+                        rowNum,
+                        column: "*",
+                        message,
+                        value: "",
+                        errorEnum: CsvValidationErrorEnum.CUSTOM_VALIDATION
+                    }));
+                setValidation((prev)=>prev ? {
+                        ...prev,
+                        errors: [
+                            ...prev.errors,
+                            ...serverValidationErrors
+                        ]
+                    } : void 0);
+            }
+            onImportSessionReady?.(sessionDataSource);
         } catch (error) {
             if (void 0 !== sessionDataSourceRef.current) await endEditSessionAndNotify(false, "failed");
             else try {
@@ -281,6 +130,7 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         handleError,
         editSession,
         addAllRows,
+        checkSessionTableErrors,
         maxRows,
         parseOptions,
         beginEditSession,
@@ -290,7 +140,9 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         table,
         endEditSessionAndNotify,
         schema,
-        validators
+        validators,
+        onImportSessionReady,
+        sessionDataSourceRef
     ]);
     const handleFiles = useCallback(async (files)=>{
         const file = files[0];
@@ -333,10 +185,11 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
     }, [
         handleFiles
     ]);
-    const canImport = useMemo(()=>void 0 !== validation && 0 === validation.errors.length && validation.rows.length > 0 && !isProcessingFile && !isImporting, [
+    const canImport = useMemo(()=>void 0 !== validation && 0 === validation.errors.length && validation.rows.length > 0 && !isProcessingFile && !isImporting && void 0 === error, [
         isImporting,
         isProcessingFile,
-        validation
+        validation,
+        error
     ]);
     const importData = useCallback(async ()=>{
         if (!canImport || void 0 === validation) return false;
@@ -357,7 +210,7 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
                     editSession,
                     tableData
                 });
-                ownsEditSessionRef.current = false;
+                releaseEditSessionOwnership();
             } else {
                 await endEditSessionAndNotify(true, "saved");
                 onImported?.({
@@ -385,6 +238,8 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         onImported,
         onPreview,
         importMode,
+        releaseEditSessionOwnership,
+        sessionDataSourceRef,
         validation
     ]);
     return {

package/src/freeze-control/FreezeControl.css.js

@@ -1,8 +1,8 @@
 const css = `
 .vuuFreezeControl {
   --freeze-control-flash-duration: .25s;
-  --freeze-control-active-button-color: var(--salt-palette-error-background);
-  --freeze-control-badge-color: var(--salt-palette-success-background);
+  --freeze-control-active-button-color: var(--salt-status-error-background);
+  --freeze-control-badge-color: var(--salt-status-success-background);
   height: fit-content;
   display: inline-flex;
 
@@ -31,7 +31,7 @@ const css = `
 
   & .vuuFreezeControl-buttonWrapper-active .saltToggleButton {
     background-color: var(--freeze-control-active-button-color);
-    color: var(--salt-actionable-secondary-foreground-active);
+    color: var(--salt-actionable-subtle-foreground-active);
   }
 
   & .saltToggleButtonGroup.vuuStateButtonGroup {
@@ -43,7 +43,7 @@ const css = `
   }
 
   & .vuuFreezeControl-customBadge {
-    color: var(--salt-text-primary-foreground);
+    color: var(--salt-content-primary-foreground);
     font-size: var(--salt-text-fontSize);
     height: var(--salt-size-base);
     width: var(--salt-size-base);

package/src/freeze-control/FrozenBanner.css.js

@@ -1,8 +1,8 @@
 const css = `
 .FrozenBanner {
-  --freeze-control-active-button-color: var(--salt-palette-error-background);
+  --freeze-control-active-button-color: var(--salt-status-error-background);
   background-color: var(--freeze-control-active-button-color);
-  color: var(--salt-actionable-secondary-foreground-active);
+  color: var(--salt-actionable-subtle-foreground-active);
   font-size: var(--salt-text-fontSize);
   height: var(--salt-size-base);
   padding: 0 var(--salt-spacing-200);

package/src/table-footer/TableFooter.js

@@ -4,10 +4,10 @@ import { useComponentCssInjection } from "@salt-ds/styles";
 import { useWindow } from "@salt-ds/window";
 import TableFooter from "./TableFooter.css";
 const classBase = "vuuTableFooter";
-const TableFooterTray = ({ children, position = 'end' })=>/*#__PURE__*/ jsx("div", {
+const TableFooterTray = ({ children, position = "end" })=>/*#__PURE__*/ jsx("div", {
         className: clsx(`${classBase}Tray`, {
-            [`${classBase}Tray-center`]: 'center' === position,
-            [`${classBase}Tray-end`]: 'end' === position
+            [`${classBase}Tray-center`]: "center" === position,
+            [`${classBase}Tray-end`]: "end" === position
         }),
         children: children
     });

package/types/calculated-column/CalculatedColumnPanel.d.ts

@@ -9,4 +9,4 @@ export interface CalculatedColumnPanelProps extends HTMLAttributes<HTMLDivElemen
     onChangeServerDataType?: (name: VuuColumnDataType) => void;
     vuuTable: VuuTable;
 }
-export declare const CalculatedColumnPanel: ({ column: columnProp, columnModel, onChangeColumn, onChangeServerDataType: onChangeServerDataTypeProp, vuuTable, }: CalculatedColumnPanelProps) => import("react").JSX.Element;
+export declare const CalculatedColumnPanel: ({ column: columnProp, columnModel, onChangeColumn, onChangeServerDataType: onChangeServerDataTypeProp, vuuTable, }: CalculatedColumnPanelProps) => import("react/jsx-runtime").JSX.Element;

package/types/cell-renderers/background-cell/BackgroundCell.d.ts

@@ -1,2 +1,2 @@
 import { TableCellRendererProps } from "@vuu-ui/vuu-table-types";
-export declare const BackgroundCell: import("react").MemoExoticComponent<({ column, dataRow, }: TableCellRendererProps) => import("react").JSX.Element>;
+export declare const BackgroundCell: import("react").MemoExoticComponent<({ column, dataRow, }: TableCellRendererProps) => import("react/jsx-runtime").JSX.Element>;

package/types/cell-renderers/background-cell/BackgroundCellConfigurationEditor.d.ts

@@ -1,2 +1,2 @@
 import { ConfigurationEditorProps } from "@vuu-ui/vuu-utils";
-export declare const BackgroundCellConfigurationEditor: ({ column, onChangeRendering, }: ConfigurationEditorProps) => import("react").JSX.Element;
+export declare const BackgroundCellConfigurationEditor: ({ column, onChangeRendering, }: ConfigurationEditorProps) => import("react/jsx-runtime").JSX.Element;

package/types/cell-renderers/button-cell/IconButtonCell.d.ts

@@ -3,4 +3,4 @@ import { TableCellRendererProps } from "@vuu-ui/vuu-table-types";
  * To assign an icon to the cell, give the columndescriptor
  * a className. In css, assign an icon variable to --vuu-svg-icon.
  */
-export declare const IconButtonCell: ({ column, dataRow }: TableCellRendererProps) => import("react").JSX.Element;
+export declare const IconButtonCell: ({ column, dataRow }: TableCellRendererProps) => import("react/jsx-runtime").JSX.Element;

package/types/cell-renderers/dropdown-cell/DropdownCell.d.ts

@@ -1,2 +1,2 @@
 import { TableCellRendererProps } from "@vuu-ui/vuu-table-types";
-export declare const DropdownCell: import("react").MemoExoticComponent<({ column, dataRow, editedDuringCurrentSession, onEdit, }: TableCellRendererProps) => import("react").JSX.Element>;
+export declare const DropdownCell: import("react").MemoExoticComponent<({ column, dataRow, editedDuringCurrentSession, onEdit, }: TableCellRendererProps) => import("react/jsx-runtime").JSX.Element>;

package/types/cell-renderers/lookup-cell/LookupCell.d.ts

@@ -1,2 +1,2 @@
 import { TableCellRendererProps } from "@vuu-ui/vuu-table-types";
-export declare const LookupCell: import("react").MemoExoticComponent<({ column, dataRow, }: TableCellRendererProps) => import("react").JSX.Element>;
+export declare const LookupCell: import("react").MemoExoticComponent<({ column, dataRow, }: TableCellRendererProps) => import("react/jsx-runtime").JSX.Element>;

package/types/cell-renderers/pct-progress-cell/PctProgressCell.d.ts

@@ -1,2 +1,2 @@
 import { TableCellProps } from "@vuu-ui/vuu-table-types";
-export declare const PctProgressCell: ({ column, dataRow }: TableCellProps) => import("react").JSX.Element;
+export declare const PctProgressCell: ({ column, dataRow }: TableCellProps) => import("react/jsx-runtime").JSX.Element;

package/types/column-expression-input/ColumnExpressionInput.d.ts

@@ -7,4 +7,4 @@ export interface ColumnExpressionInputProps extends ExpressionSuggestionConsumer
     onSubmitExpression?: ColumnExpressionSubmitHandler;
     source?: string;
 }
-export declare const ColumnExpressionInput: import("react").MemoExoticComponent<({ onChange, onSubmitExpression, source, suggestionProvider, }: ColumnExpressionInputProps) => import("react").JSX.Element>;
+export declare const ColumnExpressionInput: import("react").MemoExoticComponent<({ onChange, onSubmitExpression, source, suggestionProvider, }: ColumnExpressionInputProps) => import("react/jsx-runtime").JSX.Element>;

package/types/column-expression-input/column-language-parser/column-expression-parse-utils.d.ts

@@ -2,4 +2,4 @@ import type { SyntaxNode } from "@vuu-ui/vuu-codemirror";
 export declare const ColumnNamedTerms: readonly string[];
 export declare const isCompleteExpression: (src: string) => boolean;
 export declare const lastNamedChild: (node: SyntaxNode) => SyntaxNode | null;
-export declare const isCompleteRelationalExpression: (node?: any) => boolean;
+export declare const isCompleteRelationalExpression: (node?: SyntaxNode) => boolean;

package/types/column-expression-input/column-language-parser/test.d.mts

@@ -1 +1 @@
-export function walkTree(tree: any, source: any): void;
+export declare const walkTree: (tree: any, source: any) => void;