authscape 1.0.548 → 1.0.550

package/index.js

@@ -1506,13 +1506,18 @@ var EditableDatagrid = function EditableDatagrid(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     totalRows = _useState4[0],
     setTotalRows = _useState4[1];
-  var _useState5 = (0, _react.useState)(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    offset = _useState6[0],
-    setOffset = _useState6[1];
+  // const [offset, setOffset] = useState(0);
+
+  var _React$useState = _react["default"].useState({
+      page: 0,
+      pageSize: pageSize
+    }),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    paginationModel = _React$useState2[0],
+    setPaginationModel = _React$useState2[1];
   (0, _react.useEffect)(function () {
     reloadDataGrid();
-  }, [offset]);
+  }, [paginationModel]);
   var reloadDataGrid = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var response;
@@ -1530,16 +1535,16 @@ var EditableDatagrid = function EditableDatagrid(_ref) {
             }
             _context.next = 5;
             return apiService().post(url, {
-              offset: offset,
-              length: pageSize
+              offset: paginationModel.page,
+              length: paginationModel.pageSize
             });
           case 5:
             response = _context.sent;
             _context.next = 13;
             break;
           case 8:
-            params.offset = offset;
-            params.length = pageSize;
+            params.offset = paginationModel.page;
+            params.length = paginationModel.pageSize;
             _context.next = 12;
             return apiService().post(url, params);
           case 12:
@@ -1603,14 +1608,10 @@ var EditableDatagrid = function EditableDatagrid(_ref) {
     rowCount: totalRows,
     onRowClick: onRowClick,
     paginationMode: "server",
-    getRowHeight: function getRowHeight() {
-      return rowHeight;
-    },
-    pageSize: pageSize,
-    onPageChange: function onPageChange(newPage) {
-      return setOffset(newPage);
-    },
-    rowsPerPageOptions: rowsPerPage,
+    pageSizeOptions: rowsPerPage,
+    rowHeight: rowHeight,
+    paginationModel: paginationModel,
+    onPaginationModelChange: setPaginationModel,
     disableSelectionOnClick: true,
     onCellClick: onCellClick,
     onCellEditCommit: handleCellEditCommit(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.548",
+  "version": "1.0.550",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/EditableDatagrid.js

@@ -6,13 +6,19 @@ export const EditableDatagrid = ({url = null, eRows = null, columns, isCellEdita
 
     const [rows, setRows] = useState([]);
     const [totalRows, setTotalRows] = useState(0);
-    const [offset, setOffset] = useState(0);
+    // const [offset, setOffset] = useState(0);
+
+    const [paginationModel, setPaginationModel] = React.useState({
+        page: 0,
+        pageSize: pageSize,
+    });
+
 
     useEffect(() => {
 
         reloadDataGrid();
 
-    }, [offset]);
+    }, [paginationModel]);
 
     
     const reloadDataGrid = async () => {  
@@ -24,19 +30,18 @@ export const EditableDatagrid = ({url = null, eRows = null, columns, isCellEdita
             {
                 response = await apiService().post(url,
                 {
-                    offset: offset,
-                    length: pageSize
+                    offset: paginationModel.page,
+                    length: paginationModel.pageSize
                 });
             }
             else
             {
-                params.offset = offset;
-                params.length = pageSize;
+                params.offset = paginationModel.page;
+                params.length = paginationModel.pageSize;
 
                 response = await apiService().post(url, params);
             }
             
-
             if (response != null && response.status == 200)
             {
                 setTotalRows(response.data.recordsTotal);
@@ -69,12 +74,10 @@ export const EditableDatagrid = ({url = null, eRows = null, columns, isCellEdita
                 rowCount={totalRows}
                 onRowClick={onRowClick}
                 paginationMode="server"
-                getRowHeight={() => {
-                    return rowHeight;
-                }}
-                pageSize={pageSize}
-                onPageChange={(newPage) => setOffset(newPage)}
-                rowsPerPageOptions={rowsPerPage}
+                pageSizeOptions={rowsPerPage}
+                rowHeight={rowHeight}
+                paginationModel={paginationModel}
+                onPaginationModelChange={setPaginationModel}
                 disableSelectionOnClick={true}
                 onCellClick={onCellClick}
                 onCellEditCommit={handleCellEditCommit()}