@vuu-ui/vuu-data-editing 4.0.0-alpha.2 → 4.0.0-alpha.20

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.20",
   "description": "Shared data editing APIs and React components for VUU UI",
   "main": "./src/index.js",
   "author": "heswell",
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@salt-ds/core": "1.67.0",
-    "@vuu-ui/vuu-ui-controls": "4.0.0-alpha.2",
-    "@vuu-ui/vuu-utils": "4.0.0-alpha.2"
+    "@vuu-ui/vuu-ui-controls": "4.0.0-alpha.20",
+    "@vuu-ui/vuu-utils": "4.0.0-alpha.20"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "4.0.0-alpha.2",
-    "@vuu-ui/vuu-protocol-types": "4.0.0-alpha.2",
-    "@vuu-ui/vuu-table-types": "4.0.0-alpha.2"
+    "@vuu-ui/vuu-data-types": "4.0.0-alpha.20",
+    "@vuu-ui/vuu-protocol-types": "4.0.0-alpha.20",
+    "@vuu-ui/vuu-table-types": "4.0.0-alpha.20"
   },
   "peerDependencies": {
     "react": "^19.2.3"
@@ -31,8 +31,9 @@
   ],
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./src/index.js",
-      "types": "./types/index.d.ts"
+      "default": "./src/index.js"
     }
   },
   "module": "./src/index.js",

package/src/DataEditingProvider.js

