@dxc-technology/halstack-react 0.0.0-b061aa1 → 0.0.0-b063530

package/accordion/Accordion.test.js

@@ -0,0 +1,56 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _Accordion = _interopRequireDefault(require("./Accordion"));
+describe("Accordion component tests", function () {
+  test("Renders with correct aria accessibility attributes", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+        label: "Accordion",
+        defaultIsExpanded: true
+      }, /*#__PURE__*/_react["default"].createElement("div", null, "test-expanded"))),
+      getByRole = _render.getByRole;
+    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("Renders expanded by default when it is uncontrolled", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+        label: "Accordion",
+        defaultIsExpanded: true
+      }, /*#__PURE__*/_react["default"].createElement("div", null, "test-expanded"))),
+      getByRole = _render2.getByRole;
+    var accordion = getByRole("button");
+    expect(accordion.getAttribute("aria-expanded")).toBe("true");
+  });
+  test("Calls correct function on click", function () {
+    var onChange = jest.fn();
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+        label: "Accordion",
+        onChange: onChange
+      }, /*#__PURE__*/_react["default"].createElement("div", null, "test-expanded"))),
+      getByText = _render3.getByText;
+    _react2.fireEvent.click(getByText("Accordion"));
+    expect(onChange).toHaveBeenCalled();
+  });
+  test("Controlled accordion", function () {
+    var onChange = jest.fn();
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+        label: "Accordion",
+        onChange: onChange,
+        isExpanded: true
+      }, /*#__PURE__*/_react["default"].createElement("div", null, "test-expanded"))),
+      getByText = _render4.getByText,
+      getByRole = _render4.getByRole;
+    expect(getByRole("button").getAttribute("aria-expanded")).toBe("true");
+    _react2.fireEvent.click(getByText("Accordion"));
+    _react2.fireEvent.click(getByText("Accordion"));
+    _react2.fireEvent.click(getByText("Accordion"));
+    expect(onChange).toHaveBeenCalledTimes(3);
+    expect(onChange.mock.calls[0][0]).toBe(false);
+    expect(onChange.mock.calls[1][0]).toBe(false);
+    expect(onChange.mock.calls[2][0]).toBe(false);
+  });
+});

package/accordion/types.d.ts

@@ -1,23 +1,21 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-declare type Padding = {
-    top?: Space;
-    bottom?: Space;
-    left?: Space;
-    right?: Space;
-};
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
-declare type Props = {
+type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+type Props = {
     /**
      * The panel label.
      */
-    label?: string;
+    label: string;
+    /**
+     * Initial state of the panel, only when it is uncontrolled.
+     */
+    defaultIsExpanded?: boolean;
     /**
      * Represents the state of the panel. When true, the component will be
      * expanded. If undefined, the component will be uncontrolled and its
@@ -25,13 +23,9 @@ declare type Props = {
      */
     isExpanded?: boolean;
     /**
-     * Element used as the icon that will be placed next to panel label.
-     */
-    icon?: SVG;
-    /**
-     * @deprecated URL of the icon that will be placed next to panel label.
+     * Material Symbol name or SVG element used as the icon that will be placed next to panel label.
      */
-    iconSrc?: string;
+    icon?: string | SVG;
     /**
      * Assistive text to be placed on the right side of the panel.
      */
@@ -56,12 +50,7 @@ declare type Props = {
      */
     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.
+     * Value of the tabindex attribute.
      */
     tabIndex?: number;
 };

package/accordion-group/AccordionGroup.accessibility.test.d.ts

@@ -0,0 +1 @@
+export {};

package/accordion-group/AccordionGroup.accessibility.test.js

@@ -0,0 +1,82 @@
+"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 _AccordionGroup = _interopRequireDefault(require("./AccordionGroup"));
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+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(_AccordionGroup["default"], {
+            defaultIndexActive: 1,
+            margin: "small"
+          }, /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
+            label: "Accordion1",
+            assistiveText: "Assistive Text1",
+            icon: folderIcon
+          }, /*#__PURE__*/_react["default"].createElement("div", null, "First accordion")), /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
+            label: "Accordion2",
+            assistiveText: "Assistive Text2",
+            icon: folderIcon
+          }, /*#__PURE__*/_react["default"].createElement("div", null, "Second accordion")))), container = _render.container;
+          _context.next = 3;
+          return (0, _axeHelper.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(_AccordionGroup["default"], {
+            defaultIndexActive: 1,
+            margin: "small",
+            disabled: true
+          }, /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
+            label: "Accordion1",
+            assistiveText: "Assistive Text1",
+            icon: folderIcon
+          }, /*#__PURE__*/_react["default"].createElement("div", null, "First accordion")), /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
+            label: "Accordion2",
+            assistiveText: "Assistive Text2",
+            icon: folderIcon
+          }, /*#__PURE__*/_react["default"].createElement("div", null, "Second accordion")))), container = _render2.container;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+});

