@dxc-technology/halstack-react 0.0.0-e201636 → 0.0.0-e26622f

package/card/Card.js

@@ -25,7 +25,7 @@ var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _Box = _interopRequireDefault(require("../box/Box"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -64,17 +64,6 @@ var DxcCard = function DxcCard(_ref) {
     src: imageSrc
   }));
 
-  var tagContent = /*#__PURE__*/_react["default"].createElement(_Box["default"], {
-    shadowDepth: !outlined ? 0 : isHovered && (onClick || linkHref) ? 2 : 1
-  }, /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.card
-  }, /*#__PURE__*/_react["default"].createElement(CardContainer, {
-    hasAction: onClick || linkHref,
-    imagePosition: imagePosition
-  }, imageSrc && imagePosition === "before" && imageComponent, /*#__PURE__*/_react["default"].createElement(CardContent, {
-    contentPadding: contentPadding
-  }, children), imageSrc && imagePosition === "after" && imageComponent)));
-
   return /*#__PURE__*/_react["default"].createElement(StyledDxcCard, {
     margin: margin,
     onMouseEnter: function onMouseEnter() {
@@ -84,15 +73,23 @@ var DxcCard = function DxcCard(_ref) {
       return changeIsHovered(false);
     },
     onClick: onClick,
-    hasAction: onClick,
-    tabIndex: typeof onClick === "function" && !linkHref ? tabIndex : -1
-  }, linkHref && /*#__PURE__*/_react["default"].createElement(StyledLink, {
-    tabIndex: tabIndex,
+    hasAction: onClick || linkHref,
+    tabIndex: onClick || linkHref ? tabIndex : -1,
+    as: linkHref && "a",
     href: linkHref
-  }, tagContent) || tagContent);
+  }, /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+    shadowDepth: !outlined ? 0 : isHovered && (onClick || linkHref) ? 2 : 1
+  }, /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
+    theme: colorsTheme.card
+  }, /*#__PURE__*/_react["default"].createElement(CardContainer, {
+    hasAction: onClick || linkHref,
+    imagePosition: imagePosition
+  }, imageSrc && imagePosition === "before" && imageComponent, /*#__PURE__*/_react["default"].createElement(CardContent, {
+    contentPadding: contentPadding
+  }, children), imageSrc && imagePosition === "after" && imageComponent))));
 };
 
