@dxc-technology/halstack-react 0.0.0-6c89958 → 0.0.0-6c8ea9f

package/button/Button.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
@@ -45,16 +45,22 @@ var DxcButton = function DxcButton(_ref) {
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? "button" : _ref$type,
       icon = _ref.icon,
-      _ref$iconSrc = _ref.iconSrc,
-      iconSrc = _ref$iconSrc === void 0 ? "" : _ref$iconSrc,
-      _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, {
@@ -75,17 +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
-  }, (0, _typeof2["default"])(icon) === "object" ? icon : /*#__PURE__*/_react["default"].createElement(icon)) : iconSrc && /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
-    label: label,
-    iconPosition: iconPosition,
-    src: iconSrc
-  }))));
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
+    src: icon
+  }) : icon), label && iconPosition === "before" && labelComponent)));
 };
 
 var sizes = {
@@ -120,13 +121,9 @@ var IconContainer = _styledComponents["default"].div(_templateObject2 || (_templ
   return !props.label ? "0px" : props.iconPosition === "before" && props.label !== "" && "8px" || "8px";
 });
 
-var ButtonIcon = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 24px;\n  max-width: 24px;\n  margin-left: ", ";\n  margin-right: ", ";\n"])), function (props) {
-  return props.iconPosition === "after" && props.label !== "" && "10px" || "0px";
-}, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && "10px" || "0px";
-});
+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] : "";
@@ -148,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) {
@@ -167,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/button/Button.stories.tsx

@@ -10,14 +10,12 @@ export default {
   component: DxcButton,
 };
 
-const iconSVG = () => {
-  return (
-    <svg viewBox="0 0 24 24" fill="currentColor">
-      <path d="M0 0h24v24H0z" fill="none" />
-      <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
-    </svg>
-  );
-};
+const iconSVG = (
+  <svg viewBox="0 0 24 24" fill="currentColor">
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
+  </svg>
+);
 export const Chromatic = () => (
   <>
     <Title title="Primary" theme="light" level={2} />

package/button/Button.test.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Button = _interopRequireDefault(require("./Button"));
+
+describe("Button component tests", function () {
+  test("Button renders with correct text", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      label: "Button"
+    })),
+        getByText = _render.getByText;
+
+    expect(getByText("Button")).toBeTruthy();
+  });
+  test("Calls correct function on click", function () {
+    var onClick = jest.fn();
+
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      label: "Button",
+      onClick: onClick
+    })),
+        getByText = _render2.getByText;
+
+    var button = getByText("Button");
+
+    _react2.fireEvent.click(button);
+
+    expect(onClick).toHaveBeenCalled();
+  });
+});

package/button/types.d.ts

@@ -6,7 +6,7 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+declare type SVG = React.SVGProps<SVGSVGElement>;
 declare type Props = {
     /**
      * Text to be placed next to the button.
@@ -29,13 +29,9 @@ declare type Props = {
      */
     type?: "button" | "reset" | "submit";
     /**
-     * Element used as the icon that will be placed next to the button label.
+     * Element or path used as the icon that will be placed next to the button label.
      */
-    icon?: SVG;
-    /**
-     * @deprecated URL of the icon that will be placed next to the button label.
-     */
-    iconSrc?: string;
+    icon?: string | SVG;
     /**
      * This function will be called when the user clicks the button.
      */

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/card/Card.stories.tsx

@@ -174,7 +174,7 @@ const actionCard = () => (
       <Title title="Focused default with action" theme="light" level={4} />
       <DxcCard onClick={() => {}}>Focused default with action</DxcCard>
     </ExampleContainer>
-    <ExampleContainer>
+    <ExampleContainer expanded>
       <Title title="Hovered default with action" theme="light" level={4} />
       <DxcCard onClick={() => {}}>Hovered default with action</DxcCard>
     </ExampleContainer>

package/card/Card.test.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Card = _interopRequireDefault(require("./Card"));
+
+describe("Card component tests", function () {
+  test("Card renders with correct content", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Card["default"], null, "test-card")),
+        getByText = _render.getByText;
+
+    expect(getByText("test-card")).toBeTruthy();
+  });
+  test("Card renders with correct href", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Card["default"], {
+      linkHref: "/testPage"
+    }, "test-card")),
+        getByRole = _render2.getByRole;
+
+    var card = getByRole("link");
+    expect(card.getAttribute("href")).toEqual("/testPage");
+  });
+  test("Card renders with correct image", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Card["default"], {
+      imageSrc: "/testImage"
+    }, "test-card")),
+        getByRole = _render3.getByRole;
+
+    var card = getByRole("img");
+    expect(card.getAttribute("src")).toEqual("/testImage");
+  });
+  test("OnClick function is called", function () {
+    var onClick = jest.fn();
+
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Card["default"], {
+      onClick: onClick
+    }, "test-card")),
+        getByText = _render4.getByText;
+
+    var card = getByText("test-card");
+
+    _react2.fireEvent.click(card);
+
+    expect(onClick).toHaveBeenCalled();
+  });
+});

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;

