@dxc-technology/halstack-react 0.0.0-dddc3c4 → 0.0.0-de7c6b0

package/accordion/Accordion.js

@@ -19,28 +19,42 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
+var _utils = require("../common/utils");
 
-var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/ExpansionPanelSummary"));
-
-var _ExpansionPanelDetails = _interopRequireDefault(require("@material-ui/core/ExpansionPanelDetails"));
-
-var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
-
-var _utils = require("../common/utils.js");
-
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _BackgroundColorContext = require("../BackgroundColorContext");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
+
+var _uuid = require("uuid");
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var expandLess = /*#__PURE__*/_react["default"].createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  height: "24",
+  width: "24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "m7.4 15.375-1.4-1.4 6-6 6 6-1.4 1.4-4.6-4.6Z"
+}));
+
+var expandMore = /*#__PURE__*/_react["default"].createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  height: "24",
+  width: "24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "m12 15.375-6-6 1.4-1.4 4.6 4.6 4.6-4.6 1.4 1.4Z"
+}));
+
 var DxcAccordion = function DxcAccordion(_ref) {
   var _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
@@ -54,61 +68,85 @@ var DxcAccordion = function DxcAccordion(_ref) {
       onChange = _ref.onChange,
       children = _ref.children,
       margin = _ref.margin,
-      padding = _ref.padding,
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _useState = (0, _react.useState)(defaultIsExpanded !== null && defaultIsExpanded !== void 0 ? defaultIsExpanded : false),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerIsExpanded = _useState2[0],
-      setInnerIsExpanded = _useState2[1];
+  var _useState = (0, _react.useState)((0, _uuid.v4)()),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
+      id = _useState2[0];
+
+  var _useState3 = (0, _react.useState)(defaultIsExpanded !== null && defaultIsExpanded !== void 0 ? defaultIsExpanded : false),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      innerIsExpanded = _useState4[0],
+      setInnerIsExpanded = _useState4[1];
 
   var colorsTheme = (0, _useTheme["default"])();
 
-  var handlerAccordion = function handlerAccordion() {
-    if (isExpanded == null) {
-      setInnerIsExpanded(!innerIsExpanded);
-    }
+  var handleAccordionState = function handleAccordionState() {
+    var _isExpanded;
 
-    if (typeof onChange === "function") {
-      onChange(isExpanded == null ? !innerIsExpanded : !isExpanded);
-    }
+    isExpanded !== null && isExpanded !== void 0 ? isExpanded : setInnerIsExpanded(function (innerIsExpanded) {
+      return !innerIsExpanded;
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange((_isExpanded = !isExpanded) !== null && _isExpanded !== void 0 ? _isExpanded : !innerIsExpanded);
   };
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.accordion
-  }, /*#__PURE__*/_react["default"].createElement(DXCAccordion, {
-    padding: padding,
-    margin: margin,
+  }, /*#__PURE__*/_react["default"].createElement(AccordionContainer, {
+    isExpanded: isExpanded !== null && isExpanded !== void 0 ? isExpanded : innerIsExpanded,
+    margin: margin
+  }, /*#__PURE__*/_react["default"].createElement(AccordionHeader, null, /*#__PURE__*/_react["default"].createElement(AccordionTrigger, {
+    id: "accordion-".concat(id),
+    onClick: disabled ? undefined : handleAccordionState,
     disabled: disabled,
-    icon: icon
-  }, /*#__PURE__*/_react["default"].createElement(_ExpansionPanel["default"], {
-    disabled: disabled,
-    onChange: handlerAccordion,
-    expanded: isExpanded != null ? isExpanded : innerIsExpanded
-  }, /*#__PURE__*/_react["default"].createElement(_ExpansionPanelSummary["default"], {
-    expandIcon: /*#__PURE__*/_react["default"].createElement(_ExpandMore["default"], null),
-    tabIndex: disabled ? -1 : tabIndex
-  }, /*#__PURE__*/_react["default"].createElement(AccordionInfo, {
-    disabled: disabled
-  }, icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+    tabIndex: disabled ? -1 : tabIndex,
+    "aria-expanded": isExpanded !== null && isExpanded !== void 0 ? isExpanded : innerIsExpanded,
+    "aria-controls": "accordion-panel-".concat(id),
+    isExpanded: isExpanded !== null && isExpanded !== void 0 ? isExpanded : innerIsExpanded
+  }, /*#__PURE__*/_react["default"].createElement(AccordionInfo, null, /*#__PURE__*/_react["default"].createElement(AccordionLabel, null, icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     disabled: disabled
-  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(AccordionIcon, {
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon), /*#__PURE__*/_react["default"].createElement(AccordionLabel, null, label)), assistiveText && /*#__PURE__*/_react["default"].createElement(AccordionAssistiveText, {
-    disabled: disabled
-  }, assistiveText)), /*#__PURE__*/_react["default"].createElement(_ExpansionPanelDetails["default"], null, /*#__PURE__*/_react["default"].createElement(AccordionContent, {
+  }) : icon), /*#__PURE__*/_react["default"].createElement(_BaseTypography["default"], {
+    color: disabled ? colorsTheme.accordion.disabledTitleLabelFontColor : colorsTheme.accordion.titleLabelFontColor,
+    fontFamily: colorsTheme.accordion.titleLabelFontFamily,
+    fontSize: colorsTheme.accordion.titleLabelFontSize,
+    fontStyle: colorsTheme.accordion.titleLabelFontStyle,
+    fontWeight: colorsTheme.accordion.titleLabelFontWeight,
+    lineHeight: "1.5em"
+  }, label)), assistiveText && /*#__PURE__*/_react["default"].createElement(AccordionAssistiveText, null, /*#__PURE__*/_react["default"].createElement(_BaseTypography["default"], {
+    color: disabled ? colorsTheme.accordion.disabledAssistiveTextFontColor : colorsTheme.accordion.assistiveTextFontColor,
+    fontFamily: colorsTheme.accordion.assistiveTextFontFamily,
+    fontSize: colorsTheme.accordion.assistiveTextFontSize,
+    fontStyle: colorsTheme.accordion.assistiveTextFontStyle,
+    fontWeight: colorsTheme.accordion.assistiveTextFontWeight,
+    letterSpacing: colorsTheme.accordion.assistiveTextLetterSpacing,
+    lineHeight: "1.5em"
+  }, assistiveText))), /*#__PURE__*/_react["default"].createElement(CollapseIndicator, {
     disabled: disabled
+  }, (isExpanded !== null && isExpanded !== void 0 ? isExpanded : innerIsExpanded) ? expandLess : expandMore))), (isExpanded !== null && isExpanded !== void 0 ? isExpanded : innerIsExpanded) && /*#__PURE__*/_react["default"].createElement(AccordionPanel, {
+    id: "accordion-panel-".concat(id),
+    role: "region",
+    "aria-labelledby": "accordion-".concat(id)
   }, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
     color: colorsTheme.accordion.backgroundColor
-  }, children))))));
+  }, children))));
 };
 
 var calculateWidth = function calculateWidth(margin) {
   return "calc(100% - ".concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
 };
 
