@dxc-technology/halstack-react 0.0.0-2b5b4b0 → 0.0.0-2bca710

package/accordion/Accordion.stories.tsx

@@ -0,0 +1,297 @@
+import React from "react";
+import DxcAccordion from "./Accordion";
+import DxcHeading from "../heading/Heading";
+import DxcTextInput from "../text-input/TextInput";
+import DxcButton from "../button/Button";
+import Title from "../../.storybook/components/Title";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
+
+export default {
+  title: "Accordion",
+  component: DxcAccordion,
+};
+
+const folderIcon = (
+  <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"
+  >
+    <g>
+      <rect fill="none" height="24" width="24" />
+    </g>
+    <g>
+      <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" />
+    </g>
+  </svg>
+);
+
+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>
+);
+
+const advancedTheme = {
+  accordion: {
+    backgroundColor: "#000000",
+    assistiveTextFontColor: "#ffffff",
+    titleLabelFontColor: "#ffffff",
+    arrowColor: "#5f249f",
+    iconColor: "#5f249f",
+  },
+};
+
+const opinionatedTheme = {
+  accordion: {
+    accentColor: "#5f249f",
+    titleFontColor: "#000000",
+    assistiveTextFontColor: "#666666",
+  },
+};
+
+export const Chromatic = () => (
+  <>
+    <Title title="Component anatomy" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="With label" theme="light" level={4} />
+      <DxcAccordion label="Accordion">
+        <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 assistive text" theme="light" level={4} />
+      <DxcAccordion label="Accordion" assistiveText="Assistive text">
+        <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 icon" theme="light" level={4} />
+      <DxcAccordion label="Accordion" assistiveText="Assistive text" icon={folderIcon}>
+        <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 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.
+        </div>
+      </DxcAccordion>
+    </ExampleContainer>
+    <Title title="States" theme="light" level={2} />
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcAccordion label="Focused">
+        <div>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo
+          lobortis eget.
+        </div>
+      </DxcAccordion>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcAccordion label="Hovered">
+        <div>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo
+          lobortis eget.
+        </div>
+      </DxcAccordion>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active" theme="light" level={4} />
+      <DxcAccordion label="Active">
+        <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="Disabled" theme="light" level={4} />
+      <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>
+    </ExampleContainer>
+    <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}>
+          <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="Margins" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Xxsmall margin" theme="light" level={4} />
+      <DxcAccordion label="Xxsmall margin" margin="xxsmall">
+        <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="Xsmall margin" theme="light" level={4} />
+      <DxcAccordion label="Xsmall margin" margin="xsmall">
+        <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="Small margin" theme="light" level={4} />
+      <DxcAccordion label="Small margin" margin="small">
+        <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="Medium margin" theme="light" level={4} />
+      <DxcAccordion label="Medium margin" margin="medium">
+        <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="Large margin" theme="light" level={4} />
+      <DxcAccordion label="Large margin" margin="large">
+        <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="Xlarge margin" theme="light" level={4} />
+      <DxcAccordion label="Xlarge margin" margin="xlarge">
+        <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="Xxlarge margin" theme="light" level={4} />
+      <DxcAccordion label="Xxlarge margin" margin="xxlarge">
+        <div>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo
+          lobortis eget.
+        </div>
+      </DxcAccordion>
+    </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

@@ -0,0 +1,71 @@
+"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.tsx"));
+
+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
+    })),
+        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
+    })),
+        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

@@ -6,18 +6,16 @@ declare type Margin = {
     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 SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare 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.
+     * Element or path 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.
      */
@@ -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.
      */

package/accordion-group/AccordionGroup.d.ts

@@ -1,7 +1,8 @@
-/// <reference types="react" />
-import AccordionGroupPropsType, { AccordionPropsType } from "./types";
+import React from "react";
+import AccordionGroupPropsType, { AccordionGroupAccordionContextProps } from "./types";
+export declare const AccordionGroupAccordionContext: React.Context<AccordionGroupAccordionContextProps>;
 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

@@ -7,7 +7,7 @@ var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports["default"] = exports.AccordionGroupAccordionContext = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
@@ -17,19 +17,17 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 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");
 
-var _utils = require("../common/utils.js");
+var _variables = require("../common/variables");
 
-var _variables = require("../common/variables.js");
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _AccordionGroupAccordion = _interopRequireDefault(require("./AccordionGroupAccordion"));
 
 var _templateObject;
 
@@ -42,93 +40,73 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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;
+exports.AccordionGroupAccordionContext = AccordionGroupAccordionContext;
+
+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),
+  var _useState = (0, _react.useState)(defaultIndexActive !== null && defaultIndexActive !== void 0 ? defaultIndexActive : -1),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerIsExpanded = _useState2[0],
-      setInnerIsExpanded = _useState2[1];
+      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) {
+  }, _react.Children.map(children, function (accordion, index) {
     return /*#__PURE__*/_react["default"].createElement(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  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,26 +118,6 @@ 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) {