@dxc-technology/halstack-react 0.0.0-c25d3b6 → 0.0.0-c2834c3

package/accordion/Accordion.test.js

@@ -14,20 +14,32 @@ describe("Accordion component tests", function () {
 
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
       label: "Accordion",
+      assistiveText: "Assistive text",
       onChange: onChange
     })),
         getByText = _render.getByText;
 
     expect(getByText("Accordion")).toBeTruthy();
+    expect(getByText("Assistive text")).toBeTruthy();
+  });
+  test("Accordion 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 _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
       label: "Accordion",
       onChange: onChange
     })),
-        getByText = _render2.getByText;
+        getByText = _render3.getByText;
 
     _react2.fireEvent.click(getByText("Accordion"));
 
@@ -36,12 +48,15 @@ describe("Accordion component tests", function () {
   test("Controlled accordion", function () {
     var onChange = jest.fn();
 
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Accordion["default"], {
       label: "Accordion",
       onChange: onChange,
       isExpanded: true
     })),
-        getByText = _render3.getByText;
+        getByText = _render4.getByText,
+        getByRole = _render4.getByRole;
+
+    expect(getByRole("button").getAttribute("aria-expanded")).toBe("true");
 
     _react2.fireEvent.click(getByText("Accordion"));
 

package/accordion/types.d.ts

@@ -18,6 +18,10 @@ declare type Props = {
      * The panel label.
      */
     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

package/accordion-group/AccordionGroup.d.ts

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

package/accordion-group/AccordionGroup.js

@@ -47,13 +47,13 @@ var AccordionGroupAccordion = function AccordionGroupAccordion(_ref) {
   var childProps = (0, _extends2["default"])({}, _ref);
 
   var _useContext = (0, _react.useContext)(AccordionGroupAccordionContext),
-      innerIsExpanded = _useContext.innerIsExpanded,
+      activeIndex = _useContext.activeIndex,
       handlerActiveChange = _useContext.handlerActiveChange,
       disabled = _useContext.disabled,
       index = _useContext.index;
 
   return /*#__PURE__*/_react["default"].createElement(_Accordion["default"], (0, _extends2["default"])({
-    isExpanded: innerIsExpanded === index,
+    isExpanded: activeIndex === index,
     onChange: function onChange() {
       handlerActiveChange(index);
     },
@@ -62,7 +62,8 @@ var AccordionGroupAccordion = function AccordionGroupAccordion(_ref) {
 };
 
 var DxcAccordionGroup = function DxcAccordionGroup(_ref2) {
-  var indexActive = _ref2.indexActive,
+  var defaultIndexActive = _ref2.defaultIndexActive,
+      indexActive = _ref2.indexActive,
       _ref2$disabled = _ref2.disabled,
       disabled = _ref2$disabled === void 0 ? false : _ref2$disabled,
       onActiveChange = _ref2.onActiveChange,
@@ -70,27 +71,24 @@ var DxcAccordionGroup = function DxcAccordionGroup(_ref2) {
       children = _ref2.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, {
@@ -102,7 +100,7 @@ var DxcAccordionGroup = function DxcAccordionGroup(_ref2) {
     return /*#__PURE__*/_react["default"].createElement(AccordionGroupAccordionContext.Provider, {
       value: _objectSpread({
         index: index
-      }, value)
+      }, contextValue)
     }, accordion);
   })));
 };

package/accordion-group/AccordionGroup.stories.tsx

@@ -36,7 +36,7 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Expanded" theme="light" level={4} />
-      <DxcAccordionGroup indexActive={1}>
+      <DxcAccordionGroup defaultIndexActive={1}>
         <DxcAccordionGroup.Accordion label="Accordion1" padding="medium">
           <div>
             Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et

package/accordion-group/AccordionGroup.test.js

@@ -62,10 +62,28 @@ describe("Accordion component tests", function () {
     expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("true");
     expect(getAllByRole("button")[1].getAttribute("aria-expanded")).toBe("false");
   });
+  test("Uncontrolled accordion group renders initially with an accordion expanded", function () {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
+      defaultIndexActive: 1
+    }, /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
+      label: "Accordion1",
+      padding: "medium"
+    }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")), /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
+      label: "Accordion2",
+      padding: "medium"
+    }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")))),
+        getByText = _render4.getByText,
+        getAllByRole = _render4.getAllByRole;
+
+    expect(getByText("Accordion1")).toBeTruthy();
+    expect(getByText("Accordion2")).toBeTruthy();
+    expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("false");
+    expect(getAllByRole("button")[1].getAttribute("aria-expanded")).toBe("true");
+  });
   test("Controlled accordion with indexActive change", function () {
     var onActiveChange = jest.fn();
 
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
       margin: "large",
       indexActive: 1,
       onActiveChange: onActiveChange
@@ -77,9 +95,9 @@ describe("Accordion component tests", function () {
       label: "Accordion2",
       padding: "medium"
     }, /*#__PURE__*/_react["default"].createElement("div", null, "Text2")))),
-        getByText = _render4.getByText,
-        getAllByRole = _render4.getAllByRole,
-        rerender = _render4.rerender;
+        getByText = _render5.getByText,
+        getAllByRole = _render5.getAllByRole,
+        rerender = _render5.rerender;
 
     expect(getByText("Text1")).toBeTruthy();
     expect(getByText("Text2")).toBeTruthy();
@@ -110,7 +128,7 @@ describe("Accordion component tests", function () {
   test("Disabled uncontrolled accordion group", function () {
     var onActiveChange = jest.fn();
 
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
       margin: "large",
       onActiveChange: onActiveChange,
       disabled: true
@@ -122,7 +140,7 @@ describe("Accordion component tests", function () {
       label: "Accordion2",
       padding: "medium"
     }, /*#__PURE__*/_react["default"].createElement("div", null, "Text2")))),
-        getByText = _render5.getByText;
+        getByText = _render6.getByText;
 
     _react2.fireEvent.click(getByText("Accordion1"));
 

package/accordion-group/types.d.ts

@@ -42,6 +42,10 @@ export declare type AccordionPropsType = {
     children: React.ReactNode;
 };
 declare type Props = {
+    /**
+     * Initially active accordion, only when it is uncontrolled.
+     */
+    defaultIndexActive?: number;
     /**
      * The index of the active accordion. If undefined, the component will be uncontrolled and the active accordion will be managed internally by the component.
      * If null, the component will be controlled and all accordions will be closed.

package/alert/Alert.js

@@ -23,6 +23,8 @@ var _utils = require("../common/utils.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
+
 var _BackgroundColorContext = require("../BackgroundColorContext");
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
@@ -109,9 +111,10 @@ var DxcAlert = function DxcAlert(_ref) {
       size = _ref$size === void 0 ? "fitContent" : _ref$size,
       tabIndex = _ref.tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
 
   var getTypeText = function getTypeText() {
-    return type === "info" ? "information" : type === "confirm" ? "success" : type === "warning" ? "warning" : "error";
+    return type === "info" ? translatedLabels.alert.infoTitleText : type === "confirm" ? translatedLabels.alert.successTitleText : type === "warning" ? translatedLabels.alert.warningTitleText : translatedLabels.alert.errorTitleText;
   };
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {

package/button/Button.js

@@ -45,14 +45,22 @@ var DxcButton = function DxcButton(_ref) {
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? "button" : _ref$type,
       icon = _ref.icon,
-      _onClick = _ref.onClick,
+      _ref$onClick = _ref.onClick,
+      _onClick = _ref$onClick === void 0 ? function () {} : _ref$onClick,
       margin = _ref.margin,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "fitContent" : _ref$size,
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+
   var colorsTheme = (0, _useTheme["default"])();
   var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+
+  var labelComponent = /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    icon: icon,
+    iconPosition: iconPosition
+  }, label);
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.button
   }, /*#__PURE__*/_react["default"].createElement(DxCButton, {
@@ -73,15 +81,12 @@ var DxcButton = function DxcButton(_ref) {
     onClick: function onClick() {
       _onClick();
     }
-  }, label && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
-    icon: icon,
-    iconPosition: iconPosition
-  }, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, label && iconPosition === "after" && labelComponent, icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     label: label,
     iconPosition: iconPosition
   }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
     src: icon
-  }) : icon))));
+  }) : icon), label && iconPosition === "before" && labelComponent)));
 };
 
 var sizes = {
@@ -118,7 +123,7 @@ var IconContainer = _styledComponents["default"].div(_templateObject2 || (_templ
 
 var ButtonIcon = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])([""])));
 
