@dxc-technology/halstack-react 0.0.0-768c5d7 → 0.0.0-76bdc1f

package/{dist/card → card}/Card.js

@@ -25,12 +25,12 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
-var _Box = _interopRequireDefault(require("../box/Box"));
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.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;
@@ -40,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;
@@ -60,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;
@@ -70,7 +70,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  color: ", ";\n  align-items: center;\n  flex-direction: ", ";\n  height: ", ";\n  width: ", ";\n  border: ", ";\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;
@@ -80,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;
@@ -93,46 +93,42 @@ 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,
-      theme = _ref.theme,
       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 colorsTheme = (0, _react.useContext)(_ThemeContext["default"]) || _variables.colors;
-
-  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, {
-    brightness: theme,
     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(_styledComponents.ThemeProvider, {
-    theme: colorsTheme
-  }, _react["default"].createElement(StyledDxcCard, {
+  return _react["default"].createElement(StyledDxcCard, {
     margin: margin,
     onMouseEnter: function onMouseEnter() {
       return changeIsHovered(true);
@@ -140,57 +136,48 @@ 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));
+  }, tagContent) || tagContent);
 };
 
 var StyledDxcCard = _styledComponents["default"].div(_templateObject(), function (_ref2) {
   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 borderSizePx = "2";
-
-var getBorder = function getBorder(props) {
-  var color = props.brightness === "dark" || props.brightness === "medium" ? props.theme.white : props.theme.black;
-  return props.outlined ? "".concat(borderSizePx, "px solid ").concat(color) : "none";
-};
-
-var CardContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
-  return props.brightness === "dark" ? props.theme.black : props.brightness === "medium" ? "#212121" : props.theme.white;
-}, function (props) {
-  return props.brightness === "dark" || props.brightness === "medium" ? props.theme.white : props.theme.black;
-}, 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 (_ref9) {
-  var outlined = _ref9.outlined;
-  return outlined ? "".concat(220 - 2 * borderSizePx, "px") : "220px";
-}, function (_ref10) {
-  var outlined = _ref10.outlined;
-  return outlined ? "".concat(400 - 2 * borderSizePx, "px") : "400px";
 }, function (props) {
-  return getBorder(props);
+  return props.theme.height;
 }, function (props) {
-  return props.hasAction ? props.theme.yellow : "unset";
+  return props.theme.width;
+}, function (_ref10) {
+  var hasAction = _ref10.hasAction;
+  return hasAction ? "" : "unset";
 });
 
 var StyledLink = _styledComponents["default"].a(_templateObject3());
@@ -211,7 +198,22 @@ var ImageContainer = _styledComponents["default"].div(_templateObject5(), functi
   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,
@@ -222,18 +224,24 @@ DxcCard.propTypes = {
   onClick: _propTypes["default"].func,
   outlined: _propTypes["default"].bool,
   imageCover: _propTypes["default"].bool,
-  theme: _propTypes["default"].oneOf(["dark", "medium", "light"]),
   margin: _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)))])
+  }), _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,
-  theme: "light",
+  contentPadding: null,
   outlined: false,
   imagePadding: null,
   imageCover: false,

package/card/index.d.ts

@@ -0,0 +1,22 @@
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
+  top?: Space;
+  bottom?: Space;
+  left?: Space;
+  right?: Space;
+};
+
+type Props = {
+  imageSrc?: string;
+  margin?: Space | Margin;
+  contentPadding?: any;
+  linkHref?: string;
+  onClick?: void;
+  imageBgColor?: string;
+  imagePadding?: any;
+  imagePosition?: "before" | "after";
+  outlined?: boolean; 
+  imageCover?: boolean;
+};
+
+export default function DxcCard(props: Props): JSX.Element;

package/{dist/checkbox → checkbox}/Checkbox.js

