@vuu-ui/vuu-table 0.13.78 → 0.13.79

package/cjs/table-data-source/moving-window.js

@@ -12,31 +12,37 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 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 _sourceRange, _range;
+var _range;
 const { SELECTED } = vuuUtils.metadataKeys;
 class MovingWindow {
-  constructor(range) {
+  constructor({ from, to }) {
     __publicField(this, "data");
     __publicField(this, "rowCount", 0);
-    __privateAdd(this, _sourceRange);
     __privateAdd(this, _range);
     __publicField(this, "setRowCount", (rowCount) => {
       if (rowCount < this.data.length) {
         this.data.length = rowCount;
       }
       this.rowCount = rowCount;
-      __privateGet(this, _sourceRange).rowCount = rowCount;
-      this.setRange(__privateGet(this, _sourceRange));
     });
-    __privateSet(this, _sourceRange, range);
-    const { from, to } = range;
     __privateSet(this, _range, new vuuUtils.WindowRange(from, to));
     this.data = new Array(Math.max(0, to - from));
     this.rowCount = 0;
   }
-  setRange(range) {
-    __privateSet(this, _sourceRange, range);
-    const { from, to } = range;
+  add(data) {
+    const [index] = data;
+    if (this.isWithinRange(index)) {
+      const internalIndex = index - __privateGet(this, _range).from;
+      this.data[internalIndex] = data;
+    }
+  }
+  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;
+  }
+  isWithinRange(index) {
+    return __privateGet(this, _range).isWithin(index);
+  }
+  setRange({ from, to }) {
     if (from !== __privateGet(this, _range).from || to !== __privateGet(this, _range).to) {
       const [overlapFrom, overlapTo] = __privateGet(this, _range).overlap(from, to);
       const newData = new Array(Math.max(0, to - from));
@@ -52,19 +58,6 @@ class MovingWindow {
       __privateGet(this, _range).to = to;
     }
   }
-  add(data) {
-    const [index] = data;
-    if (this.isWithinRange(index)) {
-      const internalIndex = index - __privateGet(this, _range).from;
-      this.data[internalIndex] = data;
-    }
-  }
-  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;
-  }
-  isWithinRange(index) {
-    return __privateGet(this, _range).isWithin(index);
-  }
   getSelectedRows() {
     return this.data.filter((row) => row[SELECTED] !== 0);
   }
@@ -108,7 +101,6 @@ class MovingWindow {
     return true;
   }
 }
-_sourceRange = new WeakMap();
 _range = new WeakMap();
 
 exports.MovingWindow = MovingWindow;

package/cjs/table-data-source/moving-window.js.map

@@ -1 +1 @@
-{"version":3,"file":"moving-window.js","sources":["../../../../packages/vuu-table/src/table-data-source/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport { Range, WindowRange, metadataKeys } from \"@vuu-ui/vuu-utils\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\n  public rowCount = 0;\n  #sourceRange: Range;\n  #range: WindowRange;\n\n  constructor(range: Range) {\n    this.#sourceRange = range;\n    const { from, to } = range;\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  setRange(range: Range) {\n    this.#sourceRange = range;\n    const { from, to } = range;\n\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  setRowCount = (rowCount: number) => {\n    // TODO, do we still need this, given the call to setRange below\n    if (rowCount < this.data.length) {\n      this.data.length = rowCount;\n    }\n\n    this.rowCount = rowCount;\n\n    this.#sourceRange.rowCount = rowCount;\n    this.setRange(this.#sourceRange);\n  };\n\n  add(data: DataSourceRow) {\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  isWithinRange(index: number) {\n    return this.#range.isWithin(index);\n  }\n\n  getSelectedRows() {\n    return this.data.filter((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0, 0, false]);\n      }\n    }\n    return data;\n  }\n\n  /**\n   * Update all rows by splicing the supplied index. Used when a column\n   * is removed.\n   */\n  spliceDataAtIndex(index: number) {\n    if (index >= 10) {\n      for (let i = 0; i < this.data.length; i++) {\n        this.data[i] = this.data[i].toSpliced(index, 1) as DataSourceRow;\n      }\n    } else {\n      throw Error(`[MovingWindow] canno splir metadata value from Row`);\n    }\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":["metadataKeys","WindowRange"],"mappings":"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"}
+{"version":3,"file":"moving-window.js","sources":["../../../../packages/vuu-table/src/table-data-source/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport { metadataKeys, WindowRange } from \"@vuu-ui/vuu-utils\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\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: DataSourceRow) {\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  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((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0, 0, false]);\n      }\n    }\n    return data;\n  }\n\n  /**\n   * Update all rows by splicing the supplied index. Used when a column\n   * is removed.\n   */\n  spliceDataAtIndex(index: number) {\n    if (index >= 10) {\n      for (let i = 0; i < this.data.length; i++) {\n        this.data[i] = this.data[i].toSpliced(index, 1) as DataSourceRow;\n      }\n    } else {\n      throw Error(`[MovingWindow] canno splir metadata value from Row`);\n    }\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":["metadataKeys","WindowRange"],"mappings":"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"}

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

@@ -155,11 +155,12 @@ const useDataSource = ({
   const setRange = react.useCallback(
     (viewportRange) => {
       if (!rangeRef.current.equals(viewportRange)) {
-        const range = vuuUtils.Range(viewportRange.from, viewportRange.to, {
-          renderBufferSize,
-          rowCount: totalRowCountRef.current
-        });
-        dataWindow.setRange(range);
+        const range = vuuUtils.Range(
+          viewportRange.from,
+          viewportRange.to,
+          renderBufferSize
+        );
+        dataWindow.setRange(range.withBuffer);
         if (dataSource.status !== "subscribed") {
           dataSource?.subscribe(
             {

package/cjs/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 { NULL_RANGE, 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>(NULL_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(() => new MovingWindow(NULL_RANGE), []);\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        dataWindow.setRange(dataSource.range);\n      }\n    });\n  }, [dataSource, dataWindow]);\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 {\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        console.log(\"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    isMounted.current = true;\n    if (dataSource.status !== \"initialising\") {\n      dataSource.resume?.(datasourceMessageHandler);\n    }\n    return () => {\n      isMounted.current = false;\n      dataSource.suspend?.(\n        suspenseProps?.escalateToDisable,\n        suspenseProps?.escalateDelay,\n      );\n    };\n  }, [dataSource, datasourceMessageHandler, suspenseProps]);\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(viewportRange.from, viewportRange.to, {\n          renderBufferSize,\n          rowCount: totalRowCountRef.current,\n        });\n\n        dataWindow.setRange(range);\n\n        if (dataSource.status !== \"subscribed\") {\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  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":["metadataKeys","useState","useRef","NULL_RANGE","useCallback","useEffect","useMemo","MovingWindow","row","Range"],"mappings":";;;;;;AAeA,MAAM,EAAE,KAAQ,GAAAA,qBAAA;AAkBT,MAAM,gBAAgB,CAAC;AAAA,EAC5B,kBAAA;AAAA,EACA,gBAAA;AAAA,EACA,UAAA;AAAA,EACA,YAAA;AAAA,EACA,YAAA;AAAA,EACA,gBAAmB,GAAA,CAAA;AAAA,EACnB,cAAA;AAAA,EACA,QAAA;AAAA,EACA,cAAA;AAAA,EACA;AACF,CAA2B,KAAA;AACzB,EAAA,MAAM,GAAG,WAAW,CAAA,GAAIC,eAAkB,IAAI,CAAA;AAC9C,EAAM,MAAA,IAAA,GAAOC,YAAwB,CAAA,EAAE,CAAA;AACvC,EAAM,MAAA,SAAA,GAAYA,aAAO,IAAI,CAAA;AAC7B,EAAM,MAAA,UAAA,GAAaA,aAAO,KAAK,CAAA;AAC/B,EAAM,MAAA,QAAA,GAAWA,aAAcC,mBAAU,CAAA;AACzC,EAAM,MAAA,gBAAA,GAAmBD,aAAO,CAAC,CAAA;AACjC,EAAM,MAAA,eAAA,GAAkBA,aAAO,KAAK,CAAA;AAEpC,EAAM,MAAA,UAAA,GACJ,gBACC,KAAA,kBAAA,IAAsB,cAAmB,KAAA,oBAAA,CAAA;AAE5C,EAAA,MAAM,kBAAqB,GAAAE,iBAAA;AAAA,IACzB,CAAC,OAAA,EAAS,MAAQ,EAAA,UAAA,EAAY,aAAkB,KAAA;AAC9C,MAAA,IAAI,eAAe,aAAe,EAAA;AAChC,QAAA,eAAA,CAAgB,OAAU,GAAA,KAAA;AAAA;AAC5B,KACF;AAAA,IACA;AAAC,GACH;AAEA,EAAAC,eAAA,CAAU,MAAM;AACd,IAAA,IAAI,UAAY,EAAA;AACd,MAAW,UAAA,CAAA,EAAA,CAAG,UAAU,kBAAkB,CAAA;AAAA;AAE5C,IAAA,OAAO,MAAM;AACX,MAAA,IAAI,UAAY,EAAA;AACd,QAAW,UAAA,CAAA,cAAA,CAAe,UAAU,kBAAkB,CAAA;AAAA;AACxD,KACF;AAAA,GACC,EAAA,CAAC,UAAY,EAAA,UAAA,EAAY,kBAAkB,CAAC,CAAA;AAE/C,EAAM,MAAA,UAAA,GAAaC,cAAQ,MAAM,IAAIC,0BAAaJ,mBAAU,CAAA,EAAG,EAAE,CAAA;AAEjE,EAAAG,aAAA,CAAQ,MAAM;AACZ,IAAW,UAAA,CAAA,EAAA,CAAG,WAAW,MAAM;AAM7B,MAAM,MAAA,EAAE,OAAU,GAAA,UAAA;AAClB,MAAI,IAAA,KAAA,CAAM,OAAO,CAAG,EAAA;AAClB,QAAW,UAAA,CAAA,QAAA,CAAS,WAAW,KAAK,CAAA;AAAA;AACtC,KACD,CAAA;AAAA,GACA,EAAA,CAAC,UAAY,EAAA,UAAU,CAAC,CAAA;AAE3B,EAAA,MAAM,OAAU,GAAAF,iBAAA;AAAA,IACd,CAAC,OAA6B,KAAA;AAC5B,MAAA,KAAA,MAAW,OAAO,OAAS,EAAA;AACzB,QAAA,UAAA,CAAW,IAAI,GAAG,CAAA;AAAA;AAEpB,MAAA,IAAA,CAAK,UAAU,UAAW,CAAA,IAAA;AAC1B,MAAA,IAAI,UAAU,OAAS,EAAA;AAErB,QAAA,WAAA,CAAY,EAAE,CAAA;AAAA;AAChB,KACF;AAAA,IACA,CAAC,UAAU;AAAA,GACb;AAEA,EAAA,MAAM,SAAY,GAAAA,iBAAA;AAAA,IAChB,CAAC,GAAuB,KAAA;AACtB,MAAM,MAAA,MAAA,GAAS,IAAI,GAAG,CAAA;AACtB,MAAA,UAAA,CAAW,MAAS,GAAA;AAAA,QAClB,yBAA2B,EAAA,KAAA;AAAA,QAC3B,MAAA;AAAA,QACA,IAAM,EAAA;AAAA,OACa,CAAA;AACrB,MAAA,QAAA,GAAW,GAAG,CAAA;AAAA,KAChB;AAAA,IACA,CAAC,YAAY,QAAQ;AAAA,GACvB;AAEA,EAAA,MAAM,wBAAwD,GAAAA,iBAAA;AAAA,IAC5D,CAAC,OAAY,KAAA;AACX,MAAI,IAAA,OAAA,CAAQ,SAAS,YAAc,EAAA;AACjC,QAAA,YAAA,GAAe,OAAO,CAAA;AAAA,OACxB,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,iBAAmB,EAAA;AAC7C,QAAI,IAAA,OAAO,OAAQ,CAAA,IAAA,KAAS,QAAU,EAAA;AACpC,UAAA,YAAA,GAAe,QAAQ,IAAI,CAAA;AAC3B,UAAM,MAAA,IAAA,GAAO,WAAW,IAAK,CAAA,MAAA;AAC7B,UAAW,UAAA,CAAA,WAAA,CAAY,QAAQ,IAAI,CAAA;AACnC,UAAA,gBAAA,CAAiB,UAAU,OAAQ,CAAA,IAAA;AAEnC,UAAI,IAAA,UAAA,CAAW,IAAK,CAAA,MAAA,GAAS,IAAM,EAAA;AACjC,YAAI,IAAA,SAAA,CAAU,YAAY,KAAO,EAAA;AAC/B,cAAA,OAAA,CAAQ,IAAI,gCAAgC,CAAA;AAAA;AAG9C,YAAA,WAAA,CAAY,EAAE,CAAA;AAAA;AAChB;AAEF,QAAA,IAAI,QAAQ,IAAM,EAAA;AAChB,UAAA,OAAA,CAAQ,QAAQ,IAAI,CAAA;AACpB,UAAI,IAAA,UAAA,IAAc,eAAgB,CAAA,OAAA,KAAY,KAAO,EAAA;AAEnD,YAAA,eAAA,CAAgB,OAAU,GAAA,IAAA;AAC1B,YAAI,IAAA,OAAO,eAAe,QAAU,EAAA;AAClC,cAAM,MAAA,GAAA,GAAM,QAAQ,IAAK,CAAA,IAAA,CAAK,CAACI,IAAQA,KAAAA,IAAAA,CAAI,GAAG,CAAA,KAAM,UAAU,CAAA;AAC9D,cAAA,IAAI,GAAK,EAAA;AACP,gBAAA,SAAA,CAAU,GAAG,CAAA;AAAA,eACR,MAAA;AACL,gBAAQ,OAAA,CAAA,IAAA;AAAA,kBACN,sCAAsC,UAAU,CAAA,gBAAA;AAAA,iBAClD;AAAA;AACF,aACK,MAAA;AACL,cAAU,SAAA,CAAA,OAAA,CAAQ,IAAK,CAAA,CAAC,CAAC,CAAA;AAAA;AAC3B;AACF,SACF,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,CAAG,EAAA;AAC7B,UAAA,OAAA,CAAQ,EAAE,CAAA;AAAA,SACD,MAAA,IAAA,OAAO,OAAQ,CAAA,IAAA,KAAS,QAAU,EAAA;AAC3C,UAAA,IAAA,CAAK,UAAU,UAAW,CAAA,IAAA;AAC1B,UAAA,UAAA,CAAW,OAAU,GAAA,IAAA;AAAA;AACvB,OACF,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,gBAAkB,EAAA;AAC5C,QAAA,OAAA,CAAQ,IAAI,gBAAgB,CAAA;AAC5B,QAAA,YAAA,GAAe,CAAC,CAAA;AAChB,QAAA,UAAA,CAAW,YAAY,CAAC,CAAA;AACxB,QAAA,OAAA,CAAQ,EAAE,CAAA;AAEV,QAAI,IAAA,SAAA,CAAU,YAAY,KAAO,EAAA;AAC/B,UAAA,OAAA,CAAQ,IAAI,gCAAgC,CAAA;AAAA;AAG9C,QAAA,WAAA,CAAY,EAAE,CAAA;AAAA,OACT,MAAA;AACL,QAAA,OAAA,CAAQ,GAAI,CAAA,CAAA,iCAAA,EAAoC,OAAQ,CAAA,IAAI,CAAE,CAAA,CAAA;AAAA;AAChE,KACF;AAAA,IACA,CAAC,UAAY,EAAA,UAAA,EAAY,YAAc,EAAA,YAAA,EAAc,WAAW,OAAO;AAAA,GACzE;AAEA,EAAM,MAAA,eAAA,GAAkBJ,kBAAY,MAAM;AACxC,IAAA,OAAO,WAAW,eAAgB,EAAA;AAAA,GACpC,EAAG,CAAC,UAAU,CAAC,CAAA;AAEf,EAAAC,eAAA,CAAU,MAAM;AACd,IAAA,SAAA,CAAU,OAAU,GAAA,IAAA;AACpB,IAAI,IAAA,UAAA,CAAW,WAAW,cAAgB,EAAA;AACxC,MAAA,UAAA,CAAW,SAAS,wBAAwB,CAAA;AAAA;AAE9C,IAAA,OAAO,MAAM;AACX,MAAA,SAAA,CAAU,OAAU,GAAA,KAAA;AACpB,MAAW,UAAA,CAAA,OAAA;AAAA,QACT,aAAe,EAAA,iBAAA;AAAA,QACf,aAAe,EAAA;AAAA,OACjB;AAAA,KACF;AAAA,GACC,EAAA,CAAC,UAAY,EAAA,wBAAA,EAA0B,aAAa,CAAC,CAAA;AAExD,EAAAA,eAAA,CAAU,MAAM;AACd,IAAI,IAAA,UAAA,CAAW,WAAW,UAAY,EAAA;AACpC,MAAA,UAAA,CAAW,SAAS,wBAAwB,CAAA;AAAA;AAC9C,GACC,EAAA,CAAC,UAAY,EAAA,wBAAwB,CAAC,CAAA;AAEzC,EAAA,MAAM,QAAW,GAAAD,iBAAA;AAAA,IACf,CAAC,aAA4B,KAAA;AAC3B,MAAA,IAAI,CAAC,QAAA,CAAS,OAAQ,CAAA,MAAA,CAAO,aAAa,CAAG,EAAA;AAC3C,QAAA,MAAM,KAAQ,GAAAK,cAAA,CAAM,aAAc,CAAA,IAAA,EAAM,cAAc,EAAI,EAAA;AAAA,UACxD,gBAAA;AAAA,UACA,UAAU,gBAAiB,CAAA;AAAA,SAC5B,CAAA;AAED,QAAA,UAAA,CAAW,SAAS,KAAK,CAAA;AAEzB,QAAI,IAAA,UAAA,CAAW,WAAW,YAAc,EAAA;AACtC,UAAY,UAAA,EAAA,SAAA;AAAA,YACV;AAAA,cACE,KAAA;AAAA,cACA,cAAA;AAAA,cACA,iBAAmB,EAAA,gBAAA,GACf,CAAC,gBAAgB,CACjB,GAAA,KAAA;AAAA,aACN;AAAA,YACA;AAAA,WACF;AAAA,SACK,MAAA;AACL,UAAW,UAAA,CAAA,KAAA,GAAQ,SAAS,OAAU,GAAA,KAAA;AAAA;AACxC;AACF,KACF;AAAA,IACA;AAAA,MACE,gBAAA;AAAA,MACA,UAAA;AAAA,MACA,UAAA;AAAA,MACA,wBAAA;AAAA,MACA,gBAAA;AAAA,MACA;AAAA;AACF,GACF;AAEA,EAAA,MAAM,yBAA4B,GAAAL,iBAAA;AAAA,IAChC,CAAC,oBAAiC,KAAA;AAChC,MAAA,UAAA,CAAW,kBAAkB,oBAAoB,CAAA;AACjD,MAAA,IAAA,CAAK,UAAU,UAAW,CAAA,IAAA;AAAA,KAC5B;AAAA,IACA,CAAC,UAAU;AAAA,GACb;AAEA,EAAO,OAAA;AAAA,IACL,MAAM,IAAK,CAAA,OAAA;AAAA,IACX,OAAS,EAAA,IAAA;AAAA,IACT,eAAA;AAAA,IACA,OAAO,QAAS,CAAA,OAAA;AAAA,IAChB,yBAAA;AAAA,IACA;AAAA,GACF;AACF;;;;"}
+{"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 { NULL_RANGE, 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>(NULL_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(() => new MovingWindow(NULL_RANGE), []);\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        dataWindow.setRange(dataSource.range);\n      }\n    });\n  }, [dataSource, dataWindow]);\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 {\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        console.log(\"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    isMounted.current = true;\n    if (dataSource.status !== \"initialising\") {\n      dataSource.resume?.(datasourceMessageHandler);\n    }\n    return () => {\n      isMounted.current = false;\n      dataSource.suspend?.(\n        suspenseProps?.escalateToDisable,\n        suspenseProps?.escalateDelay,\n      );\n    };\n  }, [dataSource, datasourceMessageHandler, suspenseProps]);\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 (dataSource.status !== \"subscribed\") {\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  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":["metadataKeys","useState","useRef","NULL_RANGE","useCallback","useEffect","useMemo","MovingWindow","row","Range"],"mappings":"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"}

package/esm/table-data-source/moving-window.js

@@ -10,31 +10,37 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 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 _sourceRange, _range;
+var _range;
 const { SELECTED } = metadataKeys;
 class MovingWindow {
-  constructor(range) {
+  constructor({ from, to }) {
     __publicField(this, "data");
     __publicField(this, "rowCount", 0);
-    __privateAdd(this, _sourceRange);
     __privateAdd(this, _range);
     __publicField(this, "setRowCount", (rowCount) => {
       if (rowCount < this.data.length) {
         this.data.length = rowCount;
       }
       this.rowCount = rowCount;
-      __privateGet(this, _sourceRange).rowCount = rowCount;
-      this.setRange(__privateGet(this, _sourceRange));
     });
-    __privateSet(this, _sourceRange, range);
-    const { from, to } = range;
     __privateSet(this, _range, new WindowRange(from, to));
     this.data = new Array(Math.max(0, to - from));
     this.rowCount = 0;
   }
-  setRange(range) {
-    __privateSet(this, _sourceRange, range);
-    const { from, to } = range;
+  add(data) {
+    const [index] = data;
+    if (this.isWithinRange(index)) {
+      const internalIndex = index - __privateGet(this, _range).from;
+      this.data[internalIndex] = data;
+    }
+  }
+  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;
+  }
+  isWithinRange(index) {
+    return __privateGet(this, _range).isWithin(index);
+  }
+  setRange({ from, to }) {
     if (from !== __privateGet(this, _range).from || to !== __privateGet(this, _range).to) {
       const [overlapFrom, overlapTo] = __privateGet(this, _range).overlap(from, to);
       const newData = new Array(Math.max(0, to - from));
@@ -50,19 +56,6 @@ class MovingWindow {
       __privateGet(this, _range).to = to;
     }
   }
-  add(data) {
-    const [index] = data;
-    if (this.isWithinRange(index)) {
-      const internalIndex = index - __privateGet(this, _range).from;
-      this.data[internalIndex] = data;
-    }
-  }
-  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;
-  }
-  isWithinRange(index) {
-    return __privateGet(this, _range).isWithin(index);
-  }
   getSelectedRows() {
     return this.data.filter((row) => row[SELECTED] !== 0);
   }
@@ -106,7 +99,6 @@ class MovingWindow {
     return true;
   }
 }
-_sourceRange = new WeakMap();
 _range = new WeakMap();
 
 export { MovingWindow };

package/esm/table-data-source/moving-window.js.map

@@ -1 +1 @@
-{"version":3,"file":"moving-window.js","sources":["../../../../packages/vuu-table/src/table-data-source/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport { Range, WindowRange, metadataKeys } from \"@vuu-ui/vuu-utils\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\n  public rowCount = 0;\n  #sourceRange: Range;\n  #range: WindowRange;\n\n  constructor(range: Range) {\n    this.#sourceRange = range;\n    const { from, to } = range;\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  setRange(range: Range) {\n    this.#sourceRange = range;\n    const { from, to } = range;\n\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  setRowCount = (rowCount: number) => {\n    // TODO, do we still need this, given the call to setRange below\n    if (rowCount < this.data.length) {\n      this.data.length = rowCount;\n    }\n\n    this.rowCount = rowCount;\n\n    this.#sourceRange.rowCount = rowCount;\n    this.setRange(this.#sourceRange);\n  };\n\n  add(data: DataSourceRow) {\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  isWithinRange(index: number) {\n    return this.#range.isWithin(index);\n  }\n\n  getSelectedRows() {\n    return this.data.filter((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0, 0, false]);\n      }\n    }\n    return data;\n  }\n\n  /**\n   * Update all rows by splicing the supplied index. Used when a column\n   * is removed.\n   */\n  spliceDataAtIndex(index: number) {\n    if (index >= 10) {\n      for (let i = 0; i < this.data.length; i++) {\n        this.data[i] = this.data[i].toSpliced(index, 1) as DataSourceRow;\n      }\n    } else {\n      throw Error(`[MovingWindow] canno splir metadata value from Row`);\n    }\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":[],"mappings":"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"}
+{"version":3,"file":"moving-window.js","sources":["../../../../packages/vuu-table/src/table-data-source/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport { metadataKeys, WindowRange } from \"@vuu-ui/vuu-utils\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\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: DataSourceRow) {\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  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((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0, 0, false]);\n      }\n    }\n    return data;\n  }\n\n  /**\n   * Update all rows by splicing the supplied index. Used when a column\n   * is removed.\n   */\n  spliceDataAtIndex(index: number) {\n    if (index >= 10) {\n      for (let i = 0; i < this.data.length; i++) {\n        this.data[i] = this.data[i].toSpliced(index, 1) as DataSourceRow;\n      }\n    } else {\n      throw Error(`[MovingWindow] canno splir metadata value from Row`);\n    }\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":[],"mappings":"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"}

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

@@ -153,11 +153,12 @@ const useDataSource = ({
   const setRange = useCallback(
     (viewportRange) => {
       if (!rangeRef.current.equals(viewportRange)) {
-        const range = Range(viewportRange.from, viewportRange.to, {
-          renderBufferSize,
-          rowCount: totalRowCountRef.current
-        });
-        dataWindow.setRange(range);
+        const range = Range(
+          viewportRange.from,
+          viewportRange.to,
+          renderBufferSize
+        );
+        dataWindow.setRange(range.withBuffer);
         if (dataSource.status !== "subscribed") {
           dataSource?.subscribe(
             {

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 { NULL_RANGE, 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>(NULL_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(() => new MovingWindow(NULL_RANGE), []);\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        dataWindow.setRange(dataSource.range);\n      }\n    });\n  }, [dataSource, dataWindow]);\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 {\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        console.log(\"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    isMounted.current = true;\n    if (dataSource.status !== \"initialising\") {\n      dataSource.resume?.(datasourceMessageHandler);\n    }\n    return () => {\n      isMounted.current = false;\n      dataSource.suspend?.(\n        suspenseProps?.escalateToDisable,\n        suspenseProps?.escalateDelay,\n      );\n    };\n  }, [dataSource, datasourceMessageHandler, suspenseProps]);\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(viewportRange.from, viewportRange.to, {\n          renderBufferSize,\n          rowCount: totalRowCountRef.current,\n        });\n\n        dataWindow.setRange(range);\n\n        if (dataSource.status !== \"subscribed\") {\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  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} from \"@vuu-ui/vuu-data-types\";\nimport { SelectRowRequest, VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport { NULL_RANGE, 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>(NULL_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(() => new MovingWindow(NULL_RANGE), []);\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        dataWindow.setRange(dataSource.range);\n      }\n    });\n  }, [dataSource, dataWindow]);\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 {\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        console.log(\"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    isMounted.current = true;\n    if (dataSource.status !== \"initialising\") {\n      dataSource.resume?.(datasourceMessageHandler);\n    }\n    return () => {\n      isMounted.current = false;\n      dataSource.suspend?.(\n        suspenseProps?.escalateToDisable,\n        suspenseProps?.escalateDelay,\n      );\n    };\n  }, [dataSource, datasourceMessageHandler, suspenseProps]);\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 (dataSource.status !== \"subscribed\") {\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  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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"}

package/package.json

@@ -1,22 +1,22 @@
 {
-  "version": "0.13.78",
+  "version": "0.13.79",
   "author": "heswell",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "0.13.78",
-    "@vuu-ui/vuu-table-types": "0.13.78",
-    "@vuu-ui/vuu-protocol-types": "0.13.78"
+    "@vuu-ui/vuu-data-types": "0.13.79",
+    "@vuu-ui/vuu-table-types": "0.13.79",
+    "@vuu-ui/vuu-protocol-types": "0.13.79"
   },
   "dependencies": {
     "@salt-ds/core": "1.48.0",
     "@salt-ds/styles": "0.2.1",
     "@salt-ds/window": "0.1.1",
-    "@vuu-ui/vuu-context-menu": "0.13.78",
-    "@vuu-ui/vuu-data-react": "0.13.78",
-    "@vuu-ui/vuu-popups": "0.13.78",
-    "@vuu-ui/vuu-table-extras": "0.13.78",
-    "@vuu-ui/vuu-ui-controls": "0.13.78",
-    "@vuu-ui/vuu-utils": "0.13.78"
+    "@vuu-ui/vuu-context-menu": "0.13.79",
+    "@vuu-ui/vuu-data-react": "0.13.79",
+    "@vuu-ui/vuu-popups": "0.13.79",
+    "@vuu-ui/vuu-table-extras": "0.13.79",
+    "@vuu-ui/vuu-ui-controls": "0.13.79",
+    "@vuu-ui/vuu-utils": "0.13.79"
   },
   "peerDependencies": {
     "clsx": "^2.0.0",

package/types/table-data-source/moving-window.d.ts

@@ -1,15 +1,16 @@
 import { DataSourceRow } from "@vuu-ui/vuu-data-types";
-import { Range, WindowRange } from "@vuu-ui/vuu-utils";
+import { VuuRange } from "@vuu-ui/vuu-protocol-types";
+import { WindowRange } from "@vuu-ui/vuu-utils";
 export declare class MovingWindow {
     #private;
     data: DataSourceRow[];
     rowCount: number;
-    constructor(range: Range);
-    setRange(range: Range): void;
+    constructor({ from, to }: VuuRange);
     setRowCount: (rowCount: number) => void;
     add(data: DataSourceRow): void;
     getAtIndex(index: number): DataSourceRow | undefined;
     isWithinRange(index: number): boolean;
+    setRange({ from, to }: VuuRange): void;
     getSelectedRows(): DataSourceRow[];
     get range(): WindowRange;
     slice(): DataSourceRow[];