package/checkbox/Checkbox.js

@@ -21,14 +21,16 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox"));
 
-var _RequiredComponent = _interopRequireDefault(require("../common/RequiredComponent"));
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
+var _uuid = require("uuid");
+
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
+
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
 var _templateObject, _templateObject2, _templateObject3;
@@ -39,6 +41,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var DxcCheckbox = function DxcCheckbox(_ref) {
   var checked = _ref.checked,
+      _ref$defaultChecked = _ref.defaultChecked,
+      defaultChecked = _ref$defaultChecked === void 0 ? false : _ref$defaultChecked,
       value = _ref.value,
       _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
@@ -48,27 +52,34 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
       name = _ref$name === void 0 ? "" : _ref$name,
       _ref$disabled = _ref.disabled,
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      _ref$optional = _ref.optional,
+      optional = _ref$optional === void 0 ? false : _ref$optional,
       onChange = _ref.onChange,
-      _ref$required = _ref.required,
-      required = _ref$required === void 0 ? false : _ref$required,
       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 _useState = (0, _react.useState)(false),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerChecked = _useState2[0],
-      setInnerChecked = _useState2[1];
+  var _useState = (0, _react.useState)("checkbox-".concat((0, _uuid.v4)())),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
+      switchId = _useState2[0];
 
-  var _useState3 = (0, _react.useState)(false),
+  var labelId = "label-".concat(switchId);
+
+  var _useState3 = (0, _react.useState)(defaultChecked),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      isLabelHovered = _useState4[0],
-      setIsLabelHovered = _useState4[1];
+      innerChecked = _useState4[0],
+      setInnerChecked = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+      isLabelHovered = _useState6[0],
+      setIsLabelHovered = _useState6[1];
 
   var colorsTheme = (0, _useTheme["default"])();
   var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
 
   var handlerCheckboxChange = function handlerCheckboxChange(checkboxValue) {
     if (checked === undefined) {
@@ -89,6 +100,17 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
     setIsLabelHovered(!isLabelHovered);
   };
 
+  var labelComponent = /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
+    labelPosition: labelPosition,
+    onClick: disabled === true ? function () {} : handlerCheckboxChange,
+    disabled: disabled,
+    className: "labelContainer",
+    backgroundType: backgroundType,
+    onMouseOver: handleLabelHover,
+    onMouseOut: handleLabelHover
+  }, labelPosition === "before" ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, label, " ", optional && /*#__PURE__*/_react["default"].createElement("span", null, translatedLabels.formFields.optionalLabel)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, optional && /*#__PURE__*/_react["default"].createElement("span", null, "(Optional)"), " ", label));
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.checkbox
   }, /*#__PURE__*/_react["default"].createElement(CheckboxContainer, {
@@ -101,13 +123,13 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
     size: size,
     backgroundType: backgroundType,
     isLabelHovered: isLabelHovered
-  }, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
-    checked: checked != undefined ? checked : innerChecked,
+  }, label && labelPosition === "before" && labelComponent, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    checked: checked !== null && checked !== void 0 ? checked : innerChecked,
     inputProps: {
       name: name,
-      "aria-label": label,
+      "aria-labelledby": labelId,
       role: "checkbox",
-      "aria-checked": checked != undefined ? checked : innerChecked
+      "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked
     },
     onChange: handlerCheckboxChange,
     value: value,
