@vuu-ui/vuu-table 0.11.2 → 0.11.3

package/cjs/pagination/usePagination.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var react = require('react');
+var vuuUtils = require('@vuu-ui/vuu-utils');
 
 const getPageCount = (dataSource) => {
   const { range, size } = dataSource;
@@ -21,7 +22,7 @@ const usePagination = ({ dataSource }) => {
       const { range } = dataSource;
       const pageSize = range.to - range.from;
       const firstRow = pageSize * (page - 1);
-      dataSource.range = { from: firstRow, to: firstRow + pageSize };
+      dataSource.range = vuuUtils.Range(firstRow, firstRow + pageSize);
     },
     [dataSource]
   );

package/cjs/pagination/usePagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePagination.js","sources":["../../src/pagination/usePagination.ts"],"sourcesContent":["import { SyntheticEvent, useCallback, useMemo, useState } from \"react\";\nimport { DataSource } from \"@vuu-ui/vuu-data-types\";\n\nexport interface PaginationHookProps {\n  dataSource: DataSource;\n}\n\nconst getPageCount = (dataSource: DataSource) => {\n  const { range, size } = dataSource;\n  const pageSize = range.to - range.from;\n  if (pageSize > 0) {\n    return Math.ceil(size / pageSize);\n  } else {\n    return 0;\n  }\n};\n\nexport const usePagination = ({ dataSource }: PaginationHookProps) => {\n  const [pageCount, setPageCount] = useState<number>(getPageCount(dataSource));\n\n  useMemo(() => {\n    dataSource.on(\"page-count\", (n: number) => setPageCount(n));\n  }, [dataSource]);\n\n  const handlePageChange = useCallback(\n    (_evt: SyntheticEvent, page: number) => {\n      const { range } = dataSource;\n      const pageSize = range.to - range.from;\n      const firstRow = pageSize * (page - 1);\n      dataSource.range = { from: firstRow, to: firstRow + pageSize };\n    },\n    [dataSource],\n  );\n\n  return {\n    onPageChange: handlePageChange,\n    pageCount,\n  };\n};\n"],"names":["useState","useMemo","useCallback"],"mappings":";;;;AAOA,MAAM,YAAA,GAAe,CAAC,UAA2B,KAAA;AAC/C,EAAM,MAAA,EAAE,KAAO,EAAA,IAAA,EAAS,GAAA,UAAA;AACxB,EAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,EAAA,IAAI,WAAW,CAAG,EAAA;AAChB,IAAO,OAAA,IAAA,CAAK,IAAK,CAAA,IAAA,GAAO,QAAQ,CAAA;AAAA,GAC3B,MAAA;AACL,IAAO,OAAA,CAAA;AAAA;AAEX,CAAA;AAEO,MAAM,aAAgB,GAAA,CAAC,EAAE,UAAA,EAAsC,KAAA;AACpE,EAAA,MAAM,CAAC,SAAW,EAAA,YAAY,IAAIA,cAAiB,CAAA,YAAA,CAAa,UAAU,CAAC,CAAA;AAE3E,EAAAC,aAAA,CAAQ,MAAM;AACZ,IAAA,UAAA,CAAW,GAAG,YAAc,EAAA,CAAC,CAAc,KAAA,YAAA,CAAa,CAAC,CAAC,CAAA;AAAA,GAC5D,EAAG,CAAC,UAAU,CAAC,CAAA;AAEf,EAAA,MAAM,gBAAmB,GAAAC,iBAAA;AAAA,IACvB,CAAC,MAAsB,IAAiB,KAAA;AACtC,MAAM,MAAA,EAAE,OAAU,GAAA,UAAA;AAClB,MAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,MAAM,MAAA,QAAA,GAAW,YAAY,IAAO,GAAA,CAAA,CAAA;AACpC,MAAA,UAAA,CAAW,QAAQ,EAAE,IAAA,EAAM,QAAU,EAAA,EAAA,EAAI,WAAW,QAAS,EAAA;AAAA,KAC/D;AAAA,IACA,CAAC,UAAU;AAAA,GACb;AAEA,EAAO,OAAA;AAAA,IACL,YAAc,EAAA,gBAAA;AAAA,IACd;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"usePagination.js","sources":["../../src/pagination/usePagination.ts"],"sourcesContent":["import { SyntheticEvent, useCallback, useMemo, useState } from \"react\";\nimport { DataSource } from \"@vuu-ui/vuu-data-types\";\nimport { Range } from \"@vuu-ui/vuu-utils\";\n\nexport interface PaginationHookProps {\n  dataSource: DataSource;\n}\n\nconst getPageCount = (dataSource: DataSource) => {\n  const { range, size } = dataSource;\n  const pageSize = range.to - range.from;\n  if (pageSize > 0) {\n    return Math.ceil(size / pageSize);\n  } else {\n    return 0;\n  }\n};\n\nexport const usePagination = ({ dataSource }: PaginationHookProps) => {\n  const [pageCount, setPageCount] = useState<number>(getPageCount(dataSource));\n\n  useMemo(() => {\n    dataSource.on(\"page-count\", (n: number) => setPageCount(n));\n  }, [dataSource]);\n\n  const handlePageChange = useCallback(\n    (_evt: SyntheticEvent, page: number) => {\n      const { range } = dataSource;\n      const pageSize = range.to - range.from;\n      const firstRow = pageSize * (page - 1);\n      dataSource.range = Range(firstRow, firstRow + pageSize);\n    },\n    [dataSource],\n  );\n\n  return {\n    onPageChange: handlePageChange,\n    pageCount,\n  };\n};\n"],"names":["useState","useMemo","useCallback","Range"],"mappings":";;;;;AAQA,MAAM,YAAA,GAAe,CAAC,UAA2B,KAAA;AAC/C,EAAM,MAAA,EAAE,KAAO,EAAA,IAAA,EAAS,GAAA,UAAA;AACxB,EAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,EAAA,IAAI,WAAW,CAAG,EAAA;AAChB,IAAO,OAAA,IAAA,CAAK,IAAK,CAAA,IAAA,GAAO,QAAQ,CAAA;AAAA,GAC3B,MAAA;AACL,IAAO,OAAA,CAAA;AAAA;AAEX,CAAA;AAEO,MAAM,aAAgB,GAAA,CAAC,EAAE,UAAA,EAAsC,KAAA;AACpE,EAAA,MAAM,CAAC,SAAW,EAAA,YAAY,IAAIA,cAAiB,CAAA,YAAA,CAAa,UAAU,CAAC,CAAA;AAE3E,EAAAC,aAAA,CAAQ,MAAM;AACZ,IAAA,UAAA,CAAW,GAAG,YAAc,EAAA,CAAC,CAAc,KAAA,YAAA,CAAa,CAAC,CAAC,CAAA;AAAA,GAC5D,EAAG,CAAC,UAAU,CAAC,CAAA;AAEf,EAAA,MAAM,gBAAmB,GAAAC,iBAAA;AAAA,IACvB,CAAC,MAAsB,IAAiB,KAAA;AACtC,MAAM,MAAA,EAAE,OAAU,GAAA,UAAA;AAClB,MAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,MAAM,MAAA,QAAA,GAAW,YAAY,IAAO,GAAA,CAAA,CAAA;AACpC,MAAA,UAAA,CAAW,KAAQ,GAAAC,cAAA,CAAM,QAAU,EAAA,QAAA,GAAW,QAAQ,CAAA;AAAA,KACxD;AAAA,IACA,CAAC,UAAU;AAAA,GACb;AAEA,EAAO,OAAA;AAAA,IACL,YAAc,EAAA,gBAAA;AAAA,IACd;AAAA,GACF;AACF;;;;"}

