@vuu-ui/vuu-table 0.13.113 → 0.13.115-alpha.1

package/cjs/cell-renderers/toggle-cell/ToggleCell.js

@@ -21,9 +21,8 @@ const getValueList = ({ name, type }) => {
 };
 const ToggleCell = react.memo(function ToggleCell2({
   column,
-  columnMap,
-  onEdit,
-  row
+  dataRow,
+  onEdit
 }) {
   const targetWindow = window.useWindow();
   styles.useComponentCssInjection({
@@ -32,8 +31,7 @@ const ToggleCell = react.memo(function ToggleCell2({
     window: targetWindow
   });
   const values = getValueList(column);
-  const dataIdx = columnMap[column.name];
-  const value = row[dataIdx];
+  const value = dataRow[column.name];
   const handleCommit = react.useCallback(
     async (evt, newValue) => {
       const res = await onEdit?.(
@@ -50,11 +48,12 @@ const ToggleCell = react.memo(function ToggleCell2({
   return /* @__PURE__ */ jsxRuntime.jsx(
     vuuUiControls.CycleStateButton,
     {
+      appearance: "solid",
       className: cx(classBase, `${classBase}-${column.name}`),
       onCommit: handleCommit,
+      sentiment: "accented",
       value,
       values,
-      variant: "cta",
       children: value
     }
   );

package/cjs/cell-renderers/toggle-cell/ToggleCell.js.map

@@ -1 +1 @@
-{"version":3,"file":"ToggleCell.js","sources":["../../../../../packages/vuu-table/src/cell-renderers/toggle-cell/ToggleCell.tsx"],"sourcesContent":["import {\n  ColumnDescriptor,\n  TableCellRendererProps,\n} from \"@vuu-ui/vuu-table-types\";\nimport {\n  CommitHandler,\n  dataColumnAndKeyUnchanged,\n  dispatchCustomEvent,\n  isRpcSuccess,\n  isTypeDescriptor,\n  isValueListRenderer,\n  registerComponent,\n} from \"@vuu-ui/vuu-utils\";\nimport { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport cx from \"clsx\";\n\nimport { memo, useCallback } from \"react\";\nimport { CycleStateButton } from \"@vuu-ui/vuu-ui-controls\";\n\nimport toggleCellCss from \"./ToggleCell.css\";\n\nconst classBase = \"vuuTableToggleCell\";\n\nconst getValueList = ({ name, type }: ColumnDescriptor) => {\n  if (isTypeDescriptor(type) && isValueListRenderer(type.renderer)) {\n    return type.renderer.values;\n  } else {\n    throw Error(\n      `useLookupValues column ${name} has not been configured with a values list`,\n    );\n  }\n};\n\nexport const ToggleCell = memo(function ToggleCell({\n  column,\n  columnMap,\n  onEdit,\n  row,\n}: TableCellRendererProps) {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-toggle-cell\",\n    css: toggleCellCss,\n    window: targetWindow,\n  });\n\n  const values = getValueList(column);\n  const dataIdx = columnMap[column.name];\n  const value = row[dataIdx] as string;\n\n  const handleCommit = useCallback<CommitHandler<HTMLButtonElement>>(\n    async (evt, newValue) => {\n      const res = await onEdit?.(\n        { previousValue: value, value: newValue },\n        \"commit\",\n      );\n      if (isRpcSuccess(res)) {\n        dispatchCustomEvent(evt.target as HTMLElement, \"vuu-commit\");\n      }\n      return res;\n    },\n    [onEdit, value],\n  );\n\n  return (\n    <CycleStateButton\n      className={cx(classBase, `${classBase}-${column.name}`)}\n      onCommit={handleCommit}\n      value={value}\n      values={values}\n      variant=\"cta\"\n    >\n      {value}\n    </CycleStateButton>\n  );\n}, dataColumnAndKeyUnchanged);\n\nregisterComponent(\"toggle-cell\", ToggleCell, \"cell-renderer\", {\n  userCanAssign: false,\n});\n"],"names":["isTypeDescriptor","isValueListRenderer","memo","ToggleCell","useWindow","useComponentCssInjection","toggleCellCss","useCallback","isRpcSuccess","dispatchCustomEvent","jsx","CycleStateButton","dataColumnAndKeyUnchanged","registerComponent"],"mappings":";;;;;;;;;;;AAsBA,MAAM,SAAY,GAAA,oBAAA;AAElB,MAAM,YAAe,GAAA,CAAC,EAAE,IAAA,EAAM,MAA6B,KAAA;AACzD,EAAA,IAAIA,0BAAiB,IAAI,CAAA,IAAKC,4BAAoB,CAAA,IAAA,CAAK,QAAQ,CAAG,EAAA;AAChE,IAAA,OAAO,KAAK,QAAS,CAAA,MAAA;AAAA,GAChB,MAAA;AACL,IAAM,MAAA,KAAA;AAAA,MACJ,0BAA0B,IAAI,CAAA,2CAAA;AAAA,KAChC;AAAA;AAEJ,CAAA;AAEa,MAAA,UAAA,GAAaC,UAAK,CAAA,SAASC,WAAW,CAAA;AAAA,EACjD,MAAA;AAAA,EACA,SAAA;AAAA,EACA,MAAA;AAAA,EACA;AACF,CAA2B,EAAA;AACzB,EAAA,MAAM,eAAeC,gBAAU,EAAA;AAC/B,EAAyBC,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,iBAAA;AAAA,IACR,GAAK,EAAAC,YAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAM,MAAA,MAAA,GAAS,aAAa,MAAM,CAAA;AAClC,EAAM,MAAA,OAAA,GAAU,SAAU,CAAA,MAAA,CAAO,IAAI,CAAA;AACrC,EAAM,MAAA,KAAA,GAAQ,IAAI,OAAO,CAAA;AAEzB,EAAA,MAAM,YAAe,GAAAC,iBAAA;AAAA,IACnB,OAAO,KAAK,QAAa,KAAA;AACvB,MAAA,MAAM,MAAM,MAAM,MAAA;AAAA,QAChB,EAAE,aAAA,EAAe,KAAO,EAAA,KAAA,EAAO,QAAS,EAAA;AAAA,QACxC;AAAA,OACF;AACA,MAAI,IAAAC,qBAAA,CAAa,GAAG,CAAG,EAAA;AACrB,QAAoBC,4BAAA,CAAA,GAAA,CAAI,QAAuB,YAAY,CAAA;AAAA;AAE7D,MAAO,OAAA,GAAA;AAAA,KACT;AAAA,IACA,CAAC,QAAQ,KAAK;AAAA,GAChB;AAEA,EACE,uBAAAC,cAAA;AAAA,IAACC,8BAAA;AAAA,IAAA;AAAA,MACC,SAAA,EAAW,GAAG,SAAW,EAAA,CAAA,EAAG,SAAS,CAAI,CAAA,EAAA,MAAA,CAAO,IAAI,CAAE,CAAA,CAAA;AAAA,MACtD,QAAU,EAAA,YAAA;AAAA,MACV,KAAA;AAAA,MACA,MAAA;AAAA,MACA,OAAQ,EAAA,KAAA;AAAA,MAEP,QAAA,EAAA;AAAA;AAAA,GACH;AAEJ,CAAA,EAAGC,kCAAyB;AAE5BC,0BAAkB,CAAA,aAAA,EAAe,YAAY,eAAiB,EAAA;AAAA,EAC5D,aAAe,EAAA;AACjB,CAAC,CAAA;;;;"}
+{"version":3,"file":"ToggleCell.js","sources":["../../../../../packages/vuu-table/src/cell-renderers/toggle-cell/ToggleCell.tsx"],"sourcesContent":["import {\n  ColumnDescriptor,\n  TableCellRendererProps,\n} from \"@vuu-ui/vuu-table-types\";\nimport {\n  CommitHandler,\n  dataColumnAndKeyUnchanged,\n  dispatchCustomEvent,\n  isRpcSuccess,\n  isTypeDescriptor,\n  isValueListRenderer,\n  registerComponent,\n} from \"@vuu-ui/vuu-utils\";\nimport { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport cx from \"clsx\";\n\nimport { memo, useCallback } from \"react\";\nimport { CycleStateButton } from \"@vuu-ui/vuu-ui-controls\";\n\nimport toggleCellCss from \"./ToggleCell.css\";\n\nconst classBase = \"vuuTableToggleCell\";\n\nconst getValueList = ({ name, type }: ColumnDescriptor) => {\n  if (isTypeDescriptor(type) && isValueListRenderer(type.renderer)) {\n    return type.renderer.values;\n  } else {\n    throw Error(\n      `useLookupValues column ${name} has not been configured with a values list`,\n    );\n  }\n};\n\nexport const ToggleCell = memo(function ToggleCell({\n  column,\n  dataRow,\n  onEdit,\n}: TableCellRendererProps) {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-toggle-cell\",\n    css: toggleCellCss,\n    window: targetWindow,\n  });\n\n  const values = getValueList(column);\n  const value = dataRow[column.name] as string;\n\n  const handleCommit = useCallback<CommitHandler<HTMLButtonElement>>(\n    async (evt, newValue) => {\n      const res = await onEdit?.(\n        { previousValue: value, value: newValue },\n        \"commit\",\n      );\n      if (isRpcSuccess(res)) {\n        dispatchCustomEvent(evt.target as HTMLElement, \"vuu-commit\");\n      }\n      return res;\n    },\n    [onEdit, value],\n  );\n\n  return (\n    <CycleStateButton\n      appearance=\"solid\"\n      className={cx(classBase, `${classBase}-${column.name}`)}\n      onCommit={handleCommit}\n      sentiment=\"accented\"\n      value={value}\n      values={values}\n    >\n      {value}\n    </CycleStateButton>\n  );\n}, dataColumnAndKeyUnchanged);\n\nregisterComponent(\"toggle-cell\", ToggleCell, \"cell-renderer\", {\n  userCanAssign: false,\n});\n"],"names":["isTypeDescriptor","isValueListRenderer","memo","ToggleCell","useWindow","useComponentCssInjection","toggleCellCss","useCallback","isRpcSuccess","dispatchCustomEvent","jsx","CycleStateButton","dataColumnAndKeyUnchanged","registerComponent"],"mappings":";;;;;;;;;;;AAsBA,MAAM,SAAY,GAAA,oBAAA;AAElB,MAAM,YAAe,GAAA,CAAC,EAAE,IAAA,EAAM,MAA6B,KAAA;AACzD,EAAA,IAAIA,0BAAiB,IAAI,CAAA,IAAKC,4BAAoB,CAAA,IAAA,CAAK,QAAQ,CAAG,EAAA;AAChE,IAAA,OAAO,KAAK,QAAS,CAAA,MAAA;AAAA,GAChB,MAAA;AACL,IAAM,MAAA,KAAA;AAAA,MACJ,0BAA0B,IAAI,CAAA,2CAAA;AAAA,KAChC;AAAA;AAEJ,CAAA;AAEa,MAAA,UAAA,GAAaC,UAAK,CAAA,SAASC,WAAW,CAAA;AAAA,EACjD,MAAA;AAAA,EACA,OAAA;AAAA,EACA;AACF,CAA2B,EAAA;AACzB,EAAA,MAAM,eAAeC,gBAAU,EAAA;AAC/B,EAAyBC,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,iBAAA;AAAA,IACR,GAAK,EAAAC,YAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAM,MAAA,MAAA,GAAS,aAAa,MAAM,CAAA;AAClC,EAAM,MAAA,KAAA,GAAQ,OAAQ,CAAA,MAAA,CAAO,IAAI,CAAA;AAEjC,EAAA,MAAM,YAAe,GAAAC,iBAAA;AAAA,IACnB,OAAO,KAAK,QAAa,KAAA;AACvB,MAAA,MAAM,MAAM,MAAM,MAAA;AAAA,QAChB,EAAE,aAAA,EAAe,KAAO,EAAA,KAAA,EAAO,QAAS,EAAA;AAAA,QACxC;AAAA,OACF;AACA,MAAI,IAAAC,qBAAA,CAAa,GAAG,CAAG,EAAA;AACrB,QAAoBC,4BAAA,CAAA,GAAA,CAAI,QAAuB,YAAY,CAAA;AAAA;AAE7D,MAAO,OAAA,GAAA;AAAA,KACT;AAAA,IACA,CAAC,QAAQ,KAAK;AAAA,GAChB;AAEA,EACE,uBAAAC,cAAA;AAAA,IAACC,8BAAA;AAAA,IAAA;AAAA,MACC,UAAW,EAAA,OAAA;AAAA,MACX,SAAA,EAAW,GAAG,SAAW,EAAA,CAAA,EAAG,SAAS,CAAI,CAAA,EAAA,MAAA,CAAO,IAAI,CAAE,CAAA,CAAA;AAAA,MACtD,QAAU,EAAA,YAAA;AAAA,MACV,SAAU,EAAA,UAAA;AAAA,MACV,KAAA;AAAA,MACA,MAAA;AAAA,MAEC,QAAA,EAAA;AAAA;AAAA,GACH;AAEJ,CAAA,EAAGC,kCAAyB;AAE5BC,0BAAkB,CAAA,aAAA,EAAe,YAAY,eAAiB,EAAA;AAAA,EAC5D,aAAe,EAAA;AACjB,CAAC,CAAA;;;;"}

package/cjs/data-row/DataRow.js

@@ -0,0 +1,144 @@
+'use strict';
+
+const dataRowIntrinsicAttributes = {
+  childCount: true,
+  depth: true,
+  index: true,
+  isExpanded: true,
+  isSelected: true,
+  isLeaf: true,
+  key: true,
+  renderIndex: true
+};
+const dataRowOperations = {
+  hasColumn: true
+};
+const isDataRowIntrinsicAttribute = (attrName) => dataRowIntrinsicAttributes[attrName] === true;
+const isDataRowOperation = (attrName) => dataRowOperations[attrName] === true;
+const stringNumericTypes = {
+  long: true,
+  scaleddecimal2: true,
+  scaleddecimal4: true,
+  scaleddecimal6: true,
+  scaleddecimal8: true
+};
+const isStringNumericType = (type) => stringNumericTypes[type] === true;
+const MAX_DECIMALS = "0000000";
+const injectDecimalPoint = (value, decimal) => {
+  if (value === "0") {
+    return "0";
+  } else if (value.length < decimal) {
+    return `0.${(MAX_DECIMALS + value).slice(-decimal)}`;
+  } else {
+    return `${value.slice(0, -decimal)}.${value.slice(-decimal)}`;
+  }
+};
+const formatStringNumeric = (value, type) => {
+  switch (type) {
+    case "long":
+      return value;
+    case "scaleddecimal2":
+      return injectDecimalPoint(value, 2);
+    case "scaleddecimal4":
+      return injectDecimalPoint(value, 4);
+    case "scaleddecimal6":
+      return injectDecimalPoint(value, 6);
+    case "scaleddecimal8":
+      return injectDecimalPoint(value, 8);
+  }
+};
+function DataRowImpl(data, columnMap) {
+  const target = {};
+  const jsonSerializer = () => {
+    return Object.entries(columnMap).reduce(
+      (json, [name, mapEntry]) => {
+        if (mapEntry) {
+          json[name] = data[mapEntry.index];
+        }
+        return json;
+      },
+      {}
+    );
+  };
+  const DataRowOperations2 = {
+    hasColumn: (name) => columnMap[name] !== void 0
+  };
+  return new Proxy(target, {
+    get(_obj, prop) {
+      if (typeof prop === "symbol") {
+        return void 0;
+      } else if (prop === "toJSON") {
+        return jsonSerializer;
+      } else if (prop === "toString") {
+        return "DataRow";
+      } else if (prop === "$$typeof") {
+        return void 0;
+      } else if (isDataRowOperation(prop)) {
+        return DataRowOperations2[prop];
+      }
+      const columnMapEntry = columnMap[prop];
+      if (columnMapEntry === void 0) {
+        console.warn(`[DataRow:Proxy] unknown column ${prop}`);
+        return void 0;
+      }
+      if (isDataRowIntrinsicAttribute(prop)) {
+        return data[columnMapEntry.index];
+      }
+      if (isStringNumericType(columnMapEntry.type)) {
+        return formatStringNumeric(
+          data[columnMapEntry.index],
+          columnMapEntry.type
+        );
+      }
+      return data[columnMapEntry.index];
+    },
+    set() {
+      throw new TypeError("DataRow is readonly");
+    }
+  });
+}
+const ColumnMapIntrinsicColumns = {
+  index: { index: 0, type: "int" },
+  renderIndex: { index: 1, type: "int" },
+  isLeaf: { index: 2, type: "boolean" },
+  isExpanded: { index: 3, type: "boolean" },
+  depth: { index: 4, type: "int" },
+  childCount: { index: 5, type: "int" },
+  key: { index: 6, type: "string" },
+  isSelected: { index: 7, type: "boolean" }
+};
+function createColumnMap(columns, schemaColumns) {
+  const columnMap = {
+    ...ColumnMapIntrinsicColumns
+  };
+  columns.forEach((name, i) => {
+    const schemaColumn = schemaColumns.find((col) => col.name === name);
+    if (schemaColumn) {
+      columnMap[name] = { index: i + 10, type: schemaColumn.serverDataType };
+    } else {
+      throw Error(`[DataRow] dataRowFactory column not in schema ${name}`);
+    }
+  });
+  return columnMap;
+}
+const dataRowFactory = (columns, schemaColumns) => {
+  let columnMap = createColumnMap(columns, schemaColumns);
+  columns.forEach((name, i) => {
+    const schemaColumn = schemaColumns.find((col) => col.name === name);
+    if (schemaColumn) {
+      columnMap[name] = { index: i + 10, type: schemaColumn.serverDataType };
+    } else {
+      throw Error(`[DataRow] dataRowFactory column not in schema ${name}`);
+    }
+  });
+  const setColumns = (columns2) => {
+    columnMap = createColumnMap(columns2, schemaColumns);
+  };
+  const DataRow2 = function(data) {
+    return DataRowImpl(data, columnMap);
+  };
+  return [DataRow2, setColumns];
+};
+
+exports.dataRowFactory = dataRowFactory;
+//# sourceMappingURL=DataRow.js.map

package/cjs/data-row/DataRow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataRow.js","sources":["../../../../packages/vuu-table/src/data-row/DataRow.ts"],"sourcesContent":["import { DataSourceRow, SchemaColumn } from \"@vuu-ui/vuu-data-types\";\nimport {\n  StringNumericType,\n  VuuColumnDataType,\n  VuuDataRow,\n  VuuRowDataItemType,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  DataRow,\n  DataRowIntrinsicAttribute,\n  DataRowOperation,\n  DataRowOperations,\n} from \"@vuu-ui/vuu-table-types\";\n\ntype ColumnMapEntry = {\n  index: number;\n  type: VuuColumnDataType;\n};\n\n/**\n * We allow undefined to allow us to null out rather than delete entries, for\n * performance reasons.\n */\ntype DataRowColumnMap = Record<string, ColumnMapEntry | undefined>;\n\nconst dataRowIntrinsicAttributes: Record<DataRowIntrinsicAttribute, true> = {\n  childCount: true,\n  depth: true,\n  index: true,\n  isExpanded: true,\n  isSelected: true,\n  isLeaf: true,\n  key: true,\n  renderIndex: true,\n};\n\nconst dataRowOperations: Record<DataRowOperation, true> = {\n  hasColumn: true,\n};\n\nconst isDataRowIntrinsicAttribute = (\n  attrName: string,\n): attrName is DataRowIntrinsicAttribute =>\n  dataRowIntrinsicAttributes[attrName as DataRowIntrinsicAttribute] === true;\n\nconst isDataRowOperation = (attrName: string): attrName is DataRowOperation =>\n  dataRowOperations[attrName as DataRowOperation] === true;\n\nconst stringNumericTypes: Record<StringNumericType, true> = {\n  long: true,\n  scaleddecimal2: true,\n  scaleddecimal4: true,\n  scaleddecimal6: true,\n  scaleddecimal8: true,\n};\n\nconst isStringNumericType = (\n  type: VuuColumnDataType,\n): type is StringNumericType =>\n  stringNumericTypes[type as StringNumericType] === true;\n\nconst MAX_DECIMALS = \"0000000\";\n\nconst injectDecimalPoint = (value: string, decimal: 2 | 4 | 6 | 8) => {\n  if (value === \"0\") {\n    return \"0\";\n  } else if (value.length < decimal) {\n    return `0.${(MAX_DECIMALS + value).slice(-decimal)}`;\n  } else {\n    return `${value.slice(0, -decimal)}.${value.slice(-decimal)}`;\n  }\n};\n\nconst formatStringNumeric = (value: string, type: StringNumericType) => {\n  switch (type) {\n    case \"long\":\n      return value;\n    case \"scaleddecimal2\":\n      return injectDecimalPoint(value, 2);\n    case \"scaleddecimal4\":\n      return injectDecimalPoint(value, 4);\n    case \"scaleddecimal6\":\n      return injectDecimalPoint(value, 6);\n    case \"scaleddecimal8\":\n      return injectDecimalPoint(value, 8);\n  }\n};\n\nfunction DataRowImpl(data: VuuDataRow, columnMap: DataRowColumnMap): DataRow {\n  const target: Record<string, VuuRowDataItemType> = {};\n\n  const jsonSerializer = () => {\n    return Object.entries(columnMap).reduce<Record<string, VuuRowDataItemType>>(\n      (json, [name, mapEntry]) => {\n        if (mapEntry) {\n          json[name] = data[mapEntry.index];\n        }\n        return json;\n      },\n      {},\n    );\n  };\n\n  const DataRowOperations: DataRowOperations = {\n    hasColumn: (name: string) => columnMap[name] !== undefined,\n  };\n\n  return new Proxy(target, {\n    get(_obj, prop: string | symbol) {\n      if (typeof prop === \"symbol\") {\n        // TODO what does React use this for\n        return undefined;\n      } else if (prop === \"toJSON\") {\n        return jsonSerializer;\n      } else if (prop === \"toString\") {\n        return \"DataRow\";\n      } else if (prop === \"$$typeof\") {\n        // some react internal weirdness\n        return undefined;\n      } else if (isDataRowOperation(prop)) {\n        return DataRowOperations[prop];\n      }\n      const columnMapEntry = columnMap[prop];\n\n      if (columnMapEntry === undefined) {\n        console.warn(`[DataRow:Proxy] unknown column ${prop}`);\n        return undefined;\n      }\n\n      if (isDataRowIntrinsicAttribute(prop)) {\n        return data[columnMapEntry.index];\n      }\n\n      if (isStringNumericType(columnMapEntry.type)) {\n        return formatStringNumeric(\n          data[columnMapEntry.index] as string,\n          columnMapEntry.type,\n        );\n      }\n\n      return data[columnMapEntry.index];\n\n      // throw new Error(`Unknown column: ${prop}`);\n    },\n    set() {\n      throw new TypeError(\"DataRow is readonly\");\n    },\n  }) as DataRow;\n}\n\nexport type DataRowFunc = (data: DataSourceRow) => DataRow;\n\nconst ColumnMapIntrinsicColumns: DataRowColumnMap = {\n  index: { index: 0, type: \"int\" },\n  renderIndex: { index: 1, type: \"int\" },\n  isLeaf: { index: 2, type: \"boolean\" },\n  isExpanded: { index: 3, type: \"boolean\" },\n  depth: { index: 4, type: \"int\" },\n  childCount: { index: 5, type: \"int\" },\n  key: { index: 6, type: \"string\" },\n  isSelected: { index: 7, type: \"boolean\" },\n};\n\nfunction createColumnMap(\n  columns: string[],\n  schemaColumns: readonly SchemaColumn[],\n) {\n  const columnMap: DataRowColumnMap = {\n    ...ColumnMapIntrinsicColumns,\n  };\n\n  columns.forEach((name, i) => {\n    const schemaColumn = schemaColumns.find((col) => col.name === name);\n    if (schemaColumn) {\n      columnMap[name] = { index: i + 10, type: schemaColumn.serverDataType };\n    } else {\n      throw Error(`[DataRow] dataRowFactory column not in schema ${name}`);\n    }\n  });\n  return columnMap;\n}\n\n/**\n *\n * @param columns the names of columns included in subscription\n * @param schemaColumns full schema definitions for all available columns,\n * the serverDataTypes are used.\n * @returns a tuple containing:\n * - factory function that will create a DataRow instance from a DataSourceRow\n * array.\n * - a function that can be used to reset the columns, which will be used for all\n * subsequently created DataRows. Used by Table when user adds or removes columns\n * at runtime.\n */\nexport const dataRowFactory = (\n  columns: string[],\n  schemaColumns: readonly SchemaColumn[],\n): [DataRowFunc, (columns: string[]) => void] => {\n  let columnMap = createColumnMap(columns, schemaColumns);\n\n  columns.forEach((name, i) => {\n    const schemaColumn = schemaColumns.find((col) => col.name === name);\n    if (schemaColumn) {\n      columnMap[name] = { index: i + 10, type: schemaColumn.serverDataType };\n    } else {\n      throw Error(`[DataRow] dataRowFactory column not in schema ${name}`);\n    }\n  });\n\n  const setColumns = (columns: string[]) => {\n    // new columnMap will be used for all subsequently created DataRows\n    columnMap = createColumnMap(columns, schemaColumns);\n  };\n\n  const DataRow = function (data: DataSourceRow) {\n    return DataRowImpl(data, columnMap);\n  };\n\n  return [DataRow, setColumns];\n};\n"],"names":["DataRowOperations","columns","DataRow"],"mappings":"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"}

package/cjs/index.js

@@ -26,6 +26,7 @@ var useTableContextMenu = require('./useTableContextMenu.js');
 var useTableScroll = require('./useTableScroll.js');
 var useTableViewport = require('./useTableViewport.js');
 var VirtualColSpan = require('./VirtualColSpan.js');
+var DataRow = require('./data-row/DataRow.js');
 
 
 
@@ -61,4 +62,5 @@ exports.noScrolling = useTableScroll.noScrolling;
 exports.useTableScroll = useTableScroll.useTableScroll;
 exports.useTableViewport = useTableViewport.useTableViewport;
 exports.VirtualColSpan = VirtualColSpan.VirtualColSpan;
+exports.dataRowFactory = DataRow.dataRowFactory;
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/cjs/table-cell/TableCell.js

@@ -12,10 +12,9 @@ var TableCell$1 = require('./TableCell.css.js');
 const classBase = "vuuTableCell";
 const TableCell = ({
   column,
-  columnMap,
+  dataRow,
   onClick,
   onDataEdited,
-  row,
   searchPattern = ""
 }) => {
   const targetWindow = window.useWindow();
@@ -27,7 +26,6 @@ const TableCell = ({
   const [hasError, setHasError] = react.useState(false);
   const { className, style } = useCell.useCell(column, classBase, false, hasError);
   const { ariaColIndex, CellRenderer, valueFormatter } = column;
-  const dataIdx = columnMap[column.name];
   const handleDataItemEdited = react.useCallback(
     (editState, editPhase) => {
       if (editPhase === "commit") {
@@ -40,7 +38,7 @@ const TableCell = ({
         return onDataEdited?.(
           {
             ...editState,
-            row,
+            dataRow,
             columnName: column.name,
             value: typedValue
           },
@@ -51,7 +49,7 @@ const TableCell = ({
         onDataEdited?.(
           {
             ...editState,
-            row,
+            dataRow,
             columnName: column.name
           },
           editPhase
@@ -59,7 +57,7 @@ const TableCell = ({
         return void 0;
       }
     },
-    [column, onDataEdited, row]
+    [column, dataRow, onDataEdited]
   );
   const handleClick = react.useCallback(
     (evt) => {
@@ -67,7 +65,7 @@ const TableCell = ({
     },
     [column, onClick]
   );
-  const value = valueFormatter(row[dataIdx]);
+  const value = valueFormatter(dataRow[column.name]);
   const valueWithHighlighting = useHighlighting.useHighlighting(value, searchPattern);
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
@@ -81,9 +79,8 @@ const TableCell = ({
         CellRenderer,
         {
           column,
-          columnMap,
+          dataRow,
           onEdit: handleDataItemEdited,
-          row,
           searchPattern
         }
       ) : valueWithHighlighting

package/cjs/table-cell/TableCell.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableCell.js","sources":["../../../../packages/vuu-table/src/table-cell/TableCell.tsx"],"sourcesContent":["import { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport type {\n  TableCellEditHandler,\n  TableCellProps,\n} from \"@vuu-ui/vuu-table-types\";\nimport { getTypedValue } from \"@vuu-ui/vuu-utils\";\nimport { MouseEventHandler, useCallback, useState } from \"react\";\nimport { useCell } from \"../useCell\";\nimport { useHighlighting } from \"../useHighlighting\";\n\nimport tableCellCss from \"./TableCell.css\";\n\nconst classBase = \"vuuTableCell\";\n\nexport const TableCell = ({\n  column,\n  columnMap,\n  onClick,\n  onDataEdited,\n  row,\n  searchPattern = \"\",\n}: TableCellProps) => {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-table-cell\",\n    css: tableCellCss,\n    window: targetWindow,\n  });\n\n  const [hasError, setHasError] = useState(false);\n\n  const { className, style } = useCell(column, classBase, false, hasError);\n  const { ariaColIndex, CellRenderer, valueFormatter } = column;\n  const dataIdx = columnMap[column.name];\n\n  const handleDataItemEdited = useCallback<TableCellEditHandler>(\n    (editState, editPhase) => {\n      if (editPhase === \"commit\") {\n        const { serverDataType = \"string\" } = column;\n        const typedValue = getTypedValue(\n          String(editState.value),\n          serverDataType,\n          true,\n        );\n        return onDataEdited?.(\n          {\n            ...editState,\n            row,\n            columnName: column.name,\n            value: typedValue,\n          },\n          editPhase,\n        );\n      } else {\n        setHasError(editState.isValid === false);\n        onDataEdited?.(\n          {\n            ...editState,\n            row,\n            columnName: column.name,\n          },\n          editPhase,\n        );\n        return undefined;\n      }\n    },\n    [column, onDataEdited, row],\n  );\n\n  const handleClick = useCallback<MouseEventHandler>(\n    (evt) => {\n      onClick?.(evt, column);\n    },\n    [column, onClick],\n  );\n\n  const value = valueFormatter(row[dataIdx]);\n  const valueWithHighlighting = useHighlighting(value, searchPattern);\n\n  return (\n    <div\n      aria-colindex={ariaColIndex}\n      className={className}\n      onClick={onClick ? handleClick : undefined}\n      role=\"cell\"\n      style={style}\n    >\n      {CellRenderer ? (\n        <CellRenderer\n          column={column}\n          columnMap={columnMap}\n          onEdit={handleDataItemEdited}\n          row={row}\n          searchPattern={searchPattern}\n        />\n      ) : (\n        valueWithHighlighting\n      )}\n    </div>\n  );\n};\n"],"names":["useWindow","useComponentCssInjection","tableCellCss","useState","useCell","useCallback","getTypedValue","useHighlighting","jsx"],"mappings":";;;;;;;;;;;AAaA,MAAM,SAAY,GAAA,cAAA;AAEX,MAAM,YAAY,CAAC;AAAA,EACxB,MAAA;AAAA,EACA,SAAA;AAAA,EACA,OAAA;AAAA,EACA,YAAA;AAAA,EACA,GAAA;AAAA,EACA,aAAgB,GAAA;AAClB,CAAsB,KAAA;AACpB,EAAA,MAAM,eAAeA,gBAAU,EAAA;AAC/B,EAAyBC,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,gBAAA;AAAA,IACR,GAAK,EAAAC,WAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAA,MAAM,CAAC,QAAA,EAAU,WAAW,CAAA,GAAIC,eAAS,KAAK,CAAA;AAE9C,EAAM,MAAA,EAAE,WAAW,KAAM,EAAA,GAAIC,gBAAQ,MAAQ,EAAA,SAAA,EAAW,OAAO,QAAQ,CAAA;AACvE,EAAA,MAAM,EAAE,YAAA,EAAc,YAAc,EAAA,cAAA,EAAmB,GAAA,MAAA;AACvD,EAAM,MAAA,OAAA,GAAU,SAAU,CAAA,MAAA,CAAO,IAAI,CAAA;AAErC,EAAA,MAAM,oBAAuB,GAAAC,iBAAA;AAAA,IAC3B,CAAC,WAAW,SAAc,KAAA;AACxB,MAAA,IAAI,cAAc,QAAU,EAAA;AAC1B,QAAM,MAAA,EAAE,cAAiB,GAAA,QAAA,EAAa,GAAA,MAAA;AACtC,QAAA,MAAM,UAAa,GAAAC,sBAAA;AAAA,UACjB,MAAA,CAAO,UAAU,KAAK,CAAA;AAAA,UACtB,cAAA;AAAA,UACA;AAAA,SACF;AACA,QAAO,OAAA,YAAA;AAAA,UACL;AAAA,YACE,GAAG,SAAA;AAAA,YACH,GAAA;AAAA,YACA,YAAY,MAAO,CAAA,IAAA;AAAA,YACnB,KAAO,EAAA;AAAA,WACT;AAAA,UACA;AAAA,SACF;AAAA,OACK,MAAA;AACL,QAAY,WAAA,CAAA,SAAA,CAAU,YAAY,KAAK,CAAA;AACvC,QAAA,YAAA;AAAA,UACE;AAAA,YACE,GAAG,SAAA;AAAA,YACH,GAAA;AAAA,YACA,YAAY,MAAO,CAAA;AAAA,WACrB;AAAA,UACA;AAAA,SACF;AACA,QAAO,OAAA,KAAA,CAAA;AAAA;AACT,KACF;AAAA,IACA,CAAC,MAAQ,EAAA,YAAA,EAAc,GAAG;AAAA,GAC5B;AAEA,EAAA,MAAM,WAAc,GAAAD,iBAAA;AAAA,IAClB,CAAC,GAAQ,KAAA;AACP,MAAA,OAAA,GAAU,KAAK,MAAM,CAAA;AAAA,KACvB;AAAA,IACA,CAAC,QAAQ,OAAO;AAAA,GAClB;AAEA,EAAA,MAAM,KAAQ,GAAA,cAAA,CAAe,GAAI,CAAA,OAAO,CAAC,CAAA;AACzC,EAAM,MAAA,qBAAA,GAAwBE,+BAAgB,CAAA,KAAA,EAAO,aAAa,CAAA;AAElE,EACE,uBAAAC,cAAA;AAAA,IAAC,KAAA;AAAA,IAAA;AAAA,MACC,eAAe,EAAA,YAAA;AAAA,MACf,SAAA;AAAA,MACA,OAAA,EAAS,UAAU,WAAc,GAAA,KAAA,CAAA;AAAA,MACjC,IAAK,EAAA,MAAA;AAAA,MACL,KAAA;AAAA,MAEC,QACC,EAAA,YAAA,mBAAAA,cAAA;AAAA,QAAC,YAAA;AAAA,QAAA;AAAA,UACC,MAAA;AAAA,UACA,SAAA;AAAA,UACA,MAAQ,EAAA,oBAAA;AAAA,UACR,GAAA;AAAA,UACA;AAAA;AAAA,OAGF,GAAA;AAAA;AAAA,GAEJ;AAEJ;;;;"}
+{"version":3,"file":"TableCell.js","sources":["../../../../packages/vuu-table/src/table-cell/TableCell.tsx"],"sourcesContent":["import { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport type {\n  TableCellEditHandler,\n  TableCellProps,\n} from \"@vuu-ui/vuu-table-types\";\nimport { getTypedValue } from \"@vuu-ui/vuu-utils\";\nimport { MouseEventHandler, useCallback, useState } from \"react\";\nimport { useCell } from \"../useCell\";\nimport { useHighlighting } from \"../useHighlighting\";\n\nimport tableCellCss from \"./TableCell.css\";\n\nconst classBase = \"vuuTableCell\";\n\nexport const TableCell = ({\n  column,\n  dataRow,\n  onClick,\n  onDataEdited,\n  searchPattern = \"\",\n}: TableCellProps) => {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-table-cell\",\n    css: tableCellCss,\n    window: targetWindow,\n  });\n\n  const [hasError, setHasError] = useState(false);\n\n  const { className, style } = useCell(column, classBase, false, hasError);\n  const { ariaColIndex, CellRenderer, valueFormatter } = column;\n  // const dataIdx = columnMap[column.name];\n\n  const handleDataItemEdited = useCallback<TableCellEditHandler>(\n    (editState, editPhase) => {\n      if (editPhase === \"commit\") {\n        const { serverDataType = \"string\" } = column;\n        const typedValue = getTypedValue(\n          String(editState.value),\n          serverDataType,\n          true,\n        );\n        return onDataEdited?.(\n          {\n            ...editState,\n            dataRow,\n            columnName: column.name,\n            value: typedValue,\n          },\n          editPhase,\n        );\n      } else {\n        setHasError(editState.isValid === false);\n        onDataEdited?.(\n          {\n            ...editState,\n            dataRow,\n            columnName: column.name,\n          },\n          editPhase,\n        );\n        return undefined;\n      }\n    },\n    [column, dataRow, onDataEdited],\n  );\n\n  const handleClick = useCallback<MouseEventHandler>(\n    (evt) => {\n      onClick?.(evt, column);\n    },\n    [column, onClick],\n  );\n\n  const value = valueFormatter(dataRow[column.name]);\n  const valueWithHighlighting = useHighlighting(value, searchPattern);\n\n  return (\n    <div\n      aria-colindex={ariaColIndex}\n      className={className}\n      onClick={onClick ? handleClick : undefined}\n      role=\"cell\"\n      style={style}\n    >\n      {CellRenderer ? (\n        <CellRenderer\n          column={column}\n          dataRow={dataRow}\n          onEdit={handleDataItemEdited}\n          searchPattern={searchPattern}\n        />\n      ) : (\n        valueWithHighlighting\n      )}\n    </div>\n  );\n};\n"],"names":["useWindow","useComponentCssInjection","tableCellCss","useState","useCell","useCallback","getTypedValue","useHighlighting","jsx"],"mappings":";;;;;;;;;;;AAaA,MAAM,SAAY,GAAA,cAAA;AAEX,MAAM,YAAY,CAAC;AAAA,EACxB,MAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,YAAA;AAAA,EACA,aAAgB,GAAA;AAClB,CAAsB,KAAA;AACpB,EAAA,MAAM,eAAeA,gBAAU,EAAA;AAC/B,EAAyBC,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,gBAAA;AAAA,IACR,GAAK,EAAAC,WAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAA,MAAM,CAAC,QAAA,EAAU,WAAW,CAAA,GAAIC,eAAS,KAAK,CAAA;AAE9C,EAAM,MAAA,EAAE,WAAW,KAAM,EAAA,GAAIC,gBAAQ,MAAQ,EAAA,SAAA,EAAW,OAAO,QAAQ,CAAA;AACvE,EAAA,MAAM,EAAE,YAAA,EAAc,YAAc,EAAA,cAAA,EAAmB,GAAA,MAAA;AAGvD,EAAA,MAAM,oBAAuB,GAAAC,iBAAA;AAAA,IAC3B,CAAC,WAAW,SAAc,KAAA;AACxB,MAAA,IAAI,cAAc,QAAU,EAAA;AAC1B,QAAM,MAAA,EAAE,cAAiB,GAAA,QAAA,EAAa,GAAA,MAAA;AACtC,QAAA,MAAM,UAAa,GAAAC,sBAAA;AAAA,UACjB,MAAA,CAAO,UAAU,KAAK,CAAA;AAAA,UACtB,cAAA;AAAA,UACA;AAAA,SACF;AACA,QAAO,OAAA,YAAA;AAAA,UACL;AAAA,YACE,GAAG,SAAA;AAAA,YACH,OAAA;AAAA,YACA,YAAY,MAAO,CAAA,IAAA;AAAA,YACnB,KAAO,EAAA;AAAA,WACT;AAAA,UACA;AAAA,SACF;AAAA,OACK,MAAA;AACL,QAAY,WAAA,CAAA,SAAA,CAAU,YAAY,KAAK,CAAA;AACvC,QAAA,YAAA;AAAA,UACE;AAAA,YACE,GAAG,SAAA;AAAA,YACH,OAAA;AAAA,YACA,YAAY,MAAO,CAAA;AAAA,WACrB;AAAA,UACA;AAAA,SACF;AACA,QAAO,OAAA,KAAA,CAAA;AAAA;AACT,KACF;AAAA,IACA,CAAC,MAAQ,EAAA,OAAA,EAAS,YAAY;AAAA,GAChC;AAEA,EAAA,MAAM,WAAc,GAAAD,iBAAA;AAAA,IAClB,CAAC,GAAQ,KAAA;AACP,MAAA,OAAA,GAAU,KAAK,MAAM,CAAA;AAAA,KACvB;AAAA,IACA,CAAC,QAAQ,OAAO;AAAA,GAClB;AAEA,EAAA,MAAM,KAAQ,GAAA,cAAA,CAAe,OAAQ,CAAA,MAAA,CAAO,IAAI,CAAC,CAAA;AACjD,EAAM,MAAA,qBAAA,GAAwBE,+BAAgB,CAAA,KAAA,EAAO,aAAa,CAAA;AAElE,EACE,uBAAAC,cAAA;AAAA,IAAC,KAAA;AAAA,IAAA;AAAA,MACC,eAAe,EAAA,YAAA;AAAA,MACf,SAAA;AAAA,MACA,OAAA,EAAS,UAAU,WAAc,GAAA,KAAA,CAAA;AAAA,MACjC,IAAK,EAAA,MAAA;AAAA,MACL,KAAA;AAAA,MAEC,QACC,EAAA,YAAA,mBAAAA,cAAA;AAAA,QAAC,YAAA;AAAA,QAAA;AAAA,UACC,MAAA;AAAA,UACA,OAAA;AAAA,UACA,MAAQ,EAAA,oBAAA;AAAA,UACR;AAAA;AAAA,OAGF,GAAA;AAAA;AAAA,GAEJ;AAEJ;;;;"}

package/cjs/table-cell/TableGroupCell.css.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tableGroupCellCss = ".vuuTableGroupCell.vuuTableCell {\n  --group-cell-spacer-width: 20px;\n  align-items: center;\n  border-right-color: var(\n    --vuuTableGroupCell-borderColor,\n    var(--salt-separable-tertiary-borderColor)\n  );\n  border-right-style: solid;\n  border-right-width: 1px;\n\n  cursor: pointer;\n  display: inline-flex;\n  line-height: 16px;\n\n  .vuuIcon {\n    --vuu-icon-height: 20px;\n    --vuu-icon-width: 20px;\n    margin-right: var(--salt-spacing-100);\n    min-width: 20px;\n  }\n\n  .vuuTableGroupCell-toggle {\n    --vuu-icon-height: 16px;\n    --vuu-icon-size: 7px;\n    --vuu-icon-width: 8px;\n    margin-right: 4px;\n    transition: transform 0.25s;\n    transform: var(--toggle-icon-transform);\n  }\n\n  .vuuTableGroupCell-label {\n    overflow: hidden;\n    text-overflow: ellipsis;\n  }\n}\n\n[aria-level=\"2\"] {\n  --indent: 1;\n}\n[aria-level=\"3\"] {\n  --indent: 2;\n}\n[aria-level=\"4\"] {\n  --indent: 3;\n}\n[aria-level=\"5\"] {\n  --indent: 4;\n}\n[aria-level=\"6\"] {\n  --indent: 5;\n}\n[aria-level=\"7\"] {\n  --indent: 6;\n}\n[aria-level=\"8\"] {\n  --indent: 7;\n}\n[aria-level=\"9\"] {\n  --indent: 8;\n}\n[aria-level=\"10\"] {\n  --indent: 9;\n}\n\n.vuuTableGroupCell-spacer {\n  display: inline-block;\n  min-width: calc(var(--indent, 0) * var(--group-cell-spacer-width));\n}\n\n.vuuTreeTable {\n  .vuuTableGroupCell.vuuTableCell {\n    border-right: none;\n  } \n}";
+var tableGroupCellCss = ".vuuTableGroupCell.vuuTableCell {\n  --group-cell-spacer-width: 20px;\n  align-items: center;\n  border-right-color: var(\n    --vuuTableGroupCell-borderColor,\n    var(--salt-separable-tertiary-borderColor)\n  );\n  border-right-style: solid;\n  border-right-width: 1px;\n\n  cursor: pointer;\n  display: inline-flex;\n  line-height: 16px;\n\n  .vuuIcon {\n    --vuu-icon-height: 20px;\n    --vuu-icon-width: 20px;\n    margin-right: var(--salt-spacing-100);\n    min-width: 20px;\n  }\n\n  .vuuToggleIconButton.saltButton {\n      --saltButton-height: 20px;\n      --saltButton-width: 20px;\n  }\n\n  .vuuTableGroupCell-label {\n    overflow: hidden;\n    text-overflow: ellipsis;\n  }\n}\n\n[aria-level=\"2\"] {\n  --indent: 1;\n  &:not([aria-expanded]){\n    --indent: 2;\n  }\n}\n[aria-level=\"3\"] {\n  --indent: 2;\n  &:not([aria-expanded]){\n    --indent: 3;\n  }\n}\n[aria-level=\"4\"] {\n  --indent: 3;\n  &:not([aria-expanded]){\n    --indent: 4;\n  }\n}\n[aria-level=\"5\"] {\n  --indent: 4;\n}\n[aria-level=\"6\"] {\n  --indent: 5;\n}\n[aria-level=\"7\"] {\n  --indent: 6;\n}\n[aria-level=\"8\"] {\n  --indent: 7;\n}\n[aria-level=\"9\"] {\n  --indent: 8;\n}\n[aria-level=\"10\"] {\n  --indent: 9;\n}\n\n.vuuTableGroupCell-spacer {\n  display: inline-block;\n  min-width: calc(var(--indent, 0) * var(--group-cell-spacer-width));\n}\n\n.vuuTreeTable {\n  .vuuTableGroupCell.vuuTableCell {\n    border-right: none;\n  } \n}";
 
 module.exports = tableGroupCellCss;
 //# sourceMappingURL=TableGroupCell.css.js.map

package/cjs/table-cell/TableGroupCell.js

@@ -12,13 +12,11 @@ var TableCell = require('./TableCell.css.js');
 var TableGroupCell$1 = require('./TableGroupCell.css.js');
 var useHighlighting = require('../useHighlighting.js');
 
-const { COUNT, IS_EXPANDED, IS_LEAF } = vuuUtils.metadataKeys;
 const classBase = "vuuTableGroupCell";
 const TableGroupCell = ({
   column,
-  columnMap,
+  dataRow,
   onClick,
-  row,
   searchPattern = ""
 }) => {
   const targetWindow = window.useWindow();
@@ -33,9 +31,9 @@ const TableGroupCell = ({
     window: targetWindow
   });
   const { columns } = column;
-  const value = vuuUtils.getGroupValue(columns, row, columnMap);
+  const value = vuuUtils.getGroupValue(columns, dataRow);
   const valueWithHighlighting = useHighlighting.useHighlighting(value || "", searchPattern);
-  const icon = vuuUtils.getGroupIcon(columns, row);
+  const icon = vuuUtils.getGroupIcon(columns, dataRow);
   const { className, style } = useCell.useCell(column, classBase);
   const handleClick = react.useCallback(
     (evt) => {
@@ -43,7 +41,8 @@ const TableGroupCell = ({
     },
     [column, onClick]
   );
-  const { [COUNT]: count, [IS_EXPANDED]: isExpanded, [IS_LEAF]: isLeaf } = row;
+  const { childCount, isExpanded, isLeaf } = dataRow;
+  const isLeafNode = isLeaf || childCount == 0;
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
     {
@@ -51,10 +50,10 @@ const TableGroupCell = ({
       className: cx(className, "vuuTableCell"),
       role: "cell",
       style,
-      onClick: isLeaf ? void 0 : handleClick,
+      onClick: isLeafNode ? void 0 : handleClick,
       children: [
         /* @__PURE__ */ jsxRuntime.jsx("span", { className: `${classBase}-spacer` }),
-        isLeaf || count == 0 ? null : /* @__PURE__ */ jsxRuntime.jsx(vuuUiControls.ToggleIconButton, { isExpanded }),
+        isLeafNode ? null : /* @__PURE__ */ jsxRuntime.jsx(vuuUiControls.ToggleIconButton, { isExpanded }),
         icon ? /* @__PURE__ */ jsxRuntime.jsx(vuuUiControls.Icon, { name: icon }) : null,
         /* @__PURE__ */ jsxRuntime.jsx("span", { className: `${classBase}-label`, children: valueWithHighlighting })
       ]

package/cjs/table-cell/TableGroupCell.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableGroupCell.js","sources":["../../../../packages/vuu-table/src/table-cell/TableGroupCell.tsx"],"sourcesContent":["import { GroupColumnDescriptor, TableCellProps } from \"@vuu-ui/vuu-table-types\";\nimport { Icon, ToggleIconButton } from \"@vuu-ui/vuu-ui-controls\";\nimport { getGroupIcon, getGroupValue, metadataKeys } from \"@vuu-ui/vuu-utils\";\nimport { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport cx from \"clsx\";\nimport { MouseEvent, useCallback } from \"react\";\nimport { useCell } from \"../useCell\";\n\nimport tableCellCss from \"./TableCell.css\";\nimport tableGroupCellCss from \"./TableGroupCell.css\";\nimport { useHighlighting } from \"../useHighlighting\";\n\nconst { COUNT, IS_EXPANDED, IS_LEAF } = metadataKeys;\n\nconst classBase = \"vuuTableGroupCell\";\n\nexport const TableGroupCell = ({\n  column,\n  columnMap,\n  onClick,\n  row,\n  searchPattern = \"\",\n}: TableCellProps) => {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-table-cell\",\n    css: tableCellCss,\n    window: targetWindow,\n  });\n  useComponentCssInjection({\n    testId: \"vuu-table-group-cell\",\n    css: tableGroupCellCss,\n    window: targetWindow,\n  });\n\n  const { columns } = column as GroupColumnDescriptor;\n  const value = getGroupValue(columns, row, columnMap);\n  const valueWithHighlighting = useHighlighting(value || \"\", searchPattern);\n\n  const icon = getGroupIcon(columns, row);\n  const { className, style } = useCell(column, classBase);\n\n  const handleClick = useCallback(\n    (evt: MouseEvent<HTMLDivElement>) => {\n      onClick?.(evt, column);\n    },\n    [column, onClick],\n  );\n\n  const { [COUNT]: count, [IS_EXPANDED]: isExpanded, [IS_LEAF]: isLeaf } = row;\n\n  return (\n    <div\n      aria-colindex={1}\n      className={cx(className, \"vuuTableCell\")}\n      role=\"cell\"\n      style={style}\n      onClick={isLeaf ? undefined : handleClick}\n    >\n      <span className={`${classBase}-spacer`} />\n      {isLeaf || count == 0 ? null : (\n        <ToggleIconButton isExpanded={isExpanded} />\n      )}\n      {icon ? <Icon name={icon} /> : null}\n      <span className={`${classBase}-label`}>{valueWithHighlighting}</span>\n    </div>\n  );\n};\n"],"names":["metadataKeys","useWindow","useComponentCssInjection","tableCellCss","tableGroupCellCss","getGroupValue","useHighlighting","getGroupIcon","useCell","useCallback","jsxs","jsx","ToggleIconButton","Icon"],"mappings":";;;;;;;;;;;;;;AAaA,MAAM,EAAE,KAAA,EAAO,WAAa,EAAA,OAAA,EAAY,GAAAA,qBAAA;AAExC,MAAM,SAAY,GAAA,mBAAA;AAEX,MAAM,iBAAiB,CAAC;AAAA,EAC7B,MAAA;AAAA,EACA,SAAA;AAAA,EACA,OAAA;AAAA,EACA,GAAA;AAAA,EACA,aAAgB,GAAA;AAClB,CAAsB,KAAA;AACpB,EAAA,MAAM,eAAeC,gBAAU,EAAA;AAC/B,EAAyBC,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,gBAAA;AAAA,IACR,GAAK,EAAAC,SAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AACD,EAAyBD,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,sBAAA;AAAA,IACR,GAAK,EAAAE,gBAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAM,MAAA,EAAE,SAAY,GAAA,MAAA;AACpB,EAAA,MAAM,KAAQ,GAAAC,sBAAA,CAAc,OAAS,EAAA,GAAA,EAAK,SAAS,CAAA;AACnD,EAAA,MAAM,qBAAwB,GAAAC,+BAAA,CAAgB,KAAS,IAAA,EAAA,EAAI,aAAa,CAAA;AAExE,EAAM,MAAA,IAAA,GAAOC,qBAAa,CAAA,OAAA,EAAS,GAAG,CAAA;AACtC,EAAA,MAAM,EAAE,SAAW,EAAA,KAAA,EAAU,GAAAC,eAAA,CAAQ,QAAQ,SAAS,CAAA;AAEtD,EAAA,MAAM,WAAc,GAAAC,iBAAA;AAAA,IAClB,CAAC,GAAoC,KAAA;AACnC,MAAA,OAAA,GAAU,KAAK,MAAM,CAAA;AAAA,KACvB;AAAA,IACA,CAAC,QAAQ,OAAO;AAAA,GAClB;AAEA,EAAA,MAAM,EAAE,CAAC,KAAK,GAAG,KAAO,EAAA,CAAC,WAAW,GAAG,UAAY,EAAA,CAAC,OAAO,GAAG,QAAW,GAAA,GAAA;AAEzE,EACE,uBAAAC,eAAA;AAAA,IAAC,KAAA;AAAA,IAAA;AAAA,MACC,eAAe,EAAA,CAAA;AAAA,MACf,SAAA,EAAW,EAAG,CAAA,SAAA,EAAW,cAAc,CAAA;AAAA,MACvC,IAAK,EAAA,MAAA;AAAA,MACL,KAAA;AAAA,MACA,OAAA,EAAS,SAAS,KAAY,CAAA,GAAA,WAAA;AAAA,MAE9B,QAAA,EAAA;AAAA,wBAAAC,cAAA,CAAC,MAAK,EAAA,EAAA,SAAA,EAAW,CAAG,EAAA,SAAS,CAAW,OAAA,CAAA,EAAA,CAAA;AAAA,QACvC,UAAU,KAAS,IAAA,CAAA,GAAI,IACtB,mBAAAA,cAAA,CAACC,kCAAiB,UAAwB,EAAA,CAAA;AAAA,QAE3C,IAAO,mBAAAD,cAAA,CAACE,kBAAK,EAAA,EAAA,IAAA,EAAM,MAAM,CAAK,GAAA,IAAA;AAAA,uCAC9B,MAAK,EAAA,EAAA,SAAA,EAAW,CAAG,EAAA,SAAS,UAAW,QAAsB,EAAA,qBAAA,EAAA;AAAA;AAAA;AAAA,GAChE;AAEJ;;;;"}
+{"version":3,"file":"TableGroupCell.js","sources":["../../../../packages/vuu-table/src/table-cell/TableGroupCell.tsx"],"sourcesContent":["import { GroupColumnDescriptor, TableCellProps } from \"@vuu-ui/vuu-table-types\";\nimport { Icon, ToggleIconButton } from \"@vuu-ui/vuu-ui-controls\";\nimport { getGroupIcon, getGroupValue } from \"@vuu-ui/vuu-utils\";\nimport { useComponentCssInjection } from \"@salt-ds/styles\";\nimport { useWindow } from \"@salt-ds/window\";\nimport cx from \"clsx\";\nimport { MouseEvent, useCallback } from \"react\";\nimport { useCell } from \"../useCell\";\n\nimport tableCellCss from \"./TableCell.css\";\nimport tableGroupCellCss from \"./TableGroupCell.css\";\nimport { useHighlighting } from \"../useHighlighting\";\n\nconst classBase = \"vuuTableGroupCell\";\n\nexport const TableGroupCell = ({\n  column,\n  dataRow,\n  onClick,\n  searchPattern = \"\",\n}: TableCellProps) => {\n  const targetWindow = useWindow();\n  useComponentCssInjection({\n    testId: \"vuu-table-cell\",\n    css: tableCellCss,\n    window: targetWindow,\n  });\n  useComponentCssInjection({\n    testId: \"vuu-table-group-cell\",\n    css: tableGroupCellCss,\n    window: targetWindow,\n  });\n\n  const { columns } = column as GroupColumnDescriptor;\n  const value = getGroupValue(columns, dataRow);\n  const valueWithHighlighting = useHighlighting(value || \"\", searchPattern);\n\n  const icon = getGroupIcon(columns, dataRow);\n  const { className, style } = useCell(column, classBase);\n\n  const handleClick = useCallback(\n    (evt: MouseEvent<HTMLDivElement>) => {\n      onClick?.(evt, column);\n    },\n    [column, onClick],\n  );\n\n  const { childCount, isExpanded, isLeaf } = dataRow;\n\n  // In a TreeTable, no nodes are tagged as leaf nodes, but those with childCount = 0\n  // behave as leaf nodes\n  const isLeafNode = isLeaf || childCount == 0;\n\n  return (\n    <div\n      aria-colindex={1}\n      className={cx(className, \"vuuTableCell\")}\n      role=\"cell\"\n      style={style}\n      onClick={isLeafNode ? undefined : handleClick}\n    >\n      <span className={`${classBase}-spacer`} />\n      {isLeafNode ? null : <ToggleIconButton isExpanded={isExpanded} />}\n      {icon ? <Icon name={icon} /> : null}\n      <span className={`${classBase}-label`}>{valueWithHighlighting}</span>\n    </div>\n  );\n};\n"],"names":["useWindow","useComponentCssInjection","tableCellCss","tableGroupCellCss","getGroupValue","useHighlighting","getGroupIcon","useCell","useCallback","jsxs","jsx","ToggleIconButton","Icon"],"mappings":";;;;;;;;;;;;;;AAaA,MAAM,SAAY,GAAA,mBAAA;AAEX,MAAM,iBAAiB,CAAC;AAAA,EAC7B,MAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,aAAgB,GAAA;AAClB,CAAsB,KAAA;AACpB,EAAA,MAAM,eAAeA,gBAAU,EAAA;AAC/B,EAAyBC,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,gBAAA;AAAA,IACR,GAAK,EAAAC,SAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AACD,EAAyBD,+BAAA,CAAA;AAAA,IACvB,MAAQ,EAAA,sBAAA;AAAA,IACR,GAAK,EAAAE,gBAAA;AAAA,IACL,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAM,MAAA,EAAE,SAAY,GAAA,MAAA;AACpB,EAAM,MAAA,KAAA,GAAQC,sBAAc,CAAA,OAAA,EAAS,OAAO,CAAA;AAC5C,EAAA,MAAM,qBAAwB,GAAAC,+BAAA,CAAgB,KAAS,IAAA,EAAA,EAAI,aAAa,CAAA;AAExE,EAAM,MAAA,IAAA,GAAOC,qBAAa,CAAA,OAAA,EAAS,OAAO,CAAA;AAC1C,EAAA,MAAM,EAAE,SAAW,EAAA,KAAA,EAAU,GAAAC,eAAA,CAAQ,QAAQ,SAAS,CAAA;AAEtD,EAAA,MAAM,WAAc,GAAAC,iBAAA;AAAA,IAClB,CAAC,GAAoC,KAAA;AACnC,MAAA,OAAA,GAAU,KAAK,MAAM,CAAA;AAAA,KACvB;AAAA,IACA,CAAC,QAAQ,OAAO;AAAA,GAClB;AAEA,EAAA,MAAM,EAAE,UAAA,EAAY,UAAY,EAAA,MAAA,EAAW,GAAA,OAAA;AAI3C,EAAM,MAAA,UAAA,GAAa,UAAU,UAAc,IAAA,CAAA;AAE3C,EACE,uBAAAC,eAAA;AAAA,IAAC,KAAA;AAAA,IAAA;AAAA,MACC,eAAe,EAAA,CAAA;AAAA,MACf,SAAA,EAAW,EAAG,CAAA,SAAA,EAAW,cAAc,CAAA;AAAA,MACvC,IAAK,EAAA,MAAA;AAAA,MACL,KAAA;AAAA,MACA,OAAA,EAAS,aAAa,KAAY,CAAA,GAAA,WAAA;AAAA,MAElC,QAAA,EAAA;AAAA,wBAAAC,cAAA,CAAC,MAAK,EAAA,EAAA,SAAA,EAAW,CAAG,EAAA,SAAS,CAAW,OAAA,CAAA,EAAA,CAAA;AAAA,QACvC,UAAa,GAAA,IAAA,mBAAQA,cAAA,CAAAC,8BAAA,EAAA,EAAiB,UAAwB,EAAA,CAAA;AAAA,QAC9D,IAAO,mBAAAD,cAAA,CAACE,kBAAK,EAAA,EAAA,IAAA,EAAM,MAAM,CAAK,GAAA,IAAA;AAAA,uCAC9B,MAAK,EAAA,EAAA,SAAA,EAAW,CAAG,EAAA,SAAS,UAAW,QAAsB,EAAA,qBAAA,EAAA;AAAA;AAAA;AAAA,GAChE;AAEJ;;;;"}

package/cjs/table-data-source/{moving-window.js → DataRowMovingWindow.js}

@@ -13,8 +13,7 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
 var _range;
-const { SELECTED } = vuuUtils.metadataKeys;
-class MovingWindow {
+class MovingDataRowWindow {
   constructor({ from, to }) {
     __publicField(this, "data");
     __publicField(this, "rowCount", 0);
@@ -30,7 +29,7 @@ class MovingWindow {
     this.rowCount = 0;
   }
   add(data) {
-    const [index] = data;
+    const { index } = data;
     if (this.isWithinRange(index)) {
       const internalIndex = index - __privateGet(this, _range).from;
       this.data[internalIndex] = data;
@@ -39,6 +38,9 @@ class MovingWindow {
   getAtIndex(index) {
     return __privateGet(this, _range).isWithin(index) && this.data[index - __privateGet(this, _range).from] != null ? this.data[index - __privateGet(this, _range).from] : void 0;
   }
+  getByKey(key) {
+    return this.data.find((row) => row.key === key);
+  }
   isWithinRange(index) {
     return __privateGet(this, _range).isWithin(index);
   }
@@ -59,37 +61,25 @@ class MovingWindow {
     }
   }
   getSelectedRows() {
-    return this.data.filter((row) => row[SELECTED] !== 0);
+    return this.data.filter((dataRow) => dataRow.isSelected);
   }
-  get range() {
-    return __privateGet(this, _range);
+  get hasData() {
+    return this.data.some((d) => d !== void 0);
   }
-  slice() {
-    const data = [];
-    const { from } = this.range;
+  /**
+   * This will throw if there is no data. Check `hasData` first
+   * to guard against this, if not certain.
+   */
+  get firstRow() {
     for (let i = 0; i < this.data.length; i++) {
       if (this.data[i]) {
-        data.push(this.data[i]);
-      } else {
-        data.push([from + i, from + i, true, false, 1, 0, "", 0, 0, false]);
+        return this.data[i];
       }
     }
-    return data;
+    throw Error(`[DataRowMovingWinddow] firstRow, no data`);
   }
-  /**
-   * Update all rows by splicing the supplied index. Used when a column
-   * is removed.
-   */
-  spliceDataAtIndex(index) {
-    if (index >= 10) {
-      for (let i = 0; i < this.data.length; i++) {
-        if (this.data[i]) {
-          this.data[i] = this.data[i].toSpliced(index, 1);
-        }
-      }
-    } else {
-      throw Error(`[MovingWindow] canno splir metadata value from Row`);
-    }
+  get range() {
+    return __privateGet(this, _range);
   }
   // TODO make this more performant, see implementation in
   // array-backed-moving-window - use same implementation
@@ -105,5 +95,5 @@ class MovingWindow {
 }
 _range = new WeakMap();
 
-exports.MovingWindow = MovingWindow;
-//# sourceMappingURL=moving-window.js.map
+exports.MovingDataRowWindow = MovingDataRowWindow;
+//# sourceMappingURL=DataRowMovingWindow.js.map

package/cjs/table-data-source/DataRowMovingWindow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataRowMovingWindow.js","sources":["../../../../packages/vuu-table/src/table-data-source/DataRowMovingWindow.ts"],"sourcesContent":["import { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport { DataRow } from \"@vuu-ui/vuu-table-types\";\nimport { WindowRange } from \"@vuu-ui/vuu-utils\";\n\nexport class MovingDataRowWindow {\n  public data: DataRow[];\n  public rowCount = 0;\n  #range: WindowRange;\n\n  constructor({ from, to }: VuuRange) {\n    this.#range = new WindowRange(from, to);\n    //internal data is always 0 based, we add range.from to determine an offset\n    this.data = new Array(Math.max(0, to - from));\n    this.rowCount = 0;\n  }\n\n  setRowCount = (rowCount: number) => {\n    if (rowCount < this.data.length) {\n      this.data.length = rowCount;\n    }\n\n    this.rowCount = rowCount;\n  };\n\n  add(data: DataRow) {\n    const { index } = data;\n    if (this.isWithinRange(index)) {\n      const internalIndex = index - this.#range.from;\n      this.data[internalIndex] = data;\n    }\n  }\n\n  getAtIndex(index: number) {\n    return this.#range.isWithin(index) &&\n      this.data[index - this.#range.from] != null\n      ? this.data[index - this.#range.from]\n      : undefined;\n  }\n\n  getByKey(key: string) {\n    return this.data.find((row) => row.key === key);\n  }\n\n  isWithinRange(index: number) {\n    return this.#range.isWithin(index);\n  }\n\n  setRange({ from, to }: VuuRange) {\n    if (from !== this.#range.from || to !== this.#range.to) {\n      const [overlapFrom, overlapTo] = this.#range.overlap(from, to);\n      const newData = new Array(Math.max(0, to - from));\n      for (let i = overlapFrom; i < overlapTo; i++) {\n        const data = this.getAtIndex(i);\n        if (data) {\n          const index = i - from;\n          newData[index] = data;\n        }\n      }\n      this.data = newData;\n      this.#range.from = from;\n      this.#range.to = to;\n    }\n  }\n\n  getSelectedRows() {\n    return this.data.filter((dataRow) => dataRow.isSelected);\n  }\n\n  get hasData() {\n    return this.data.some((d) => d !== undefined);\n  }\n\n  /**\n   * This will throw if there is no data. Check `hasData` first\n   * to guard against this, if not certain.\n   */\n  get firstRow() {\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        return this.data[i];\n      }\n    }\n    throw Error(`[DataRowMovingWinddow] firstRow, no data`);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  // TODO make this more performant, see implementation in\n  // array-backed-moving-window - use same implementation\n  get hasAllRowsWithinRange(): boolean {\n    const { from, to } = this.#range;\n\n    for (let i = from; i < to; i++) {\n      if (this.getAtIndex(i) === undefined) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n"],"names":["WindowRange"],"mappings":"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"}