@economic/taco 2.42.0 → 2.42.1

package/dist/esm/packages/taco/src/primitives/Table/useTableDataLoader.js

@@ -17,6 +17,7 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
   const _lastUsedSorting = React__default.useRef([]);
   const _lastUsedFilters = React__default.useRef([]);
   const _lastUsedSearch = React__default.useRef();
+  const _lastUsedPageIndex = React__default.useRef();
   const _forceReset = React__default.useRef(false);
   const loadPage = function (pageIndex, sorting, filters) {
     try {
@@ -34,6 +35,8 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
         _pendingPageRequests.current[pageIndex] = true;
       }
       _forceReset.current = false;
+      // set the last page loaded (or tried to load), so that we can load it back again after resets
+      _lastUsedPageIndex.current = pageIndex;
       // set the sorting so we can track if it changed between loads
       _lastUsedSorting.current = sorting;
       // set the filters so we can track if it changed between loads
@@ -97,12 +100,15 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
   };
   const invalidate = function () {
     try {
+      // empties the entire data array
       _forceReset.current = true;
       if (_lastUsedSearch.current) {
         // we're searching, which means we need to refetch all with the correct sorting applied
         return loadAll(_lastUsedSorting.current, _lastUsedFilters.current);
       } else {
-        return loadPage(0, _lastUsedSorting.current, _lastUsedFilters.current);
+        var _lastUsedPageIndex$cu;
+        // load the last page that we scrolled to
+        return loadPage((_lastUsedPageIndex$cu = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu !== void 0 ? _lastUsedPageIndex$cu : 0, _lastUsedSorting.current, _lastUsedFilters.current);
       }
     } catch (e) {
       return Promise.reject(e);
@@ -116,8 +122,9 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
         // we're searching, which means we need to refetch all with the correct sorting applied
         loadAll(sorting, _lastUsedFilters.current);
       } else {
-        // reset the page to 0 whenever sorting
-        loadPage(0, sorting, _lastUsedFilters.current);
+        var _lastUsedPageIndex$cu2;
+        // load the last page that we scrolled to
+        loadPage((_lastUsedPageIndex$cu2 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu2 !== void 0 ? _lastUsedPageIndex$cu2 : 0, sorting, _lastUsedFilters.current);
       }
       return Promise.resolve();
     } catch (e) {
@@ -130,8 +137,9 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
         // we're searching, which means we need to refetch all with the correct sorting applied
         loadAll(_lastUsedSorting.current, filters);
       } else {
-        // reset the page to 0 whenever sorting
-        loadPage(0, _lastUsedSorting.current, filters);
+        var _lastUsedPageIndex$cu3;
+        // load the last page that we scrolled to
+        loadPage((_lastUsedPageIndex$cu3 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu3 !== void 0 ? _lastUsedPageIndex$cu3 : 0, _lastUsedSorting.current, filters);
       }
       return Promise.resolve();
     } catch (e) {

package/dist/esm/packages/taco/src/primitives/Table/useTableDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTableDataLoader.js","sources":["../../../../../../../src/primitives/Table/useTableDataLoader.ts"],"sourcesContent":["import React from 'react';\nimport {\n    TableColumnFilter,\n    TableColumnSort,\n    TableFilterHandler,\n    TableServerLoadPageHandler,\n    TableServerLoadAllHandler,\n    TableSortHandler,\n    TableSearchHandler,\n} from './types';\n\nexport const DEFAULT_PAGE_SIZE = 100;\n\nexport type useTableDataPageFetcher<TType = unknown> = (\n    pageIndex: number,\n    pageSize: number,\n    sorting: TableColumnSort[],\n    filters: TableColumnFilter[]\n) => Promise<{ data: TType[]; length: number }>;\n\nexport type useTableDataAllFetcher<TType = unknown> = (\n    sorting: TableColumnSort[],\n    filters: TableColumnFilter[]\n) => Promise<{ data: TType[]; length: number }>;\n\nexport type useTableDataLoaderOptions = { pageSize: number };\n\nexport type useTableDataLoaderValues<TType = unknown> = {\n    data: TType[];\n    length: number | undefined;\n    loadAll: TableServerLoadAllHandler;\n    loadPage: TableServerLoadPageHandler;\n    onChangeFilter: TableFilterHandler;\n    onChangeSearch: TableSearchHandler;\n    onChangeSort: TableSortHandler;\n    pageSize: number;\n};\n\nexport function useTableDataLoader<TType = unknown>(\n    fetchPage: useTableDataPageFetcher<TType>,\n    fetchAll: useTableDataAllFetcher<TType>,\n    options: useTableDataLoaderOptions = { pageSize: DEFAULT_PAGE_SIZE }\n): [useTableDataLoaderValues<TType>, () => void] {\n    const { pageSize } = options;\n\n    // track the data length, we don't know it until the first request\n    const length = React.useRef<number | undefined>(undefined);\n    // data will be filled after the first request, then we'll update values in place\n    const [data, setData] = React.useState<any[]>([]);\n    // track which pages have been loaded to dedupe requests\n    const _pendingPageRequests = React.useRef({});\n    const _lastUsedSorting = React.useRef<TableColumnSort[]>([]);\n    const _lastUsedFilters = React.useRef<TableColumnFilter[]>([]);\n    const _lastUsedSearch = React.useRef<string>();\n    const _forceReset = React.useRef(false);\n\n    const loadPage = async (pageIndex: number, sorting: TableColumnSort[], filters: TableColumnFilter[]) => {\n        let reset = false;\n\n        // sorting or filters changed, reset everything\n        if (\n            _forceReset.current ||\n            JSON.stringify(sorting) !== JSON.stringify(_lastUsedSorting.current) ||\n            JSON.stringify(filters) !== JSON.stringify(_lastUsedFilters.current)\n        ) {\n            _pendingPageRequests.current = {};\n            // nuke the dataset so that we \"start again\" after sorting\n            reset = true;\n        }\n\n        if (_pendingPageRequests.current[pageIndex]) {\n            // if page is already loaded/loading, abort, otherwise mark it as loading\n            return;\n        } else {\n            _pendingPageRequests.current[pageIndex] = true;\n        }\n\n        _forceReset.current = false;\n        // set the sorting so we can track if it changed between loads\n        _lastUsedSorting.current = sorting;\n        // set the filters so we can track if it changed between loads\n        _lastUsedFilters.current = filters;\n\n        try {\n            const response = await fetchPage(pageIndex, pageSize, sorting, filters);\n\n            // update state, here we do some \"magic\" to support \"load in place\"\n            setData(currentData => {\n                let nextData;\n\n                // reset table state if:\n                // - the length isn't set at all (first load)\n                // - the client length and server length are different (the data changed)\n                if (reset || length.current !== response.length) {\n                    length.current = response.length;\n                    nextData = Array(length.current).fill(undefined);\n                } else {\n                    nextData = [...currentData];\n                }\n\n                const startIndex = pageIndex * pageSize;\n                nextData.splice(startIndex, pageSize, ...response.data);\n                return nextData;\n            });\n        } catch {\n            //\n        } finally {\n            _pendingPageRequests.current[pageIndex] = false;\n        }\n    };\n\n    const loadAll = async (sorting: TableColumnSort[], filters: TableColumnFilter[]) => {\n        // set the sorting so we can track if it changed between loads\n        _lastUsedSorting.current = sorting;\n        // set the filters so we can track if it changed between loads\n        _lastUsedFilters.current = filters;\n\n        try {\n            const response = await fetchAll(sorting, filters);\n            length.current = response.length;\n\n            setData(() => {\n                let nextData;\n\n                if (response.data.length !== response.length) {\n                    nextData = Array(response.length).fill(undefined);\n                    nextData.splice(0, response.data.length, ...response.data);\n                } else {\n                    nextData = [...response.data];\n                }\n\n                return nextData;\n            });\n        } catch {\n            //\n        }\n    };\n\n    const invalidate = async () => {\n        _forceReset.current = true;\n\n        if (_lastUsedSearch.current) {\n            // we're searching, which means we need to refetch all with the correct sorting applied\n            return loadAll(_lastUsedSorting.current, _lastUsedFilters.current);\n        } else {\n            return loadPage(0, _lastUsedSorting.current, _lastUsedFilters.current);\n        }\n    };\n\n    // search works client side - it fetches all then works client side - so these handlers are a little \"weird\"\n    // if a search is currently \"active\", we need to re load all because\n    const handleSort = async (sorting: TableColumnSort[]) => {\n        if (_lastUsedSearch.current) {\n            // we're searching, which means we need to refetch all with the correct sorting applied\n            loadAll(sorting, _lastUsedFilters.current);\n        } else {\n            // reset the page to 0 whenever sorting\n            loadPage(0, sorting, _lastUsedFilters.current);\n        }\n    };\n    const handleFilter = async (filters: TableColumnFilter[]) => {\n        if (_lastUsedSearch.current) {\n            // we're searching, which means we need to refetch all with the correct sorting applied\n            loadAll(_lastUsedSorting.current, filters);\n        } else {\n            // reset the page to 0 whenever sorting\n            loadPage(0, _lastUsedSorting.current, filters);\n        }\n    };\n    const handleSearch = async (search: string | undefined) => {\n        // set the search so we can track if it changed between loads\n        _lastUsedSearch.current = search || undefined;\n        // search works client side, and focusing the search field triggers a load of all so we don't actually\n        // want to load anything when search gets changed, we just store the value for other handlers\n    };\n\n    return [\n        {\n            data,\n            length: length.current,\n            loadAll,\n            loadPage,\n            onChangeFilter: handleFilter,\n            onChangeSearch: handleSearch,\n            onChangeSort: handleSort,\n            pageSize,\n        },\n        invalidate,\n    ];\n}\n"],"names":["DEFAULT_PAGE_SIZE","useTableDataLoader","fetchPage","fetchAll","options","pageSize","length","React","useRef","undefined","data","setData","useState","_pendingPageRequests","_lastUsedSorting","_lastUsedFilters","_lastUsedSearch","_forceReset","loadPage","pageIndex","sorting","filters","reset","current","JSON","stringify","Promise","resolve","_temp","_finallyRethrows","_catch","then","response","currentData","nextData","Array","fill","startIndex","splice","_wasThrown","_result","e","reject","loadAll","_temp2","invalidate","handleSort","handleFilter","handleSearch","search","onChangeFilter","onChangeSearch","onChangeSort"],"mappings":"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"}
+{"version":3,"file":"useTableDataLoader.js","sources":["../../../../../../../src/primitives/Table/useTableDataLoader.ts"],"sourcesContent":["import React from 'react';\nimport {\n    TableColumnFilter,\n    TableColumnSort,\n    TableFilterHandler,\n    TableServerLoadPageHandler,\n    TableServerLoadAllHandler,\n    TableSortHandler,\n    TableSearchHandler,\n} from './types';\n\nexport const DEFAULT_PAGE_SIZE = 100;\n\nexport type useTableDataPageFetcher<TType = unknown> = (\n    pageIndex: number,\n    pageSize: number,\n    sorting: TableColumnSort[],\n    filters: TableColumnFilter[]\n) => Promise<{ data: TType[]; length: number }>;\n\nexport type useTableDataAllFetcher<TType = unknown> = (\n    sorting: TableColumnSort[],\n    filters: TableColumnFilter[]\n) => Promise<{ data: TType[]; length: number }>;\n\nexport type useTableDataLoaderOptions = { pageSize: number };\n\nexport type useTableDataLoaderValues<TType = unknown> = {\n    data: TType[];\n    length: number | undefined;\n    loadAll: TableServerLoadAllHandler;\n    loadPage: TableServerLoadPageHandler;\n    onChangeFilter: TableFilterHandler;\n    onChangeSearch: TableSearchHandler;\n    onChangeSort: TableSortHandler;\n    pageSize: number;\n};\n\nexport function useTableDataLoader<TType = unknown>(\n    fetchPage: useTableDataPageFetcher<TType>,\n    fetchAll: useTableDataAllFetcher<TType>,\n    options: useTableDataLoaderOptions = { pageSize: DEFAULT_PAGE_SIZE }\n): [useTableDataLoaderValues<TType>, () => void] {\n    const { pageSize } = options;\n\n    // track the data length, we don't know it until the first request\n    const length = React.useRef<number | undefined>(undefined);\n    // data will be filled after the first request, then we'll update values in place\n    const [data, setData] = React.useState<any[]>([]);\n    // track which pages have been loaded to dedupe requests\n    const _pendingPageRequests = React.useRef({});\n    const _lastUsedSorting = React.useRef<TableColumnSort[]>([]);\n    const _lastUsedFilters = React.useRef<TableColumnFilter[]>([]);\n    const _lastUsedSearch = React.useRef<string>();\n    const _lastUsedPageIndex = React.useRef<number>();\n    const _forceReset = React.useRef(false);\n\n    const loadPage = async (pageIndex: number, sorting: TableColumnSort[], filters: TableColumnFilter[]) => {\n        let reset = false;\n\n        // sorting or filters changed, reset everything\n        if (\n            _forceReset.current ||\n            JSON.stringify(sorting) !== JSON.stringify(_lastUsedSorting.current) ||\n            JSON.stringify(filters) !== JSON.stringify(_lastUsedFilters.current)\n        ) {\n            _pendingPageRequests.current = {};\n            // nuke the dataset so that we \"start again\" after sorting\n            reset = true;\n        }\n\n        if (_pendingPageRequests.current[pageIndex]) {\n            // if page is already loaded/loading, abort, otherwise mark it as loading\n            return;\n        } else {\n            _pendingPageRequests.current[pageIndex] = true;\n        }\n\n        _forceReset.current = false;\n        // set the last page loaded (or tried to load), so that we can load it back again after resets\n        _lastUsedPageIndex.current = pageIndex;\n        // set the sorting so we can track if it changed between loads\n        _lastUsedSorting.current = sorting;\n        // set the filters so we can track if it changed between loads\n        _lastUsedFilters.current = filters;\n\n        try {\n            const response = await fetchPage(pageIndex, pageSize, sorting, filters);\n\n            // update state, here we do some \"magic\" to support \"load in place\"\n            setData(currentData => {\n                let nextData;\n\n                // reset table state if:\n                // - the length isn't set at all (first load)\n                // - the client length and server length are different (the data changed)\n                if (reset || length.current !== response.length) {\n                    length.current = response.length;\n                    nextData = Array(length.current).fill(undefined);\n                } else {\n                    nextData = [...currentData];\n                }\n\n                const startIndex = pageIndex * pageSize;\n                nextData.splice(startIndex, pageSize, ...response.data);\n                return nextData;\n            });\n        } catch {\n            //\n        } finally {\n            _pendingPageRequests.current[pageIndex] = false;\n        }\n    };\n\n    const loadAll = async (sorting: TableColumnSort[], filters: TableColumnFilter[]) => {\n        // set the sorting so we can track if it changed between loads\n        _lastUsedSorting.current = sorting;\n        // set the filters so we can track if it changed between loads\n        _lastUsedFilters.current = filters;\n\n        try {\n            const response = await fetchAll(sorting, filters);\n            length.current = response.length;\n\n            setData(() => {\n                let nextData;\n\n                if (response.data.length !== response.length) {\n                    nextData = Array(response.length).fill(undefined);\n                    nextData.splice(0, response.data.length, ...response.data);\n                } else {\n                    nextData = [...response.data];\n                }\n\n                return nextData;\n            });\n        } catch {\n            //\n        }\n    };\n\n    const invalidate = async () => {\n        // empties the entire data array\n        _forceReset.current = true;\n\n        if (_lastUsedSearch.current) {\n            // we're searching, which means we need to refetch all with the correct sorting applied\n            return loadAll(_lastUsedSorting.current, _lastUsedFilters.current);\n        } else {\n            // load the last page that we scrolled to\n            return loadPage(_lastUsedPageIndex.current ?? 0, _lastUsedSorting.current, _lastUsedFilters.current);\n        }\n    };\n\n    // search works client side - it fetches all then works client side - so these handlers are a little \"weird\"\n    // if a search is currently \"active\", we need to re load all because\n    const handleSort = async (sorting: TableColumnSort[]) => {\n        if (_lastUsedSearch.current) {\n            // we're searching, which means we need to refetch all with the correct sorting applied\n            loadAll(sorting, _lastUsedFilters.current);\n        } else {\n            // load the last page that we scrolled to\n            loadPage(_lastUsedPageIndex.current ?? 0, sorting, _lastUsedFilters.current);\n        }\n    };\n    const handleFilter = async (filters: TableColumnFilter[]) => {\n        if (_lastUsedSearch.current) {\n            // we're searching, which means we need to refetch all with the correct sorting applied\n            loadAll(_lastUsedSorting.current, filters);\n        } else {\n            // load the last page that we scrolled to\n            loadPage(_lastUsedPageIndex.current ?? 0, _lastUsedSorting.current, filters);\n        }\n    };\n    const handleSearch = async (search: string | undefined) => {\n        // set the search so we can track if it changed between loads\n        _lastUsedSearch.current = search || undefined;\n        // search works client side, and focusing the search field triggers a load of all so we don't actually\n        // want to load anything when search gets changed, we just store the value for other handlers\n    };\n\n    return [\n        {\n            data,\n            length: length.current,\n            loadAll,\n            loadPage,\n            onChangeFilter: handleFilter,\n            onChangeSearch: handleSearch,\n            onChangeSort: handleSort,\n            pageSize,\n        },\n        invalidate,\n    ];\n}\n"],"names":["DEFAULT_PAGE_SIZE","useTableDataLoader","fetchPage","fetchAll","options","pageSize","length","React","useRef","undefined","data","setData","useState","_pendingPageRequests","_lastUsedSorting","_lastUsedFilters","_lastUsedSearch","_lastUsedPageIndex","_forceReset","loadPage","pageIndex","sorting","filters","reset","current","JSON","stringify","Promise","resolve","_temp","_finallyRethrows","_catch","then","response","currentData","nextData","Array","fill","startIndex","splice","_wasThrown","_result","e","reject","loadAll","_temp2","invalidate","_lastUsedPageIndex$cu","handleSort","_lastUsedPageIndex$cu2","handleFilter","_lastUsedPageIndex$cu3","handleSearch","search","onChangeFilter","onChangeSearch","onChangeSort"],"mappings":"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"}

package/dist/taco.cjs.development.js

@@ -11163,6 +11163,7 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
   const _lastUsedSorting = React__default.useRef([]);
   const _lastUsedFilters = React__default.useRef([]);
   const _lastUsedSearch = React__default.useRef();
+  const _lastUsedPageIndex = React__default.useRef();
   const _forceReset = React__default.useRef(false);
   const loadPage = function (pageIndex, sorting, filters) {
     try {
@@ -11180,6 +11181,8 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
         _pendingPageRequests.current[pageIndex] = true;
       }
       _forceReset.current = false;
+      // set the last page loaded (or tried to load), so that we can load it back again after resets
+      _lastUsedPageIndex.current = pageIndex;
       // set the sorting so we can track if it changed between loads
       _lastUsedSorting.current = sorting;
       // set the filters so we can track if it changed between loads
@@ -11243,12 +11246,15 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
   };
   const invalidate = function () {
     try {
+      // empties the entire data array
       _forceReset.current = true;
       if (_lastUsedSearch.current) {
         // we're searching, which means we need to refetch all with the correct sorting applied
         return loadAll(_lastUsedSorting.current, _lastUsedFilters.current);
       } else {
-        return loadPage(0, _lastUsedSorting.current, _lastUsedFilters.current);
+        var _lastUsedPageIndex$cu;
+        // load the last page that we scrolled to
+        return loadPage((_lastUsedPageIndex$cu = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu !== void 0 ? _lastUsedPageIndex$cu : 0, _lastUsedSorting.current, _lastUsedFilters.current);
       }
     } catch (e) {
       return Promise.reject(e);
@@ -11262,8 +11268,9 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
         // we're searching, which means we need to refetch all with the correct sorting applied
         loadAll(sorting, _lastUsedFilters.current);
       } else {
-        // reset the page to 0 whenever sorting
-        loadPage(0, sorting, _lastUsedFilters.current);
+        var _lastUsedPageIndex$cu2;
+        // load the last page that we scrolled to
+        loadPage((_lastUsedPageIndex$cu2 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu2 !== void 0 ? _lastUsedPageIndex$cu2 : 0, sorting, _lastUsedFilters.current);
       }
       return Promise.resolve();
     } catch (e) {
@@ -11276,8 +11283,9 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
         // we're searching, which means we need to refetch all with the correct sorting applied
         loadAll(_lastUsedSorting.current, filters);
       } else {
-        // reset the page to 0 whenever sorting
-        loadPage(0, _lastUsedSorting.current, filters);
+        var _lastUsedPageIndex$cu3;
+        // load the last page that we scrolled to
+        loadPage((_lastUsedPageIndex$cu3 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu3 !== void 0 ? _lastUsedPageIndex$cu3 : 0, _lastUsedSorting.current, filters);
       }
       return Promise.resolve();
     } catch (e) {