ordering-ui-admin-external 1.43.67 → 1.43.68

package/_modules/components/Orders/DriversList/index.js

@@ -74,26 +74,32 @@ var DriversList = exports.DriversList = function DriversList(props) {
     return validation;
   };
   var handleChangePage = function handleChangePage(page) {
-    setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
-      currentPage: page
-    }));
+    setPagination(function (pagination) {
+      return _objectSpread(_objectSpread({}, pagination), {}, {
+        currentPage: page
+      });
+    });
   };
   var handleChangePageSize = function handleChangePageSize(pageSize) {
     var expectedPage = Math.ceil((((pagination === null || pagination === void 0 ? void 0 : pagination.currentPage) - 1) * (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) + 1) / pageSize);
-    setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
-      currentPage: expectedPage,
-      pageSize: pageSize,
-      totalPages: Math.ceil((drivers === null || drivers === void 0 ? void 0 : drivers.length) / pageSize)
-    }));
+    setPagination(function (pagination) {
+      return _objectSpread(_objectSpread({}, pagination), {}, {
+        currentPage: expectedPage,
+        pageSize: pageSize,
+        totalPages: Math.ceil((drivers === null || drivers === void 0 ? void 0 : drivers.length) / pageSize)
+      });
+    });
   };
   (0, _react.useEffect)(function () {
     if (drivers !== null && drivers !== void 0 && drivers.length) {
-      setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
-        totalItems: drivers === null || drivers === void 0 ? void 0 : drivers.length,
-        totalPages: Math.ceil((drivers === null || drivers === void 0 ? void 0 : drivers.length) / 10)
-      }));
+      setPagination(function (pagination) {
+        return _objectSpread(_objectSpread({}, pagination), {}, {
+          totalItems: drivers === null || drivers === void 0 ? void 0 : drivers.length,
+          totalPages: Math.ceil((drivers === null || drivers === void 0 ? void 0 : drivers.length) / 10)
+        });
+      });
     }
-  }, [drivers]);
+  }, [drivers === null || drivers === void 0 ? void 0 : drivers.length]);
   return /*#__PURE__*/_react.default.createElement(_styles.DriversListContainer, {
     showCompressedInfo: showCompressedInfo
   }, loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, _toConsumableArray(Array(10).keys()).map(function (i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.67",
+  "version": "1.43.68",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.43.43",
+    "ordering-components-admin-external": "1.43.44",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Orders/DriversList/index.js

@@ -56,31 +56,31 @@ export const DriversList = (props) => {
   }
 
   const handleChangePage = (page) => {
-    setPagination({
+    setPagination((pagination) => ({
       ...pagination,
       currentPage: page
-    })
+    }))
   }
 
   const handleChangePageSize = (pageSize) => {
     const expectedPage = Math.ceil(((pagination?.currentPage - 1) * pagination?.pageSize + 1) / pageSize)
-    setPagination({
+    setPagination((pagination) => ({
       ...pagination,
       currentPage: expectedPage,
       pageSize,
       totalPages: Math.ceil(drivers?.length / pageSize)
-    })
+    }))
   }
 
   useEffect(() => {
     if (drivers?.length) {
-      setPagination({
+      setPagination((pagination) => ({
         ...pagination,
         totalItems: drivers?.length,
         totalPages: Math.ceil(drivers?.length / 10)
-      })
+      }))
     }
-  }, [drivers])
+  }, [drivers?.length])
 
   return (
     <DriversListContainer showCompressedInfo={showCompressedInfo}>