@widergy/energy-ui 3.1.4 → 3.1.6

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.1.6](https://github.com/widergy/energy-ui/compare/v3.1.5...v3.1.6) (2024-02-05)
+
+
+### Bug Fixes
+
+* uttable select all logic not working ([#408](https://github.com/widergy/energy-ui/issues/408)) ([a61e69b](https://github.com/widergy/energy-ui/commit/a61e69b26afa6f2097ada3dac007bc9c3f2fd6e4))
+
+## [3.1.5](https://github.com/widergy/energy-ui/compare/v3.1.4...v3.1.5) (2024-01-31)
+
+
+### Bug Fixes
+
+* change gmaps key env -> props ([#404](https://github.com/widergy/energy-ui/issues/404)) ([59953a3](https://github.com/widergy/energy-ui/commit/59953a3472c169d40faf750b92ae363854c1e0b6))
+
 ## [3.1.4](https://github.com/widergy/energy-ui/compare/v3.1.3...v3.1.4) (2024-01-23)
 
 

package/dist/components/UTMap/types.js

@@ -34,6 +34,7 @@ const UTMapPropTypes = exports.UTMapPropTypes = {
   field: _formTypes.fieldType,
   meta: _formTypes.metaPropTypes,
   input: _formTypes.inputPropTypes,
+  apiKey: _propTypes.string,
   disabled: _propTypes.bool
 };
 const GoogleMapsPropTypes = exports.GoogleMapsPropTypes = {

package/dist/components/UTMap/withGoogleMapScript.js

@@ -6,18 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _withScriptjs = _interopRequireDefault(require("react-google-maps/lib/withScriptjs"));
+var _types = require("./types");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const WithGoogleMapScript = () => WrappedComponent => {
   const Component = (0, _withScriptjs.default)(WrappedComponent);
-  const WithGoogleMap = props => /*#__PURE__*/_react.default.createElement(Component, _extends({
-    googleMapURL: "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&key=".concat(process.env.REACT_APP_GMAPS_API_KEY),
-    loadingElement: /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        height: "100%"
-      }
-    })
-  }, props));
+  const WithGoogleMap = _ref => {
+    let {
+      apiKey,
+      ...props
+    } = _ref;
+    return /*#__PURE__*/_react.default.createElement(Component, _extends({
+      googleMapURL: "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&key=".concat(apiKey),
+      loadingElement: /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          height: "100%"
+        }
+      })
+    }, props));
+  };
+  WithGoogleMap.propTypes = _types.UTMapPropTypes.propTypes;
   return WithGoogleMap;
 };
 var _default = exports.default = WithGoogleMapScript;

package/dist/components/UTTable/index.js

