@widergy/energy-ui 3.94.0 → 3.94.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/components/UTDataElement/index.js +8 -8
  3. package/dist/components/UTDataElement/styles.module.scss +4 -2
  4. package/dist/utils/classesUtils.js +17 -1
  5. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## [3.94.1](https://github.com/widergy/energy-ui/compare/v3.94.0...v3.94.1) (2025-07-29)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * [SFPE-434] data element merge multiple classess ([#651](https://github.com/widergy/energy-ui/issues/651)) ([79052a9](https://github.com/widergy/energy-ui/commit/79052a993e67e9e671d2b23f2b9222b779b2d5fb))
7
+
1
8
  # [3.94.0](https://github.com/widergy/energy-ui/compare/v3.93.0...v3.94.0) (2025-07-29)
2
9
 
3
10
 
package/dist/components/UTDataElement/index.js CHANGED
@@ -50,7 +50,7 @@ const UTDataElement = _ref => {
50
50
  title,
51
51
  titleProps = {}
52
52
  } = _ref;
53
- const classes = (0, _react.useMemo)(() => (0, _classesUtils.mergeClasses)(theme, classNames), [classNames, theme]);
53
+ const classes = (0, _react.useMemo)(() => (0, _classesUtils.mergeMultipleClassNames)(_stylesModule.default, theme, classNames), [classNames, theme]);
54
54
  const [isCollapsed, setIsCollapsed] = (0, _react.useState)(true);
55
55
  const [childrenHeight, setChildrenHeight] = (0, _react.useState)(0);
56
56
  const childrenRef = (0, _react.useRef)(null);
@@ -64,11 +64,11 @@ const UTDataElement = _ref => {
64
64
  const IconComponent = (0, _componentUtils.isUTIcon)(Icon) ? _UTIcon.default : Icon;
65
65
  const DataComponent = (0, _componentUtils.isUTLabel)(Data) ? /*#__PURE__*/_react.default.createElement(_UTLabel.default, dataProps, Data) : Data;
66
66
  const showBadge = forceShowBadge || (0, _isString.default)(badge) && !(0, _isEmpty.default)(badge) || (0, _isFinite.default)(badge);
67
- const contentClasses = "".concat(_stylesModule.default.content, " ").concat(_stylesModule.default["spacing".concat((0, _componentUtils.capitalize)(spacing))]);
68
- const infoClasses = "".concat(_stylesModule.default.info, " ").concat(orientation === _constants.ORIENTATION.VERTICAL && _stylesModule.default.vertical);
69
- const iconCollapseButtonClasses = "".concat(_stylesModule.default.iconCollapseButton, " ").concat(isCollapsed && _stylesModule.default.collapsed);
67
+ const contentClasses = "".concat(classes.content, " ").concat(_stylesModule.default["spacing".concat((0, _componentUtils.capitalize)(spacing))]);
68
+ const infoClasses = "".concat(classes.info, " ").concat(orientation === _constants.ORIENTATION.VERTICAL && classes.vertical);
69
+ const iconCollapseButtonClasses = "".concat(classes.iconCollapseButton, " ").concat(isCollapsed && classes.collapsed);
70
70
  return /*#__PURE__*/_react.default.createElement("div", {
71
- className: "".concat(_stylesModule.default.container, " ").concat(classes.container, " ").concat(area ? classes.area : '', " ").concat(_stylesModule.default["padding".concat((0, _componentUtils.capitalize)(paddingVertical))]),
71
+ className: "".concat(classes.container, " ").concat(area ? classes.area : '', " ").concat(classes["padding".concat((0, _componentUtils.capitalize)(paddingVertical))]),
72
72
  "data-testid": dataTestId ? "".concat(dataTestId, ".").concat(dataElement.container) : undefined
73
73
  }, /*#__PURE__*/_react.default.createElement("div", {
74
74
  className: contentClasses
@@ -78,14 +78,14 @@ const UTDataElement = _ref => {
78
78
  }, iconProps)), /*#__PURE__*/_react.default.createElement("div", {
79
79
  className: infoClasses
80
80
  }, (prefix || title || showBadge) && /*#__PURE__*/_react.default.createElement("div", {
81
- className: _stylesModule.default.topInfo
81
+ className: classes.topInfo
82
82
  }, prefix && /*#__PURE__*/_react.default.createElement(_UTLabel.default, _extends({
83
83
  colorTheme: "gray"
84
84
  }, prefixProps), prefix), title && /*#__PURE__*/_react.default.createElement(_UTLabel.default, _extends({
85
85
  colorTheme: "gray"
86
86
  }, titleProps), title), showBadge && /*#__PURE__*/_react.default.createElement(_UTBadge.default, _extends({
87
87
  colorTheme: "accent",
88
- className: _stylesModule.default.badge
88
+ className: classes.badge
89
89
  }, badgeProps), forceShowBadge ? null : badge)), DataComponent && DataComponent), action && /*#__PURE__*/_react.default.createElement(_MainAction.default, _extends({
90
90
  dataTestId: dataTestId
91
91
  }, action)), children && /*#__PURE__*/_react.default.createElement(_UTButton.default, {
@@ -102,7 +102,7 @@ const UTDataElement = _ref => {
102
102
  maxHeight: isCollapsed ? 0 : childrenHeight,
103
103
  marginTop: isCollapsed ? 0 : 16
104
104
  },
105
- className: _stylesModule.default.children
105
+ className: classes.children
106
106
  }, /*#__PURE__*/_react.default.createElement("div", {
107
107
  ref: childrenRef
108
108
  }, children)));
package/dist/components/UTDataElement/styles.module.scss CHANGED
@@ -4,11 +4,13 @@
4
4
  }