-var DXCAccordion = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  min-width: 280px;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n  cursor: ", ";\n\n  .MuiPaper-root {\n    min-width: 0;\n    display: flex;\n    left: 85px;\n    background-color: ", " !important;\n    box-shadow: ", ";\n    position: static;\n    width: 100%;\n    border-radius: ", ";\n\n    &.Mui-expanded {\n      border-radius: ", ";\n    }\n    &.MuiExpansionPanel-root {\n      display: flex;\n      flex-direction: column;\n      min-height: 48px;\n    }\n    &.MuiExpansionPanel-rounded {\n      border-radius: ", ";\n    }\n    .MuiButtonBase-root.MuiExpansionPanelSummary-root {\n      min-height: 48px;\n      height: 48px;\n\n      :focus {\n        outline-color: ", ";\n        outline-style: ", ";\n        outline-width: ", ";\n        background-color: ", ";\n      }\n      :hover {\n        background-color: ", ";\n      }\n      :active {\n        background-color: ", ";\n      }\n      &.Mui-disabled {\n        opacity: 1;\n      }\n    }\n    .MuiButtonBase-root {\n      border-radius: ", ";\n\n      &.Mui-expanded {\n        border-bottom-right-radius: 0;\n        border-bottom-left-radius: 0;\n        .MuiSvgIcon-root {\n          opacity: 1;\n        }\n      }\n      &.MuiIconButton-root {\n        height: auto;\n      }\n      .MuiExpansionPanelSummary-content {\n        padding-top: ", ";\n        padding-bottom: ", ";\n        padding-right: ", ";\n        padding-left: ", ";\n        min-width: 0;\n        &.Mui-expanded {\n          div:nth-child(2) {\n            opacity: 1;\n          }\n        }\n        :hover {\n          div {\n            opacity: 1;\n          }\n        }\n      }\n    }\n    .MuiTouchRipple-root {\n      display: none;\n    }\n  }\n  .MuiCollapse-hidden {\n    display: none;\n  }\n  .MuiCollapse-container {\n    border-radius: 0px 0px 4px 4px;\n    cursor: default;\n    width: 100%;\n  }\n  .MuiIconButton-label {\n    & > .MuiSvgIcon-root {\n      color: ", ";\n    }\n  }\n  .MuiExpansionPanelDetails-root {\n    padding: ", ";\n    padding-top: ", ";\n    padding-right: ", ";\n    padding-bottom: ", ";\n    padding-left: ", ";\n  }\n"])), function (props) {
+var AccordionContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n  border-radius: ", ";\n  ", "\n  box-shadow: ", ";\n  min-width: 280px;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n"])), function (props) {
+  return props.theme.backgroundColor;
+}, function (props) {
+  return props.theme.borderRadius;
+}, function (props) {
+  return props.isExpanded && "border-bottom-left-radius: 0; border-bottom-right-radius: 0;";
+}, function (props) {
+  return "".concat(props.theme.boxShadowOffsetX, " ").concat(props.theme.boxShadowOffsetY, " ").concat(props.theme.boxShadowBlur, " ").concat(props.theme.boxShadowColor);
+}, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
@@ -120,33 +158,27 @@ var DXCAccordion = _styledComponents["default"].div(_templateObject || (_templat
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
   return calculateWidth(props.margin);
-}, function (props) {
-  return props.disabled && "not-allowed" || "pointer";
-}, function (props) {
-  return props.theme.backgroundColor;
-}, function (props) {
-  return "".concat(props.theme.boxShadowOffsetX, " ").concat(props.theme.boxShadowOffsetY, " ").concat(props.theme.boxShadowBlur, " ").concat(props.theme.boxShadowColor);
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
+});
+
+var AccordionHeader = _styledComponents["default"].h3(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  min-height: 48px;\n  margin: 0;\n"])));
+
+var AccordionTrigger = _styledComponents["default"].button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  gap: 24px;\n  width: 100%;\n  background-color: transparent;\n  border: none;\n  border-radius: ", ";\n  ", "\n  padding: 12px 16px;\n  cursor: ", ";\n\n  :focus {\n    outline: ", ";\n  }\n  :hover:enabled {\n    background-color: ", ";\n  }\n  :active:enabled {\n    background-color: ", ";\n  }\n"])), function (props) {
   return props.theme.borderRadius;
 }, function (props) {
-  return props.theme.focusBorderColor;
-}, function (props) {
-  return props.theme.focusBorderStyle;
+  return props.isExpanded && "border-bottom-left-radius: 0; border-bottom-right-radius: 0;";
 }, function (props) {
-  return props.theme.focusBorderThickness;
+  return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
-  return props.theme.backgroundColor;
+  return "".concat(props.theme.focusBorderColor, " ").concat(props.theme.focusBorderStyle, " ").concat(props.theme.focusBorderThickness);
 }, function (props) {
   return "".concat(props.theme.hoverBackgroundColor);
 }, function (props) {
   return "".concat(props.theme.hoverBackgroundColor);
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
+});
+
+var AccordionInfo = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: space-between;\n  width: 100%;\n"])));
+
+var AccordionLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-right: ", ";\n  padding-left: ", ";\n"])), function (props) {
   return props.theme.titleLabelPaddingTop;
 }, function (props) {
   return props.theme.titleLabelPaddingBottom;
@@ -154,73 +186,37 @@ var DXCAccordion = _styledComponents["default"].div(_templateObject || (_templat
   return props.theme.titleLabelPaddingRight;
 }, function (props) {
   return props.theme.titleLabelPaddingLeft;
-}, function (props) {
-  return props.disabled ? props.theme.disabledArrowColor : props.theme.arrowColor;
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) !== "object" ? _variables.spaces[props.padding] : "0px";
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.top ? _variables.spaces[props.padding.top] : "";
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.right ? _variables.spaces[props.padding.right] : "";
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.bottom ? _variables.spaces[props.padding.bottom] : "";
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.left ? _variables.spaces[props.padding.left] : "";
 });
 