package/accordion-group/AccordionGroup.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import AccordionGroupPropsType, { AccordionPropsType } from "./types";
+import AccordionGroupPropsType from "./types";
 declare const DxcAccordionGroup: {
-    ({ indexActive, disabled, onActiveChange, margin, children, }: AccordionGroupPropsType): JSX.Element;
-    Accordion: ({ ...childProps }: AccordionPropsType) => JSX.Element;
+    ({ defaultIndexActive, indexActive, disabled, onActiveChange, margin, children, }: AccordionGroupPropsType): JSX.Element;
+    Accordion: ({ ...childProps }: import("./types").AccordionPropsType) => JSX.Element;
 };
 export default DxcAccordionGroup;

package/accordion-group/AccordionGroup.js

@@ -1,134 +1,87 @@
 "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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _Accordion = _interopRequireDefault(require("../accordion/Accordion"));
-
-var _utils = require("../common/utils.js");
-
-var _variables = require("../common/variables.js");
-
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
-
+var _utils = require("../common/utils");
+var _variables = require("../common/variables");
+var _useTheme = _interopRequireDefault(require("../useTheme"));
+var _AccordionGroupAccordion = _interopRequireDefault(require("./AccordionGroupAccordion"));
+var _AccordionGroupContext = require("./AccordionGroupContext");
 var _templateObject;