package/cjs/useDataSource.js

@@ -17,8 +17,9 @@ const useDataSource = ({
   const isMounted = react.useRef(true);
   const hasUpdated = react.useRef(false);
   const rangeRef = react.useRef(vuuUtils.NULL_RANGE);
+  const totalRowCountRef = react.useRef(0);
   const dataWindow = react.useMemo(
-    () => new vuuUtils.MovingWindow(vuuUtils.getFullRange(vuuUtils.NULL_RANGE, renderBufferSize)),
+    () => new vuuUtils.MovingWindow(vuuUtils.NULL_RANGE),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
@@ -51,6 +52,7 @@ const useDataSource = ({
           onSizeChange?.(message.size);
           const size = dataWindow.data.length;
           dataWindow.setRowCount(message.size);
+          totalRowCountRef.current = message.size;
           if (dataWindow.data.length < size) {
             if (isMounted.current === false) {
               console.log("setting state whilst unmounted");
@@ -99,14 +101,17 @@ const useDataSource = ({
     }
   }, [dataSource, datasourceMessageHandler, renderBufferSize]);
   const setRange = react.useCallback(
-    (range) => {
-      if (!vuuUtils.rangesAreSame(range, rangeRef.current)) {
-        const fullRange = vuuUtils.getFullRange(range, renderBufferSize);
-        dataWindow.setRange(fullRange);
+    (viewportRange) => {
+      if (!rangeRef.current.equals(viewportRange)) {
+        const range = vuuUtils.Range(viewportRange.from, viewportRange.to, {
+          renderBufferSize,
+          rowCount: totalRowCountRef.current
+        });
+        dataWindow.setRange(range);
         if (dataSource.status !== "subscribed") {
           dataSource?.subscribe(
             {
-              range: fullRange,
+              range,
               revealSelected,
               selectedIndexValues: defaultSelectedIndexValues,
               selectedKeyValues: defaultSelectedKeyValues
@@ -114,7 +119,7 @@ const useDataSource = ({
             datasourceMessageHandler
           );
         } else {
-          dataSource.range = rangeRef.current = fullRange;
+          dataSource.range = rangeRef.current = range;
         }
       }
     },

package/cjs/useDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDataSource.js","sources":["../src/useDataSource.ts"],"sourcesContent":["import {\n  DataSourceRow,\n  DataSourceSubscribedMessage,\n  SubscribeCallback,\n} from \"@vuu-ui/vuu-data-types\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  getFullRange,\n  MovingWindow,\n  NULL_RANGE,\n  rangesAreSame,\n} from \"@vuu-ui/vuu-utils\";\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { TableProps } from \"./Table\";\n\nexport interface DataSourceHookProps\n  extends Pick<\n    TableProps,\n    | \"dataSource\"\n    | \"defaultSelectedIndexValues\"\n    | \"defaultSelectedKeyValues\"\n    | \"renderBufferSize\"\n    | \"revealSelected\"\n  > {\n  onSizeChange: (size: number) => void;\n  onSubscribed: (subscription: DataSourceSubscribedMessage) => void;\n}\n\nexport const useDataSource = ({\n  dataSource,\n  defaultSelectedIndexValues,\n  defaultSelectedKeyValues,\n  onSizeChange,\n  onSubscribed,\n  renderBufferSize = 0,\n  revealSelected,\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<VuuRange>(NULL_RANGE);\n\n  const dataWindow = useMemo(\n    () => new MovingWindow(getFullRange(NULL_RANGE, renderBufferSize)),\n    // eslint-disable-next-line react-hooks/exhaustive-deps\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        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 datasourceMessageHandler: SubscribeCallback = 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          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          // Removed because known to cause issues when multiple server requests\n          // are handled  - a newer range can be overwritten with an out-of-date\n          // range. If we need this for some reason, amke sure server sends up\n          // top date range\n          // if (message.range) {\n          //   if (message.range.to !== dataWindow.range.to) {\n          //     dataWindow.setRange(message.range);\n          //   }\n          // }\n          setData(message.rows);\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    [dataWindow, onSizeChange, onSubscribed, 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    };\n  }, [dataSource, datasourceMessageHandler]);\n\n  useEffect(() => {\n    if (dataSource.status === \"disabled\") {\n      dataSource.enable?.(datasourceMessageHandler);\n    }\n  }, [dataSource, datasourceMessageHandler, renderBufferSize]);\n\n  const setRange = useCallback(\n    (range: VuuRange) => {\n      if (!rangesAreSame(range, rangeRef.current)) {\n        const fullRange = getFullRange(range, renderBufferSize);\n        dataWindow.setRange(fullRange);\n\n        if (dataSource.status !== \"subscribed\") {\n          dataSource?.subscribe(\n            {\n              range: fullRange,\n              revealSelected,\n              selectedIndexValues: defaultSelectedIndexValues,\n              selectedKeyValues: defaultSelectedKeyValues,\n            },\n            datasourceMessageHandler,\n          );\n        } else {\n          dataSource.range = rangeRef.current = fullRange;\n        }\n        // emit a range event omitting the renderBufferSize\n        // This isn't great, we're using the dataSource as a conduit to emit a\n        // message that has nothing to do with the dataSource itself. Client\n        // is the DataSourceState component.\n        // WHY CANT THIS BE DONE WITHIN DataSource ?\n        // dataSource.emit(\"range\", range);\n      }\n    },\n    [\n      dataSource,\n      dataWindow,\n      datasourceMessageHandler,\n      defaultSelectedIndexValues,\n      defaultSelectedKeyValues,\n      renderBufferSize,\n      revealSelected,\n    ],\n  );\n\n  return {\n    data: data.current,\n    dataRef: data,\n    getSelectedRows,\n    range: rangeRef.current,\n    setRange,\n  };\n};\n"],"names":["useState","useRef","NULL_RANGE","useMemo","MovingWindow","getFullRange","useCallback","useEffect","rangesAreSame"],"mappings":"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"}
+{"version":3,"file":"useDataSource.js","sources":["../src/useDataSource.ts"],"sourcesContent":["import {\n  DataSourceRow,\n  DataSourceSubscribedMessage,\n  DataSourceSubscribeCallback,\n} from \"@vuu-ui/vuu-data-types\";\nimport { MovingWindow, NULL_RANGE, Range } from \"@vuu-ui/vuu-utils\";\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { TableProps } from \"./Table\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\nexport interface DataSourceHookProps\n  extends Pick<\n    TableProps,\n    | \"dataSource\"\n    | \"defaultSelectedIndexValues\"\n    | \"defaultSelectedKeyValues\"\n    | \"renderBufferSize\"\n    | \"revealSelected\"\n  > {\n  onSizeChange: (size: number) => void;\n  onSubscribed: (subscription: DataSourceSubscribedMessage) => void;\n}\n\nexport const useDataSource = ({\n  dataSource,\n  defaultSelectedIndexValues,\n  defaultSelectedKeyValues,\n  onSizeChange,\n  onSubscribed,\n  renderBufferSize = 0,\n  revealSelected,\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\n  const dataWindow = useMemo(\n    () => new MovingWindow(NULL_RANGE),\n    // eslint-disable-next-line react-hooks/exhaustive-deps\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        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 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          // Removed because known to cause issues when multiple server requests\n          // are handled  - a newer range can be overwritten with an out-of-date\n          // range. If we need this for some reason, amke sure server sends up\n          // top date range\n          // if (message.range) {\n          //   if (message.range.to !== dataWindow.range.to) {\n          //     dataWindow.setRange(message.range);\n          //   }\n          // }\n          setData(message.rows);\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    [dataWindow, onSizeChange, onSubscribed, 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    };\n  }, [dataSource, datasourceMessageHandler]);\n\n  useEffect(() => {\n    if (dataSource.status === \"disabled\") {\n      dataSource.enable?.(datasourceMessageHandler);\n    }\n  }, [dataSource, datasourceMessageHandler, renderBufferSize]);\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              selectedIndexValues: defaultSelectedIndexValues,\n              selectedKeyValues: defaultSelectedKeyValues,\n            },\n            datasourceMessageHandler,\n          );\n        } else {\n          dataSource.range = rangeRef.current = range;\n        }\n        // emit a range event omitting the renderBufferSize\n        // This isn't great, we're using the dataSource as a conduit to emit a\n        // message that has nothing to do with the dataSource itself. Client\n        // is the DataSourceState component.\n        // WHY CANT THIS BE DONE WITHIN DataSource ?\n        // dataSource.emit(\"range\", range);\n      }\n    },\n    [\n      dataSource,\n      dataWindow,\n      datasourceMessageHandler,\n      defaultSelectedIndexValues,\n      defaultSelectedKeyValues,\n      renderBufferSize,\n      revealSelected,\n    ],\n  );\n\n  return {\n    data: data.current,\n    dataRef: data,\n    getSelectedRows,\n    range: rangeRef.current,\n    setRange,\n  };\n};\n"],"names":["useState","useRef","NULL_RANGE","useMemo","MovingWindow","useCallback","useEffect","Range"],"mappings":";;;;;AAuBO,MAAM,gBAAgB,CAAC;AAAA,EAC5B,UAAA;AAAA,EACA,0BAAA;AAAA,EACA,wBAAA;AAAA,EACA,YAAA;AAAA,EACA,YAAA;AAAA,EACA,gBAAmB,GAAA,CAAA;AAAA,EACnB;AACF,CAA2B,KAAA;AACzB,EAAA,MAAM,GAAG,WAAW,CAAA,GAAIA,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;AAEjC,EAAA,MAAM,UAAa,GAAAE,aAAA;AAAA,IACjB,MAAM,IAAIC,qBAAA,CAAaF,mBAAU,CAAA;AAAA;AAAA,IAEjC;AAAC,GACH;AAEA,EAAAC,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,GAAAE,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,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;AAUhB,UAAA,OAAA,CAAQ,QAAQ,IAAI,CAAA;AAAA,SACtB,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,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,UAAA,EAAY,YAAc,EAAA,YAAA,EAAc,OAAO;AAAA,GAClD;AAEA,EAAM,MAAA,eAAA,GAAkBA,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,MAAA,UAAA,CAAW,OAAU,IAAA;AAAA,KACvB;AAAA,GACC,EAAA,CAAC,UAAY,EAAA,wBAAwB,CAAC,CAAA;AAEzC,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,wBAAA,EAA0B,gBAAgB,CAAC,CAAA;AAE3D,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,GAAAE,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,mBAAqB,EAAA,0BAAA;AAAA,cACrB,iBAAmB,EAAA;AAAA,aACrB;AAAA,YACA;AAAA,WACF;AAAA,SACK,MAAA;AACL,UAAW,UAAA,CAAA,KAAA,GAAQ,SAAS,OAAU,GAAA,KAAA;AAAA;AACxC;AAOF,KACF;AAAA,IACA;AAAA,MACE,UAAA;AAAA,MACA,UAAA;AAAA,MACA,wBAAA;AAAA,MACA,0BAAA;AAAA,MACA,wBAAA;AAAA,MACA,gBAAA;AAAA,MACA;AAAA;AACF,GACF;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;AAAA,GACF;AACF;;;;"}

package/esm/pagination/usePagination.js

@@ -1,4 +1,5 @@
 import { useState, useMemo, useCallback } from 'react';
+import { Range } from '@vuu-ui/vuu-utils';
 
 const getPageCount = (dataSource) => {
   const { range, size } = dataSource;
@@ -19,7 +20,7 @@ const usePagination = ({ dataSource }) => {
       const { range } = dataSource;
       const pageSize = range.to - range.from;
       const firstRow = pageSize * (page - 1);
-      dataSource.range = { from: firstRow, to: firstRow + pageSize };
+      dataSource.range = Range(firstRow, firstRow + pageSize);
     },
     [dataSource]
   );

package/esm/pagination/usePagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePagination.js","sources":["../../src/pagination/usePagination.ts"],"sourcesContent":["import { SyntheticEvent, useCallback, useMemo, useState } from \"react\";\nimport { DataSource } from \"@vuu-ui/vuu-data-types\";\n\nexport interface PaginationHookProps {\n  dataSource: DataSource;\n}\n\nconst getPageCount = (dataSource: DataSource) => {\n  const { range, size } = dataSource;\n  const pageSize = range.to - range.from;\n  if (pageSize > 0) {\n    return Math.ceil(size / pageSize);\n  } else {\n    return 0;\n  }\n};\n\nexport const usePagination = ({ dataSource }: PaginationHookProps) => {\n  const [pageCount, setPageCount] = useState<number>(getPageCount(dataSource));\n\n  useMemo(() => {\n    dataSource.on(\"page-count\", (n: number) => setPageCount(n));\n  }, [dataSource]);\n\n  const handlePageChange = useCallback(\n    (_evt: SyntheticEvent, page: number) => {\n      const { range } = dataSource;\n      const pageSize = range.to - range.from;\n      const firstRow = pageSize * (page - 1);\n      dataSource.range = { from: firstRow, to: firstRow + pageSize };\n    },\n    [dataSource],\n  );\n\n  return {\n    onPageChange: handlePageChange,\n    pageCount,\n  };\n};\n"],"names":[],"mappings":";;AAOA,MAAM,YAAA,GAAe,CAAC,UAA2B,KAAA;AAC/C,EAAM,MAAA,EAAE,KAAO,EAAA,IAAA,EAAS,GAAA,UAAA;AACxB,EAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,EAAA,IAAI,WAAW,CAAG,EAAA;AAChB,IAAO,OAAA,IAAA,CAAK,IAAK,CAAA,IAAA,GAAO,QAAQ,CAAA;AAAA,GAC3B,MAAA;AACL,IAAO,OAAA,CAAA;AAAA;AAEX,CAAA;AAEO,MAAM,aAAgB,GAAA,CAAC,EAAE,UAAA,EAAsC,KAAA;AACpE,EAAA,MAAM,CAAC,SAAW,EAAA,YAAY,IAAI,QAAiB,CAAA,YAAA,CAAa,UAAU,CAAC,CAAA;AAE3E,EAAA,OAAA,CAAQ,MAAM;AACZ,IAAA,UAAA,CAAW,GAAG,YAAc,EAAA,CAAC,CAAc,KAAA,YAAA,CAAa,CAAC,CAAC,CAAA;AAAA,GAC5D,EAAG,CAAC,UAAU,CAAC,CAAA;AAEf,EAAA,MAAM,gBAAmB,GAAA,WAAA;AAAA,IACvB,CAAC,MAAsB,IAAiB,KAAA;AACtC,MAAM,MAAA,EAAE,OAAU,GAAA,UAAA;AAClB,MAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,MAAM,MAAA,QAAA,GAAW,YAAY,IAAO,GAAA,CAAA,CAAA;AACpC,MAAA,UAAA,CAAW,QAAQ,EAAE,IAAA,EAAM,QAAU,EAAA,EAAA,EAAI,WAAW,QAAS,EAAA;AAAA,KAC/D;AAAA,IACA,CAAC,UAAU;AAAA,GACb;AAEA,EAAO,OAAA;AAAA,IACL,YAAc,EAAA,gBAAA;AAAA,IACd;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"usePagination.js","sources":["../../src/pagination/usePagination.ts"],"sourcesContent":["import { SyntheticEvent, useCallback, useMemo, useState } from \"react\";\nimport { DataSource } from \"@vuu-ui/vuu-data-types\";\nimport { Range } from \"@vuu-ui/vuu-utils\";\n\nexport interface PaginationHookProps {\n  dataSource: DataSource;\n}\n\nconst getPageCount = (dataSource: DataSource) => {\n  const { range, size } = dataSource;\n  const pageSize = range.to - range.from;\n  if (pageSize > 0) {\n    return Math.ceil(size / pageSize);\n  } else {\n    return 0;\n  }\n};\n\nexport const usePagination = ({ dataSource }: PaginationHookProps) => {\n  const [pageCount, setPageCount] = useState<number>(getPageCount(dataSource));\n\n  useMemo(() => {\n    dataSource.on(\"page-count\", (n: number) => setPageCount(n));\n  }, [dataSource]);\n\n  const handlePageChange = useCallback(\n    (_evt: SyntheticEvent, page: number) => {\n      const { range } = dataSource;\n      const pageSize = range.to - range.from;\n      const firstRow = pageSize * (page - 1);\n      dataSource.range = Range(firstRow, firstRow + pageSize);\n    },\n    [dataSource],\n  );\n\n  return {\n    onPageChange: handlePageChange,\n    pageCount,\n  };\n};\n"],"names":[],"mappings":";;;AAQA,MAAM,YAAA,GAAe,CAAC,UAA2B,KAAA;AAC/C,EAAM,MAAA,EAAE,KAAO,EAAA,IAAA,EAAS,GAAA,UAAA;AACxB,EAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,EAAA,IAAI,WAAW,CAAG,EAAA;AAChB,IAAO,OAAA,IAAA,CAAK,IAAK,CAAA,IAAA,GAAO,QAAQ,CAAA;AAAA,GAC3B,MAAA;AACL,IAAO,OAAA,CAAA;AAAA;AAEX,CAAA;AAEO,MAAM,aAAgB,GAAA,CAAC,EAAE,UAAA,EAAsC,KAAA;AACpE,EAAA,MAAM,CAAC,SAAW,EAAA,YAAY,IAAI,QAAiB,CAAA,YAAA,CAAa,UAAU,CAAC,CAAA;AAE3E,EAAA,OAAA,CAAQ,MAAM;AACZ,IAAA,UAAA,CAAW,GAAG,YAAc,EAAA,CAAC,CAAc,KAAA,YAAA,CAAa,CAAC,CAAC,CAAA;AAAA,GAC5D,EAAG,CAAC,UAAU,CAAC,CAAA;AAEf,EAAA,MAAM,gBAAmB,GAAA,WAAA;AAAA,IACvB,CAAC,MAAsB,IAAiB,KAAA;AACtC,MAAM,MAAA,EAAE,OAAU,GAAA,UAAA;AAClB,MAAM,MAAA,QAAA,GAAW,KAAM,CAAA,EAAA,GAAK,KAAM,CAAA,IAAA;AAClC,MAAM,MAAA,QAAA,GAAW,YAAY,IAAO,GAAA,CAAA,CAAA;AACpC,MAAA,UAAA,CAAW,KAAQ,GAAA,KAAA,CAAM,QAAU,EAAA,QAAA,GAAW,QAAQ,CAAA;AAAA,KACxD;AAAA,IACA,CAAC,UAAU;AAAA,GACb;AAEA,EAAO,OAAA;AAAA,IACL,YAAc,EAAA,gBAAA;AAAA,IACd;AAAA,GACF;AACF;;;;"}

package/esm/useDataSource.js

@@ -1,4 +1,4 @@
-import { NULL_RANGE, MovingWindow, getFullRange, rangesAreSame } from '@vuu-ui/vuu-utils';
+import { NULL_RANGE, MovingWindow, Range } from '@vuu-ui/vuu-utils';
 import { useState, useRef, useMemo, useCallback, useEffect } from 'react';
 
 const useDataSource = ({
@@ -15,8 +15,9 @@ const useDataSource = ({
   const isMounted = useRef(true);
   const hasUpdated = useRef(false);
   const rangeRef = useRef(NULL_RANGE);
+  const totalRowCountRef = useRef(0);
   const dataWindow = useMemo(
-    () => new MovingWindow(getFullRange(NULL_RANGE, renderBufferSize)),
+    () => new MovingWindow(NULL_RANGE),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
@@ -49,6 +50,7 @@ const useDataSource = ({
           onSizeChange?.(message.size);
           const size = dataWindow.data.length;
           dataWindow.setRowCount(message.size);
+          totalRowCountRef.current = message.size;
           if (dataWindow.data.length < size) {
             if (isMounted.current === false) {
               console.log("setting state whilst unmounted");
@@ -97,14 +99,17 @@ const useDataSource = ({
     }
   }, [dataSource, datasourceMessageHandler, renderBufferSize]);
   const setRange = useCallback(
-    (range) => {
-      if (!rangesAreSame(range, rangeRef.current)) {
-        const fullRange = getFullRange(range, renderBufferSize);
-        dataWindow.setRange(fullRange);
+    (viewportRange) => {
+      if (!rangeRef.current.equals(viewportRange)) {
+        const range = Range(viewportRange.from, viewportRange.to, {
+          renderBufferSize,
+          rowCount: totalRowCountRef.current
+        });
+        dataWindow.setRange(range);
         if (dataSource.status !== "subscribed") {
           dataSource?.subscribe(
             {
-              range: fullRange,
+              range,
               revealSelected,
               selectedIndexValues: defaultSelectedIndexValues,
               selectedKeyValues: defaultSelectedKeyValues
@@ -112,7 +117,7 @@ const useDataSource = ({
             datasourceMessageHandler
           );
         } else {
-          dataSource.range = rangeRef.current = fullRange;
+          dataSource.range = rangeRef.current = range;
         }
       }
     },

package/esm/useDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDataSource.js","sources":["../src/useDataSource.ts"],"sourcesContent":["import {\n  DataSourceRow,\n  DataSourceSubscribedMessage,\n  SubscribeCallback,\n} from \"@vuu-ui/vuu-data-types\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  getFullRange,\n  MovingWindow,\n  NULL_RANGE,\n  rangesAreSame,\n} from \"@vuu-ui/vuu-utils\";\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { TableProps } from \"./Table\";\n\nexport interface DataSourceHookProps\n  extends Pick<\n    TableProps,\n    | \"dataSource\"\n    | \"defaultSelectedIndexValues\"\n    | \"defaultSelectedKeyValues\"\n    | \"renderBufferSize\"\n    | \"revealSelected\"\n  > {\n  onSizeChange: (size: number) => void;\n  onSubscribed: (subscription: DataSourceSubscribedMessage) => void;\n}\n\nexport const useDataSource = ({\n  dataSource,\n  defaultSelectedIndexValues,\n  defaultSelectedKeyValues,\n  onSizeChange,\n  onSubscribed,\n  renderBufferSize = 0,\n  revealSelected,\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<VuuRange>(NULL_RANGE);\n\n  const dataWindow = useMemo(\n    () => new MovingWindow(getFullRange(NULL_RANGE, renderBufferSize)),\n    // eslint-disable-next-line react-hooks/exhaustive-deps\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        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 datasourceMessageHandler: SubscribeCallback = 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          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          // Removed because known to cause issues when multiple server requests\n          // are handled  - a newer range can be overwritten with an out-of-date\n          // range. If we need this for some reason, amke sure server sends up\n          // top date range\n          // if (message.range) {\n          //   if (message.range.to !== dataWindow.range.to) {\n          //     dataWindow.setRange(message.range);\n          //   }\n          // }\n          setData(message.rows);\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    [dataWindow, onSizeChange, onSubscribed, 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    };\n  }, [dataSource, datasourceMessageHandler]);\n\n  useEffect(() => {\n    if (dataSource.status === \"disabled\") {\n      dataSource.enable?.(datasourceMessageHandler);\n    }\n  }, [dataSource, datasourceMessageHandler, renderBufferSize]);\n\n  const setRange = useCallback(\n    (range: VuuRange) => {\n      if (!rangesAreSame(range, rangeRef.current)) {\n        const fullRange = getFullRange(range, renderBufferSize);\n        dataWindow.setRange(fullRange);\n\n        if (dataSource.status !== \"subscribed\") {\n          dataSource?.subscribe(\n            {\n              range: fullRange,\n              revealSelected,\n              selectedIndexValues: defaultSelectedIndexValues,\n              selectedKeyValues: defaultSelectedKeyValues,\n            },\n            datasourceMessageHandler,\n          );\n        } else {\n          dataSource.range = rangeRef.current = fullRange;\n        }\n        // emit a range event omitting the renderBufferSize\n        // This isn't great, we're using the dataSource as a conduit to emit a\n        // message that has nothing to do with the dataSource itself. Client\n        // is the DataSourceState component.\n        // WHY CANT THIS BE DONE WITHIN DataSource ?\n        // dataSource.emit(\"range\", range);\n      }\n    },\n    [\n      dataSource,\n      dataWindow,\n      datasourceMessageHandler,\n      defaultSelectedIndexValues,\n      defaultSelectedKeyValues,\n      renderBufferSize,\n      revealSelected,\n    ],\n  );\n\n  return {\n    data: data.current,\n    dataRef: data,\n    getSelectedRows,\n    range: rangeRef.current,\n    setRange,\n  };\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDataSource.js","sources":["../src/useDataSource.ts"],"sourcesContent":["import {\n  DataSourceRow,\n  DataSourceSubscribedMessage,\n  DataSourceSubscribeCallback,\n} from \"@vuu-ui/vuu-data-types\";\nimport { MovingWindow, NULL_RANGE, Range } from \"@vuu-ui/vuu-utils\";\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { TableProps } from \"./Table\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\nexport interface DataSourceHookProps\n  extends Pick<\n    TableProps,\n    | \"dataSource\"\n    | \"defaultSelectedIndexValues\"\n    | \"defaultSelectedKeyValues\"\n    | \"renderBufferSize\"\n    | \"revealSelected\"\n  > {\n  onSizeChange: (size: number) => void;\n  onSubscribed: (subscription: DataSourceSubscribedMessage) => void;\n}\n\nexport const useDataSource = ({\n  dataSource,\n  defaultSelectedIndexValues,\n  defaultSelectedKeyValues,\n  onSizeChange,\n  onSubscribed,\n  renderBufferSize = 0,\n  revealSelected,\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\n  const dataWindow = useMemo(\n    () => new MovingWindow(NULL_RANGE),\n    // eslint-disable-next-line react-hooks/exhaustive-deps\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        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 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          // Removed because known to cause issues when multiple server requests\n          // are handled  - a newer range can be overwritten with an out-of-date\n          // range. If we need this for some reason, amke sure server sends up\n          // top date range\n          // if (message.range) {\n          //   if (message.range.to !== dataWindow.range.to) {\n          //     dataWindow.setRange(message.range);\n          //   }\n          // }\n          setData(message.rows);\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    [dataWindow, onSizeChange, onSubscribed, 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    };\n  }, [dataSource, datasourceMessageHandler]);\n\n  useEffect(() => {\n    if (dataSource.status === \"disabled\") {\n      dataSource.enable?.(datasourceMessageHandler);\n    }\n  }, [dataSource, datasourceMessageHandler, renderBufferSize]);\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              selectedIndexValues: defaultSelectedIndexValues,\n              selectedKeyValues: defaultSelectedKeyValues,\n            },\n            datasourceMessageHandler,\n          );\n        } else {\n          dataSource.range = rangeRef.current = range;\n        }\n        // emit a range event omitting the renderBufferSize\n        // This isn't great, we're using the dataSource as a conduit to emit a\n        // message that has nothing to do with the dataSource itself. Client\n        // is the DataSourceState component.\n        // WHY CANT THIS BE DONE WITHIN DataSource ?\n        // dataSource.emit(\"range\", range);\n      }\n    },\n    [\n      dataSource,\n      dataWindow,\n      datasourceMessageHandler,\n      defaultSelectedIndexValues,\n      defaultSelectedKeyValues,\n      renderBufferSize,\n      revealSelected,\n    ],\n  );\n\n  return {\n    data: data.current,\n    dataRef: data,\n    getSelectedRows,\n    range: rangeRef.current,\n    setRange,\n  };\n};\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,21 +1,21 @@
 {
-  "version": "0.11.2",
+  "version": "0.11.3",
   "author": "heswell",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "0.11.2",
-    "@vuu-ui/vuu-table-types": "0.11.2",
-    "@vuu-ui/vuu-protocol-types": "0.11.2"
+    "@vuu-ui/vuu-data-types": "0.11.3",
+    "@vuu-ui/vuu-table-types": "0.11.3",
+    "@vuu-ui/vuu-protocol-types": "0.11.3"
   },
   "dependencies": {
     "@salt-ds/core": "1.43.0",
     "@salt-ds/styles": "0.2.1",
     "@salt-ds/window": "0.1.1",
-    "@vuu-ui/vuu-data-react": "0.11.2",
-    "@vuu-ui/vuu-layout": "0.11.2",
-    "@vuu-ui/vuu-popups": "0.11.2",
-    "@vuu-ui/vuu-ui-controls": "0.11.2",
-    "@vuu-ui/vuu-utils": "0.11.2"
+    "@vuu-ui/vuu-data-react": "0.11.3",
+    "@vuu-ui/vuu-layout": "0.11.3",
+    "@vuu-ui/vuu-popups": "0.11.3",
+    "@vuu-ui/vuu-ui-controls": "0.11.3",
+    "@vuu-ui/vuu-utils": "0.11.3"
   },
   "peerDependencies": {
     "clsx": "^2.0.0",

package/types/useDataSource.d.ts

@@ -1,6 +1,7 @@
 import { DataSourceRow, DataSourceSubscribedMessage } from "@vuu-ui/vuu-data-types";
-import { VuuRange } from "@vuu-ui/vuu-protocol-types";
+import { Range } from "@vuu-ui/vuu-utils";
 import { TableProps } from "./Table";
+import { VuuRange } from "@vuu-ui/vuu-protocol-types";
 export interface DataSourceHookProps extends Pick<TableProps, "dataSource" | "defaultSelectedIndexValues" | "defaultSelectedKeyValues" | "renderBufferSize" | "revealSelected"> {
     onSizeChange: (size: number) => void;
     onSubscribed: (subscription: DataSourceSubscribedMessage) => void;
@@ -9,6 +10,6 @@ export declare const useDataSource: ({ dataSource, defaultSelectedIndexValues, d
     data: DataSourceRow[];
     dataRef: import("react").MutableRefObject<DataSourceRow[]>;
     getSelectedRows: () => DataSourceRow[];
-    range: VuuRange;
-    setRange: (range: VuuRange) => void;
+    range: Range;
+    setRange: (viewportRange: VuuRange) => void;
 };