-var AccordionInfo = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  padding-left: ", ";\n  padding-right: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n"])), function (props) {
-  return props.theme.titlePaddingLeft;
-}, function (props) {
-  return props.theme.titlePaddingRight;
-}, function (props) {
-  return props.theme.titleLabelFontFamily;
+var IconContainer = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\n\n  svg,\n  img {\n    height: ", ";\n    width: ", ";\n  }\n"])), function (props) {
+  return props.theme.iconMarginLeft;
 }, function (props) {
-  return props.theme.titleLabelFontSize;
+  return props.theme.iconMarginRigth;
 }, function (props) {
-  return props.theme.titleLabelFontStyle;
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
 }, function (props) {
-  return props.theme.titleFonLabeltWeight;
+  return props.theme.iconSize;
 }, function (props) {
-  return props.disabled ? props.theme.disabledTitleLabelFontColor : props.theme.titleLabelFontColor;
+  return props.theme.iconSize;
 });
 
-var AccordionLabel = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var AccordionContent = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n"])));
-
-var AccordionAssistiveText = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  padding-left: ", ";\n  padding-right: ", ";\n  font-size: ", ";\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  flex: 1;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  min-width: ", ";\n  text-align: end;\n"])), function (props) {
+var AccordionAssistiveText = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  min-width: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n"])), function (props) {
+  return props.theme.assistiveTextMinWidth;
+}, function (props) {
   return props.theme.assistiveTextPaddingLeft;
 }, function (props) {
   return props.theme.assistiveTextPaddingRight;
-}, function (props) {
-  return props.theme.assistiveTextFontSize;
-}, function (props) {
-  return props.theme.assistiveTextFontFamily;
-}, function (props) {
-  return props.theme.assistiveTextFontStyle;
-}, function (props) {
-  return props.theme.assistiveTextFontWeight;
-}, function (props) {
-  return props.disabled ? props.theme.disabledAssistiveTextFontColor : props.theme.assistiveTextFontColor;
-}, function (props) {
-  return props.theme.assistiveTextLetterSpacing;
-}, function (props) {
-  return props.theme.assistiveTextMinWidth;
 });
 