@@ -1,5 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import { createContext, useContext } from "react";
+import { EditSession } from "./EditSession.js";
 const DataEditingContext = /*#__PURE__*/ createContext(void 0);
 const DataEditingProvider = ({ children, editSession })=>/*#__PURE__*/ jsx(DataEditingContext.Provider, {
         value: editSession,
@@ -7,7 +8,8 @@ const DataEditingProvider = ({ children, editSession })=>/*#__PURE__*/ jsx(DataE
     });
 function useEditSession(throwIfUnavailable = false) {
     const editSession = useContext(DataEditingContext);
-    if (void 0 !== editSession) return editSession;
-    if (throwIfUnavailable) throw Error("[useEditSession] no DataEditingContext in scope. You need to enclose editable component(s) with DataEditingProvider");
+    if (editSession instanceof EditSession) return editSession;
+    if (throwIfUnavailable) throw Error(void 0 === editSession ? "[useEditSession] no DataEditingContext in scope. You need to enclose editable component(s) with DataEditingProvider" : "[useEditSession] DataEditingProvider does not provide an EditSession");
 }
-export { DataEditingProvider, useEditSession };
+const useTableEditSession = ()=>useContext(DataEditingContext);
+export { DataEditingProvider, useEditSession, useTableEditSession };

package/src/DirectEditSession.js

@@ -0,0 +1,35 @@
+import { EventEmitter } from "@vuu-ui/vuu-utils";
+class DirectEditSession extends EventEmitter {
+    #dataSource;
+    constructor({ dataSource }){
+        super();
+        this.#dataSource = dataSource;
+    }
+    get dataSource() {
+        return this.#dataSource;
+    }
+    get inEditMode() {
+        return false;
+    }
+    isCellEdited(_key, _columnName) {
+        return false;
+    }
+    async cancel(_key, _columnName, _restoredValue) {
+        return {
+            data: void 0,
+            type: "SUCCESS_RESULT"
+        };
+    }
+    async commit(key, columnName, _originalValue, typedValue, isValid) {
+        if (!isValid) return {
+            errorMessage: "Invalid value",
+            type: "ERROR_RESULT"
+        };
+        const editCell = this.#dataSource.editCell;
+        if (void 0 === editCell) throw Error("[DirectEditSession] datasource does not support editCell");
+        const response = await editCell.call(this.#dataSource, key, columnName, typedValue);
+        if (void 0 === response) throw Error("[DirectEditSession] datasource returned no response from editCell");
+        return response;
+    }
+}
+export { DirectEditSession };

package/src/EditButtons.js

@@ -1,8 +1,10 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@salt-ds/core";
-import { useCallback, useEffect, useState } from "react";
-const EditButtons = ({ canCancel, canSave, confirmCancel, confirmSave, editSession, hasSelection = false, onCancel, onDelete, onSave, saveLabel = "Save" })=>{
-    const [editState, setEditState] = useState(()=>editSession?.editState ?? "clean");
+import { useCallback } from "react";
+import { useEditState } from "./useEditState.js";
+const EditButtons = ({ canCancel, canSave: _canSave, confirmCancel, confirmSave, editSession, hasSelection = false, onCancel, onDelete, onSave, saveLabel = "Save" })=>{
+    const editState = useEditState(editSession);
+    const isDirty = editSession?.isDirty ?? false;
     const handleSave = useCallback(async ()=>{
         if (confirmSave) {
             const confirmed = await confirmSave();
@@ -15,24 +17,16 @@ const EditButtons = ({ canCancel, canSave, confirmCancel, confirmSave, editSessi
         onSave
     ]);
     const handleCancel = useCallback(async ()=>{
-        if (confirmCancel) {
+        if (confirmCancel && isDirty) {
             const confirmed = await confirmCancel();
             if (!confirmed) return;
         }
         onCancel?.();
     }, [
         confirmCancel,
+        isDirty,
         onCancel
     ]);
-    useEffect(()=>{
-        if (editSession) {
-            setEditState(editSession.editState);
-            editSession.on("editState", setEditState);
-            return ()=>editSession.removeListener("editState", setEditState);
-        }
-    }, [
-        editSession
-    ]);
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
             onDelete && /*#__PURE__*/ jsx(Button, {
@@ -42,7 +36,7 @@ const EditButtons = ({ canCancel, canSave, confirmCancel, confirmSave, editSessi
                 children: "Delete"
             }),
             /*#__PURE__*/ jsx(Button, {
-                disabled: !canSave,
+                disabled: !editSession?.canSave,
                 onClick: handleSave,
                 sentiment: "accented",
                 children: "stale" === editState ? `${saveLabel} (force)` : saveLabel

package/src/EditModeProvider.js

@@ -1,11 +1,16 @@
 import { jsx } from "react/jsx-runtime";
-import { createContext, useContext, useState } from "react";
+import { createContext, useContext, useEffect, useState } from "react";
 const EditModeContext = /*#__PURE__*/ createContext({
     isEditMode: false,
     setEditMode: ()=>"EditModeProvider in place"
 });
-const EditModeProvider = ({ children })=>{
-    const [isEditMode, setEditMode] = useState(false);
+const EditModeProvider = ({ children, isEditMode: isEditModeProp = false })=>{
+    const [isEditMode, setEditMode] = useState(isEditModeProp);
+    useEffect(()=>{
+        setEditMode(isEditModeProp);
+    }, [
+        isEditModeProp
+    ]);
     return /*#__PURE__*/ jsx(EditModeContext.Provider, {
         value: {
             isEditMode,

package/src/EditSession.js

@@ -66,6 +66,15 @@ class EditSession extends EventEmitter {
         if (this.#isStale) return "stale";
         return 0 === this.#editCount && 0 === this.#deleteCount && 0 === this.#addCount ? "clean" : "dirty";
     }
+    get isDirty() {
+        return "clean" !== this.editState;
+    }
+    get canCancel() {
+        return "active" === this.lifecycle.status || "error" === this.lifecycle.status && "end" === this.lifecycle.operation;
+    }
+    get canSave() {
+        return this.canCancel && ("dirty" === this.editState || "stale" === this.editState) && 0 === this.invalidCount;
+    }
     #emitEditStateChange(oldState, force = false) {
         const newState = this.editState;
         if (force || newState !== oldState) this.emit("editState", newState);
@@ -393,7 +402,8 @@ class EditSession extends EventEmitter {
                 sessionDataSource
             });
             try {
-                await this.dataSource?.endEditSession?.(saveChanges, force);
+                const response = await this.dataSource?.endEditSession?.(saveChanges, force);
+                if (isRpcError(response)) throw new Error(response.errorMessage);
                 this.#clearEdits();
                 this.#sessionDataSource = void 0;
                 this.#setLifecycle({
@@ -468,15 +478,26 @@ class EditSession extends EventEmitter {
     #isLatestCellCommit(key, columnName, revision) {
         return this.#cellCommitRevisions.get(key)?.get(columnName) === revision;
     }
-    async commit(key, columnName, originalValue, typedValue, isValid) {
+    async cancel(key, columnName, restoredValue) {
+        const cellEdits = this.#rowEdits.get(key)?.cellEdits;
+        const cellEdit = cellEdits?.get(columnName);
+        if (this.inEditMode && cellEdits && cellEdit && !cellEdit.isValid) this.#storeCellEdit(key, cellEdits, columnName, cellEdit.originalValue, restoredValue, true);
+        return {
+            data: void 0,
+            type: "SUCCESS_RESULT"
+        };
+    }
+    async commit(key, columnName, originalValue, typedValue, isValid, { dataSourceValue, syncToDataSource = true } = {}) {
         if ("active" !== this.#lifecycle.status && !("error" === this.#lifecycle.status && "end" === this.#lifecycle.operation)) throw new Error("No edit session in progress");
         const revision = this.#setCellCommitRevision(key, columnName);
         const rowEditDetails = this.#getOrCreateRowEdits(key);
         const { cellEdits } = rowEditDetails;
         if (isValid) {
             const cellEdit = this.#storeCellEdit(key, cellEdits, columnName, originalValue, typedValue, isValid);
-            if (this.dataSource?.editCell) {
-                const response = await this.dataSource.editCell(key, columnName, typedValue);
+            if (syncToDataSource && this.dataSource?.editCell) {
+                const valueForDataSource = dataSourceValue ?? typedValue;
+                if ("object" == typeof valueForDataSource && null !== valueForDataSource) throw new Error("Custom edit values require a scalar dataSourceValue.");
+                const response = await this.dataSource.editCell(key, columnName, valueForDataSource);
                 if (!this.inEditMode) return {
                     data: void 0,
                     type: "SUCCESS_RESULT"

package/src/edit-field/EditField.css.js

@@ -0,0 +1,13 @@
+const css = `
+.vuuEditField {
+  & .saltDropdown {
+    --vuu-icon-height: 15px;
+    --vuu-icon-left: calc(100% - var(--salt-spacing-300));
+    --vuu-icon-size: 8px;
+    --vuu-icon-top: -3px;
+  }
+}
+
+
+`;
+export default css;

package/src/edit-field/EditField.js

@@ -0,0 +1,105 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Checkbox, Dropdown, FormField, FormFieldLabel, Input, Option } from "@salt-ds/core";
+import { useCallback } from "react";
+import { useEditField } from "./useEditField.js";
+import { useEditSession } from "../DataEditingProvider.js";
+import { dataDescriptorTypeToVuuRowDataItemType } from "@vuu-ui/vuu-utils";
+import { useEditMode } from "../EditModeProvider.js";
+import { useLookupValues } from "../lookup-values/useLookupValues.js";
+import "./EditField.css";
+const classBase = "vuuEditField";
+const EditField = ({ dataRow, deferNewRow = false, label, name, readOnly = false, required, type, ...options })=>{
+    const editSession = useEditSession();
+    const { isEditMode } = useEditMode();
+    const lookupValues = useLookupValues({
+        enabled: "dropdown" === type,
+        ...options
+    });
+    const onEdit = useCallback(async (editState, editPhase)=>{
+        const { isValid = true, previousValue = "", value } = editState;
+        if ("commit" === editPhase && editSession) {
+            if (editSession.isNewRow(dataRow.key)) {
+                const isEmptyValue = "string" == typeof value && "" === value.trim();
+                if (!isValid && !isEmptyValue) return {
+                    errorMessage: "Invalid value",
+                    type: "ERROR_RESULT"
+                };
+                editSession.setNewRowValue(name, value);
+                if (!deferNewRow && (editSession.isNewRowFinalColumn(name) || editSession.isNewRowComplete())) return editSession.addNewRow();
+                return {
+                    data: void 0,
+                    type: "SUCCESS_RESULT"
+                };
+            }
+            return editSession.commit(dataRow.key, name, previousValue, value, isValid);
+        }
+        if ("change" === editPhase && deferNewRow && editSession?.isNewRow(dataRow.key)) {
+            editSession.setNewRowValue(name, value);
+            return {
+                data: void 0,
+                type: "SUCCESS_RESULT"
+            };
+        }
+    }, [
+        dataRow,
+        deferNewRow,
+        editSession,
+        name
+    ]);
+    const onCommit = useCallback(()=>{
+        console.log("onCommit");
+    }, []);
+    const necessity = required ? "asterisk" : void 0;
+    const dataValue = dataRow?.[name] ?? "";
+    const column = {
+        label,
+        name,
+        serverDataType: "string"
+    };
+    const { inputProps, onChange, onDropdownSelectionChange, onKeyDown, value } = useEditField({
+        column,
+        textType: "checkbox" !== type && "dropdown" !== type ? type : void 0,
+        onEdit,
+        type: dataDescriptorTypeToVuuRowDataItemType(column),
+        value: dataValue
+    });
+    return /*#__PURE__*/ jsxs(FormField, {
+        className: classBase,
+        "data-field": name,
+        necessity: necessity,
+        children: [
+            /*#__PURE__*/ jsx(FormFieldLabel, {
+                children: label
+            }),
+            false === isEditMode ? /*#__PURE__*/ jsx(Input, {
+                bordered: true,
+                inputProps: {
+                    readOnly: true
+                },
+                value: String(dataValue)
+            }) : "checkbox" === type ? /*#__PURE__*/ jsx(Checkbox, {
+                checked: Boolean(dataValue),
+                onChange: onCommit
+            }) : "dropdown" === type ? /*#__PURE__*/ jsx(Dropdown, {
+                "data-icon": "triangle-down",
+                onSelectionChange: onDropdownSelectionChange,
+                placeholder: "Please select value",
+                value: value,
+                children: lookupValues.map((listOption)=>/*#__PURE__*/ jsx(Option, {
+                        value: listOption,
+                        children: listOption.label
+                    }, listOption.value))
+            }) : /*#__PURE__*/ jsx(Input, {
+                bordered: true,
+                inputProps: {
+                    ...inputProps,
+                    onChange
+                },
+                onKeyDown: onKeyDown,
+                readOnly: readOnly,
+                value: value
+            })
+        ]
+    });
+};
+export { EditField };

package/src/edit-field/useEditField.js

@@ -0,0 +1,218 @@
+import { DataValidationError, dispatchCustomEvent, getTypedValue, isRpcError, isRpcSuccess } from "@vuu-ui/vuu-utils";
+import { useCallback, useEffect, useRef, useState } from "react";
+const stringValueOf = (value)=>value?.toString() ?? "";
+const useEditField = ({ column, value, onEdit, textType, type = "string" })=>{
+    const [editState, setEditState] = useState({
+        editing: false,
+        value: stringValueOf(value)
+    });
+    const initialValueRef = useRef(value?.toString() ?? "");
+    const isDirtyRef = useRef(false);
+    useEffect(()=>{
+        const nextValue = stringValueOf(value);
+        if (initialValueRef.current !== nextValue) {
+            initialValueRef.current = nextValue;
+            isDirtyRef.current = false;
+            setEditState((editState)=>({
+                    ...editState,
+                    message: void 0,
+                    value: nextValue
+                }));
+        }
+    }, [
+        value
+    ]);
+    const commit = useCallback(async (value = editState.value)=>{
+        const result = column.clientSideEditValidationCheck?.(value, "*");
+        if (result?.ok === false) setEditState((state)=>({
+                ...state,
+                message: result?.messages?.join(",")
+            }));
+        else {
+            const { current: initialValue } = initialValueRef;
+            const previousValue = getTypedValue(initialValue, type);
+            try {
+                const typedValue = getTypedValue(value, type, true);
+                const response = await onEdit?.({
+                    editType: "commit",
+                    isValid: true,
+                    previousValue,
+                    value: typedValue
+                }, "commit");
+                if (isRpcSuccess(response)) {
+                    isDirtyRef.current = false;
+                    setEditState((state)=>({
+                            editing: false,
+                            previousValue: state.previousValue === value ? void 0 : void 0 === state.previousValue ? initialValue : state.previousValue,
+                            value
+                        }));
+                } else if (isRpcError(response)) {
+                    setEditState((state)=>({
+                            ...state,
+                            message: response.errorMessage
+                        }));
+                    return false;
+                }
+                initialValueRef.current = value;
+                return true;
+            } catch (e) {
+                if (e instanceof DataValidationError) {
+                    const { actualType, expectedType, message } = e;
+                    if (column) {
+                        const { name, label = name } = column;
+                        const message = `${label} is a ${expectedType} value, data entered is ${actualType} `;
+                        setEditState((state)=>({
+                                ...state,
+                                message
+                            }));
+                        onEdit?.({
+                            editType: "commit",
+                            isValid: false,
+                            previousValue,
+                            value
+                        }, "commit");
+                    } else setEditState((state)=>({
+                            ...state,
+                            message
+                        }));
+                }
+            }
+        }
+        return false;
+    }, [
+        column,
+        editState,
+        onEdit,
+        type
+    ]);
+    const toggleActivation = useCallback(async (input, cancel = false)=>{
+        if (editState.editing) if (isDirtyRef.current) if (cancel) {
+            const { value: previousValue } = editState;
+            isDirtyRef.current = false;
+            setEditState({
+                editing: false,
+                value: initialValueRef.current,
+                message: void 0
+            });
+            onEdit?.({
+                editType: "cancel",
+                isValid: true,
+                previousValue,
+                value: getTypedValue(initialValueRef.current, type, true)
+            }, "commit");
+        } else {
+            const commitSuccessful = await commit();
+            if (commitSuccessful) {
+                setEditState((editState)=>({
+                        ...editState,
+                        editing: false
+                    }));
+                dispatchCustomEvent(input, "vuu-commit");
+            }
+        }
+        else setEditState((editState)=>({
+                ...editState,
+                editing: false
+            }));
+        else if (!cancel) {
+            setEditState((editState)=>({
+                    ...editState,
+                    editing: true
+                }));
+            input.select();
+        }
+    }, [
+        commit,
+        editState,
+        onEdit,
+        type
+    ]);
+    const handleKeyDown = useCallback(async (evt)=>{
+        const { key, target } = evt;
+        const input = target;
+        if ("Enter" === key) toggleActivation(input);
+        else if ("ArrowRight" === key || "ArrowLeft" === key || "ArrowUp" === key || "ArrowDown" === key) {
+            if (editState.editing) evt.stopPropagation();
+        } else if ("Escape" === evt.key) toggleActivation(input, true);
+    }, [
+        editState,
+        toggleActivation
+    ]);
+    const handleFocus = useCallback((e)=>{
+        const input = e.target;
+        const source = e.relatedTarget;
+        if (source?.classList.contains("vuuTableCell") && source.contains(input)) toggleActivation(input);
+    }, [
+        toggleActivation
+    ]);
+    const handleBlur = useCallback(async ()=>{
+        if (editState.editing) {
+            if (isDirtyRef.current) await commit();
+            setEditState((editState)=>({
+                    ...editState,
+                    editing: false
+                }));
+        }
+    }, [
+        commit,
+        editState
+    ]);
+    const handleChange = useCallback((evt)=>{
+        const { value } = evt.target;
+        isDirtyRef.current = value !== initialValueRef.current;
+        const result = column.clientSideEditValidationCheck?.(value, "change");
+        setEditState({
+            editing: true,
+            value
+        });
+        onEdit?.({
+            editType: "change",
+            isValid: result?.ok !== false,
+            previousValue: initialValueRef.current,
+            value
+        }, "change");
+        if (result?.ok === false) setEditState({
+            editing: true,
+            value,
+            message: result.messages?.join(",")
+        });
+    }, [
+        column,
+        onEdit
+    ]);
+    const handleDropdownSelectionChange = useCallback((_evt, [selectedOption])=>{
+        if (!selectedOption) return;
+        const value = String(selectedOption.value);
+        isDirtyRef.current = value !== initialValueRef.current;
+        setEditState((state)=>({
+                ...state,
+                editing: true,
+                message: void 0,
+                value
+            }));
+        commit(value).then((committed)=>{
+            if (committed) setEditState((state)=>({
+                    ...state,
+                    editing: false,
+                    value
+                }));
+        });
+    }, [
+        commit
+    ]);
+    return {
+        editing: editState.editing,
+        inputProps: {
+            onBlur: handleBlur,
+            onFocus: handleFocus,
+            type: textType
+        },
+        onKeyDown: handleKeyDown,
+        previousValue: editState.previousValue,
+        value: editState.value,
+        warningMessage: editState.message,
+        onChange: handleChange,
+        onDropdownSelectionChange: handleDropdownSelectionChange
+    };
+};
+export { useEditField };

package/src/edit-utils.js

@@ -4,7 +4,7 @@ const timeFormatter = formatDate({
     time: "hh:mm:ss"
 });
 const dataRowEditErrors = Symbol("vuuDataRowEditErrors");
-const isEditRowReadOnly = (dataRow)=>"deleteRow" === dataRow.vuuAction;
+const isEditRowReadOnly = (dataRow)=>dataRow.hasColumn("vuuAction") && "deleteRow" === dataRow.vuuAction;
 const withDataRowEditErrors = (dataRow, errors)=>{
     Object.defineProperty(dataRow, dataRowEditErrors, {
         configurable: true,

package/src/index.js

@@ -1,10 +1,16 @@
-export { DataEditingProvider, useEditSession } from "./DataEditingProvider.js";
+export { DataEditingProvider, useEditSession, useTableEditSession } from "./DataEditingProvider.js";
+export { DirectEditSession } from "./DirectEditSession.js";
 export { useCellEdited } from "./useCellEdited.js";
+export { useEditState } from "./useEditState.js";
 export { getVuuEditMessage, isEditRowReadOnly, isInlineEditingSession, withDataRowEditErrors } from "./edit-utils.js";
 export { EditButtons } from "./EditButtons.js";
+export { EditField } from "./edit-field/EditField.js";
+export { useEditField } from "./edit-field/useEditField.js";
 export { EditModeProvider, useEditMode } from "./EditModeProvider.js";
 export { EditError, EditSession, SupersededEditError } from "./EditSession.js";
 export { StaleUpdateError } from "@vuu-ui/vuu-utils";
+export { lookupOptionsFromRows, useLookupValues } from "./lookup-values/useLookupValues.js";
+export { useEditable } from "./useEditable.js";
 export { EDIT_ACTION_ROW_CLASS_NAME_GENERATOR, editActionRowClassNameGenerator } from "./editActionRowClassNameGenerator.js";
 export { UNDO_CELL_RENDERER, UndoCellRenderer, getUndoButtonContent, getUndoTooltipContent } from "./UndoCellRenderer.js";
 export { useEditableTable } from "./useEditableTable.js";

package/src/lookup-values/useLookupValues.js

@@ -0,0 +1,78 @@
+import { Range, useData } from "@vuu-ui/vuu-utils";
+import { useEffect, useMemo, useState } from "react";
+const DATA_ROW_COLUMN_OFFSET = 10;
+const lookupOptionsFromRows = (columns, rows, optionMap)=>{
+    const requestedColumns = [
+        optionMap.value,
+        optionMap.label,
+        ...optionMap.additionalFields ?? []
+    ];
+    const missingColumns = requestedColumns.filter((column)=>!columns.includes(column));
+    if (missingColumns.length > 0) throw Error(`[useLookupValues] lookup columns not found: ${requestedColumns.join(", ")}`);
+    return rows.map((row)=>{
+        const metadata = Object.fromEntries((optionMap.additionalFields ?? []).map((field)=>[
+                field,
+                String(row[columns.indexOf(field) + DATA_ROW_COLUMN_OFFSET])
+            ]));
+        return {
+            value: String(row[columns.indexOf(optionMap.value) + DATA_ROW_COLUMN_OFFSET]),
+            label: String(row[columns.indexOf(optionMap.label) + DATA_ROW_COLUMN_OFFSET]),
+            ...Object.keys(metadata).length > 0 ? {
+                metadata
+            } : {}
+        };
+    });
+};
+const useLookupValues = ({ enabled, optionMap, table })=>{
+    if (enabled && (void 0 === optionMap || void 0 === table)) throw Error("[useLookupValues] optionsMap and Table must be provided");
+    const { VuuDataSource } = useData();
+    const [options, setOptions] = useState([]);
+    const lookupColumns = useMemo(()=>optionMap ? [
+            optionMap.value,
+            optionMap.label,
+            ...optionMap.additionalFields ?? []
+        ] : [], [
+        optionMap
+    ]);
+    const dataSource = useMemo(()=>enabled && optionMap && table ? new VuuDataSource({
+            columns: lookupColumns,
+            table
+        }) : void 0, [
+        VuuDataSource,
+        enabled,
+        lookupColumns,
+        optionMap,
+        table
+    ]);
+    useEffect(()=>{
+        setOptions([]);
+        if (!dataSource || !optionMap) return;
+        let active = true;
+        let columns;
+        const subscribe = (message)=>{
+            if (!active) return;
+            if ("subscribed" === message.type) {
+                const schemaColumns = new Set(message.tableSchema.columns.map(({ name })=>name));
+                if (!lookupColumns.every((column)=>message.columns.includes(column) && schemaColumns.has(column))) throw Error(`[useLookupValues] lookup columns not found: ${lookupColumns.join(", ")}`);
+                columns = message.columns;
+            } else if ("viewport-update" === message.type && columns) setOptions(lookupOptionsFromRows(columns, message.rows ?? [], optionMap));
+            else if ("subscribe-failed" === message.type) console.error(`Lookup table ${table?.table} subscription failed: ${message.msg}`);
+        };
+        dataSource.subscribe({
+            range: Range(0, 100)
+        }, subscribe).catch((cause)=>{
+            if (active) console.error("Role client dropdown subscription failed:", cause);
+        });
+        return ()=>{
+            active = false;
+            dataSource.unsubscribe();
+        };
+    }, [
+        dataSource,
+        lookupColumns,
+        optionMap,
+        table
+    ]);
+    return options;
+};
+export { lookupOptionsFromRows, useLookupValues };

package/src/useEditState.js

@@ -0,0 +1,15 @@
+import { useCallback, useSyncExternalStore } from "react";
+function useEditState(editSession) {
+    const subscribe = useCallback((onStoreChange)=>{
+        if (!editSession) return ()=>void 0;
+        editSession.on("editState", onStoreChange);
+        return ()=>editSession.removeListener("editState", onStoreChange);
+    }, [
+        editSession
+    ]);
+    const getSnapshot = useCallback(()=>editSession?.editState ?? "clean", [
+        editSession
+    ]);
+    return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+}
+export { useEditState };

package/src/useEditable.js

@@ -0,0 +1,53 @@
+import { EditSession } from "./EditSession.js";
+import { useEditMode } from "./EditModeProvider.js";
+import { useCallback, useEffect, useMemo } from "react";
+const useEditable = ({ copyOption = "Selected", dataSource, onCancel, onSave })=>{
+    const { isEditMode } = useEditMode();
+    const editSession = useMemo(()=>new EditSession({
+            dataSource
+        }), [
+        dataSource
+    ]);
+    const handleCancel = useCallback(async ()=>{
+        try {
+            await editSession.end();
+            onCancel();
+        } catch (error) {
+            console.error("[useEditable] cancel edit session failed", error);
+        }
+    }, [
+        editSession,
+        onCancel
+    ]);
+    const handleSave = useCallback(async (force = false)=>{
+        try {
+            await editSession.end(true, force);
+            onSave();
+        } catch (error) {
+            console.error("[useEditable] save edit session failed", error);
+        }
+    }, [
+        editSession,
+        onSave
+    ]);
+    useEffect(()=>{
+        const transition = isEditMode ? editSession.begin(copyOption) : editSession.end();
+        transition.catch((error)=>{
+            if (isEditMode) {
+                console.error("[useEditable] begin edit session failed", error);
+                handleCancel();
+            } else console.error("[useEditable] end edit session failed", error);
+        });
+    }, [
+        copyOption,
+        editSession,
+        isEditMode,
+        handleCancel
+    ]);
+    return {
+        editSession,
+        onCancel: handleCancel,
+        onSave: handleSave
+    };
+};
+export { useEditable };

package/types/DataEditingProvider.d.ts

@@ -1,8 +1,20 @@
 import { type ReactNode } from "react";
-import type { EditSession } from "./EditSession";
+import { EditSession } from "./EditSession";
+import type { TableEditSession } from "./TableEditSession";
 export declare const DataEditingProvider: ({ children, editSession, }: {
     children: ReactNode;
-    editSession: EditSession;
+    editSession: TableEditSession;
 }) => import("react").JSX.Element;
+/**
+ * Returns the EditSession provided by an enclosing DataEditingProvider. If the
+ * provider holds some other TableEditSession (e.g. DirectEditSession), there is
+ * no EditSession in scope and undefined is returned.
+ */
 export declare function useEditSession(throwIfUnavailable?: false): EditSession | undefined;
 export declare function useEditSession(throwIfUnavailable: true): EditSession;
+/**
+ * Returns whichever TableEditSession is provided by an enclosing
+ * DataEditingProvider. Intended for use by Table cells, which commit and
+ * cancel edits regardless of the type of session.
+ */
+export declare const useTableEditSession: () => TableEditSession | undefined;

package/types/DirectEditSession.d.ts

@@ -0,0 +1,22 @@
+import type { DataSource } from "@vuu-ui/vuu-data-types";
+import type { RpcResult, VuuRowDataItemType } from "@vuu-ui/vuu-protocol-types";
+import { EventEmitter } from "@vuu-ui/vuu-utils";
+import type { TableEditSession, TableEditSessionEvents } from "./TableEditSession";
+export type DirectEditSessionConstructorProps = {
+    dataSource: DataSource;
+};
+/**
+ * A lightweight edit session for services that allow cells to be edited
+ * directly on the source table. There is no begin/end lifecycle, no session
+ * table and no local tracking of edits - each committed edit is sent
+ * immediately via the dataSource editCell RPC.
+ */
+export declare class DirectEditSession extends EventEmitter<TableEditSessionEvents> implements TableEditSession {
+    #private;
+    constructor({ dataSource }: DirectEditSessionConstructorProps);
+    get dataSource(): DataSource;
+    get inEditMode(): boolean;
+    isCellEdited(_key: string, _columnName: string): boolean;
+    cancel(_key: string, _columnName: string, _restoredValue: VuuRowDataItemType): Promise<RpcResult>;
+    commit(key: string, columnName: string, _originalValue: VuuRowDataItemType, typedValue: string | number | boolean, isValid: boolean): Promise<RpcResult>;
+}

package/types/EditButtons.d.ts

@@ -11,4 +11,4 @@ export interface EditButtonProps {
     confirmSave?: () => boolean | Promise<boolean>;
     confirmCancel?: () => boolean | Promise<boolean>;
 }
-export declare const EditButtons: ({ canCancel, canSave, confirmCancel, confirmSave, editSession, hasSelection, onCancel, onDelete, onSave, saveLabel, }: EditButtonProps) => import("react").JSX.Element;
+export declare const EditButtons: ({ canCancel, canSave: _canSave, confirmCancel, confirmSave, editSession, hasSelection, onCancel, onDelete, onSave, saveLabel, }: EditButtonProps) => import("react").JSX.Element;

package/types/EditModeProvider.d.ts

@@ -1,4 +1,4 @@
-import { ReactNode } from "react";
+import { type ReactNode } from "react";
 export interface EditModeContextProps {
     isEditMode: boolean;
     setEditMode: (inEditMode: boolean) => void;
@@ -7,7 +7,8 @@ export interface EditModeContextProps {
  * Implemented as a standalone Provider so that EditMode cna be implemented
  * at higher level than individual edit controls.
  */
-export declare const EditModeProvider: ({ children }: {
+export declare const EditModeProvider: ({ children, isEditMode: isEditModeProp, }: {
     children: ReactNode;
+    isEditMode?: boolean;
 }) => import("react").JSX.Element;
 export declare const useEditMode: () => EditModeContextProps;

package/types/EditSession.d.ts

@@ -1,8 +1,14 @@
 import type { CopyOption, DataSource, DeleteRowMode, SessionType } from "@vuu-ui/vuu-data-types";
 import type { RpcResult, VuuRowDataItemType } from "@vuu-ui/vuu-protocol-types";
 import { EventEmitter } from "@vuu-ui/vuu-utils";
+import type { TableEditSession } from "./TableEditSession";
 export type EditState = "clean" | "dirty" | "invalid" | "stale";
 export type EditActionType = "deleteRow" | "addRow" | "editCell";
+export type EditSessionValue = VuuRowDataItemType | object;
+export type EditCommitOptions = {
+    dataSourceValue?: VuuRowDataItemType;
+    syncToDataSource?: boolean;
+};
 /** Column name to default value mapping applied to every addRow call when a column is absent from the row data. */
 export type RowDefaultDataItemValues = Record<string, VuuRowDataItemType>;
 export type EditSessionApi = "createSessionDataSource" | "beginEditSession";
@@ -49,7 +55,7 @@ type EditSessionEvents = {
     lifecycle: (lifecycle: EditLifecycle) => void;
     newRow: (newRowState: NewRowState) => void;
 };
-export declare class EditSession extends EventEmitter<EditSessionEvents> {
+export declare class EditSession extends EventEmitter<EditSessionEvents> implements TableEditSession {
     #private;
     static readonly newRowKey = "__vuu_new_row__";
     constructor({ dataSource, deleteMode, editSessionApi, rowDefaults, }: EditSessionConstructorProps);
@@ -58,6 +64,9 @@ export declare class EditSession extends EventEmitter<EditSessionEvents> {
     get deleteCount(): number;
     get addCount(): number;
     get editState(): EditState;
+    get isDirty(): boolean;
+    get canCancel(): boolean;
+    get canSave(): boolean;
     get newRowState(): NewRowState;
     isNewRow(key: string): key is "__vuu_new_row__";
     isNewRowFinalColumn(columnName: string): boolean;
@@ -81,6 +90,7 @@ export declare class EditSession extends EventEmitter<EditSessionEvents> {
     end(saveChanges?: boolean, force?: boolean): Promise<void>;
     get lifecycle(): EditLifecycle;
     get inEditMode(): boolean;
-    commit(key: string, columnName: string, originalValue: VuuRowDataItemType, typedValue: string | number | boolean, isValid: boolean): Promise<RpcResult>;
+    cancel(key: string, columnName: string, restoredValue: VuuRowDataItemType): Promise<RpcResult>;
+    commit(key: string, columnName: string, originalValue: EditSessionValue, typedValue: EditSessionValue, isValid: boolean, { dataSourceValue, syncToDataSource }?: EditCommitOptions): Promise<RpcResult>;
 }
 export {};

package/types/TableEditSession.d.ts

@@ -0,0 +1,28 @@
+import type { RpcResult, VuuRowDataItemType } from "@vuu-ui/vuu-protocol-types";
+export type TableEditSessionEvents = {
+    cellEditChanged: (key: string, columnName: string) => void;
+};
+/**
+ * The subset of edit session behaviour consumed by Table and its cells.
+ * Implemented by EditSession (edits staged in a session table, committed or
+ * discarded at end of session) and DirectEditSession (edits applied directly
+ * to the source table).
+ */
+export interface TableEditSession {
+    /**
+     * True while a staged edit session is in progress. Always false for
+     * DirectEditSession.
+     */
+    readonly inEditMode: boolean;
+    commit(key: string, columnName: string, originalValue: VuuRowDataItemType, typedValue: string | number | boolean, isValid: boolean): Promise<RpcResult>;
+    /**
+     * Invoked when user abandons an in-progress cell edit, restoring the value
+     * the cell held before editing began. Values that have only been typed, not
+     * committed, have never been sent to the server, so nothing is sent here.
+     * Any invalid edit previously recorded for the cell is discarded.
+     */
+    cancel(key: string, columnName: string, restoredValue: VuuRowDataItemType): Promise<RpcResult>;
+    isCellEdited(key: string, columnName: string): boolean;
+    on<E extends keyof TableEditSessionEvents>(event: E, listener: TableEditSessionEvents[E]): void;
+    removeListener<E extends keyof TableEditSessionEvents>(event: E, listener: TableEditSessionEvents[E]): void;
+}

package/types/edit-field/EditField.d.ts

@@ -0,0 +1,21 @@
+import type { DataRow } from "@vuu-ui/vuu-table-types";
+import type { VuuTable } from "@vuu-ui/vuu-protocol-types";
+import { type OptionMap } from "../lookup-values/useLookupValues";
+import "./EditField.css";
+export type TextFieldType = "email" | "password";
+export type EditFieldType = "checkbox" | "dropdown" | TextFieldType;
+export interface EditFieldProps {
+    dataRow: DataRow;
+    deferNewRow?: boolean;
+    label: string;
+    name: string;
+    readOnly?: boolean;
+    required?: boolean;
+    type?: EditFieldType;
+}
+export interface DropdownEditFieldProps extends EditFieldProps {
+    type: "dropdown";
+    optionMap: OptionMap;
+    table: VuuTable;
+}
+export declare const EditField: ({ dataRow, deferNewRow, label, name, readOnly, required, type, ...options }: EditFieldProps | DropdownEditFieldProps) => import("react").JSX.Element;

package/types/edit-field/useEditField.d.ts

@@ -0,0 +1,26 @@
+import type { VuuRowDataItemType } from "@vuu-ui/vuu-protocol-types";
+import type { RuntimeColumnDescriptor, TableCellEditHandler } from "@vuu-ui/vuu-table-types";
+import { type ChangeEventHandler, type FocusEventHandler, type KeyboardEvent, type SyntheticEvent } from "react";
+import type { LookupOption } from "../lookup-values/useLookupValues";
+import type { TextFieldType } from "./EditField";
+export interface EditFieldHookProps<T extends VuuRowDataItemType = VuuRowDataItemType> {
+    column: Pick<RuntimeColumnDescriptor, "clientSideEditValidationCheck" | "label" | "name">;
+    value?: T;
+    onEdit?: TableCellEditHandler;
+    textType?: TextFieldType;
+    type?: "string" | "number" | "boolean";
+}
+export declare const useEditField: <T extends string | number | boolean = string>({ column, value, onEdit, textType, type, }: EditFieldHookProps<T>) => {
+    editing: boolean;
+    inputProps: {
+        onBlur: FocusEventHandler<HTMLElement>;
+        onFocus: FocusEventHandler<HTMLElement>;
+        type: TextFieldType | undefined;
+    };
+    onKeyDown: (evt: KeyboardEvent<HTMLElement>) => Promise<void>;
+    previousValue: string | undefined;
+    value: string;
+    warningMessage: string | undefined;
+    onChange: ChangeEventHandler<HTMLInputElement>;
+    onDropdownSelectionChange: (_evt: SyntheticEvent, [selectedOption]: LookupOption[]) => void;
+};

package/types/index.d.ts

@@ -1,10 +1,17 @@
-export { DataEditingProvider, useEditSession } from "./DataEditingProvider";
+export { DataEditingProvider, useEditSession, useTableEditSession, } from "./DataEditingProvider";
+export { DirectEditSession, type DirectEditSessionConstructorProps, } from "./DirectEditSession";
+export type { TableEditSession, TableEditSessionEvents, } from "./TableEditSession";
 export { useCellEdited } from "./useCellEdited";
+export { useEditState } from "./useEditState";
 export { getVuuEditMessage, isInlineEditingSession, isEditRowReadOnly, withDataRowEditErrors, } from "./edit-utils";
 export { EditButtons, type EditButtonProps } from "./EditButtons";
+export { EditField, type DropdownEditFieldProps, type EditFieldProps, type EditFieldType, type TextFieldType, } from "./edit-field/EditField";
+export { useEditField, type EditFieldHookProps, } from "./edit-field/useEditField";
 export { EditModeProvider, useEditMode, type EditModeContextProps, } from "./EditModeProvider";
-export { EditError, EditSession, SupersededEditError, type EditActionType, type EditLifecycle, type EditSessionConstructorProps, type NewRowState, type EditState, type RowDefaultDataItemValues, } from "./EditSession";
+export { EditError, EditSession, SupersededEditError, type EditActionType, type EditCommitOptions, type EditLifecycle, type EditSessionConstructorProps, type EditSessionValue, type NewRowState, type EditState, type RowDefaultDataItemValues, } from "./EditSession";
 export { StaleUpdateError } from "@vuu-ui/vuu-utils";
+export { lookupOptionsFromRows, useLookupValues, type LookupOption, type LookupValuedHookProps, type OptionMap, } from "./lookup-values/useLookupValues";
+export { useEditable, type EditableHookProps } from "./useEditable";
 export { EDIT_ACTION_ROW_CLASS_NAME_GENERATOR, editActionRowClassNameGenerator, } from "./editActionRowClassNameGenerator";
 export { getUndoButtonContent, getUndoTooltipContent, UNDO_CELL_RENDERER, UndoCellRenderer, type UndoCellRendererComponentProps, } from "./UndoCellRenderer";
 export { useEditableTable, type EditableTableHookProps, type EditMode, } from "./useEditableTable";

package/types/lookup-values/useLookupValues.d.ts

@@ -0,0 +1,19 @@
+import type { DataSourceRow } from "@vuu-ui/vuu-data-types";
+import type { VuuTable } from "@vuu-ui/vuu-protocol-types";
+export type LookupOption = {
+    label: string;
+    metadata?: Record<string, string>;
+    value: number | string;
+};
+export type OptionMap = {
+    additionalFields?: readonly string[];
+    label: string;
+    value: string;
+};
+export interface LookupValuedHookProps {
+    enabled: boolean;
+    optionMap?: OptionMap;
+    table?: VuuTable;
+}
+export declare const lookupOptionsFromRows: (columns: string[], rows: DataSourceRow[], optionMap: OptionMap) => LookupOption[];
+export declare const useLookupValues: ({ enabled, optionMap, table, }: LookupValuedHookProps) => LookupOption[];

package/types/useCellEdited.d.ts

@@ -1,2 +1,2 @@
-import type { EditSession } from "./EditSession";
-export declare const useCellEdited: (editSession: EditSession | undefined, key: string, columnName: string) => boolean;
+import type { TableEditSession } from "./TableEditSession";
+export declare const useCellEdited: (editSession: TableEditSession | undefined, key: string, columnName: string) => boolean;

package/types/useEditState.d.ts

@@ -0,0 +1,2 @@
+import type { EditSession, EditState } from "./EditSession";
+export declare function useEditState(editSession: EditSession | undefined): EditState;

package/types/useEditable.d.ts

@@ -0,0 +1,13 @@
+import type { CopyOption, DataSource } from "@vuu-ui/vuu-data-types";
+import { EditSession } from "./EditSession";
+export interface EditableHookProps {
+    copyOption?: CopyOption;
+    dataSource: DataSource;
+    onCancel: () => void;
+    onSave: () => void;
+}
+export declare const useEditable: ({ copyOption, dataSource, onCancel, onSave, }: EditableHookProps) => {
+    editSession: EditSession;
+    onCancel: () => Promise<void>;
+    onSave: (force?: boolean) => Promise<void>;
+};