@@ -23,7 +23,7 @@ var _ResponsiveCell = _interopRequireDefault(require("./components/ResponsiveCel
 var _TableRow = _interopRequireDefault(require("./components/TableRow"));
 var _theme = require("./theme");
 var _constants = require("./constants");
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 var _types = require("./types");
 var _stylesModule = _interopRequireDefault(require("./styles.module.scss"));
 var _hook = require("./hook");
@@ -79,8 +79,8 @@ const UTTable = _ref => {
     totalRows,
     totalRowsLabel
   } = _ref;
-  const initialValidRowsPerPageOption = (0, _utils.getInitialValidRowsPerPage)(externalRowsPerPage, rowsPerPageOptions, data);
-  const initialValidPage = (0, _utils.getInitialValidPage)(externalPage, initialValidRowsPerPageOption, data, integrationType);
+  const initialValidRowsPerPageOption = (0, _utils2.getInitialValidRowsPerPage)(externalRowsPerPage, rowsPerPageOptions, data);
+  const initialValidPage = (0, _utils2.getInitialValidPage)(externalPage, initialValidRowsPerPageOption, data, integrationType);
   const [order, setOrder] = (0, _react.useState)(initialOrder || {});
   const [rows, setRows] = (0, _react.useState)([]);
   const [selectedAll, setSelectedAll] = (0, _react.useState)(false);
@@ -102,24 +102,28 @@ const UTTable = _ref => {
   (0, _react.useEffect)(() => {
     if (!selectAllInCurrentPageOnly) setSelectedAll(!(0, _array.isEmpty)(data) && initialSelectedRows.length === data.length);
     setSelectedRows(selectable ? initialSelectedRows : []);
-    setRows((0, _utils.orderRows)(data, order, data, columns));
+    setRows((0, _utils2.orderRows)(data, order, data, columns));
     if (externalRowsPerPage) setRowsPerPage(initialValidRowsPerPageOption);
     const validPage = data.length / rowsPerPage > page || integrationType === _UTTable.INTEGRATION_TYPES.EXTERNAL;
     if (!validPage) setPage(initialValidPage);
   }, [data]);
-  const currentRows = (0, _react.useMemo)(() => disablePagination || integrationType === _UTTable.INTEGRATION_TYPES.EXTERNAL ? rows : (0, _utils.getCurrentRows)(rows, page, rowsPerPage), [page, rowsPerPage, rows]);
+  const currentRows = (0, _react.useMemo)(() => disablePagination || integrationType === _UTTable.INTEGRATION_TYPES.EXTERNAL ? rows : (0, _utils2.getCurrentRows)(rows, page, rowsPerPage), [page, rowsPerPage, rows]);
   const handleOrder = newOrder => {
     setOrder(newOrder);
-    if (!disableAutoOrder && !(0, _array.isEmpty)(rows)) setRows((0, _utils.orderRows)(rows, newOrder, data, columns));
+    if (!disableAutoOrder && !(0, _array.isEmpty)(rows)) setRows((0, _utils2.orderRows)(rows, newOrder, data, columns));
     if (onOrderChange) onOrderChange(newOrder);
   };
   const handlePageChange = newPage => {
     setPage(newPage);
     if (onPageChange) onPageChange(newPage);
   };
+  const allDisplayedRowsAreSelected = newSelectedRows => {
+    const displayedRows = (0, _utils.getSelectableRowIds)(rows, rowKey, disableRowSelection);
+    return displayedRows.every(value => newSelectedRows.includes(value));
+  };
   const selectRow = row => {
     if (!row[rowKey]) return null;
-    const pageRowsIds = (0, _utils.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
+    const pageRowsIds = (0, _utils2.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
     let newSelectedRows = [];
     if (exclusiveSelection) {
       newSelectedRows = [row[rowKey]];
@@ -127,7 +131,7 @@ const UTTable = _ref => {
       const rowKeyIndex = selectedRows.indexOf(row[rowKey]);
       if (rowKeyIndex === -1) newSelectedRows = [...selectedRows, row[rowKey]];else newSelectedRows = selectedRows.filter(el => el !== row[rowKey]);
       const pageNewSelectedRows = newSelectedRows.filter(newSelectedRow => pageRowsIds.includes(newSelectedRow));
-      const allSelected = selectAllInCurrentPageOnly ? pageNewSelectedRows.length === pageRowsIds.length : newSelectedRows.length === (0, _utils.getSelectableRowIds)(rows, rowKey, disableRowSelection).length;
+      const allSelected = selectAllInCurrentPageOnly ? pageNewSelectedRows.length === pageRowsIds.length : allDisplayedRowsAreSelected(newSelectedRows);
       if (!allSelected && selectedAll) setSelectedAll(false);
       if (allSelected && !selectedAll) setSelectedAll(true);
     }
@@ -136,19 +140,19 @@ const UTTable = _ref => {
   };
   const selectAllRows = () => {
     const newSelectedAll = !selectedAll;
-    const pageRowsIds = (0, _utils.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
-    const newSelectedRows = selectAllInCurrentPageOnly ? newSelectedAll ? [...pageRowsIds, ...selectedRows.filter(row => !pageRowsIds.includes(row))] : selectedRows.filter(row => !pageRowsIds.includes(row)) : newSelectedAll ? (0, _utils.getSelectableRowIds)(rows, rowKey, disableRowSelection) : [];
+    const pageRowsIds = (0, _utils2.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
+    const newSelectedRows = selectAllInCurrentPageOnly ? newSelectedAll ? [...pageRowsIds, ...selectedRows.filter(row => !pageRowsIds.includes(row))] : selectedRows.filter(row => !pageRowsIds.includes(row)) : newSelectedAll ? (0, _utils2.getSelectableRowIds)(rows, rowKey, disableRowSelection) : [];
     setSelectedRows(newSelectedRows);
     setSelectedAll(newSelectedAll);
     if (onSelectAllRows) onSelectAllRows(selectAllInCurrentPageOnly ? newSelectedRows : newSelectedAll);
   };
   (0, _react.useEffect)(() => {
     if (selectAllInCurrentPageOnly) {
-      const pageRowsIds = (0, _utils.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
+      const pageRowsIds = (0, _utils2.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
       setSelectedAll(!(0, _array.isEmpty)(pageRowsIds) && pageRowsIds.every(row => selectedRows.includes(row)));
     }
   }, [page, rowsPerPage, rows, order, disableSelectAll]);
-  const columnsDefinition = (0, _react.useMemo)(() => (0, _utils.getColumnDefinition)(columns, isResponsive), [columns, isResponsive]);
+  const columnsDefinition = (0, _react.useMemo)(() => (0, _utils2.getColumnDefinition)(columns, isResponsive), [columns, isResponsive]);
   const isFirstRow = (0, _react.useCallback)(index => !index, []);
   const isLastRow = (0, _react.useCallback)(index => index === currentRows.length - 1, [currentRows]);
   const onChangeRowPerPage = newRowsPerPage => {
@@ -157,7 +161,7 @@ const UTTable = _ref => {
     if (onRowsPerPageChange) onRowsPerPageChange(newRowsPerPage || rowsPerPageOptions[0]);
   };
   const showPagination = !disablePagination && !loading && !(0, _array.isEmpty)(currentRows);
-  const rowStyles = (0, _react.useMemo)(() => (0, _utils.createRowStyles)(rowPadding, rowSpacing, headerPadding, isResponsive), [rowPadding, rowSpacing, headerPadding, isResponsive]);
+  const rowStyles = (0, _react.useMemo)(() => (0, _utils2.createRowStyles)(rowPadding, rowSpacing, headerPadding, isResponsive), [rowPadding, rowSpacing, headerPadding, isResponsive]);
   const tableWidth = (0, _react.useMemo)(() => {
     var _entry$target;
     return (entry === null || entry === void 0 || (_entry$target = entry.target) === null || _entry$target === void 0 ? void 0 : _entry$target.clientWidth) || '100%';
@@ -174,7 +178,7 @@ const UTTable = _ref => {
     var _event$target;
     if (contentRef.current && stickyHeader) contentRef.current.scrollTo(event === null || event === void 0 || (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.scrollLeft, 0);
   };
-  const columnSizes = (0, _react.useMemo)(() => (0, _utils.getColumnsSizes)({
+  const columnSizes = (0, _react.useMemo)(() => (0, _utils2.getColumnsSizes)({
     columns,
     fitColumnsWidth,
     selectable

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widergy/energy-ui",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "description": "Widergy Web Components",
   "author": "widergy",
   "license": "MIT",