-var StyledDxcCard = _styledComponents["default"].div(_templateObject || (_templateObject = (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\n  :focus {\n    outline: #0095ff auto 1px;\n  }\n"])), function (_ref2) {
+var StyledDxcCard = _styledComponents["default"].div(_templateObject || (_templateObject = (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  text-decoration: none;\n\n  ", "\n"])), function (_ref2) {
   var hasAction = _ref2.hasAction;
   return hasAction && "pointer" || "unset";
 }, function (_ref3) {
@@ -113,49 +110,50 @@ var StyledDxcCard = _styledComponents["default"].div(_templateObject || (_templa
 }, function (_ref8) {
   var margin = _ref8.margin;
   return margin && margin.left ? _variables.spaces[margin.left] : "";
+}, function (_ref9) {
+  var hasAction = _ref9.hasAction;
+  return hasAction && ":focus {\n    outline: #0095ff auto 1px;\n  }";
 });
 
 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 (_ref9) {
-  var hasAction = _ref9.hasAction;
+}, function (_ref10) {
+  var hasAction = _ref10.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 (_ref10) {
-  var imagePadding = _ref10.imagePadding;
-  return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
-}, function (_ref11) {
+var TagImage = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  object-fit: ", ";\n"])), function (_ref11) {
   var imagePadding = _ref11.imagePadding;
   return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
 }, function (_ref12) {
-  var cover = _ref12.cover;
+  var imagePadding = _ref12.imagePadding;
+  return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
+}, function (_ref13) {
+  var cover = _ref13.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 (_ref13) {
-  var imageBgColor = _ref13.imageBgColor;
+var ImageContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (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;
   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 (_ref14) {
-  var contentPadding = _ref14.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) !== "object" ? _variables.spaces[contentPadding] : "0px";
-}, function (_ref15) {
+var CardContent = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (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;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.top ? _variables.spaces[contentPadding.top] : "";
+  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.right ? _variables.spaces[contentPadding.right] : "";
+  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.bottom ? _variables.spaces[contentPadding.bottom] : "";
+  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] : "";
 });
 

package/card/types.d.ts

@@ -47,6 +47,7 @@ declare type Props = {
      */
     margin?: Space | Size;
     /**
+     * @deprecated This prop will be removed shortly, consider using the Inset component for this purpose.
      * Size of the padding to be applied to the content area ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
      * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different padding sizes.
      */

package/checkbox/Checkbox.js

@@ -19,8 +19,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox"));
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
@@ -33,12 +31,21 @@ var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabel
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var checkedIcon = /*#__PURE__*/_react["default"].createElement("svg", {
+  fill: "currentColor",
+  focusable: "false",
+  "aria-hidden": "true",
+  viewBox: "0 0 24 24"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+}));
+
 var DxcCheckbox = function DxcCheckbox(_ref) {
   var checked = _ref.checked,
       _ref$defaultChecked = _ref.defaultChecked,
@@ -61,88 +68,77 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _useState = (0, _react.useState)("checkbox-".concat((0, _uuid.v4)())),
+  var _useState = (0, _react.useState)("label-checkbox-".concat((0, _uuid.v4)())),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
-      switchId = _useState2[0];
-
-  var labelId = "label-".concat(switchId);
+      labelId = _useState2[0];
 
   var _useState3 = (0, _react.useState)(defaultChecked),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
       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 checkboxRef = (0, _react.useRef)(null);
   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) {
-      var isChecked = checkboxValue.target.checked === undefined ? !innerChecked : checkboxValue.target.checked;
-      setInnerChecked(isChecked);
-
-      if (typeof onChange === "function") {
-        onChange(isChecked);
-      }
-    } else {
-      if (typeof onChange === "function") {
-        onChange(!checked);
-      }
-    }
-  };
+  var handleCheckboxChange = function handleCheckboxChange() {
+    var _checkboxRef$current;
 
-  var handleLabelHover = function handleLabelHover() {
-    setIsLabelHovered(!isLabelHovered);
+    document.activeElement !== (checkboxRef === null || checkboxRef === void 0 ? void 0 : checkboxRef.current) && (checkboxRef === null || checkboxRef === void 0 ? void 0 : (_checkboxRef$current = checkboxRef.current) === null || _checkboxRef$current === void 0 ? void 0 : _checkboxRef$current.focus());
+    var newChecked = checked !== null && checked !== void 0 ? checked : innerChecked;
+    checked !== null && checked !== void 0 ? checked : setInnerChecked(function (innerChecked) {
+      return !innerChecked;
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(!newChecked);
   };
 
-  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));
+  var handleKeyboard = function handleKeyboard(event) {
+    switch (event.key) {
+      case " ":
+        event.preventDefault();
+        handleCheckboxChange();
+    }
+  };
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.checkbox
-  }, /*#__PURE__*/_react["default"].createElement(CheckboxContainer, {
-    id: name,
-    brightness: _variables.componentTokens,
-    label: label,
-    labelPosition: labelPosition,
+  }, /*#__PURE__*/_react["default"].createElement(MainContainer, {
     disabled: disabled,
+    onClick: disabled ? undefined : handleCheckboxChange,
     margin: margin,
     size: size,
-    backgroundType: backgroundType,
-    isLabelHovered: isLabelHovered
-  }, label && labelPosition === "before" && labelComponent, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
     checked: checked !== null && checked !== void 0 ? checked : innerChecked,
-    inputProps: {
-      name: name,
-      "aria-labelledby": labelId,
-      role: "checkbox",
-      "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked
-    },
-    onChange: handlerCheckboxChange,
-    value: value,
+    backgroundType: backgroundType
+  }, label && labelPosition === "before" && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
     disabled: disabled,
-    disableRipple: true,
-    className: "test",
-    tabIndex: tabIndex
-  }), /*#__PURE__*/_react["default"].createElement(CheckboxBlackBack, {
-    labelPosition: labelPosition,
+    backgroundType: backgroundType
+  }, label, optional && " ".concat(translatedLabels.formFields.optionalLabel)), /*#__PURE__*/_react["default"].createElement(ValueInput, {
+    type: "checkbox",
+    checked: checked !== null && checked !== void 0 ? checked : innerChecked,
+    name: name,
+    "aria-hidden": "true",
+    value: value,
     disabled: disabled,
+    readOnly: true
+  }), /*#__PURE__*/_react["default"].createElement(CheckboxContainer, null, /*#__PURE__*/_react["default"].createElement(Checkbox, {
+    onKeyDown: handleKeyboard,
+    role: "checkbox",
+    tabIndex: disabled ? -1 : tabIndex,
+    "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked,
+    "aria-disabled": disabled,
+    "aria-required": !disabled && !optional,
+    "aria-labelledby": labelId,
+    backgroundType: backgroundType,
     checked: checked !== null && checked !== void 0 ? checked : innerChecked,
+    disabled: disabled,
+    ref: checkboxRef
+  }, (checked !== null && checked !== void 0 ? checked : innerChecked) && checkedIcon)), label && labelPosition === "after" && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
+    disabled: disabled,
     backgroundType: backgroundType
-  }), label && labelPosition === "after" && labelComponent));
+  }, optional && "".concat(translatedLabels.formFields.optionalLabel, " "), label)));
 };
 
 var sizes = {
@@ -150,7 +146,7 @@ var sizes = {
   medium: "240px",
   large: "480px",
   fillParent: "100%",
-  fitContent: "unset"
+  fitContent: "fit-content"
 };
 
 var calculateWidth = function calculateWidth(margin, size) {
@@ -185,15 +181,21 @@ var getNotDisabledColor = function getNotDisabledColor(props, element) {
     case "background":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.backgroundColorCheckedOnDark : props.theme.backgroundColorChecked;
 
+    case "hoverBackground":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.hoverBackgroundColorCheckedOnDark : props.theme.hoverBackgroundColorChecked;
+
     case "border":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.borderColorOnDark : props.theme.borderColor;
 
+    case "hoverBorder":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor;
+
     case "label":
       return props.backgroundType && props.backgroundType === "dark" ? props.theme.fontColorOnDark : props.theme.fontColor;
   }
 };
 
-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) {
+var LabelContainer = _styledComponents["default"].span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"])), function (props) {
   return props.disabled ? getDisabledColor(props, "label") : getNotDisabledColor(props, "label");
 }, function (props) {
   return props.theme.fontFamily;
@@ -201,11 +203,27 @@ var LabelContainer = _styledComponents["default"].span(_templateObject || (_temp
   return props.theme.fontSize;
 }, function (props) {
   return props.theme.fontWeight;
+});
+
+var ValueInput = _styledComponents["default"].input(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));
+
+var CheckboxContainer = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 24px;\n  width: 24px;\n"])));
+
+var Checkbox = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 18px;\n  width: 18px;\n  border: solid 2px\n    ", ";\n  border-radius: 2px;\n  background-color: ", ";\n  color: ", ";\n\n  &:focus {\n    outline: 2px solid\n      ", ";\n    outline-offset: 2px;\n  }\n  svg {\n    position: absolute;\n    width: 22px;\n    height: 22px;\n  }\n  ", "\n"])), function (props) {
+  return props.disabled ? getDisabledColor(props, "border") : getNotDisabledColor(props, "border");
 }, function (props) {
-  return props.disabled ? "not-allowed" : "pointer";
+  return props.checked ? props.disabled ? getDisabledColor(props, "check") : getNotDisabledColor(props, "check") : "transparent";
+}, function (props) {
+  return props.disabled ? getDisabledColor(props, "background") : getNotDisabledColor(props, "background");
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
+}, function (props) {
+  return props.disabled && "pointer-events: none;";
 });
 