-
-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; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-var AccordionGroupAccordionContext = /*#__PURE__*/(0, _react.createContext)(null);
-
-var AccordionGroupAccordion = function AccordionGroupAccordion(_ref) {
-  var childProps = (0, _extends2["default"])({}, _ref);
-
-  var _useContext = (0, _react.useContext)(AccordionGroupAccordionContext),
-      innerIsExpanded = _useContext.innerIsExpanded,
-      handlerActiveChange = _useContext.handlerActiveChange,
-      disabled = _useContext.disabled,
-      index = _useContext.index;
-
-  return /*#__PURE__*/_react["default"].createElement(_Accordion["default"], (0, _extends2["default"])({
-    isExpanded: innerIsExpanded === index,
-    onChange: function onChange() {
-      handlerActiveChange(index);
-    },
-    disabled: disabled
-  }, childProps), childProps.children);
-};
-
-var DxcAccordionGroup = function DxcAccordionGroup(_ref2) {
-  var indexActive = _ref2.indexActive,
-      _ref2$disabled = _ref2.disabled,
-      disabled = _ref2$disabled === void 0 ? false : _ref2$disabled,
-      onActiveChange = _ref2.onActiveChange,
-      margin = _ref2.margin,
-      children = _ref2.children;
+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; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var DxcAccordionGroup = function DxcAccordionGroup(_ref) {
+  var defaultIndexActive = _ref.defaultIndexActive,
+    indexActive = _ref.indexActive,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    onActiveChange = _ref.onActiveChange,
+    margin = _ref.margin,
+    children = _ref.children;
   var colorsTheme = (0, _useTheme["default"])();
-
-  var _useState = (0, _react.useState)(0),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerIsExpanded = _useState2[0],
-      setInnerIsExpanded = _useState2[1];
-
+  var _useState = (0, _react.useState)(defaultIndexActive !== null && defaultIndexActive !== void 0 ? defaultIndexActive : -1),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    innerIndexActive = _useState2[0],
+    setInnerIndexActive = _useState2[1];
   var handlerActiveChange = (0, _react.useCallback)(function (index) {
-    indexActive === undefined ? setInnerIsExpanded(function (prev) {
+    indexActive !== null && indexActive !== void 0 ? indexActive : setInnerIndexActive(function (prev) {
       return index === prev ? -1 : index;
-    }) : setInnerIsExpanded(indexActive);
+    });
     !disabled && (onActiveChange === null || onActiveChange === void 0 ? void 0 : onActiveChange(index));
   }, [disabled, indexActive, onActiveChange]);
-  var value = (0, _react.useMemo)(function () {
+  var contextValue = (0, _react.useMemo)(function () {
     return {
-      innerIsExpanded: innerIsExpanded,
+      activeIndex: indexActive !== null && indexActive !== void 0 ? indexActive : innerIndexActive,
       handlerActiveChange: handlerActiveChange,
       disabled: disabled
     };
-  }, [innerIsExpanded, disabled]);
-  (0, _react.useEffect)(function () {
-    setInnerIsExpanded(indexActive);
-  }, [indexActive]);
+  }, [indexActive, innerIndexActive, handlerActiveChange, disabled]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.accordion
   }, /*#__PURE__*/_react["default"].createElement(AccordionGroupContainer, {
     margin: margin,
     disabled: disabled
-  }, (Array.isArray(children) ? children : [children]).filter(function (child) {
-    return child.type === AccordionGroupAccordion;
-  }).map(function (accordion, index) {
-    return /*#__PURE__*/_react["default"].createElement(AccordionGroupAccordionContext.Provider, {
+  }, _react.Children.map(children, function (accordion, index) {
+    return /*#__PURE__*/_react["default"].createElement(_AccordionGroupContext.AccordionGroupAccordionContext.Provider, {
+      key: "accordion-".concat(index),
       value: _objectSpread({
         index: index
-      }, value)
+      }, contextValue)
     }, accordion);
   })));
 };
-
-DxcAccordionGroup.Accordion = AccordionGroupAccordion;
-
+DxcAccordionGroup.Accordion = _AccordionGroupAccordion["default"];
 var calculateWidth = function calculateWidth(margin) {
   return "calc(100% - ".concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
 };
-
-var AccordionGroupContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-block;\n  width: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  cursor: ", ";\n\n  & > :not(div:last-child) {\n    & > div:first-child {\n      border-radius: 0;\n      border-bottom: ", ";\n      border-color: ", ";\n\n      & > .Mui-expanded {\n        border-radius: 0;\n      }\n      & > .MuiButtonBase-root {\n        border-radius: 0;\n      }\n    }\n  }\n\n  & > div:first-child {\n    & > div:first-child {\n      border-bottom-left-radius: 0;\n      border-bottom-right-radius: 0;\n      border-top-left-radius: ", ";\n      border-top-right-radius: ", ";\n      border-bottom: ", ";\n      border-color: ", ";\n\n      & > .Mui-expanded {\n        border-bottom-left-radius: 0;\n        border-bottom-right-radius: 0;\n        border-top-left-radius: ", ";\n        border-top-right-radius: ", ";\n      }\n      & > .MuiButtonBase-root {\n        border-bottom-left-radius: 0;\n        border-bottom-right-radius: 0;\n        border-top-left-radius: ", ";\n        border-top-right-radius: ", ";\n      }\n    }\n  }\n\n  & > div:last-child {\n    & > div:first-child {\n      border-bottom-left-radius: ", ";\n      border-bottom-right-radius: ", ";\n      border-top-left-radius: 0;\n      border-top-right-radius: 0;\n\n      & > .Mui-expanded {\n        border-bottom-left-radius: ", ";\n        border-bottom-right-radius: ", ";\n        border-top-left-radius: 0;\n        border-top-right-radius: 0;\n      }\n      & > .MuiButtonBase-root {\n        border-bottom-left-radius: ", ";\n        border-bottom-right-radius: ", ";\n        border-top-left-radius: 0;\n        border-top-right-radius: 0;\n      }\n    }\n  }\n"])), function (props) {
+var AccordionGroupContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n\n  > div:not(:last-of-type):not(:only-of-type) {\n    border-bottom: ", ";\n    border-color: ", ";\n  }\n  > div:not(:first-of-type):not(:last-of-type):not(:only-of-type) {\n    border-radius: 0;\n    & > h3 > button {\n      border-radius: 0;\n    }\n  }\n  > div:first-of-type:not(:only-of-type) {\n    border-bottom-left-radius: 0;\n    border-bottom-right-radius: 0;\n    border-top-left-radius: ", ";\n    border-top-right-radius: ", ";\n\n    & > h3 > button {\n      border-bottom-left-radius: 0;\n      border-bottom-right-radius: 0;\n    }\n  }\n  > div:last-of-type:not(:only-of-type) {\n    border-top-left-radius: 0;\n    border-top-right-radius: 0;\n    border-bottom-left-radius: ", ";\n    border-bottom-right-radius: ", ";\n\n    & > h3 > button {\n      border-top-left-radius: 0;\n      border-top-right-radius: 0;\n    }\n  }\n"])), function (props) {
   return calculateWidth(props.margin);
+}, function (_ref2) {
+  var margin = _ref2.margin;
+  return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
 }, function (_ref3) {
   var margin = _ref3.margin;
-  return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.top ? _variables.spaces[margin.top] : "";
 }, function (_ref4) {
   var margin = _ref4.margin;
-  return margin && (0, _typeof2["default"])(margin) === "object" && margin.top ? _variables.spaces[margin.top] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.right ? _variables.spaces[margin.right] : "";
 }, function (_ref5) {
   var margin = _ref5.margin;
-  return margin && (0, _typeof2["default"])(margin) === "object" && margin.right ? _variables.spaces[margin.right] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.bottom ? _variables.spaces[margin.bottom] : "";
 }, function (_ref6) {
   var margin = _ref6.margin;
-  return margin && (0, _typeof2["default"])(margin) === "object" && margin.bottom ? _variables.spaces[margin.bottom] : "";
-}, function (_ref7) {
-  var margin = _ref7.margin;
   return margin && (0, _typeof2["default"])(margin) === "object" && margin.left ? _variables.spaces[margin.left] : "";
 }, function (props) {
   return props.disabled ? "not-allowed" : "pointer";
@@ -140,31 +93,9 @@ var AccordionGroupContainer = _styledComponents["default"].div(_templateObject |
   return props.theme.borderRadius;
 }, function (props) {
   return props.theme.borderRadius;
-}, function (props) {
-  return "".concat(props.theme.accordionGroupSeparatorBorderThickness, " ").concat(props.theme.accordionGroupSeparatorBorderStyle);
-}, function (props) {
-  return props.theme.accordionGroupSeparatorBorderColor;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
 }, function (props) {
   return props.theme.borderRadius;
 }, function (props) {
   return props.theme.borderRadius;
 });
-
-var _default = DxcAccordionGroup;
-exports["default"] = _default;
+var _default = exports["default"] = DxcAccordionGroup;