@@ -27,16 +27,16 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _RequiredComponent = _interopRequireDefault(require("../common/RequiredComponent"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  width: 17px;\n  height: 17px;\n  position: absolute;\n  left: ", ";\n  right: ", ";\n  z-index: 0;\n  opacity: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  width: 16px;\n  height: 16px;\n  position: absolute;\n  left: ", ";\n  right: ", ";\n  z-index: 0;\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -46,7 +46,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  width: ", ";\n\n  opacity: ", ";\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n  position: relative;\n  flex-direction: ", ";\n  .MuiCheckbox-colorSecondary {\n    &.Mui-checked {\n      color: ", ";\n      &.Mui-disabled {\n        color: ", ";\n      }\n      &:hover {\n        background-color: transparent;\n      }\n    }\n    &.Mui-disabled {\n      color: ", ";\n    }\n  }\n  .MuiIconButton-colorSecondary {\n    &:hover {\n      background-color: transparent;\n    }\n  }\n  .MuiButtonBase-root {\n    &.Mui-focusVisible {\n      .MuiIconButton-label {\n        outline: ", " auto 1px;\n      }\n    }\n    z-index: 1;\n    padding: 10px 10px;\n    margin: 0px 2px;\n    color: ", "};\n    &.Mui-checked {\n      color: ", ";\n      &:hover {\n        background-color: transparent;\n      }\n    }\n    &.Mui-disabled {\n      opacity: ", ";\n    }\n    .MuiSvgIcon-root {\n      width: 26.6px;\n      height: 26.6px;\n    }\n  }\n"]);
+  var data = (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"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -56,7 +56,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: black;\n  cursor: ", ";\n  font-family: \"Open Sans\", sans-serif;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  cursor: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -81,17 +81,22 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
       required = _ref$required === void 0 ? false : _ref$required,
       margin = _ref.margin,
       _ref$size = _ref.size,
-      size = _ref$size === void 0 ? "fitContent" : _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 customTheme = (0, _react.useContext)(_ThemeContext["default"]);
-  var colorsTheme = (0, _react.useMemo)(function () {
-    return (0, _utils.getCustomTheme)(_variables.theme, (0, _utils.getCustomTheme)(_variables.defaultTheme, customTheme));
-  }, [customTheme]);
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      isLabelHovered = _useState4[0],
+      setIsLabelHovered = _useState4[1];
+
+  var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
 
   var handlerCheckboxChange = function handlerCheckboxChange(checkboxValue) {
     if (checked === undefined) {
@@ -108,34 +113,49 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
     }
   };
 
+  var handleLabelHover = function handleLabelHover() {
+    setIsLabelHovered(!isLabelHovered);
+  };
+
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.checkbox
   }, _react["default"].createElement(CheckboxContainer, {
     id: name,
-    brightness: _variables.theme,
+    brightness: _variables.componentTokens,
+    label: label,
     labelPosition: labelPosition,
     disabled: disabled,
     margin: margin,
-    size: size
+    size: size,
+    backgroundType: backgroundType,
+    isLabelHovered: isLabelHovered
   }, _react["default"].createElement(_Checkbox["default"], {
     checked: checked != undefined ? checked : innerChecked,
-    inputProps: name = {
-      name: name
+    inputProps: {
+      name: name,
+      "aria-label": label,
+      role: "checkbox",
+      "aria-checked": checked != undefined ? checked : innerChecked
     },
     onChange: handlerCheckboxChange,
     value: value,
     disabled: disabled,
     disableRipple: true,
-    className: "test"
+    className: "test",
+    tabIndex: tabIndex
   }), _react["default"].createElement(CheckboxBlackBack, {
     labelPosition: labelPosition,
     disabled: disabled,
-    checked: checked != undefined ? checked : innerChecked
+    checked: checked != undefined ? checked : innerChecked,
+    backgroundType: backgroundType
   }), required && _react["default"].createElement(_RequiredComponent["default"], null), label && _react["default"].createElement(LabelContainer, {
     labelPosition: labelPosition,
     onClick: disabled === true ? function (e) {} : handlerCheckboxChange,
     disabled: disabled,
-    className: "labelContainer"
+    className: "labelContainer",
+    backgroundType: backgroundType,
+    onMouseOver: handleLabelHover,
+    onMouseOut: handleLabelHover
   }, label)));
 };
 
@@ -155,8 +175,56 @@ var calculateWidth = function calculateWidth(margin, size) {
   return sizes[size];
 };
 
+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;
+  }
+};
+
+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(), 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;
 });
 
 var CheckboxContainer = _styledComponents["default"].span(_templateObject2(), function (props) {
@@ -171,36 +239,42 @@ var CheckboxContainer = _styledComponents["default"].span(_templateObject2(), fu
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
   return calculateWidth(props.margin, props.size);
-}, function (props) {
-  return props.disabled ? props.theme.disabled : "1";
 }, function (props) {
   return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
   return props.labelPosition === "before" ? "row-reverse" : "row";
 }, function (props) {
-  return props.theme.color;
+  return props.isLabelHovered ? props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor : getNotDisabledColor(props, "border");
+}, function (props) {
+  return getDisabledColor(props, "border");
 }, function (props) {
-  return props.theme.color;
+  return props.disabled ? getDisabledColor(props, "background") : getNotDisabledColor(props, "background");
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.hoverBackgroundColorCheckedOnDark : props.theme.hoverBackgroundColorChecked;
 }, function (props) {
-  return props.theme.focusColor;
+  return props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
 }, function (props) {
-  return props.theme.color;
+  return props.labelPosition === "before" && props.label ? props.theme.checkLabelSpacing : "0";
 }, function (props) {
-  return props.theme.disabled;
+  return props.labelPosition === "after" && props.label ? props.theme.checkLabelSpacing : "0";
+}, function (props) {
+  return props.labelPosition === "before" ? "unset" : "1px";
+}, function (props) {
+  return props.labelPosition === "before" ? "1px" : "unset";
 });
 
 var CheckboxBlackBack = _styledComponents["default"].span(_templateObject3(), function (props) {
-  return props.checked !== true ? "transparent" : props.theme.checkColor;
+  return !props.checked ? "transparent" : props.disabled ? getDisabledColor(props, "check") : getNotDisabledColor(props, "check");
+}, function (props) {
+  return props.labelPosition === "before" ? "unset" : "5px";
 }, function (props) {
-  return props.labelPosition === "before" ? "unset" : "17px";
+  return props.labelPosition === "before" ? "5px" : "unset";
 }, function (props) {
-  return props.labelPosition === "before" ? "17px" : "unset";
+  return props.labelPosition === "after" ? "0px" : "";
 }, function (props) {
-  return props.disabled ? props.theme.disabled : "1";
+  return props.labelPosition === "before" ? "0px" : "";
 });
 
 DxcCheckbox.propTypes = {
@@ -218,7 +292,8 @@ DxcCheckbox.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)))]),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcCheckbox;
 exports["default"] = _default;

package/checkbox/index.d.ts

@@ -0,0 +1,24 @@
+type Size = "small" | "medium" | "large" | "fillParent" | "fitContent";
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
+  top?: Space;
+  bottom?: Space;
+  left?: Space;
+  right?: Space;
+};
+
+type Props = {
+  checked?: boolean;
+  value?: any;
+  label?: string;
+  labelPosition?: "before" | "after";
+  name?: string,
+  disabled?: boolean;
+  onChange?: void;
+  required?: boolean;
+  margin?: Space | Margin;
+  size?: Size;
+  tabIndex?: number;
+};
+
+export default function DxcCheckbox(props: Props): JSX.Element;