-var IconContainer = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  color: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
-  return props.theme.iconSize;
-}, function (props) {
-  return props.theme.iconSize;
-}, function (props) {
-  return props.theme.iconMarginLeft;
-}, function (props) {
-  return props.theme.iconMarginRigth;
-}, function (props) {
-  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+var CollapseIndicator = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  color: ", ";\n"])), function (props) {
+  return props.disabled ? props.theme.disabledArrowColor : props.theme.arrowColor;
 });
 
-var AccordionIcon = _styledComponents["default"].img(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])([""])));
+var AccordionPanel = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  border-bottom-left-radius: ", ";\n  border-bottom-right-radius: ", ";\n"])), function (props) {
+  return props.theme.borderRadius;
+}, function (props) {
+  return props.theme.borderRadius;
+});
 
 var _default = DxcAccordion;
 exports["default"] = _default;

package/accordion/Accordion.stories.tsx

@@ -30,10 +30,33 @@ const folderIcon = (
   </svg>
 );
 
-const thumbIcon = (
-  <svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="currentColor">
-    <path d="M0 0h24v24H0V0z" fill="none" />
-    <path d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-2z" />
+const smallIcon = (
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" height="20" width="20">
+    <path d="m7.646 18.333-.313-2.625q-.208-.125-.458-.27-.25-.146-.458-.271l-2.438 1.021-2.354-4.063 2.083-1.583V9.458L1.625 7.875l2.354-4.063 2.438 1.021q.208-.125.458-.27.25-.146.458-.271l.313-2.625h4.708l.313 2.625q.208.125.458.271.25.145.458.27l2.438-1.021 2.354 4.063-2.063 1.583v1.084l2.063 1.583-2.354 4.063-2.438-1.021q-.208.125-.458.271-.25.145-.458.27l-.313 2.625ZM10 12.979q1.229 0 2.104-.875T12.979 10q0-1.229-.875-2.104T10 7.021q-1.229 0-2.104.875T7.021 10q0 1.229.875 2.104t2.104.875Zm0-1.75q-.5 0-.865-.364-.364-.365-.364-.865t.364-.865q.365-.364.865-.364t.865.364q.364.365.364.865t-.364.865q-.365.364-.865.364ZM10.021 10Zm-.854 6.583h1.666l.25-2.166q.605-.167 1.167-.5.562-.334 1.021-.792l2.021.854.833-1.375-1.771-1.354q.104-.292.146-.604.042-.313.042-.646 0-.292-.042-.594t-.125-.635l1.771-1.375-.834-1.375-2.02.875q-.48-.479-1.032-.802-.552-.323-1.156-.49l-.271-2.187H9.167l-.271 2.187q-.604.167-1.156.49-.552.323-1.011.781l-2.021-.854-.833 1.375 1.75 1.354q-.083.333-.125.646-.042.312-.042.604t.042.594q.042.302.125.635l-1.75 1.375.833 1.375 2.021-.854q.459.458 1.011.781.552.323 1.156.49Z" />
+  </svg>
+);
+
+const facebookIcon = (
+  <svg
+    version="1.1"
+    id="Capa_1"
+    x="0px"
+    y="0px"
+    width="438.536px"
+    height="438.536px"
+    viewBox="0 0 438.536 438.536"
+    fill="currentColor"
+  >
+    <g>
+      <path
+        d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
+  C8.045,40.207,0.003,59.576,0.003,82.225v274.084c0,22.647,8.042,42.018,24.123,58.102c16.084,16.084,35.454,24.126,58.102,24.126
+  h274.084c22.648,0,42.018-8.042,58.095-24.126c16.084-16.084,24.126-35.454,24.126-58.102V82.225
+  C438.532,59.576,430.49,40.204,414.41,24.123z M373.155,225.548h-49.963V406.84h-74.802V225.548H210.99V163.02h37.401v-37.402
+  c0-26.838,6.283-47.107,18.843-60.813c12.559-13.706,33.304-20.555,62.242-20.555h49.963v62.526h-31.401
+  c-10.663,0-17.467,1.853-20.417,5.568c-2.949,3.711-4.428,10.23-4.428,19.558v31.119h56.534L373.155,225.548z"
+      />
+    </g>
   </svg>
 );
 
@@ -47,6 +70,14 @@ const advancedTheme = {
   },
 };
 
