@dxc-technology/halstack-react 0.0.0-335f028 → 0.0.0-33c1fd8

package/README.md

@@ -0,0 +1,47 @@
+<p align="center">
+  <a href="https://developer.dxc.com/halstack/">
+    <img src="website/screens/common/images/halstack_logo.svg" alt="Halstack Design System logo" />
+  </a>
+</p>
+
+<h1 align="center">Halstack Design System</h1>
+
+Halstack is an Open Source Design System built and maintained by DXC Technology with the purpose of providing all the necessary tools for designing and implementing accessible, intuitive and consistent User Experiences with React.
+
+## How to start
+
+You can start using Halstack right now:
+
+```bash
+npm i @dxc-technology/halstack-react
+```
+
+### Usage
+
+```jsx
+import React from "react";
+import { DxcButton, DxcTextInput } from "@dxc-technology/halstack-react";
+
+const App = () => (
+  <>
+    <DxcTextInput label="Enter your name" />
+    <DxcButton label="Submit" type="submit" />
+  </>
+);
+```
+
+## Where to start
+
+Learn everything you need to know about Halstack principles and components on the [official documentation site](https://developer.dxc.com/halstack/).
+
+## Contributing
+
+Any feedback is always welcome in Halstack!
+
+Before opening a new issue, pull request or discussion, please read carefully and respect our [contribution guidelines](https://github.com/dxc-technology/halstack-react/wiki/Contributing).
+
+## Thanks
+
+<a href="https://www.chromatic.com/"><img src="https://user-images.githubusercontent.com/321738/84662277-e3db4f80-af1b-11ea-88f5-91d67a5e59f6.png" width="153" height="30" alt="Chromatic" /></a>
+
+Thanks to [Chromatic](https://www.chromatic.com/) for providing the visual testing platform that helps us review UI changes and catch visual regressions.

package/accordion/Accordion.accessibility.test.js

@@ -0,0 +1,71 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _Accordion = _interopRequireDefault(require("./Accordion.tsx"));
+var _jestAxe = require("jest-axe");
+var folderIcon = /*#__PURE__*/_react["default"].createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  enableBackground: "new 0 0 24 24",
+  height: "24px",
+  viewBox: "0 0 24 24",
+  width: "24px",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("rect", {
+  fill: "none",
+  height: "24",
+  width: "24"
+})), /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M20,6h-8l-2-2H4C2.9,4,2.01,4.9,2.01,6L2,18c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8C22,6.9,21.1,6,20,6z M16,16h2v-2h-2v-2 h2v-2h-2V8h4v10h-4V16z M16,16h-2v2H4V6h5.17l2,2H14v2h2v2h-2v2h2V16z"
+})));
+describe("Accordion component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+            label: "Accordion",
+            assistiveText: "Assistive Text",
+            icon: folderIcon,
+            margin: "small",
+            defaultIsExpanded: true
+          }, /*#__PURE__*/_react["default"].createElement("div", null, "test-expanded"))), container = _render.container;
+          _context.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for disabled mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, container, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+            label: "Accordion",
+            assistiveText: "Assistive Text",
+            icon: folderIcon,
+            margin: "small",
+            disabled: true
+          }, /*#__PURE__*/_react["default"].createElement("div", null, "test-expanded"))), container = _render2.container;
+          _context2.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+});

package/accordion/Accordion.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import AccordionPropsType from "./types";
-declare const DxcAccordion: ({ label, defaultIsExpanded, isExpanded, icon, assistiveText, disabled, onChange, children, margin, padding, tabIndex, }: AccordionPropsType) => JSX.Element;
+declare const DxcAccordion: ({ label, defaultIsExpanded, isExpanded, icon, assistiveText, disabled, onChange, children, margin, tabIndex, }: AccordionPropsType) => JSX.Element;
 export default DxcAccordion;

package/accordion/Accordion.js

@@ -1,114 +1,109 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
-
-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 _utils = require("../common/utils");
+var _variables = require("../common/variables");
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-
-var _BackgroundColorContext = require("../BackgroundColorContext");
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
-
-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 _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
+var _uuid = require("uuid");
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcAccordion = function DxcAccordion(_ref) {
   var _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
-      defaultIsExpanded = _ref.defaultIsExpanded,
-      isExpanded = _ref.isExpanded,
-      icon = _ref.icon,
-      _ref$assistiveText = _ref.assistiveText,
-      assistiveText = _ref$assistiveText === void 0 ? "" : _ref$assistiveText,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      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];
-
+    label = _ref$label === void 0 ? "" : _ref$label,
+    defaultIsExpanded = _ref.defaultIsExpanded,
+    isExpanded = _ref.isExpanded,
+    icon = _ref.icon,
+    _ref$assistiveText = _ref.assistiveText,
+    assistiveText = _ref$assistiveText === void 0 ? "" : _ref$assistiveText,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    onChange = _ref.onChange,
+    children = _ref.children,
+    margin = _ref.margin,
+    _ref$tabIndex = _ref.tabIndex,
+    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+  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);
-    }
-
-    if (typeof onChange === "function") {
-      onChange(isExpanded == null ? !innerIsExpanded : !isExpanded);
-    }
+  var handleAccordionState = function handleAccordionState() {
+    var _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, {
-    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, {
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: icon
+  }) : 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
-  }, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
-    color: colorsTheme.accordion.backgroundColor
-  }, children))))));
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: (isExpanded !== null && isExpanded !== void 0 ? isExpanded : innerIsExpanded) ? "expand_less" : "expand_more"
+  })))), (isExpanded !== null && isExpanded !== void 0 ? isExpanded : innerIsExpanded) && /*#__PURE__*/_react["default"].createElement(AccordionPanel, {
+    id: "accordion-panel-".concat(id),
+    role: "region",
+    "aria-labelledby": "accordion-".concat(id)
+  }, 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 +115,23 @@ 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 +139,33 @@ 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;
+var IconContainer = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\n  font-size: ", ";\n\n  svg {\n    height: ", ";\n    width: ", ";\n  }\n"])), function (props) {
+  return props.theme.iconMarginLeft;
 }, function (props) {
-  return props.theme.titleLabelFontFamily;
+  return props.theme.iconMarginRight;
 }, function (props) {
-  return props.theme.titleLabelFontSize;
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
 }, function (props) {
-  return props.theme.titleLabelFontStyle;
+  return props.theme.iconSize;
 }, 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;
+var CollapseIndicator = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  font-size: 24px;\n  color: ", ";\n"])), function (props) {
+  return props.disabled ? props.theme.disabledArrowColor : props.theme.arrowColor;
+});
+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.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+  return props.theme.borderRadius;
 });
-
-var AccordionIcon = _styledComponents["default"].img(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var _default = DxcAccordion;
-exports["default"] = _default;
+var _default = exports["default"] = DxcAccordion;