@widergy/energy-ui 2.12.1 → 2.12.3

package/dist/components/UTTable/components/TableRow/index.js

@@ -16,6 +16,7 @@ var _ActionIcons = _interopRequireDefault(require("../ActionIcons"));
 var _PrimaryAction = _interopRequireDefault(require("../PrimaryAction"));
 var _types = require("../../types");
 var _constants2 = require("./constants");
+var _utils = require("./utils");
 var _stylesModule = _interopRequireDefault(require("./styles.module.scss"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -54,7 +55,8 @@ const TableRow = _ref => {
     secondaryActions = []
   } = columnsDefinition;
   const SelectionComponent = exclusiveSelection ? _Radio.default : _Checkbox.default;
-  const selectableCellStyles = isResponsive ? "".concat(_stylesModule.default.secondaryActionsContainer, "\n      ").concat(cellProps.classes.responsiveCell, "\n      ").concat(selectable || !(0, _array.isEmpty)(secondaryActions) ? cellProps.classes.responsiveRowTopBorder : _stylesModule.default.hidden) : "\n\t".concat(_stylesModule.default.fixedRowLeft, "\n\t").concat(fixedRowsLeftClassName, "\n\t").concat((removeFixedRowsDivisors || (0, _array.isEmpty)(fixedLeftColumns)) && _stylesModule.default.disableBorderRight, "\n\t").concat(!selectable && (0, _array.isEmpty)(fixedLeftColumns) && _stylesModule.default.cleanFixedColumns, "\n");
+  const hasActionsRow = selectable || (0, _utils.hasVisibleActions)(secondaryActions, cellProps.rowData);
+  const selectableCellStyles = isResponsive ? "".concat(_stylesModule.default.secondaryActionsContainer, "\n      ").concat(cellProps.classes.responsiveCell, "\n      ").concat(hasActionsRow ? cellProps.classes.responsiveRowTopBorder : _stylesModule.default.hidden, "\n      ") : "\n\t".concat(_stylesModule.default.fixedRowLeft, "\n\t").concat(fixedRowsLeftClassName, "\n\t").concat((removeFixedRowsDivisors || (0, _array.isEmpty)(fixedLeftColumns)) && _stylesModule.default.disableBorderRight, "\n\t").concat(!selectable && (0, _array.isEmpty)(fixedLeftColumns) && _stylesModule.default.cleanFixedColumns, "\n");
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_UTTouchableWithoutFeedback.default, {
     onClick: handleRowClick,
     className: "\n          ".concat(_stylesModule.default.row, "\n          ").concat((!handleRowClick || isResponsive) && _stylesModule.default.noClick, "\n          ").concat(isResponsive && cellProps.classes.responsiveRow, "\n          ").concat(className, "\n        "),
@@ -102,7 +104,7 @@ const TableRow = _ref => {
     rowData: cellProps.rowData,
     classes: cellProps.classes
   })))), !(0, _array.isEmpty)(secondaryColumns) && /*#__PURE__*/_react.default.createElement("div", {
-    className: "\n              ".concat(_stylesModule.default.secondaryColumns, " \n              ").concat(isResponsive && checkBoxSelected && cellProps.classes.selectedResponsiveCell, "\n              ").concat(isResponsive && selectable && _stylesModule.default.hideTopBorder, "\n            "),
+    className: "\n              ".concat(_stylesModule.default.secondaryColumns, " \n              ").concat(isResponsive && checkBoxSelected && cellProps.classes.selectedResponsiveCell, "\n              ").concat(isResponsive && selectable && _stylesModule.default.hideTopBorder, "\n              ").concat(isResponsive && hasActionsRow && _stylesModule.default.fixBorderRadius, "\n            "),
     style: {
       width: isResponsive ? 'auto' : columnSizes.secondaryColumnsSize
     }

package/dist/components/UTTable/components/TableRow/styles.module.scss

@@ -133,7 +133,7 @@ $selection-element-size: 42px;
 }
 
 .hidden {
-  display: none;
+  display: none !important;
 }
 
 .hideTopBorder {
@@ -146,3 +146,10 @@ $selection-element-size: 42px;
 .disableSelectionTooltip {
   text-align: center;
 }
+
+.fixBorderRadius {
+  & :first-child {
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
+  }
+}

package/dist/components/UTTable/components/TableRow/utils.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasVisibleActions = void 0;
+var _array = require("@widergy/web-utils/lib/array");
+const hasVisibleActions = (secondaryActions, rowData) => !(0, _array.isEmpty)(secondaryActions) && secondaryActions.some(secondaryAction => {
+  var _secondaryAction$acti;
+  return secondaryAction === null || secondaryAction === void 0 || (_secondaryAction$acti = secondaryAction.actions) === null || _secondaryAction$acti === void 0 ? void 0 : _secondaryAction$acti.some(action => {
+    var _action$isVisible;
+    return (_action$isVisible = action.isVisible) === null || _action$isVisible === void 0 ? void 0 : _action$isVisible.call(action, rowData);
+  });
+});
+exports.hasVisibleActions = hasVisibleActions;

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 _utils2 = require("./utils");
+var _utils = 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, _utils2.getInitialValidRowsPerPage)(externalRowsPerPage, rowsPerPageOptions, data);
-  const initialValidPage = (0, _utils2.getInitialValidPage)(externalPage, initialValidRowsPerPageOption, data, integrationType);
+  const initialValidRowsPerPageOption = (0, _utils.getInitialValidRowsPerPage)(externalRowsPerPage, rowsPerPageOptions, data);
+  const initialValidPage = (0, _utils.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,15 +102,15 @@ const UTTable = _ref => {
   (0, _react.useEffect)(() => {
     if (!selectAllInCurrentPageOnly) setSelectedAll(!(0, _array.isEmpty)(data) && initialSelectedRows.length === data.length);
     setSelectedRows(selectable ? initialSelectedRows : []);
-    setRows((0, _utils2.orderRows)(data, order, data, columns));
+    setRows((0, _utils.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, _utils2.getCurrentRows)(rows, page, rowsPerPage), [page, rowsPerPage, rows]);
+  const currentRows = (0, _react.useMemo)(() => disablePagination || integrationType === _UTTable.INTEGRATION_TYPES.EXTERNAL ? rows : (0, _utils.getCurrentRows)(rows, page, rowsPerPage), [page, rowsPerPage, rows]);
   const handleOrder = newOrder => {
     setOrder(newOrder);
-    if (!disableAutoOrder && !(0, _array.isEmpty)(rows)) setRows((0, _utils2.orderRows)(rows, newOrder, data, columns));
+    if (!disableAutoOrder && !(0, _array.isEmpty)(rows)) setRows((0, _utils.orderRows)(rows, newOrder, data, columns));
     if (onOrderChange) onOrderChange(newOrder);
   };
   const handlePageChange = newPage => {
@@ -123,7 +123,7 @@ const UTTable = _ref => {
   };
   const selectRow = row => {
     if (!row[rowKey]) return null;
-    const pageRowsIds = (0, _utils2.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
+    const pageRowsIds = (0, _utils.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
     let newSelectedRows = [];
     if (exclusiveSelection) {
       newSelectedRows = [row[rowKey]];
@@ -140,19 +140,19 @@ const UTTable = _ref => {
   };
   const selectAllRows = () => {
     const newSelectedAll = !selectedAll;
-    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) : [];
+    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) : [];
     setSelectedRows(newSelectedRows);
     setSelectedAll(newSelectedAll);
     if (onSelectAllRows) onSelectAllRows(selectAllInCurrentPageOnly ? newSelectedRows : newSelectedAll);
   };
   (0, _react.useEffect)(() => {
     if (selectAllInCurrentPageOnly) {
-      const pageRowsIds = (0, _utils2.getSelectableRowIds)(currentRows, rowKey, disableRowSelection);
+      const pageRowsIds = (0, _utils.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, _utils2.getColumnDefinition)(columns, isResponsive), [columns, isResponsive]);
+  const columnsDefinition = (0, _react.useMemo)(() => (0, _utils.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 => {
@@ -161,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, _utils2.createRowStyles)(rowPadding, rowSpacing, headerPadding, isResponsive), [rowPadding, rowSpacing, headerPadding, isResponsive]);
+  const rowStyles = (0, _react.useMemo)(() => (0, _utils.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%';
@@ -178,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, _utils2.getColumnsSizes)({
+  const columnSizes = (0, _react.useMemo)(() => (0, _utils.getColumnsSizes)({
     columns,
     fitColumnsWidth,
     selectable

package/package.json

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