-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) {
+var MainContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n  gap: ", ";\n\n  &:hover ", " {\n    border: 2px solid\n      ", ";\n    background-color: ", ";\n    color: ", ";\n  }\n"])), function (props) {
+  return calculateWidth(props.margin, props.size);
+}, 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] : "";
@@ -215,42 +233,16 @@ var CheckboxContainer = _styledComponents["default"].span(_templateObject2 || (_
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, function (props) {
   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 ? "not-allowed" : "pointer";
 }, function (props) {
-  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.disabled ? getDisabledColor(props, "background") : getNotDisabledColor(props, "background");
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.hoverBackgroundColorCheckedOnDark : props.theme.hoverBackgroundColorChecked;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
-}, function (props) {
-  return props.labelPosition === "before" && props.label ? props.theme.checkLabelSpacing : "0";
-}, function (props) {
-  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 || (_templateObject3 = (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"])), function (props) {
-  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" ? "5px" : "unset";
+  return props.theme.checkLabelSpacing;
+}, Checkbox, function (props) {
+  return props.disabled ? getDisabledColor(props, "border") : getNotDisabledColor(props, "hoverBorder");
 }, function (props) {
-  return props.labelPosition === "after" ? "0px" : "";
+  return props.checked ? props.disabled ? getDisabledColor(props, "check") : getNotDisabledColor(props, "check") : "transparent";
 }, function (props) {
-  return props.labelPosition === "before" ? "0px" : "";
+  return props.disabled ? getDisabledColor(props, "background") : getNotDisabledColor(props, "hoverBackground");
 });
 
 var _default = DxcCheckbox;

package/checkbox/Checkbox.test.js

@@ -6,25 +6,39 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+
 var _Checkbox = _interopRequireDefault(require("./Checkbox"));
 
 describe("Checkbox component tests", function () {
-  test("Checkbox renders with correct text", function () {
+  test("Checkbox renders with correct aria-labelledby and aria-required", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox"
     })),
-        getByText = _render.getByText;
+        getByText = _render.getByText,
+        getByRole = _render.getByRole;
 
-    expect(getByText("Checkbox")).toBeTruthy();
+    var labelId = getByText("Checkbox").getAttribute("id");
+    expect(getByRole("checkbox").getAttribute("aria-labelledby")).toBe(labelId);
+    expect(getByRole("checkbox").getAttribute("aria-required")).toBe("true");
+  });
+  test("Optional checkbox renders with correct aria-required", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      optional: true
+    })),
+        getByRole = _render2.getByRole;
+
+    expect(getByRole("checkbox").getAttribute("aria-required")).toBe("false");
   });
   test("Calls correct function on click", function () {
     var onChange = jest.fn();
 
-    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox",
       onChange: onChange
     })),