+const opinionatedTheme = {
+  accordion: {
+    accentColor: "#5f249f",
+    titleFontColor: "#000000",
+    assistiveTextFontColor: "#666666",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <Title title="Component anatomy" theme="light" level={2} />
@@ -78,8 +109,30 @@ export const Chromatic = () => (
       </DxcAccordion>
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="With bigger icon 48x48" theme="light" level={4} />
-      <DxcAccordion label="Accordion" assistiveText="Assistive text" icon={thumbIcon}>
+      <Title title="With smaller icon" theme="light" level={4} />
+      <DxcAccordion label="Accordion" assistiveText="Assistive text" icon={smallIcon}>
+        <div>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo
+          lobortis eget.
+        </div>
+      </DxcAccordion>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With bigger icon (SVG)" theme="light" level={4} />
+      <DxcAccordion label="AccordionTest" assistiveText="Assistive text" icon={facebookIcon}>
+        <div>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo
+          lobortis eget.
+        </div>
+      </DxcAccordion>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With bigger icon (image)" theme="light" level={4} />
+      <DxcAccordion
+        label="Accordion"
+        assistiveText="Assistive text"
+        icon="https://www.freepnglogos.com/uploads/facebook-logo-design-1.png"
+      >
         <div>
           Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo
           lobortis eget.
@@ -126,118 +179,14 @@ export const Chromatic = () => (
     <ExampleContainer>
       <Title title="Background color provider over accordion content" theme="light" level={4} />
       <HalstackProvider advancedTheme={advancedTheme}>
-        <DxcAccordion
-          label="Dark Accordion"
-          defaultIsExpanded
-          assistiveText="Assistive text"
-          icon={folderIcon}
-          padding="medium"
-        >
-          <div style={{ display: "flex", flexDirection: "column" }}>
-            <DxcTextInput
-              label="Label"
-              helperText="HelperText"
-              placeholder="Placeholder"
-              size="fillParent"
-              margin={{ bottom: "medium" }}
-            />
+        <DxcAccordion label="Dark Accordion" defaultIsExpanded assistiveText="Assistive text" icon={folderIcon}>
+          <div style={{ display: "flex", flexDirection: "column", gap: "36px", padding: "36px" }}>
+            <DxcTextInput label="Label" helperText="HelperText" placeholder="Placeholder" size="fillParent" />
             <DxcButton label="Submit" size="medium" />
           </div>
         </DxcAccordion>
       </HalstackProvider>
     </ExampleContainer>
-    <Title title="Paddings" theme="light" level={2} />
-    <ExampleContainer>
-      <Title title="Xxsmall padding" theme="light" level={4} />
-      <DxcAccordion label="Xxsmall padding" defaultIsExpanded padding="xxsmall">
-        <div>
-          <DxcHeading level={5} text="Content header" margin={{ bottom: "xxsmall" }} />
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </div>
-      </DxcAccordion>
-    </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Xsmall padding" theme="light" level={4} />
-      <DxcAccordion label="Xsmall padding" defaultIsExpanded padding="xsmall">
-        <div>
-          <DxcHeading level={5} text="Content header" margin={{ bottom: "xxsmall" }} />
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </div>
-      </DxcAccordion>
-    </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Small padding" theme="light" level={4} />
-      <DxcAccordion label="Small padding" defaultIsExpanded padding="small">
-        <div>
-          <DxcHeading level={5} text="Content header" margin={{ bottom: "xxsmall" }} />
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </div>
-      </DxcAccordion>
-    </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Medium padding" theme="light" level={4} />
-      <DxcAccordion label="Medium padding" defaultIsExpanded padding="medium">
-        <div>
-          <DxcHeading level={5} text="Content header" margin={{ bottom: "xxsmall" }} />
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </div>
-      </DxcAccordion>
-    </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Large padding" theme="light" level={4} />
-      <DxcAccordion label="Large padding" defaultIsExpanded padding="large">
-        <div>
-          <DxcHeading level={5} text="Content header" margin={{ bottom: "xxsmall" }} />
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </div>
-      </DxcAccordion>
-    </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Xlarge padding" theme="light" level={4} />
-      <DxcAccordion label="Xlarge padding" defaultIsExpanded padding="xlarge">
-        <div>
-          <DxcHeading level={5} text="Content header" margin={{ bottom: "xxsmall" }} />
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </div>
-      </DxcAccordion>
-    </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Xxlarge padding" theme="light" level={4} />
-      <DxcAccordion label="Xxlarge padding" defaultIsExpanded padding="xxlarge">
-        <div>
-          <DxcHeading level={5} text="Content header" margin={{ bottom: "xxsmall" }} />
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </div>
-      </DxcAccordion>
-    </ExampleContainer>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall margin" theme="light" level={4} />
@@ -301,7 +250,48 @@ export const Chromatic = () => (
           lobortis eget.
         </div>
       </DxcAccordion>
-      <hr />
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="With assistive text and icon" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcAccordion label="Accordion" assistiveText="Assistive text" icon={folderIcon}>
+          Content
+        </DxcAccordion>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcAccordion label="Hovered">
+          <div>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit
+            leo lobortis eget.
+          </div>
+        </DxcAccordion>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcAccordion label="Active">
+          <div>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit
+            leo lobortis eget.
+          </div>
+        </DxcAccordion>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcAccordion label="Disabled" assistiveText="Assistive text" icon={folderIcon} disabled>
+          <div>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit
+            leo lobortis eget.
+          </div>
+        </DxcAccordion>
+      </HalstackProvider>
     </ExampleContainer>
   </>
 );

package/accordion/Accordion.test.js

@@ -6,23 +6,22 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Accordion = _interopRequireDefault(require("./Accordion"));
+var _Accordion = _interopRequireDefault(require("./Accordion.tsx"));
 
 describe("Accordion component tests", function () {
-  test("Accordion renders with correct text", function () {
-    var onChange = jest.fn();
-
+  test("Renders with correct aria accessibility attributes", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
       label: "Accordion",
-      assistiveText: "Assistive text",
-      onChange: onChange
-    })),
-        getByText = _render.getByText;
+      defaultIsExpanded: true
+    }, /*#__PURE__*/_react["default"].createElement("div", null, "test-expanded"))),
+        getByRole = _render.getByRole;
 
-    expect(getByText("Accordion")).toBeTruthy();
-    expect(getByText("Assistive text")).toBeTruthy();
+    var accordion = getByRole("button");
+    var panel = getByRole("region");
+    expect(accordion.getAttribute("aria-controls")).toBe(panel.id);
+    expect(panel.getAttribute("aria-labelledby")).toBe(accordion.id);
   });
-  test("Accordion renders expanded by default when it is uncontrolled", function () {
+  test("Renders expanded by default when it is uncontrolled", function () {
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
       label: "Accordion",
       defaultIsExpanded: true

package/accordion/types.d.ts

@@ -6,12 +6,6 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type Padding = {
-    top?: Space;
-    bottom?: Space;
-    left?: Space;
-    right?: Space;
-};
 declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare type Props = {
     /**
@@ -55,11 +49,6 @@ declare type Props = {
      * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
      */
     margin?: Space | Margin;
-    /**
-     * Size of the padding to be applied to the custom area ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
-     * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different padding sizes.
-     */
-    padding?: Space | Padding;
     /**
      * Value of the tabindex.
      */