5
5
 
6
6
  .paddingSmall {
7
- padding: 8px 0;
7
+ padding-bottom: 8px;
8
+ padding-top: 8px;
8
9
  }
9
10
 
10
11
  .paddingMedium {
11
- padding: 16px 0;
12
+ padding-bottom: 16px;
13
+ padding-top: 16px;
12
14
  }
13
15
 
14
16
  .content {
package/dist/utils/classesUtils.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.withImportant = exports.resolveCssValue = exports.mergeClasses = void 0;
6
+ exports.withImportant = exports.resolveCssValue = exports.mergeMultipleClassNames = exports.mergeClasses = void 0;
7
7
  const mergeClasses = (themeClasses, classNames) => {
8
8
  if (!classNames) return themeClasses;
9
9
  const classes = {};
@@ -14,6 +14,22 @@ const mergeClasses = (themeClasses, classNames) => {
14
14
  return classes;
15
15
  };
16
16
  exports.mergeClasses = mergeClasses;
17
+ const mergeMultipleClassNames = function () {
18
+ for (var _len = arguments.length, classSources = new Array(_len), _key = 0; _key < _len; _key++) {
19
+ classSources[_key] = arguments[_key];
20
+ }
21
+ const classes = {};
22
+ const allKeysClassNames = new Set();
23
+ classSources.forEach(source => {
24
+ if (source) Object.keys(source).forEach(key => allKeysClassNames.add(key));
25
+ });
26
+ allKeysClassNames.forEach(key => {
27
+ const mergedClass = classSources.map(source => (source === null || source === void 0 ? void 0 : source[key]) || '').join(' ').trim();
28
+ if (mergedClass) classes[key] = mergedClass;
29
+ });
30
+ return classes;
31
+ };
32
+ exports.mergeMultipleClassNames = mergeMultipleClassNames;
17
33
  const withImportant = style => style && "".concat(style, " !important");
18
34
  exports.withImportant = withImportant;
19
35
  const resolveCssValue = value => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@widergy/energy-ui",
3
- "version": "3.94.0",
3
+ "version": "3.94.1",
4
4
  "description": "Widergy Web Components",
5
5
  "author": "widergy",
6
6
  "license": "MIT",