@@ -118,17 +140,9 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
   }), /*#__PURE__*/_react["default"].createElement(CheckboxBlackBack, {
     labelPosition: labelPosition,
     disabled: disabled,
-    checked: checked != undefined ? checked : innerChecked,
+    checked: checked !== null && checked !== void 0 ? checked : innerChecked,
     backgroundType: backgroundType
-  }), required && /*#__PURE__*/_react["default"].createElement(_RequiredComponent["default"], null), label && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
-    labelPosition: labelPosition,
-    onClick: disabled === true ? function (e) {} : handlerCheckboxChange,
-    disabled: disabled,
-    className: "labelContainer",
-    backgroundType: backgroundType,
-    onMouseOver: handleLabelHover,
-    onMouseOut: handleLabelHover
-  }, label)));
+  }), label && labelPosition === "after" && labelComponent));
 };
 
 var sizes = {
@@ -151,19 +165,15 @@ var getDisabledColor = function getDisabledColor(props, element) {
   switch (element) {
     case "check":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledCheckColorOnDark : props.theme.disabledCheckColor;
-      break;
 
     case "background":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledBackgroundColorCheckedOnDark : props.theme.disabledBackgroundColorChecked;
-      break;
 
     case "border":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledBorderColorOnDark : props.theme.disabledBorderColor;
-      break;
 
     case "label":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledFontColorOnDark : props.theme.disabledFontColor;
-      break;
   }
 };
 
@@ -171,35 +181,31 @@ var getNotDisabledColor = function getNotDisabledColor(props, element) {
   switch (element) {
     case "check":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.checkColorOnDark : props.theme.checkColor;
-      break;
 
     case "background":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.backgroundColorCheckedOnDark : props.theme.backgroundColorChecked;
-      break;
 
     case "border":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.borderColorOnDark : props.theme.borderColor;
-      break;
 
     case "label":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.fontColorOnDark : props.theme.fontColor;
-      break;
   }
 };
 
-var LabelContainer = _styledComponents["default"].span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  cursor: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"])), function (props) {
+var LabelContainer = _styledComponents["default"].span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  cursor: ", ";\n"])), function (props) {
   return props.disabled ? getDisabledColor(props, "label") : getNotDisabledColor(props, "label");
-}, function (props) {
-  return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.fontSize;
 }, function (props) {
   return props.theme.fontWeight;
+}, function (props) {
+  return props.disabled ? "not-allowed" : "pointer";
 });
 
-var CheckboxContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n  position: relative;\n  flex-direction: ", ";\n  .MuiCheckbox-colorSecondary {\n    .MuiIconButton-label {\n      & > .MuiSvgIcon-root {\n        color: ", ";\n      }\n    }\n    &.Mui-disabled {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n          opacity: 0.34;\n        }\n      }\n    }\n    &.Mui-checked {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n        }\n      }\n\n      &:hover {\n        background-color: transparent;\n        .MuiIconButton-label {\n          & > .MuiSvgIcon-root {\n            background-color: transparent;\n            color: ", ";\n          }\n        }\n      }\n    }\n    .MuiIconButton-label {\n      & > .MuiSvgIcon-root {\n        width: 24px;\n        height: 24px;\n      }\n    }\n  }\n\n  .MuiIconButton-colorSecondary {\n    &:hover {\n      background-color: transparent;\n    }\n  }\n  .MuiButtonBase-root {\n    &:hover {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n        }\n      }\n    }\n\n    &.Mui-focusVisible {\n      .MuiIconButton-label {\n        box-shadow: 0 0 0 2px\n          ", ";\n      }\n    }\n    z-index: 1;\n    margin-left: ", ";\n    margin-right: ", ";\n    padding: 0px;\n    left: ", ";\n    right: ", ";\n  }\n"])), function (props) {
+var CheckboxContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n  position: relative;\n  .MuiCheckbox-colorSecondary {\n    .MuiIconButton-label {\n      & > .MuiSvgIcon-root {\n        color: ", ";\n      }\n    }\n    &.Mui-disabled {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n          opacity: 0.34;\n        }\n      }\n    }\n    &.Mui-checked {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n        }\n      }\n\n      &:hover {\n        background-color: transparent;\n        .MuiIconButton-label {\n          & > .MuiSvgIcon-root {\n            background-color: transparent;\n            color: ", ";\n          }\n        }\n      }\n    }\n    .MuiIconButton-label {\n      & > .MuiSvgIcon-root {\n        width: 24px;\n        height: 24px;\n      }\n    }\n  }\n\n  .MuiIconButton-colorSecondary {\n    &:hover {\n      background-color: transparent;\n    }\n  }\n  .MuiButtonBase-root {\n    &:hover {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n        }\n      }\n    }\n\n    &.Mui-focusVisible {\n      .MuiIconButton-label {\n        border-radius: 2px;\n        outline: 2px solid\n          ", ";\n        outline-offset: -1px;\n      }\n    }\n    z-index: 1;\n    margin-left: ", ";\n    margin-right: ", ";\n    padding: 0px;\n    left: ", ";\n    right: ", ";\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] : "";
@@ -213,8 +219,6 @@ var CheckboxContainer = _styledComponents["default"].span(_templateObject2 || (_
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.disabled ? "not-allowed" : "pointer";
-}, function (props) {
-  return props.labelPosition === "before" ? "row-reverse" : "row";
 }, function (props) {
   return props.isLabelHovered ? props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor : getNotDisabledColor(props, "border");
 }, function (props) {