@vuu-ui/vuu-table 0.13.114 → 0.13.115-alpha.2

package/esm/table-data-source/useDataSource.js

@@ -1,8 +1,9 @@
-import { Range, metadataKeys } from '@vuu-ui/vuu-utils';
+import { Range } from '@vuu-ui/vuu-utils';
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
-import { MovingWindow } from './moving-window.js';
+import { MovingDataRowWindow } from './DataRowMovingWindow.js';
+import { dataRowFactory } from '../data-row/DataRow.js';
 
-const { KEY } = metadataKeys;
+const NullDataRow = () => ({});
 const useDataSource = ({
   autoSelectFirstRow,
   autoSelectRowKey,
@@ -16,10 +17,14 @@ const useDataSource = ({
   suspenseProps
 }) => {
   const [, forceUpdate] = useState(null);
-  const data = useRef([]);
+  const dataRows = useRef([]);
   const isMounted = useRef(true);
   const hasUpdated = useRef(false);
   const rangeRef = useRef(dataSource.range);
+  const dataRowRef = useRef(NullDataRow);
+  const setColumnsRef = useRef(
+    void 0
+  );
   const totalRowCountRef = useRef(0);
   const rowAutoSelected = useRef(false);
   const autoSelect = autoSelectRowKey ?? (autoSelectFirstRow || selectionModel === "single-no-deselect");
@@ -41,45 +46,63 @@ const useDataSource = ({
       }
     };
   }, [autoSelect, dataSource, handleConfigChange]);
-  const dataWindow = useMemo(
-    () => new MovingWindow(rangeRef.current.withBuffer),
+  const dataRowWindow = useMemo(
+    () => new MovingDataRowWindow(rangeRef.current.withBuffer),
     []
   );
+  useMemo(() => {
+    dataSource.on("resumed", () => {
+      const { range } = dataSource;
+      if (range.to !== 0) {
+        dataRowWindow.setRange(dataSource.range.withBuffer);
+      }
+    });
+  }, [dataRowWindow, dataSource]);
   const setData = useCallback(
     (updates) => {
+      const { current: DataRow2 } = dataRowRef;
       for (const row of updates) {
-        dataWindow.add(row);
+        dataRowWindow.add(DataRow2(row));
       }
-      data.current = dataWindow.data;
+      dataRows.current = dataRowWindow.data;
       if (isMounted.current) {
         forceUpdate({});
       }
     },
-    [dataWindow]
+    [dataRowWindow]
   );
   const selectRow = useCallback(
-    (row) => {
-      const rowKey = row[KEY];
+    (dataRow) => {
+      const rowKey = dataRow.key;
       dataSource.select?.({
         preserveExistingSelection: false,
         rowKey,
         type: "SELECT_ROW"
       });
-      onSelect?.(row);
+      onSelect?.(dataRow);
     },
     [dataSource, onSelect]
   );
+  const createDataRow = useCallback(
+    (columns, schemaColumns) => {
+      const [DataRow2, setColumns] = dataRowFactory(columns, schemaColumns);
+      dataRowRef.current = DataRow2;
+      setColumnsRef.current = setColumns;
+    },
+    []
+  );
   const datasourceMessageHandler = useCallback(
     (message) => {
       if (message.type === "subscribed") {
+        createDataRow(message.columns, message.tableSchema.columns);
         onSubscribed?.(message);
       } else if (message.type === "viewport-update") {
         if (typeof message.size === "number") {
           onSizeChange?.(message.size);
-          const size = dataWindow.data.length;
-          dataWindow.setRowCount(message.size);
+          const size = dataRowWindow.data.length;
+          dataRowWindow.setRowCount(message.size);
           totalRowCountRef.current = message.size;
-          if (dataWindow.data.length < size) {
+          if (dataRowWindow.data.length < size) {
             if (isMounted.current === false) {
               console.log("setting state whilst unmounted");
             }
@@ -91,27 +114,27 @@ const useDataSource = ({
           if (autoSelect && rowAutoSelected.current === false) {
             rowAutoSelected.current = true;
             if (typeof autoSelect === "string") {
-              const row = message.rows.find((row2) => row2[KEY] === autoSelect);
-              if (row) {
-                selectRow(row);
+              const dataRow = dataRowWindow.getByKey(autoSelect);
+              if (dataRow) {
+                selectRow(dataRow);
               } else {
                 console.warn(
                   `[useDataSource] autoSelect row key ${autoSelect} not in viewport`
                 );
               }
-            } else if (message.rows.length > 0) {
-              selectRow(message.rows[0]);
+            } else if (dataRowWindow.hasData) {
+              selectRow(dataRowWindow.firstRow);
             }
           }
         } else if (message.size === 0) {
           setData([]);
         } else if (typeof message.size === "number") {
-          data.current = dataWindow.data;
+          dataRows.current = dataRowWindow.data;
           hasUpdated.current = true;
         }
       } else if (message.type === "viewport-clear") {
         onSizeChange?.(0);
-        dataWindow.setRowCount(0);
+        dataRowWindow.setRowCount(0);
         setData([]);
         if (isMounted.current === false) {
           console.log("setting state whilst unmounted");
@@ -121,16 +144,27 @@ const useDataSource = ({
         console.log(`useDataSource unexpected message ${message.type}`);
       }
     },
-    [autoSelect, dataWindow, onSizeChange, onSubscribed, selectRow, setData]
+    [
+      autoSelect,
+      createDataRow,
+      dataRowWindow,
+      onSizeChange,
+      onSubscribed,
+      selectRow,
+      setData
+    ]
   );
   const getSelectedRows = useCallback(() => {
-    return dataWindow.getSelectedRows();
-  }, [dataWindow]);
+    return dataRowWindow.getSelectedRows();
+  }, [dataRowWindow]);
   useEffect(() => {
     if (dataSource.status === "disabled") {
       dataSource.enable?.(datasourceMessageHandler);
     }
   }, [dataSource, datasourceMessageHandler]);
+  useMemo(() => {
+    setColumnsRef.current?.(dataSource.columns);
+  }, [dataSource.columns]);
   const setRange = useCallback(
     (viewportRange) => {
       if (!rangeRef.current.equals(viewportRange)) {
@@ -139,7 +173,7 @@ const useDataSource = ({
           viewportRange.to,
           renderBufferSize
         );
-        dataWindow.setRange(range.withBuffer);
+        dataRowWindow.setRange(range.withBuffer);
         if (dataSource.status !== "subscribed" && dataSource.status !== "subscribing" && dataSource.status !== "enabling") {
           dataSource?.subscribe(
             {
@@ -156,8 +190,8 @@ const useDataSource = ({
     },
     [
       autoSelectRowKey,
+      dataRowWindow,
       dataSource,
-      dataWindow,
       datasourceMessageHandler,
       renderBufferSize,
       revealSelected
@@ -166,6 +200,14 @@ const useDataSource = ({
   useEffect(() => {
     isMounted.current = true;
     if (dataSource.status !== "initialising") {
+      const { columns, tableSchema } = dataSource;
+      if (tableSchema) {
+        createDataRow(columns, tableSchema.columns);
+      } else {
+        throw Error(
+          `[useDataSource] a resumed dataSource must have a tableSchema`
+        );
+      }
       dataSource.resume?.(datasourceMessageHandler);
       if (dataSource.range.from > 0) {
         const { from, to } = rangeRef.current.reset;
@@ -179,20 +221,18 @@ const useDataSource = ({
         suspenseProps?.escalateDelay
       );
     };
-  }, [dataSource, datasourceMessageHandler, setRange, suspenseProps]);
-  const removeColumnDataFromCache = useCallback(
-    (indexOfRemovedColumn) => {
-      dataWindow.spliceDataAtIndex(indexOfRemovedColumn);
-      data.current = dataWindow.data;
-    },
-    [dataWindow]
-  );
+  }, [
+    createDataRow,
+    dataSource,
+    datasourceMessageHandler,
+    setRange,
+    suspenseProps
+  ]);
   return {
-    data: data.current,
-    dataRef: data,
+    dataRows: dataRows.current,
+    dataRowsRef: dataRows,
     getSelectedRows,
     range: rangeRef.current,
-    removeColumnDataFromCache,
     setRange
   };
 };

package/esm/table-data-source/useDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDataSource.js","sources":["../../../../packages/vuu-table/src/table-data-source/useDataSource.ts"],"sourcesContent":["import type {\n  DataSourceConfigChangeHandler,\n  DataSourceRow,\n  DataSourceSubscribeCallback,\n  DataSourceSubscribedMessage,\n  DataSourceSuspenseProps,\n} from \"@vuu-ui/vuu-data-types\";\nimport { SelectRowRequest, VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport { Range } from \"@vuu-ui/vuu-utils\";\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { TableProps } from \"../Table\";\nimport { metadataKeys } from \"@vuu-ui/vuu-utils\";\nimport { TableRowSelectHandlerInternal } from \"@vuu-ui/vuu-table-types\";\nimport { MovingWindow } from \"./moving-window\";\n\nconst { KEY } = metadataKeys;\n\nexport interface DataSourceHookProps\n  extends Pick<\n    TableProps,\n    | \"autoSelectFirstRow\"\n    | \"autoSelectRowKey\"\n    | \"dataSource\"\n    | \"renderBufferSize\"\n    | \"revealSelected\"\n    | \"selectionModel\"\n  > {\n  suspenseProps?: DataSourceSuspenseProps;\n  onSelect: TableRowSelectHandlerInternal;\n  onSizeChange: (size: number) => void;\n  onSubscribed: (subscription: DataSourceSubscribedMessage) => void;\n}\n\nexport const useDataSource = ({\n  autoSelectFirstRow,\n  autoSelectRowKey,\n  dataSource,\n  onSizeChange,\n  onSubscribed,\n  renderBufferSize = 0,\n  revealSelected,\n  onSelect,\n  selectionModel,\n  suspenseProps,\n}: DataSourceHookProps) => {\n  const [, forceUpdate] = useState<unknown>(null);\n  const data = useRef<DataSourceRow[]>([]);\n  const isMounted = useRef(true);\n  const hasUpdated = useRef(false);\n  const rangeRef = useRef<Range>(dataSource.range);\n  const totalRowCountRef = useRef(0);\n  const rowAutoSelected = useRef(false);\n\n  const autoSelect =\n    autoSelectRowKey ??\n    (autoSelectFirstRow || selectionModel === \"single-no-deselect\");\n\n  const handleConfigChange = useCallback<DataSourceConfigChangeHandler>(\n    (_config, _range, _confirmed, configChanges) => {\n      if (configChanges?.filterChanged) {\n        rowAutoSelected.current = false;\n      }\n    },\n    [],\n  );\n\n  useEffect(() => {\n    if (autoSelect) {\n      dataSource.on(\"config\", handleConfigChange);\n    }\n    return () => {\n      if (autoSelect) {\n        dataSource.removeListener(\"config\", handleConfigChange);\n      }\n    };\n  }, [autoSelect, dataSource, handleConfigChange]);\n\n  const dataWindow = useMemo(\n    () => new MovingWindow(rangeRef.current.withBuffer),\n    [],\n  );\n\n  const setData = useCallback(\n    (updates: DataSourceRow[]) => {\n      for (const row of updates) {\n        dataWindow.add(row);\n      }\n      data.current = dataWindow.data;\n      if (isMounted.current) {\n        // TODO do we ever need to worry about missing updates here ?\n        forceUpdate({});\n      }\n    },\n    [dataWindow],\n  );\n\n  const selectRow = useCallback(\n    (row: DataSourceRow) => {\n      const rowKey = row[KEY];\n      dataSource.select?.({\n        preserveExistingSelection: false,\n        rowKey,\n        type: \"SELECT_ROW\",\n      } as SelectRowRequest);\n      onSelect?.(row);\n    },\n    [dataSource, onSelect],\n  );\n\n  const datasourceMessageHandler: DataSourceSubscribeCallback = useCallback(\n    (message) => {\n      if (message.type === \"subscribed\") {\n        onSubscribed?.(message);\n      } else if (message.type === \"viewport-update\") {\n        if (typeof message.size === \"number\") {\n          onSizeChange?.(message.size);\n          const size = dataWindow.data.length;\n          dataWindow.setRowCount(message.size);\n          totalRowCountRef.current = message.size;\n\n          if (dataWindow.data.length < size) {\n            if (isMounted.current === false) {\n              console.log(\"setting state whilst unmounted\");\n            }\n\n            forceUpdate({});\n          }\n        }\n        if (message.rows) {\n          setData(message.rows);\n          if (autoSelect && rowAutoSelected.current === false) {\n            // OR if no selected row in message.rows, e.g after a filter\n            rowAutoSelected.current = true;\n            if (typeof autoSelect === \"string\") {\n              const row = message.rows.find((row) => row[KEY] === autoSelect);\n              if (row) {\n                selectRow(row);\n              } else {\n                console.warn(\n                  `[useDataSource] autoSelect row key ${autoSelect} not in viewport`,\n                );\n              }\n            } else if (message.rows.length > 0) {\n              selectRow(message.rows[0]);\n            }\n          }\n        } else if (message.size === 0) {\n          setData([]);\n        } else if (typeof message.size === \"number\") {\n          data.current = dataWindow.data;\n          hasUpdated.current = true;\n        }\n      } else if (message.type === \"viewport-clear\") {\n        onSizeChange?.(0);\n        dataWindow.setRowCount(0);\n        setData([]);\n\n        if (isMounted.current === false) {\n          console.log(\"setting state whilst unmounted\");\n        }\n\n        forceUpdate({});\n      } else {\n        console.log(`useDataSource unexpected message ${message.type}`);\n      }\n    },\n    [autoSelect, dataWindow, onSizeChange, onSubscribed, selectRow, setData],\n  );\n\n  const getSelectedRows = useCallback(() => {\n    return dataWindow.getSelectedRows();\n  }, [dataWindow]);\n\n  useEffect(() => {\n    if (dataSource.status === \"disabled\") {\n      dataSource.enable?.(datasourceMessageHandler);\n    }\n  }, [dataSource, datasourceMessageHandler]);\n\n  const setRange = useCallback(\n    (viewportRange: VuuRange) => {\n      if (!rangeRef.current.equals(viewportRange)) {\n        const range = Range(\n          viewportRange.from,\n          viewportRange.to,\n          renderBufferSize,\n        );\n\n        dataWindow.setRange(range.withBuffer);\n\n        if (\n          dataSource.status !== \"subscribed\" &&\n          dataSource.status !== \"subscribing\" &&\n          dataSource.status !== \"enabling\"\n        ) {\n          dataSource?.subscribe(\n            {\n              range,\n              revealSelected,\n              selectedKeyValues: autoSelectRowKey\n                ? [autoSelectRowKey]\n                : undefined,\n            },\n            datasourceMessageHandler,\n          );\n        } else {\n          dataSource.range = rangeRef.current = range;\n        }\n      }\n    },\n    [\n      autoSelectRowKey,\n      dataSource,\n      dataWindow,\n      datasourceMessageHandler,\n      renderBufferSize,\n      revealSelected,\n    ],\n  );\n\n  useEffect(() => {\n    isMounted.current = true;\n    if (dataSource.status !== \"initialising\") {\n      dataSource.resume?.(datasourceMessageHandler);\n\n      if (dataSource.range.from > 0) {\n        // UI does not currently restore scroll position, so always reset to top of dataset\n        const { from, to } = rangeRef.current.reset;\n        setRange({ from, to });\n      }\n    }\n    return () => {\n      isMounted.current = false;\n      dataSource.suspend?.(\n        suspenseProps?.escalateToDisable,\n        suspenseProps?.escalateDelay,\n      );\n    };\n  }, [dataSource, datasourceMessageHandler, setRange, suspenseProps]);\n\n  const removeColumnDataFromCache = useCallback(\n    (indexOfRemovedColumn: number) => {\n      dataWindow.spliceDataAtIndex(indexOfRemovedColumn);\n      data.current = dataWindow.data;\n    },\n    [dataWindow],\n  );\n\n  return {\n    data: data.current,\n    dataRef: data,\n    getSelectedRows,\n    range: rangeRef.current,\n    removeColumnDataFromCache,\n    setRange,\n  };\n};\n"],"names":["row"],"mappings":"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"}
+{"version":3,"file":"useDataSource.js","sources":["../../../../packages/vuu-table/src/table-data-source/useDataSource.ts"],"sourcesContent":["import type {\n  DataSourceConfigChangeHandler,\n  DataSourceRow,\n  DataSourceSubscribeCallback,\n  DataSourceSubscribedMessage,\n  DataSourceSuspenseProps,\n  SchemaColumn,\n} from \"@vuu-ui/vuu-data-types\";\nimport { SelectRowRequest, VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport { Range } from \"@vuu-ui/vuu-utils\";\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { TableProps } from \"../Table\";\nimport {\n  DataRow,\n  TableRowSelectHandlerInternal,\n} from \"@vuu-ui/vuu-table-types\";\nimport { MovingDataRowWindow } from \"./DataRowMovingWindow\";\nimport { dataRowFactory, DataRowFunc } from \"../data-row/DataRow\";\n\nconst NullDataRow = () => ({}) as DataRow;\n\nexport interface DataSourceHookProps\n  extends Pick<\n    TableProps,\n    | \"autoSelectFirstRow\"\n    | \"autoSelectRowKey\"\n    | \"dataSource\"\n    | \"renderBufferSize\"\n    | \"revealSelected\"\n    | \"selectionModel\"\n  > {\n  suspenseProps?: DataSourceSuspenseProps;\n  onSelect: TableRowSelectHandlerInternal;\n  onSizeChange: (size: number) => void;\n  onSubscribed: (subscription: DataSourceSubscribedMessage) => void;\n}\n\nexport const useDataSource = ({\n  autoSelectFirstRow,\n  autoSelectRowKey,\n  dataSource,\n  onSizeChange,\n  onSubscribed,\n  renderBufferSize = 0,\n  revealSelected,\n  onSelect,\n  selectionModel,\n  suspenseProps,\n}: DataSourceHookProps) => {\n  const [, forceUpdate] = useState<unknown>(null);\n  const dataRows = useRef<DataRow[]>([]);\n  const isMounted = useRef(true);\n  const hasUpdated = useRef(false);\n  const rangeRef = useRef<Range>(dataSource.range);\n  const dataRowRef = useRef<DataRowFunc>(NullDataRow);\n  const setColumnsRef = useRef<undefined | ((columns: string[]) => void)>(\n    undefined,\n  );\n  const totalRowCountRef = useRef(0);\n  const rowAutoSelected = useRef(false);\n\n  const autoSelect =\n    autoSelectRowKey ??\n    (autoSelectFirstRow || selectionModel === \"single-no-deselect\");\n\n  const handleConfigChange = useCallback<DataSourceConfigChangeHandler>(\n    (_config, _range, _confirmed, configChanges) => {\n      if (configChanges?.filterChanged) {\n        rowAutoSelected.current = false;\n      }\n    },\n    [],\n  );\n\n  useEffect(() => {\n    if (autoSelect) {\n      dataSource.on(\"config\", handleConfigChange);\n    }\n    return () => {\n      if (autoSelect) {\n        dataSource.removeListener(\"config\", handleConfigChange);\n      }\n    };\n  }, [autoSelect, dataSource, handleConfigChange]);\n\n  const dataRowWindow = useMemo(\n    () => new MovingDataRowWindow(rangeRef.current.withBuffer),\n    [],\n  );\n\n  useMemo(() => {\n    dataSource.on(\"resumed\", () => {\n      // When we resume a dataSource (after switching tabs etc)\n      // client will receive rows. We may not have received any\n      // setRange calls at this point so dataWindow range will\n      //not yet be set. If the dataWindow range is already set,\n      // this is a no-op.\n      const { range } = dataSource;\n      if (range.to !== 0) {\n        dataRowWindow.setRange(dataSource.range.withBuffer);\n      }\n    });\n  }, [dataRowWindow, dataSource]);\n\n  const setData = useCallback(\n    (updates: DataSourceRow[]) => {\n      const { current: DataRow } = dataRowRef;\n      for (const row of updates) {\n        // for now, we create a new DataRow each time\n        dataRowWindow.add(DataRow(row));\n      }\n      dataRows.current = dataRowWindow.data;\n      if (isMounted.current) {\n        // TODO do we ever need to worry about missing updates here ?\n        forceUpdate({});\n      }\n    },\n    [dataRowWindow],\n  );\n\n  const selectRow = useCallback(\n    (dataRow: DataRow) => {\n      const rowKey = dataRow.key;\n      dataSource.select?.({\n        preserveExistingSelection: false,\n        rowKey,\n        type: \"SELECT_ROW\",\n      } as SelectRowRequest);\n      onSelect?.(dataRow);\n    },\n    [dataSource, onSelect],\n  );\n\n  const createDataRow = useCallback(\n    (columns: string[], schemaColumns: readonly SchemaColumn[]) => {\n      const [DataRow, setColumns] = dataRowFactory(columns, schemaColumns);\n      dataRowRef.current = DataRow;\n      setColumnsRef.current = setColumns;\n    },\n    [],\n  );\n\n  const datasourceMessageHandler: DataSourceSubscribeCallback = useCallback(\n    (message) => {\n      if (message.type === \"subscribed\") {\n        createDataRow(message.columns, message.tableSchema.columns);\n        onSubscribed?.(message);\n      } else if (message.type === \"viewport-update\") {\n        if (typeof message.size === \"number\") {\n          onSizeChange?.(message.size);\n          const size = dataRowWindow.data.length;\n          dataRowWindow.setRowCount(message.size);\n          totalRowCountRef.current = message.size;\n\n          if (dataRowWindow.data.length < size) {\n            if (isMounted.current === false) {\n              console.log(\"setting state whilst unmounted\");\n            }\n\n            forceUpdate({});\n          }\n        }\n        if (message.rows) {\n          setData(message.rows);\n          if (autoSelect && rowAutoSelected.current === false) {\n            // OR if no selected row in message.rows, e.g after a filter\n            rowAutoSelected.current = true;\n            if (typeof autoSelect === \"string\") {\n              const dataRow = dataRowWindow.getByKey(autoSelect);\n              if (dataRow) {\n                selectRow(dataRow);\n              } else {\n                console.warn(\n                  `[useDataSource] autoSelect row key ${autoSelect} not in viewport`,\n                );\n              }\n            } else if (dataRowWindow.hasData) {\n              selectRow(dataRowWindow.firstRow);\n            }\n          }\n        } else if (message.size === 0) {\n          setData([]);\n        } else if (typeof message.size === \"number\") {\n          dataRows.current = dataRowWindow.data;\n          hasUpdated.current = true;\n        }\n      } else if (message.type === \"viewport-clear\") {\n        onSizeChange?.(0);\n        dataRowWindow.setRowCount(0);\n        setData([]);\n\n        if (isMounted.current === false) {\n          console.log(\"setting state whilst unmounted\");\n        }\n\n        forceUpdate({});\n      } else {\n        console.log(`useDataSource unexpected message ${message.type}`);\n      }\n    },\n    [\n      autoSelect,\n      createDataRow,\n      dataRowWindow,\n      onSizeChange,\n      onSubscribed,\n      selectRow,\n      setData,\n    ],\n  );\n\n  const getSelectedRows = useCallback(() => {\n    return dataRowWindow.getSelectedRows();\n  }, [dataRowWindow]);\n\n  useEffect(() => {\n    if (dataSource.status === \"disabled\") {\n      dataSource.enable?.(datasourceMessageHandler);\n    }\n  }, [dataSource, datasourceMessageHandler]);\n\n  useMemo(() => {\n    setColumnsRef.current?.(dataSource.columns);\n  }, [dataSource.columns]);\n\n  const setRange = useCallback(\n    (viewportRange: VuuRange) => {\n      if (!rangeRef.current.equals(viewportRange)) {\n        const range = Range(\n          viewportRange.from,\n          viewportRange.to,\n          renderBufferSize,\n        );\n\n        dataRowWindow.setRange(range.withBuffer);\n\n        if (\n          dataSource.status !== \"subscribed\" &&\n          dataSource.status !== \"subscribing\" &&\n          dataSource.status !== \"enabling\"\n        ) {\n          dataSource?.subscribe(\n            {\n              range,\n              revealSelected,\n              selectedKeyValues: autoSelectRowKey\n                ? [autoSelectRowKey]\n                : undefined,\n            },\n            datasourceMessageHandler,\n          );\n        } else {\n          dataSource.range = rangeRef.current = range;\n        }\n      }\n    },\n    [\n      autoSelectRowKey,\n      dataRowWindow,\n      dataSource,\n      datasourceMessageHandler,\n      renderBufferSize,\n      revealSelected,\n    ],\n  );\n\n  useEffect(() => {\n    isMounted.current = true;\n    if (dataSource.status !== \"initialising\") {\n      const { columns, tableSchema } = dataSource;\n      if (tableSchema) {\n        createDataRow(columns, tableSchema.columns);\n      } else {\n        throw Error(\n          `[useDataSource] a resumed dataSource must have a tableSchema`,\n        );\n      }\n\n      dataSource.resume?.(datasourceMessageHandler);\n\n      if (dataSource.range.from > 0) {\n        // UI does not currently restore scroll position, so always reset to top of dataset\n        const { from, to } = rangeRef.current.reset;\n        setRange({ from, to });\n      }\n    }\n    return () => {\n      isMounted.current = false;\n      dataSource.suspend?.(\n        suspenseProps?.escalateToDisable,\n        suspenseProps?.escalateDelay,\n      );\n    };\n  }, [\n    createDataRow,\n    dataSource,\n    datasourceMessageHandler,\n    setRange,\n    suspenseProps,\n  ]);\n\n  return {\n    dataRows: dataRows.current,\n    dataRowsRef: dataRows,\n    getSelectedRows,\n    range: rangeRef.current,\n    setRange,\n  };\n};\n"],"names":["DataRow"],"mappings":"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"}

package/esm/useRowClassNameGenerators.js

@@ -9,10 +9,10 @@ const createClassNameGenerator = (ids) => {
       functions.push(fn.fn);
     }
   });
-  return (row, columnMap) => {
+  return (dataRow) => {
     const classNames = [];
     functions?.forEach((fn) => {
-      const className = fn(row, columnMap);
+      const className = fn(dataRow);
       if (className) {
         classNames.push(className);
       }

package/esm/useRowClassNameGenerators.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRowClassNameGenerators.js","sources":["../../../packages/vuu-table/src/useRowClassNameGenerators.ts"],"sourcesContent":["import { TableConfig } from \"@vuu-ui/vuu-table-types\";\nimport {\n  getRowClassNameGenerator,\n  RowClassNameGenerator,\n} from \"@vuu-ui/vuu-utils\";\nimport { useMemo } from \"react\";\n\nconst createClassNameGenerator = (\n  ids?: string[],\n): RowClassNameGenerator | undefined => {\n  const functions: RowClassNameGenerator[] = [];\n  ids?.forEach((id) => {\n    const fn = getRowClassNameGenerator(id);\n    if (fn) {\n      functions.push(fn.fn);\n    }\n  });\n  return (row, columnMap) => {\n    const classNames: string[] = [];\n    functions?.forEach((fn) => {\n      const className = fn(row, columnMap);\n      if (className) {\n        classNames.push(className);\n      }\n    });\n    return classNames.join(\" \");\n  };\n};\n\nexport const useRowClassNameGenerators = ({\n  rowClassNameGenerators,\n}: TableConfig) => {\n  return useMemo<RowClassNameGenerator | undefined>(() => {\n    return createClassNameGenerator(rowClassNameGenerators);\n  }, [rowClassNameGenerators]);\n};\n"],"names":[],"mappings":";;;AAOA,MAAM,wBAAA,GAA2B,CAC/B,GACsC,KAAA;AACtC,EAAA,MAAM,YAAqC,EAAC;AAC5C,EAAK,GAAA,EAAA,OAAA,CAAQ,CAAC,EAAO,KAAA;AACnB,IAAM,MAAA,EAAA,GAAK,yBAAyB,EAAE,CAAA;AACtC,IAAA,IAAI,EAAI,EAAA;AACN,MAAU,SAAA,CAAA,IAAA,CAAK,GAAG,EAAE,CAAA;AAAA;AACtB,GACD,CAAA;AACD,EAAO,OAAA,CAAC,KAAK,SAAc,KAAA;AACzB,IAAA,MAAM,aAAuB,EAAC;AAC9B,IAAW,SAAA,EAAA,OAAA,CAAQ,CAAC,EAAO,KAAA;AACzB,MAAM,MAAA,SAAA,GAAY,EAAG,CAAA,GAAA,EAAK,SAAS,CAAA;AACnC,MAAA,IAAI,SAAW,EAAA;AACb,QAAA,UAAA,CAAW,KAAK,SAAS,CAAA;AAAA;AAC3B,KACD,CAAA;AACD,IAAO,OAAA,UAAA,CAAW,KAAK,GAAG,CAAA;AAAA,GAC5B;AACF,CAAA;AAEO,MAAM,4BAA4B,CAAC;AAAA,EACxC;AACF,CAAmB,KAAA;AACjB,EAAA,OAAO,QAA2C,MAAM;AACtD,IAAA,OAAO,yBAAyB,sBAAsB,CAAA;AAAA,GACxD,EAAG,CAAC,sBAAsB,CAAC,CAAA;AAC7B;;;;"}
+{"version":3,"file":"useRowClassNameGenerators.js","sources":["../../../packages/vuu-table/src/useRowClassNameGenerators.ts"],"sourcesContent":["import { TableConfig } from \"@vuu-ui/vuu-table-types\";\nimport {\n  getRowClassNameGenerator,\n  RowClassNameGenerator,\n} from \"@vuu-ui/vuu-utils\";\nimport { useMemo } from \"react\";\n\nconst createClassNameGenerator = (\n  ids?: string[],\n): RowClassNameGenerator | undefined => {\n  const functions: RowClassNameGenerator[] = [];\n  ids?.forEach((id) => {\n    const fn = getRowClassNameGenerator(id);\n    if (fn) {\n      functions.push(fn.fn);\n    }\n  });\n  return (dataRow) => {\n    const classNames: string[] = [];\n    functions?.forEach((fn) => {\n      const className = fn(dataRow);\n      if (className) {\n        classNames.push(className);\n      }\n    });\n    return classNames.join(\" \");\n  };\n};\n\nexport const useRowClassNameGenerators = ({\n  rowClassNameGenerators,\n}: TableConfig) => {\n  return useMemo<RowClassNameGenerator | undefined>(() => {\n    return createClassNameGenerator(rowClassNameGenerators);\n  }, [rowClassNameGenerators]);\n};\n"],"names":[],"mappings":";;;AAOA,MAAM,wBAAA,GAA2B,CAC/B,GACsC,KAAA;AACtC,EAAA,MAAM,YAAqC,EAAC;AAC5C,EAAK,GAAA,EAAA,OAAA,CAAQ,CAAC,EAAO,KAAA;AACnB,IAAM,MAAA,EAAA,GAAK,yBAAyB,EAAE,CAAA;AACtC,IAAA,IAAI,EAAI,EAAA;AACN,MAAU,SAAA,CAAA,IAAA,CAAK,GAAG,EAAE,CAAA;AAAA;AACtB,GACD,CAAA;AACD,EAAA,OAAO,CAAC,OAAY,KAAA;AAClB,IAAA,MAAM,aAAuB,EAAC;AAC9B,IAAW,SAAA,EAAA,OAAA,CAAQ,CAAC,EAAO,KAAA;AACzB,MAAM,MAAA,SAAA,GAAY,GAAG,OAAO,CAAA;AAC5B,MAAA,IAAI,SAAW,EAAA;AACb,QAAA,UAAA,CAAW,KAAK,SAAS,CAAA;AAAA;AAC3B,KACD,CAAA;AACD,IAAO,OAAA,UAAA,CAAW,KAAK,GAAG,CAAA;AAAA,GAC5B;AACF,CAAA;AAEO,MAAM,4BAA4B,CAAC;AAAA,EACxC;AACF,CAAmB,KAAA;AACjB,EAAA,OAAO,QAA2C,MAAM;AACtD,IAAA,OAAO,yBAAyB,sBAAsB,CAAA;AAAA,GACxD,EAAG,CAAC,sBAAsB,CAAC,CAAA;AAC7B;;;;"}

package/esm/useSelection.js

@@ -1,8 +1,7 @@
-import { deselectItem, selectItem, queryClosest, dispatchMouseEvent, metadataKeys } from '@vuu-ui/vuu-utils';
+import { deselectItem, selectItem, queryClosest, dispatchMouseEvent } from '@vuu-ui/vuu-utils';
 import { useRef, useState, useCallback, useEffect } from 'react';
 import { getRowElementByAriaIndex } from './table-dom-utils.js';
 
-const { IDX, KEY, SELECTED } = metadataKeys;
 const orderedRowKeys = (activeRowIdentifier, newRowIdentifier, rangeSelect = false) => {
   if (rangeSelect && activeRowIdentifier) {
     if (newRowIdentifier.rowIdx > activeRowIdentifier.rowIdx) {
@@ -44,14 +43,14 @@ const useSelection = ({
     [selectionKeys]
   );
   const handleRowClick = useCallback(
-    (e, row, rangeSelect, keepExistingSelection) => {
-      const { [IDX]: rowIdx, [KEY]: rowKey } = row;
+    (e, dataRow, rangeSelect, keepExistingSelection) => {
+      const { index: rowIdx, key: rowKey } = dataRow;
       const { current: activeRowKey } = lastActiveRef;
       const newRowIdentifier = { rowIdx, rowKey };
-      if (row[SELECTED] && selectionModel === "single-no-deselect") {
+      if (dataRow.isSelected && selectionModel === "single-no-deselect") {
         return;
       }
-      const selectOperation = row[SELECTED] ? deselectItem : selectItem;
+      const selectOperation = dataRow.isSelected ? deselectItem : selectItem;
       if (selectionModel === "checkbox" && allowSelectCheckboxRow !== true) {
         const cell = queryClosest(e.target, ".vuuTableCell");
         if (!cell?.querySelector(".vuuCheckboxRowSelector")) {
@@ -72,7 +71,7 @@ const useSelection = ({
       );
       lastActiveRef.current = newRowIdentifier;
       if (selectRequest) {
-        onSelect?.(selectOperation === selectItem ? row : null);
+        onSelect?.(selectOperation === selectItem ? dataRow : null);
         onSelectionChange?.(selectRequest);
       }
       if (allRowsSelected && selectOperation === deselectItem) {

package/esm/useSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSelection.js","sources":["../../../packages/vuu-table/src/useSelection.ts"],"sourcesContent":["import {\n  TableRowClickHandlerInternal,\n  TableRowSelectHandlerInternal,\n  SelectionChangeHandler,\n  TableSelectionModel,\n} from \"@vuu-ui/vuu-table-types\";\nimport {\n  deselectItem,\n  dispatchMouseEvent,\n  metadataKeys,\n  queryClosest,\n  selectItem,\n} from \"@vuu-ui/vuu-utils\";\nimport {\n  KeyboardEvent,\n  KeyboardEventHandler,\n  RefObject,\n  useCallback,\n  useEffect,\n  useRef,\n  useState,\n} from \"react\";\nimport { getRowElementByAriaIndex } from \"./table-dom-utils\";\nimport { TableProps } from \"./Table\";\nimport { DataSource, RowSelectionEventHandler } from \"@vuu-ui/vuu-data-types\";\n\nconst { IDX, KEY, SELECTED } = metadataKeys;\n\nconst orderedRowKeys = (\n  activeRowIdentifier: RowIdentifier | undefined,\n  newRowIdentifier: RowIdentifier,\n  rangeSelect = false,\n): [string, string] | [string] => {\n  if (rangeSelect && activeRowIdentifier) {\n    if (newRowIdentifier.rowIdx > activeRowIdentifier.rowIdx) {\n      return [activeRowIdentifier.rowKey, newRowIdentifier.rowKey];\n    } else {\n      return [newRowIdentifier.rowKey, activeRowIdentifier.rowKey];\n    }\n  } else {\n    return [newRowIdentifier.rowKey];\n  }\n};\n\nconst defaultSelectionKeys = [\"Enter\", \" \"];\n\ntype RowIdentifier = {\n  rowIdx: number;\n  rowKey: string;\n};\n\nexport interface SelectionHookProps\n  extends Pick<TableProps, \"allowSelectCheckboxRow\" | \"onSelectionChange\"> {\n  containerRef: RefObject<HTMLElement | null>;\n  dataSource: DataSource;\n  highlightedIndexRef: RefObject<number | undefined>;\n  selectionKeys?: string[];\n  selectionModel: TableSelectionModel;\n  onSelectionChange: SelectionChangeHandler;\n  onSelect?: TableRowSelectHandlerInternal;\n}\n\nexport const useSelection = ({\n  allowSelectCheckboxRow,\n  containerRef,\n  dataSource,\n  highlightedIndexRef,\n  selectionKeys = defaultSelectionKeys,\n  selectionModel,\n  onSelect,\n  onSelectionChange,\n}: SelectionHookProps) => {\n  const lastActiveRef = useRef<RowIdentifier | undefined>(undefined);\n  const [allRowsSelected, setAllRowsSelected] = useState(false);\n\n  const handleRowSelection = useCallback<RowSelectionEventHandler>(\n    (selectedRowsCount) => {\n      setAllRowsSelected((allSelected) =>\n        allSelected && selectedRowsCount < dataSource.size\n          ? false\n          : allSelected,\n      );\n    },\n    [dataSource.size],\n  );\n\n  useEffect(() => {\n    dataSource.on(\"row-selection\", handleRowSelection);\n    return () => dataSource.removeListener(\"row-selection\", handleRowSelection);\n  }, [dataSource, handleRowSelection]);\n\n  const isSelectionEvent = useCallback(\n    (evt: KeyboardEvent<HTMLElement>) => selectionKeys.includes(evt.key),\n    [selectionKeys],\n  );\n\n  const handleRowClick = useCallback<TableRowClickHandlerInternal>(\n    (e, row, rangeSelect, keepExistingSelection) => {\n      const { [IDX]: rowIdx, [KEY]: rowKey } = row;\n      const { current: activeRowKey } = lastActiveRef;\n      const newRowIdentifier = { rowIdx, rowKey } as RowIdentifier;\n\n      if (row[SELECTED] && selectionModel === \"single-no-deselect\") {\n        return;\n      }\n\n      const selectOperation = row[SELECTED] ? deselectItem : selectItem;\n\n      if (selectionModel === \"checkbox\" && allowSelectCheckboxRow !== true) {\n        const cell = queryClosest(e.target, \".vuuTableCell\");\n        if (!cell?.querySelector(\".vuuCheckboxRowSelector\")) {\n          return;\n        }\n      }\n\n      const [fromRowKey, toRowKey] = orderedRowKeys(\n        activeRowKey,\n        newRowIdentifier,\n        rangeSelect,\n      );\n\n      const selectRequest = selectOperation(\n        selectionModel,\n        fromRowKey,\n        rangeSelect,\n        keepExistingSelection,\n        toRowKey,\n      );\n\n      lastActiveRef.current = newRowIdentifier;\n\n      if (selectRequest) {\n        onSelect?.(selectOperation === selectItem ? row : null);\n        onSelectionChange?.(selectRequest);\n      }\n\n      if (allRowsSelected && selectOperation === deselectItem) {\n        setAllRowsSelected(false);\n      }\n    },\n    [\n      allRowsSelected,\n      allowSelectCheckboxRow,\n      onSelect,\n      onSelectionChange,\n      selectionModel,\n    ],\n  );\n\n  const handleKeyDown = useCallback<KeyboardEventHandler<HTMLElement>>(\n    (e) => {\n      if (isSelectionEvent(e)) {\n        const { current: rowIndex } = highlightedIndexRef;\n        const { current: container } = containerRef;\n        if (rowIndex !== undefined && rowIndex !== -1 && container) {\n          const rowEl = getRowElementByAriaIndex(container, rowIndex);\n          if (rowEl) {\n            dispatchMouseEvent(rowEl, \"click\");\n          }\n        }\n      }\n    },\n    [containerRef, highlightedIndexRef, isSelectionEvent],\n  );\n\n  const handleCheckboxColumnHeaderClick = useCallback(() => {\n    setAllRowsSelected((allSelected) => {\n      if (allSelected) {\n        onSelectionChange({\n          type: \"DESELECT_ALL\",\n        });\n      } else {\n        onSelectionChange({\n          type: \"SELECT_ALL\",\n        });\n      }\n      return !allSelected;\n    });\n  }, [onSelectionChange]);\n\n  return {\n    allRowsSelected,\n    onCheckBoxColumnHeaderClick: handleCheckboxColumnHeaderClick,\n    onKeyDown: handleKeyDown,\n    onRowClick: handleRowClick,\n  };\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"useSelection.js","sources":["../../../packages/vuu-table/src/useSelection.ts"],"sourcesContent":["import {\n  TableRowClickHandlerInternal,\n  TableRowSelectHandlerInternal,\n  SelectionChangeHandler,\n  TableSelectionModel,\n} from \"@vuu-ui/vuu-table-types\";\nimport {\n  deselectItem,\n  dispatchMouseEvent,\n  queryClosest,\n  selectItem,\n} from \"@vuu-ui/vuu-utils\";\nimport {\n  KeyboardEvent,\n  KeyboardEventHandler,\n  RefObject,\n  useCallback,\n  useEffect,\n  useRef,\n  useState,\n} from \"react\";\nimport { getRowElementByAriaIndex } from \"./table-dom-utils\";\nimport { TableProps } from \"./Table\";\nimport { DataSource, RowSelectionEventHandler } from \"@vuu-ui/vuu-data-types\";\n\nconst orderedRowKeys = (\n  activeRowIdentifier: RowIdentifier | undefined,\n  newRowIdentifier: RowIdentifier,\n  rangeSelect = false,\n): [string, string] | [string] => {\n  if (rangeSelect && activeRowIdentifier) {\n    if (newRowIdentifier.rowIdx > activeRowIdentifier.rowIdx) {\n      return [activeRowIdentifier.rowKey, newRowIdentifier.rowKey];\n    } else {\n      return [newRowIdentifier.rowKey, activeRowIdentifier.rowKey];\n    }\n  } else {\n    return [newRowIdentifier.rowKey];\n  }\n};\n\nconst defaultSelectionKeys = [\"Enter\", \" \"];\n\ntype RowIdentifier = {\n  rowIdx: number;\n  rowKey: string;\n};\n\nexport interface SelectionHookProps\n  extends Pick<TableProps, \"allowSelectCheckboxRow\" | \"onSelectionChange\"> {\n  containerRef: RefObject<HTMLElement | null>;\n  dataSource: DataSource;\n  highlightedIndexRef: RefObject<number | undefined>;\n  selectionKeys?: string[];\n  selectionModel: TableSelectionModel;\n  onSelectionChange: SelectionChangeHandler;\n  onSelect?: TableRowSelectHandlerInternal;\n}\n\nexport const useSelection = ({\n  allowSelectCheckboxRow,\n  containerRef,\n  dataSource,\n  highlightedIndexRef,\n  selectionKeys = defaultSelectionKeys,\n  selectionModel,\n  onSelect,\n  onSelectionChange,\n}: SelectionHookProps) => {\n  const lastActiveRef = useRef<RowIdentifier | undefined>(undefined);\n  const [allRowsSelected, setAllRowsSelected] = useState(false);\n\n  const handleRowSelection = useCallback<RowSelectionEventHandler>(\n    (selectedRowsCount) => {\n      setAllRowsSelected((allSelected) =>\n        allSelected && selectedRowsCount < dataSource.size\n          ? false\n          : allSelected,\n      );\n    },\n    [dataSource.size],\n  );\n\n  useEffect(() => {\n    dataSource.on(\"row-selection\", handleRowSelection);\n    return () => dataSource.removeListener(\"row-selection\", handleRowSelection);\n  }, [dataSource, handleRowSelection]);\n\n  const isSelectionEvent = useCallback(\n    (evt: KeyboardEvent<HTMLElement>) => selectionKeys.includes(evt.key),\n    [selectionKeys],\n  );\n\n  const handleRowClick = useCallback<TableRowClickHandlerInternal>(\n    (e, dataRow, rangeSelect, keepExistingSelection) => {\n      const { index: rowIdx, key: rowKey } = dataRow;\n      const { current: activeRowKey } = lastActiveRef;\n      const newRowIdentifier = { rowIdx, rowKey } as RowIdentifier;\n\n      if (dataRow.isSelected && selectionModel === \"single-no-deselect\") {\n        return;\n      }\n\n      const selectOperation = dataRow.isSelected ? deselectItem : selectItem;\n\n      if (selectionModel === \"checkbox\" && allowSelectCheckboxRow !== true) {\n        const cell = queryClosest(e.target, \".vuuTableCell\");\n        if (!cell?.querySelector(\".vuuCheckboxRowSelector\")) {\n          return;\n        }\n      }\n\n      const [fromRowKey, toRowKey] = orderedRowKeys(\n        activeRowKey,\n        newRowIdentifier,\n        rangeSelect,\n      );\n\n      const selectRequest = selectOperation(\n        selectionModel,\n        fromRowKey,\n        rangeSelect,\n        keepExistingSelection,\n        toRowKey,\n      );\n\n      lastActiveRef.current = newRowIdentifier;\n\n      if (selectRequest) {\n        onSelect?.(selectOperation === selectItem ? dataRow : null);\n        onSelectionChange?.(selectRequest);\n      }\n\n      if (allRowsSelected && selectOperation === deselectItem) {\n        setAllRowsSelected(false);\n      }\n    },\n    [\n      allRowsSelected,\n      allowSelectCheckboxRow,\n      onSelect,\n      onSelectionChange,\n      selectionModel,\n    ],\n  );\n\n  const handleKeyDown = useCallback<KeyboardEventHandler<HTMLElement>>(\n    (e) => {\n      if (isSelectionEvent(e)) {\n        const { current: rowIndex } = highlightedIndexRef;\n        const { current: container } = containerRef;\n        if (rowIndex !== undefined && rowIndex !== -1 && container) {\n          const rowEl = getRowElementByAriaIndex(container, rowIndex);\n          if (rowEl) {\n            dispatchMouseEvent(rowEl, \"click\");\n          }\n        }\n      }\n    },\n    [containerRef, highlightedIndexRef, isSelectionEvent],\n  );\n\n  const handleCheckboxColumnHeaderClick = useCallback(() => {\n    setAllRowsSelected((allSelected) => {\n      if (allSelected) {\n        onSelectionChange({\n          type: \"DESELECT_ALL\",\n        });\n      } else {\n        onSelectionChange({\n          type: \"SELECT_ALL\",\n        });\n      }\n      return !allSelected;\n    });\n  }, [onSelectionChange]);\n\n  return {\n    allRowsSelected,\n    onCheckBoxColumnHeaderClick: handleCheckboxColumnHeaderClick,\n    onKeyDown: handleKeyDown,\n    onRowClick: handleRowClick,\n  };\n};\n"],"names":[],"mappings":"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"}

package/esm/useTable.js

@@ -1,6 +1,6 @@
 import { useTableAndColumnSettings, columnSettingsFromColumnMenuPermissions, tableSettingsFromColumnMenuPermissions, useColumnActions } from '@vuu-ui/vuu-table-extras';
 import { useDragDrop } from '@vuu-ui/vuu-ui-controls';
-import { useStableReference, useLayoutEffectSkipFirst, buildColumnMap, updateColumn, logUnhandledMessage, toggleOrApplySort, isValidNumber, getAllCellsInColumn, getPinStateFromElement, isJsonGroup, isGroupColumn, getAriaRowIndex, asDataSourceRowObject, metadataKeys } from '@vuu-ui/vuu-utils';
+import { useStableReference, useLayoutEffectSkipFirst, updateColumn, logUnhandledMessage, toggleOrApplySort, isValidNumber, getAllCellsInColumn, getPinStateFromElement, isJsonGroup, isGroupColumn, getAriaRowIndex, metadataKeys } from '@vuu-ui/vuu-utils';
 import { useRef, useMemo, useState, useCallback, useEffect } from 'react';
 import { useCellBlockSelection } from './cell-block/useCellBlockSelection.js';
 import { CellFocusState } from './CellFocusState.js';
@@ -28,7 +28,7 @@ const zeroHeaderState = {
 const stripInternalProperties = (tableConfig) => {
   return tableConfig;
 };
-const { KEY, IS_EXPANDED, IS_LEAF } = metadataKeys;
+const { IS_EXPANDED, IS_LEAF } = metadataKeys;
 const NULL_DRAG_DROP = {
   draggable: void 0,
   onMouseDown: void 0
@@ -66,7 +66,6 @@ const useTable = ({
   renderBufferSize = 0,
   revealSelected,
   rowHeight,
-  rowToObject = asDataSourceRowObject,
   scrollingApiRef,
   selectionModel,
   showColumnHeaderMenus = true,
@@ -143,9 +142,6 @@ const useTable = ({
       selectionModel
     ]
   );
-  const columnMap = useMemo(() => {
-    return buildColumnMap(dataSource.columns);
-  }, [dataSource.columns]);
   const handleSelectionChange = useCallback(
     (selectRequest) => {
       dataSource.select?.(selectRequest);
@@ -154,12 +150,12 @@ const useTable = ({
     [dataSource, onSelectionChange]
   );
   const handleSelect = useCallback(
-    (row) => {
+    (dataRow) => {
       if (onSelect) {
-        onSelect(row === null ? null : rowToObject(row, columnMap));
+        onSelect(dataRow);
       }
     },
-    [columnMap, onSelect, rowToObject]
+    [onSelect]
   );
   const onSubscribed = useCallback(
     ({ tableSchema }) => {
@@ -190,11 +186,11 @@ const useTable = ({
     showPaginationControls
   });
   const {
-    data,
-    dataRef,
+    dataRows,
+    dataRowsRef,
     getSelectedRows,
     range,
-    removeColumnDataFromCache,
+    // removeColumnDataFromCache,
     setRange
   } = useDataSource({
     autoSelectFirstRow,
@@ -210,7 +206,6 @@ const useTable = ({
   const { requestScroll, scrollTop, ...scrollProps } = useTableScroll({
     cellFocusStateRef,
     columns,
-    focusCell: focusCellRef.current,
     getRowAtPosition,
     rowHeight,
     scrollingApiRef,
@@ -290,14 +285,12 @@ const useTable = ({
         ...tableConfig,
         columns: tableConfig.columns.filter((col) => col.name !== column.name)
       };
-      const indexOfRemovedColumn = columnMap[column.name];
-      removeColumnDataFromCache(indexOfRemovedColumn);
       applyTableConfigChange(newTableConfig, {
         type: "column-removed",
         column
       });
     },
-    [applyTableConfigChange, columnMap, removeColumnDataFromCache, tableConfig]
+    [applyTableConfigChange, tableConfig]
   );
   const hideColumns = useCallback(
     (action) => {
@@ -404,7 +397,6 @@ const useTable = ({
   const onResizeColumn = useCallback(
     (phase, columnName, width = 0) => {
       if (phase === "resize") {
-        console.log(`resize column ${columnName}`);
         cellResizeState.current?.cells.forEach((cell) => {
           cell.style.width = `${width}px`;
         });
@@ -481,15 +473,15 @@ const useTable = ({
     ]
   );
   const onToggleGroup = useCallback(
-    (row, column) => {
-      const isJson = isJsonGroup(column, row, columnMap);
-      const key = row[KEY];
-      if (row[IS_EXPANDED]) {
+    (dataRow, column) => {
+      const isJson = isJsonGroup(column, dataRow);
+      const { key } = dataRow;
+      if (dataRow.isExpanded) {
         dataSource.closeTreeNode(key, true);
         if (isJson) {
           const idx = columns.indexOf(column);
           const rows = dataSource.getRowsAtDepth?.(idx + 1);
-          if (rows && !rows.some((row2) => row2[IS_EXPANDED] || row2[IS_LEAF])) {
+          if (rows && !rows.some((row) => row[IS_EXPANDED] || row[IS_LEAF])) {
             dispatchTableModelAction({
               type: "hideColumns",
               columns: columns.slice(idx + 2)
@@ -502,7 +494,7 @@ const useTable = ({
           const childRows = dataSource.getChildRows?.(key);
           const idx = columns.indexOf(column) + 1;
           const columnsToShow = [columns[idx]];
-          if (childRows && childRows.some((row2) => row2[IS_LEAF])) {
+          if (childRows && childRows.some((row) => row[IS_LEAF])) {
             columnsToShow.push(columns[idx + 1]);
           }
           if (columnsToShow.some((col) => col.hidden)) {
@@ -514,7 +506,7 @@ const useTable = ({
         }
       }
     },
-    [columnMap, columns, dataSource, dispatchTableModelAction]
+    [columns, dataSource, dispatchTableModelAction]
   );
   const handleToggleGroup = useCallback(
     (treeNodeOperation, rowIdx) => {
@@ -580,9 +572,8 @@ const useTable = ({
     [editingFocus, navigationFocus]
   );
   const onContextMenu = useTableContextMenu({
-    columnMap,
     columns,
-    data,
+    dataRows,
     dataSource,
     getSelectedRows,
     headerCount: headerState.count
@@ -642,11 +633,11 @@ const useTable = ({
     rowCount
   });
   const handleRowClick = useCallback(
-    (evt, row, rangeSelect, keepExistingSelection) => {
-      selectionHookOnRowClick(evt, row, rangeSelect, keepExistingSelection);
-      onRowClickProp?.(evt, rowToObject(row, columnMap));
+    (evt, dataRow, rangeSelect, keepExistingSelection) => {
+      selectionHookOnRowClick(evt, dataRow, rangeSelect, keepExistingSelection);
+      onRowClickProp?.(evt, dataRow);
     },
-    [columnMap, onRowClickProp, rowToObject, selectionHookOnRowClick]
+    [onRowClickProp, selectionHookOnRowClick]
   );
   const handleKeyDown = useCallback(
     (e) => {
@@ -718,17 +709,17 @@ const useTable = ({
       const {
         editType = "commit",
         isValid = true,
-        row,
+        dataRow,
         columnName,
         value
       } = editState;
       if (editType === "commit" && isValid) {
         if (dataSource.rpcRequest) {
-          if (columnName && row) {
+          if (columnName && dataRow) {
             const response = await dataSource.rpcRequest({
               params: {
                 column: columnName,
-                key: row[KEY],
+                key: dataRow.key,
                 data: value
               },
               rpcName: "editCell",
@@ -755,13 +746,13 @@ const useTable = ({
     (dragDropState) => {
       const { initialDragElement } = dragDropState;
       const rowIndex = getAriaRowIndex(initialDragElement) - headerState.count - 1;
-      const row = dataRef.current.find((row2) => row2[0] === rowIndex);
+      const row = dataRowsRef.current.find((row2) => row2.index === rowIndex);
       if (row) {
         dragDropState.setPayload(row);
       }
       onDragStart?.(dragDropState);
     },
-    [dataRef, headerState.count, onDragStart]
+    [dataRowsRef, headerState.count, onDragStart]
   );
   const onHeaderHeightMeasured = useCallback(
     (height, count) => {
@@ -793,9 +784,8 @@ const useTable = ({
     allRowsSelected,
     "aria-rowcount": dataSource.size,
     cellBlock,
-    columnMap,
     columns,
-    data,
+    dataRows,
     draggableRow,
     focusCellPlaceholderKeyDown,
     focusCellPlaceholderRef,