-        getByText = _render2.getByText;
+        getByText = _render3.getByText;
 
     _react2.fireEvent.click(getByText("Checkbox"));
 
@@ -34,45 +48,108 @@ describe("Checkbox component tests", function () {
     var onChange = jest.fn();
     var component = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox",
-      onChange: onChange
+      onChange: onChange,
+      name: "test"
     }));
     var visibleCheckbox = component.getByText("Checkbox");
     var input = component.getByRole("checkbox");
-    expect(input.checked).toBe(false);
+    var submitInput = component.container.querySelector("input[name=\"test\"]");
+    expect(input.getAttribute("aria-checked")).toBe("false");
+    expect(submitInput.checked).toBe(false);
 
     _react2.fireEvent.click(visibleCheckbox);
 
     expect(onChange).toHaveBeenCalled();
     expect(onChange).toHaveBeenCalledWith(true);
-    expect(input.checked).toBe(true);
+    expect(input.getAttribute("aria-checked")).toBe("true");
+    expect(submitInput.checked).toBe(true);
   });
   test("Controlled checkbox", function () {
     var onChange = jest.fn();
     var component = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox",
       checked: false,
-      onChange: onChange
+      onChange: onChange,
+      name: "test"
     }));
     var input = component.getByRole("checkbox");
     var visibleCheckbox = component.getByText("Checkbox");
+    var submitInput = component.container.querySelector("input[name=\"test\"]");
 
     _react2.fireEvent.click(visibleCheckbox);
 
     expect(onChange).toHaveBeenCalled();
     expect(onChange).toHaveBeenCalledWith(true);
-    expect(input.checked).toBe(false);
+    expect(input.getAttribute("aria-checked")).toBe("false");
+    expect(submitInput.checked).toBe(false);
   });
   test("Renders with correct initial value and initial state when it is uncontrolled", function () {
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Default label",
       defaultChecked: true,
-      value: "test-defaultChecked"
+      value: "test-defaultChecked",
+      name: "test"
+    })),
+        getByRole = _render4.getByRole,
+        container = _render4.container;
+
+    var checkbox = getByRole("checkbox");
+    var submitInput = container.querySelector("input[name=\"test\"]");
+    expect(submitInput.value).toBe("test-defaultChecked");
+    expect(checkbox.getAttribute("aria-checked")).toBe("true");
+    expect(submitInput.checked).toBe(true);
+  });
+  test("Test disable keyboard and mouse interactions", function () {
+    var onChange = jest.fn();
+
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      onChange: onChange,
+      disabled: true,
+      name: "test"
     })),
-        getByRole = _render3.getByRole;
+        getByRole = _render5.getByRole,
+        getByText = _render5.getByText,
+        container = _render5.container;
 
     var input = getByRole("checkbox");
-    expect(input.checked).toBe(true);
-    expect(input.value).toBe("test-defaultChecked");
-    expect(input.getAttribute("aria-checked")).toBe("true");
+    var visibleCheckbox = getByText("Checkbox");
+    var submitInput = container.querySelector("input[name=\"test\"]");
+
+    _react2.fireEvent.click(visibleCheckbox);
+
+    expect(onChange).toHaveBeenCalledTimes(0);
+    expect(input.getAttribute("aria-checked")).toBe("false");
+    expect(input.getAttribute("aria-disabled")).toBe("true");
+    expect(submitInput.checked).toBe(false);
+
+    _userEvent["default"].tab();
+
+    expect(document.activeElement === input).toBeFalsy();
+  });
+  test("Test keyboard interactions", function () {
+    var onChange = jest.fn();
+
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      name: "test",
+      onChange: onChange
+    })),
+        getByRole = _render6.getByRole;
+
+    var checkbox = getByRole("checkbox");
+
+    _userEvent["default"].tab();
+
+    expect(document.activeElement === checkbox).toBeTruthy();
+
+    _react2.fireEvent.keyDown(checkbox, {
+      key: " ",
+      code: "Space",
+      keyCode: 32,
+      charCode: 32
+    });
+
+    expect(onChange).toHaveBeenCalledWith(true);
   });
 });

package/checkbox/types.d.ts

@@ -1,5 +1,5 @@
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+export declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;

package/chip/types.d.ts

@@ -6,7 +6,7 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement>;
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare type Props = {
     /**
      * Text to be placed on the chip.