@dxc-technology/halstack-react 0.0.0-011babe → 0.0.0-0355f44

package/dist/button/Button.js

@@ -15,7 +15,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _core = require("@material-ui/core");
 
@@ -23,16 +23,16 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
+
 function _templateObject4() {
-  var data = (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    .MuiButton-label {\n      display: flex;\n      flex-direction: ", ";\n      align-items: center;\n    }\n    letter-spacing: 1px;\n    box-shadow: none;\n    fontSize: ", ";\n    font-weight: 500;\n    min-width: ", ";\n    border-radius: 4px;\n    width: 100%;\n    min-height: 43px;\n    line-height: 1;\n    font-family: ", ";\n    &:focus {\n      outline: ", " auto 1px;\n    }\n    transition: color 0.16s ease-in-out, background-color 0.16s ease-in-out;\n    transition: color 0.16s ease-in-out, border-color 0.16s ease-in-out;\n    &:hover {\n      transition: color 0.16s ease-in-out, background-color 0.16s ease-in-out;\n      transition: color 0.16s ease-in-out, border-color 0.16s ease-in-out;\n    }\n    ", "\n  }\n"]);
+  var data = (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"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -42,7 +42,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 20px;\n  max-width: 20px;\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 24px;\n  max-width: 24px;\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -52,7 +52,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 20px;\n  max-width: 20px;\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 24px;\n  max-width: 24px;\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -62,7 +62,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  line-height: 18px;\n  fontSize: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  line-height: ", ";\n  font-size: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  text-transform: none;\n  margin-right: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -88,29 +88,38 @@ var DxcButton = function DxcButton(_ref) {
       _ref$onClick = _ref.onClick,
       _onClick = _ref$onClick === void 0 ? "" : _ref$onClick,
       margin = _ref.margin,
-      size = _ref.size;
+      size = _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"]);
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.button
   }, _react["default"].createElement(DxCButton, {
     type: type,
     margin: margin,
-    mode: mode,
+    mode: mode !== "primary" && mode !== "secondary" && mode !== "text" ? "primary" : mode,
     disabled: disabled,
     iconPosition: iconPosition,
-    size: size
+    size: size,
+    backgroundType: backgroundType,
+    icon: icon
   }, _react["default"].createElement(_core.Button, {
     disabled: disabled,
     type: type,
     disableRipple: true,
     "aria-disabled": disabled ? true : false,
+    tabIndex: disabled ? -1 : tabIndex,
     onClick: function onClick() {
       if (_onClick) {
         _onClick();
       }
     }
-  }, _react["default"].createElement(LabelContainer, null, label), icon ? _react["default"].createElement(IconContainer, {
+  }, label && _react["default"].createElement(LabelContainer, {
+    icon: icon,
+    iconPosition: iconPosition
+  }, label), icon ? _react["default"].createElement(IconContainer, {
     label: label,
     iconPosition: iconPosition
   }, (0, _typeof2["default"])(icon) === "object" ? icon : _react["default"].createElement(icon)) : iconSrc && _react["default"].createElement(ButtonIcon, {
@@ -137,13 +146,19 @@ var calculateWidth = function calculateWidth(margin, size) {
 };
 
 var LabelContainer = _styledComponents["default"].span(_templateObject(), function (props) {
+  return props.theme.labelFontLineHeight;
+}, function (props) {
   return props.theme.fontSize;
+}, function (props) {
+  return !props.icon || props.iconPosition === "before" ? "8px" : "0px";
+}, function (props) {
+  return !props.icon || props.iconPosition === "after" ? "8px" : "0px";
 });
 
 var IconContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
-  return props.iconPosition === "after" && props.label !== "" && "10px" || "0px";
+  return !props.label ? "0px" : props.iconPosition === "after" && props.label !== "" && "8px" || "8px";
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && "10px" || "0px";
+  return !props.label ? "0px" : props.iconPosition === "before" && props.label !== "" && "8px" || "8px";
 });
 
 var ButtonIcon = _styledComponents["default"].img(_templateObject3(), function (props) {
@@ -166,25 +181,38 @@ var DxCButton = _styledComponents["default"].div(_templateObject4(), function (p
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.disabled && "not-allowed" || "pointer";
+}, function (props) {
+  return props.theme.paddingLeft;
+}, function (props) {
+  return props.theme.paddingRight;
+}, function (props) {
+  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) {
   return props.theme.fontSize;
 }, function (props) {
-  return props.size === "small" && "calc(100% - 22px)" || "unset";
+  return props.theme.fontWeight;
 }, function (props) {
-  return props.theme.fontFamily;
+  return props.theme.labelLetterSpacing;
+}, function (props) {
+  return props.size === "small" && "calc(100% - 22px)" || "unset";
 }, function (props) {
-  return props.theme.focusColor;
+  return props.backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor;
 }, function (props) {
-  var mode = props.mode;
+  var mode = props.mode,
+      backgroundType = props.backgroundType;
 
   if (mode === "primary") {
-    return "\n          background-color: ".concat(props.disabled && props.theme.disabledPrimaryBackgroundColor || props.theme.primaryBackgroundColor, ";\n          color: ").concat(props.disabled && props.theme.disabledPrimaryFontColor || props.theme.primaryFontColor, " !important;\n          padding: ").concat(props.size === "small" && "11px" || "12px 30px", ";\n          &:hover{\n            background-color: ").concat(props.theme.primaryHoverBackgroundColor, ";\n            color: ").concat(props.theme.primaryHoverFontColor, " !important; \n          }\n          &:active {\n            background-color: ").concat(props.theme.primaryActiveBackgroundColor, " !important;\n            color: ").concat(props.theme.primaryHoverFontColor, " !important;\n          }\n          &:focus {\n            background-color: ").concat(props.theme.primaryBackgroundColor, ";\n            color: ").concat(props.theme.primaryHoverFontColor, " !important;\n          }\n          &:disabled{ \n            cursor: not-allowed;\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        .MuiButton-label {\n          z-index: 5;\n        }\n      ");
   } else if (mode === "secondary") {
-    return "\n            background-color: ".concat(props.theme.secondaryBackgroundColor, ";\n            padding: ").concat(props.size === "small" && "9px" || "10px 28px", ";\n            color: ").concat(props.disabled && props.theme.disabledSecondaryFontColor || props.theme.secondaryFontColor, " !important;\n            border: 2px solid;\n            border-color: ").concat(props.disabled && props.theme.disabledSecondaryOutlinedColor || props.theme.secondaryOutlinedColor, ";\n            &:hover{\n              border-color: ").concat(props.theme.hoverOutlinedColor, ";\n              background-color: ").concat(props.theme.secondaryHoverBackgroundColor, ";\n              color: ").concat(props.theme.secondaryHoverFontColor, " !important; \n            }\n            &:active {\n              background-color: ").concat(props.theme.secondaryActiveBackgroundColor, " !important;\n              color: ").concat(props.theme.secondaryHoverFontColor, " !important;\n            }\n            &:focus {\n              background-color: ").concat(props.theme.secondaryBackgroundColor, ";\n              color: ").concat(props.theme.secondaryHoverFontColor, " !important; \n            }\n            &:disabled{\n              cursor: not-allowed;\n            }\n            .MuiButton-label {\n              z-index: 5\n            }\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          .MuiButton-label {\n            z-index: 5;\n          }\n        ");
   } else if (mode === "text") {
-    return "\n            background-color: ".concat(props.theme.textBackgroundColor, ";\n            color: ").concat(props.disabled && props.theme.disabledTextFontColor || props.theme.textFontColor, " !important;;\n            padding: ").concat(props.size === "small" && "11px" || "12px 30px", ";\n            &:hover{\n              background-color: ").concat(props.theme.textHoverBackgroundColor, ";\n              color: ").concat(props.theme.textHoverFontColor, " !important;\n            }\n            &:active {\n              background-color: ").concat(props.theme.textActiveBackgroundColor, " !important;\n              color: ").concat(props.theme.textHoverFontColor, " !important;\n            }\n            &:focus {\n              background-color: ").concat(props.theme.textBackgroundColor, ";\n              color: ").concat(props.theme.textFontColor, " !important; \n            }\n            &:disabled{\n              cursor:not-allowed;\n            }\n          ");
+    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      ");
   }
 });
 
@@ -203,7 +231,8 @@ DxcButton.propTypes = {
   onClick: _propTypes["default"].func,
   iconSrc: _propTypes["default"].string,
   icon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
-  type: _propTypes["default"].oneOf(["button", "reset", "submit"])
+  type: _propTypes["default"].oneOf(["button", "reset", "submit"]),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcButton;
 exports["default"] = _default;

package/dist/card/Card.js

@@ -19,16 +19,18 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+
 var _Box = _interopRequireDefault(require("../box/Box"));
 
 function _templateObject6() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  flex-grow: 1;\n  height: 100%;\n  overflow: hidden;\n"]);
+  var data = (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"]);
 
   _templateObject6 = function _templateObject6() {
     return data;
@@ -38,7 +40,7 @@ function _templateObject6() {
 }
 
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 140px;\n  height: 100%;\n  flex-shrink: 0;\n  background: ", ";\n  justify-content: center;\n  align-items: center;\n  display: inline-flex;\n"]);
+  var data = (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"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -58,7 +60,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-decoration: none;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: pointer;\n  text-decoration: none;\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -68,7 +70,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  flex-direction: ", ";\n  height: 220px;\n  width: 400px;\n  &:hover {\n    border-color: ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  height: ", ";\n  width: ", ";\n  &:hover {\n    border-color: ", ";\n  }\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -78,7 +80,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  cursor: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  cursor: ", ";\n  outline: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -91,38 +93,40 @@ var DxcCard = function DxcCard(_ref) {
   var imageSrc = _ref.imageSrc,
       children = _ref.children,
       margin = _ref.margin,
+      contentPadding = _ref.contentPadding,
       linkHref = _ref.linkHref,
       onClick = _ref.onClick,
       imageBgColor = _ref.imageBgColor,
       imagePadding = _ref.imagePadding,
       imagePosition = _ref.imagePosition,
       outlined = _ref.outlined,
-      imageCover = _ref.imageCover;
+      imageCover = _ref.imageCover,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+  var colorsTheme = (0, _useTheme["default"])();
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       isHovered = _useState2[0],
       changeIsHovered = _useState2[1];
 
-  var clickHandler = function clickHandler() {
-    if (onClick) {
-      onClick();
-    }
-  };
-
   var tagContent = _react["default"].createElement(_Box["default"], {
     shadowDepth: outlined ? 0 : isHovered && (onClick || linkHref) ? 2 : 1
+  }, _react["default"].createElement(_styledComponents.ThemeProvider, {
+    theme: colorsTheme.card
   }, _react["default"].createElement(CardContainer, {
     hasAction: onClick || linkHref,
     outlined: outlined,
     imagePosition: imagePosition
-  }, _react["default"].createElement(ImageContainer, {
+  }, imageSrc && _react["default"].createElement(ImageContainer, {
     imageBgColor: imageBgColor
   }, _react["default"].createElement(TagImage, {
     imagePadding: imagePadding,
     cover: imageCover,
     src: imageSrc
-  })), _react["default"].createElement(CardContent, null, children)));
+  })), _react["default"].createElement(CardContent, {
+    contentPadding: contentPadding
+  }, children))));
 
   return _react["default"].createElement(StyledDxcCard, {
     margin: margin,
@@ -132,9 +136,11 @@ var DxcCard = function DxcCard(_ref) {
     onMouseLeave: function onMouseLeave() {
       return changeIsHovered(false);
     },
-    onClick: clickHandler,
-    hasAction: onClick || linkHref
+    onClick: onClick,
+    hasAction: onClick,
+    tabIndex: typeof onClick === "function" && !linkHref ? tabIndex : -1
   }, linkHref && _react["default"].createElement(StyledLink, {
+    tabIndex: tabIndex,
     href: linkHref
   }, tagContent) || tagContent);
 };
@@ -143,48 +149,71 @@ var StyledDxcCard = _styledComponents["default"].div(_templateObject(), function
   var hasAction = _ref2.hasAction;
   return hasAction && "pointer" || "unset";
 }, function (_ref3) {
-  var margin = _ref3.margin;
-  return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
+  var hasAction = _ref3.hasAction;
+  return !hasAction && "none";
 }, function (_ref4) {
   var margin = _ref4.margin;
-  return margin && margin.top ? _variables.spaces[margin.top] : "";
+  return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
 }, function (_ref5) {
   var margin = _ref5.margin;
-  return margin && margin.right ? _variables.spaces[margin.right] : "";
+  return margin && margin.top ? _variables.spaces[margin.top] : "";
 }, function (_ref6) {
   var margin = _ref6.margin;
-  return margin && margin.bottom ? _variables.spaces[margin.bottom] : "";
+  return margin && margin.right ? _variables.spaces[margin.right] : "";
 }, function (_ref7) {
   var margin = _ref7.margin;
+  return margin && margin.bottom ? _variables.spaces[margin.bottom] : "";
+}, function (_ref8) {
+  var margin = _ref8.margin;
   return margin && margin.left ? _variables.spaces[margin.left] : "";
 });
 
-var CardContainer = _styledComponents["default"].div(_templateObject2(), function (_ref8) {
-  var imagePosition = _ref8.imagePosition;
+var CardContainer = _styledComponents["default"].div(_templateObject2(), function (_ref9) {
+  var imagePosition = _ref9.imagePosition;
   return imagePosition === "before" && "row" || "row-reverse";
 }, function (props) {
-  return props.hasAction ? "#FFED00" : "unset";
+  return props.theme.height;
+}, function (props) {
+  return props.theme.width;
+}, function (_ref10) {
+  var hasAction = _ref10.hasAction;
+  return hasAction ? "" : "unset";
 });
 
 var StyledLink = _styledComponents["default"].a(_templateObject3());
 
-var TagImage = _styledComponents["default"].img(_templateObject4(), function (_ref9) {
-  var imagePadding = _ref9.imagePadding;
+var TagImage = _styledComponents["default"].img(_templateObject4(), function (_ref11) {
+  var imagePadding = _ref11.imagePadding;
   return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
-}, function (_ref10) {
-  var imagePadding = _ref10.imagePadding;
+}, function (_ref12) {
+  var imagePadding = _ref12.imagePadding;
   return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
-}, function (_ref11) {
-  var cover = _ref11.cover;
+}, function (_ref13) {
+  var cover = _ref13.cover;
   return cover ? "cover" : "contain";
 });
 
-var ImageContainer = _styledComponents["default"].div(_templateObject5(), function (_ref12) {
-  var imageBgColor = _ref12.imageBgColor;
+var ImageContainer = _styledComponents["default"].div(_templateObject5(), function (_ref14) {
+  var imageBgColor = _ref14.imageBgColor;
   return imageBgColor;
 });
 
-var CardContent = _styledComponents["default"].div(_templateObject6());
+var CardContent = _styledComponents["default"].div(_templateObject6(), function (_ref15) {
+  var contentPadding = _ref15.contentPadding;
+  return contentPadding && (0, _typeof2["default"])(contentPadding) !== "object" ? _variables.spaces[contentPadding] : "0px";
+}, function (_ref16) {
+  var contentPadding = _ref16.contentPadding;
+  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.top ? _variables.spaces[contentPadding.top] : "";
+}, function (_ref17) {
+  var contentPadding = _ref17.contentPadding;
+  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.right ? _variables.spaces[contentPadding.right] : "";
+}, 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] : "";
+});
 
 DxcCard.propTypes = {
   imageSrc: _propTypes["default"].string,
@@ -200,11 +229,19 @@ DxcCard.propTypes = {
     bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
+  contentPadding: _propTypes["default"].oneOfType([_propTypes["default"].shape({
+    top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
+    bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
+    left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
+    right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
+  tabIndex: _propTypes["default"].number
 };
 DxcCard.defaultProps = {
   imageSrc: null,
   margin: null,
+  contentPadding: null,
   outlined: false,
   imagePadding: null,
   imageCover: false,