Fix 0-based MUI vs. 1-based API

CartoDB · Dec 30, 2021 · 1984724 · 1984724
1 parent ee47ff7
commit 1984724
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/react-ui/src/widgets/TableWidgetUI/TableWidgetUI.js b/packages/react-ui/src/widgets/TableWidgetUI/TableWidgetUI.js
@@ -81,12 +81,12 @@ function TableWidgetUI({
   };
 
   const handleChangePage = (_event, newPage) => {
-    onSetPage(newPage);
+    onSetPage(newPage + 1);
   };
 
   const handleChangeRowsPerPage = (event) => {
     onSetRowsPerPage(parseInt(event.target.value, 10));
-    onSetPage(0);
+    onSetPage(1);
   };
 
   return (
@@ -110,7 +110,7 @@ function TableWidgetUI({
           component='div'
           count={totalCount}
           rowsPerPage={rowsPerPage}
-          page={page}
+          page={page - 1}
           onPageChange={handleChangePage}
           onRowsPerPageChange={handleChangeRowsPerPage}
         />

diff --git a/packages/react-widgets/src/widgets/TableWidget.js b/packages/react-widgets/src/widgets/TableWidget.js
@@ -27,7 +27,7 @@ function TableWidget({
   onError
 }) {
   const [rowsPerPage, setRowsPerPage] = useState(10);
-  const [page, setPage] = useState(0);
+  const [page, setPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
 
   const [sortBy, setSortBy] = useState(undefined);

diff --git a/packages/react-workers/src/workers/features.worker.js b/packages/react-workers/src/workers/features.worker.js
@@ -191,7 +191,7 @@ function getRawFeatures({
 }
 
 function applyPagination(features, { limit, page }) {
-  return features.slice(limit * page, limit * (page + 1));
+  return features.slice(limit * Math.max(0, page - 1), limit * Math.max(1, page));
 }
 
 function getFilteredFeatures(filters = {}) {