-var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  display: inline-block;\n  width: ", ";\n  cursor: ", ";\n\n  .MuiButtonBase-root {\n    padding-left: ", ";\n    padding-right: ", ";\n    padding-top: ", ";\n    padding-bottom: ", ";\n\n    .MuiButton-label {\n      display: flex;\n      flex-direction: ", ";\n      align-items: center;\n    }\n\n    box-shadow: 0 0 0 2px transparent;\n    font-family: ", ";\n    font-size: ", ";\n    font-weight: ", ";\n    letter-spacing: ", ";\n    min-width: ", ";\n    width: 100%;\n    height: 40px;\n    transition: none !important;\n\n    &:focus {\n      border-color: transparent;\n      box-shadow: 0 0 0 2px\n        ", ";\n    }\n\n    ", "\n  }\n"])), function (props) {
+var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  display: inline-block;\n  width: ", ";\n  cursor: ", ";\n\n  .MuiButtonBase-root {\n    padding-left: ", ";\n    padding-right: ", ";\n    padding-top: ", ";\n    padding-bottom: ", ";\n\n    .MuiButton-label {\n      display: flex;\n      align-items: center;\n    }\n\n    box-shadow: 0 0 0 2px transparent;\n    font-family: ", ";\n    font-size: ", ";\n    font-weight: ", ";\n    letter-spacing: ", ";\n    min-width: ", ";\n    width: 100%;\n    height: 40px;\n    transition: none !important;\n\n    &:focus {\n      border-color: transparent;\n      box-shadow: 0 0 0 2px\n        ", ";\n    }\n\n    ", "\n  }\n"])), 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] : "";
@@ -140,8 +145,6 @@ var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateO
   return props.theme.paddingTop;
 }, function (props) {
   return props.theme.paddingBottom;
-}, function (props) {
-  return props.iconPosition === "after" && "row" || "row-reverse";
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -159,9 +162,9 @@ var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateO
       backgroundType = props.backgroundType;
 
   if (mode === "primary") {
-    return "\n        border-radius: ".concat(props.theme.primaryBorderRadius, ";\n        border-width:  ").concat(props.theme.primaryBorderThickness, ";\n        border-style:  ").concat(props.theme.primaryBorderStyle, ";\n        font-family:   ").concat(props.theme.primaryFontFamily, ";\n        font-size:     ").concat(props.theme.primaryFontSize, ";\n        font-weight:   ").concat(props.theme.primaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.primaryBackgroundColorOnDark : props.theme.primaryBackgroundColor, ";\n        color: ").concat(backgroundType && backgroundType === "dark" ? props.theme.primaryFontColorOnDark : props.theme.primaryFontColor, " !important;\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryHoverBackgroundColorOnDark : props.theme.primaryHoverBackgroundColor, ";\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryActiveBackgroundColorOnDark : props.theme.primaryActiveBackgroundColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled { \n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledBackgroundColorOnDark : props.theme.primaryDisabledBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledFontColorOnDark : props.theme.primaryDisabledFontColor, "!important; \n        }\n        .MuiButton-label {\n          z-index: 5;\n        }\n      ");
+    return "\n        border-radius: ".concat(props.theme.primaryBorderRadius, ";\n        border-width:  ").concat(props.theme.primaryBorderThickness, ";\n        border-style:  ").concat(props.theme.primaryBorderStyle, ";\n        font-family:   ").concat(props.theme.primaryFontFamily, ";\n        font-size:     ").concat(props.theme.primaryFontSize, ";\n        font-weight:   ").concat(props.theme.primaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.primaryBackgroundColorOnDark : props.theme.primaryBackgroundColor, ";\n        color: ").concat(backgroundType && backgroundType === "dark" ? props.theme.primaryFontColorOnDark : props.theme.primaryFontColor, " !important;\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryHoverBackgroundColorOnDark : props.theme.primaryHoverBackgroundColor, ";\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryActiveBackgroundColorOnDark : props.theme.primaryActiveBackgroundColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled { \n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledBackgroundColorOnDark : props.theme.primaryDisabledBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledFontColorOnDark : props.theme.primaryDisabledFontColor, " !important; \n        }\n      ");
   } else if (mode === "secondary") {
-    return "\n        border-radius: ".concat(props.theme.secondaryBorderRadius, ";\n        border-width:  ").concat(props.theme.secondaryBorderThickness, ";\n        border-style:  ").concat(props.theme.secondaryBorderStyle, ";\n        font-family:   ").concat(props.theme.secondaryFontFamily, ";\n        font-size:     ").concat(props.theme.secondaryFontSize, ";\n        font-weight:   ").concat(props.theme.secondaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBackgroundColorOnDark : props.theme.secondaryBackgroundColor, ";\n        color: ").concat(backgroundType === "dark" ? props.theme.secondaryFontColorOnDark : props.theme.secondaryFontColor, " !important;\n        border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBorderColorOnDark : props.theme.secondaryBorderColor, ";\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverBackgroundColorOnDark : props.theme.secondaryHoverBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryActiveBackgroundColorOnDark : props.theme.secondaryActiveBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled {\n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBackgroundColorOnDark : props.theme.secondaryDisabledBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledFontColorOnDark : props.theme.secondaryDisabledFontColor, " !important;\n          border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBorderColorOnDark : props.theme.secondaryDisabledBorderColor, ";\n          }\n          .MuiButton-label {\n            z-index: 5;\n          }\n        ");
+    return "\n        border-radius: ".concat(props.theme.secondaryBorderRadius, ";\n        border-width:  ").concat(props.theme.secondaryBorderThickness, ";\n        border-style:  ").concat(props.theme.secondaryBorderStyle, ";\n        font-family:   ").concat(props.theme.secondaryFontFamily, ";\n        font-size:     ").concat(props.theme.secondaryFontSize, ";\n        font-weight:   ").concat(props.theme.secondaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBackgroundColorOnDark : props.theme.secondaryBackgroundColor, ";\n        color: ").concat(backgroundType === "dark" ? props.theme.secondaryFontColorOnDark : props.theme.secondaryFontColor, " !important;\n        border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBorderColorOnDark : props.theme.secondaryBorderColor, ";\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverBackgroundColorOnDark : props.theme.secondaryHoverBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryActiveBackgroundColorOnDark : props.theme.secondaryActiveBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled {\n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBackgroundColorOnDark : props.theme.secondaryDisabledBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledFontColorOnDark : props.theme.secondaryDisabledFontColor, " !important;\n          border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBorderColorOnDark : props.theme.secondaryDisabledBorderColor, ";\n          }\n        ");
   } else if (mode === "text") {
     return "\n        border-radius: ".concat(props.theme.textBorderRadius, ";\n        border-width:  ").concat(props.theme.textBorderThickness, ";\n        border-style:  ").concat(props.theme.textBorderStyle, ";\n        font-family:   ").concat(props.theme.textFontFamily, ";\n        font-size:     ").concat(props.theme.textFontSize, ";\n        font-weight:   ").concat(props.theme.textFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.textBackgroundColorOnDark : props.theme.textBackgroundColor, ";\n        color: ").concat(backgroundType === "dark" ? props.theme.textFontColorOnDark : props.theme.textFontColor, " !important;\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.textHoverBackgroundColorOnDark : props.theme.textHoverBackgroundColor, ";\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.textActiveBackgroundColorOnDark : props.theme.textActiveBackgroundColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled {\n          cursor:not-allowed;\n          color: ").concat(backgroundType === "dark" ? props.theme.textDisabledFontColorOnDark : props.theme.textDisabledFontColor, " !important;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.textDisabledBackgroundColorOnDark : props.theme.textDisabledBackgroundColor, ";\n        }\n      ");
   }

package/card/Card.js

@@ -56,6 +56,14 @@ var DxcCard = function DxcCard(_ref) {
       isHovered = _useState2[0],
       changeIsHovered = _useState2[1];
 
+  var imageComponent = /*#__PURE__*/_react["default"].createElement(ImageContainer, {
+    imageBgColor: imageBgColor
+  }, /*#__PURE__*/_react["default"].createElement(TagImage, {
+    imagePadding: imagePadding,
+    cover: imageCover,
+    src: imageSrc
+  }));
+
   var tagContent = /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     shadowDepth: !outlined ? 0 : isHovered && (onClick || linkHref) ? 2 : 1
   }, /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
@@ -63,15 +71,9 @@ var DxcCard = function DxcCard(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(CardContainer, {
     hasAction: onClick || linkHref,
     imagePosition: imagePosition
-  }, imageSrc && /*#__PURE__*/_react["default"].createElement(ImageContainer, {
-    imageBgColor: imageBgColor
-  }, /*#__PURE__*/_react["default"].createElement(TagImage, {
-    imagePadding: imagePadding,
-    cover: imageCover,
-    src: imageSrc
-  })), /*#__PURE__*/_react["default"].createElement(CardContent, {
+  }, imageSrc && imagePosition === "before" && imageComponent, /*#__PURE__*/_react["default"].createElement(CardContent, {
     contentPadding: contentPadding
-  }, children))));
+  }, children), imageSrc && imagePosition === "after" && imageComponent)));
 
   return /*#__PURE__*/_react["default"].createElement(StyledDxcCard, {
     margin: margin,
@@ -113,50 +115,47 @@ var StyledDxcCard = _styledComponents["default"].div(_templateObject || (_templa
   return margin && margin.left ? _variables.spaces[margin.left] : "";
 });
 
-var CardContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  height: ", ";\n  width: ", ";\n  &:hover {\n    border-color: ", ";\n  }\n"])), function (_ref9) {
-  var imagePosition = _ref9.imagePosition;
-  return imagePosition === "before" && "row" || "row-reverse";
-}, function (props) {
+var CardContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  height: ", ";\n  width: ", ";\n  &:hover {\n    border-color: ", ";\n  }\n"])), function (props) {
   return props.theme.height;
 }, function (props) {
   return props.theme.width;
-}, function (_ref10) {
-  var hasAction = _ref10.hasAction;
+}, function (_ref9) {
+  var hasAction = _ref9.hasAction;
   return hasAction ? "" : "unset";
 });
 
 var StyledLink = _styledComponents["default"].a(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: pointer;\n  text-decoration: none;\n\n  :focus {\n    outline-color: #0095ff;\n  }\n"])));
 
-var TagImage = _styledComponents["default"].img(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  object-fit: ", ";\n"])), function (_ref11) {
+var TagImage = _styledComponents["default"].img(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  object-fit: ", ";\n"])), function (_ref10) {
+  var imagePadding = _ref10.imagePadding;
+  return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
+}, function (_ref11) {
   var imagePadding = _ref11.imagePadding;
   return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
 }, function (_ref12) {
-  var imagePadding = _ref12.imagePadding;
-  return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
-}, function (_ref13) {
-  var cover = _ref13.cover;
+  var cover = _ref12.cover;
   return cover ? "cover" : "contain";
 });
 
-var ImageContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 35%;\n  height: 100%;\n  flex-shrink: 0;\n  background: ", ";\n  justify-content: center;\n  align-items: center;\n  display: inline-flex;\n"])), function (_ref14) {
-  var imageBgColor = _ref14.imageBgColor;
+var ImageContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 35%;\n  height: 100%;\n  flex-shrink: 0;\n  background: ", ";\n  justify-content: center;\n  align-items: center;\n  display: inline-flex;\n"])), function (_ref13) {
+  var imageBgColor = _ref13.imageBgColor;
   return imageBgColor;
 });
 
-var CardContent = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  flex-grow: 1;\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  overflow: hidden;\n"])), function (_ref15) {
-  var contentPadding = _ref15.contentPadding;
+var CardContent = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  flex-grow: 1;\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  overflow: hidden;\n"])), function (_ref14) {
+  var contentPadding = _ref14.contentPadding;
   return contentPadding && (0, _typeof2["default"])(contentPadding) !== "object" ? _variables.spaces[contentPadding] : "0px";
+}, function (_ref15) {
+  var contentPadding = _ref15.contentPadding;
+  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.top ? _variables.spaces[contentPadding.top] : "";
 }, function (_ref16) {
   var contentPadding = _ref16.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.top ? _variables.spaces[contentPadding.top] : "";
+  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.right ? _variables.spaces[contentPadding.right] : "";
 }, function (_ref17) {
   var contentPadding = _ref17.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.right ? _variables.spaces[contentPadding.right] : "";
+  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.bottom ? _variables.spaces[contentPadding.bottom] : "";
 }, function (_ref18) {
   var contentPadding = _ref18.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.bottom ? _variables.spaces[contentPadding.bottom] : "";
-}, function (_ref19) {
-  var contentPadding = _ref19.contentPadding;
   return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.left ? _variables.spaces[contentPadding.left] : "";
 });
 

package/checkbox/Checkbox.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import CheckboxPropsType from "./types";
-declare const DxcCheckbox: ({ checked, value, label, labelPosition, name, disabled, onChange, required, margin, size, tabIndex, }: CheckboxPropsType) => JSX.Element;
+declare const DxcCheckbox: ({ checked, defaultChecked, value, label, labelPosition, name, disabled, optional, onChange, margin, size, tabIndex, }: CheckboxPropsType) => JSX.Element;
 export default DxcCheckbox;