@dxc-technology/halstack-react 0.0.0-b3e1a2f → 0.0.0-b41d935

package/button/types.d.ts

@@ -1,19 +1,19 @@
 /// <reference types="react" />
-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;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement>;
+export declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare type Props = {
     /**
-     * Text to be placed next to the button.
+     * Text to be placed in the button.
      */
     label?: string;
     /**
-     * Uses one of the available button modes.
+     * The available button modes.
      */
     mode?: "primary" | "secondary" | "text";
     /**
@@ -25,11 +25,11 @@ declare type Props = {
      */
     iconPosition?: "before" | "after";
     /**
-     * This prop corresponds to the 'type' prop of the button in html.
+     * 'type' html prop of the button.
      */
     type?: "button" | "reset" | "submit";
     /**
-     * Element or path 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 label.
      */
     icon?: string | SVG;
     /**

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); }
 
@@ -56,22 +56,13 @@ var DxcCard = function DxcCard(_ref) {
       isHovered = _useState2[0],
       changeIsHovered = _useState2[1];
 
-  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 && /*#__PURE__*/_react["default"].createElement(ImageContainer, {
+  var imageComponent = /*#__PURE__*/_react["default"].createElement(ImageContainer, {
     imageBgColor: imageBgColor
   }, /*#__PURE__*/_react["default"].createElement(TagImage, {
     imagePadding: imagePadding,
     cover: imageCover,
     src: imageSrc
-  })), /*#__PURE__*/_react["default"].createElement(CardContent, {
-    contentPadding: contentPadding
-  }, children))));
+  }));
 
   return /*#__PURE__*/_react["default"].createElement(StyledDxcCard, {
     margin: margin,
@@ -82,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) {
@@ -111,12 +110,12 @@ 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  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;
@@ -125,9 +124,7 @@ var CardContainer = _styledComponents["default"].div(_templateObject2 || (_templ
   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(_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) {
@@ -138,12 +135,12 @@ var TagImage = _styledComponents["default"].img(_templateObject4 || (_templateOb
   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 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 (_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" ? _variables.spaces[contentPadding] : "0px";
 }, function (_ref16) {

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/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.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

@@ -19,26 +19,37 @@ var _react = _interopRequireWildcard(require("react"));
 
 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;
+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,
+      defaultChecked = _ref$defaultChecked === void 0 ? false : _ref$defaultChecked,
       value = _ref.value,
       _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
@@ -48,87 +59,86 @@ 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)("label-checkbox-".concat((0, _uuid.v4)())),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
+      labelId = _useState2[0];
 
-  var _useState3 = (0, _react.useState)(false),
+  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 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;
+
+    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 handleLabelHover = function handleLabelHover() {
-    setIsLabelHovered(!isLabelHovered);
+  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
-  }, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
-    checked: checked != undefined ? checked : innerChecked,
-    inputProps: {
-      name: name,
-      "aria-label": label,
-      role: "checkbox",
-      "aria-checked": checked != undefined ? checked : innerChecked
-    },
-    onChange: handlerCheckboxChange,
-    value: value,
-    disabled: disabled,
-    disableRipple: true,
-    className: "test",
-    tabIndex: tabIndex
-  }), /*#__PURE__*/_react["default"].createElement(CheckboxBlackBack, {
-    labelPosition: labelPosition,
+    checked: checked !== null && checked !== void 0 ? checked : innerChecked,
+    backgroundType: backgroundType
+  }, label && labelPosition === "before" && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
     disabled: disabled,
-    checked: checked != undefined ? 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,
+  }, 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,
-    className: "labelContainer",
+    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,
-    onMouseOver: handleLabelHover,
-    onMouseOut: handleLabelHover
-  }, label)));
+    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
+  }, optional && "".concat(translatedLabels.formFields.optionalLabel, " "), label)));
 };
 
 var sizes = {
@@ -136,7 +146,7 @@ var sizes = {
   medium: "240px",
   large: "480px",
   fillParent: "100%",
-  fitContent: "unset"
+  fitContent: "fit-content"
 };
 
 var calculateWidth = function calculateWidth(margin, size) {
@@ -151,46 +161,42 @@ 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) {
+var getEnabledColor = function getEnabledColor(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 "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;
-      break;
+
+    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;
-      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) {
-  return props.disabled ? getDisabledColor(props, "label") : getNotDisabledColor(props, "label");
-}, function (props) {
-  return props.disabled ? "not-allowed" : "pointer";
+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") : getEnabledColor(props, "label");
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -199,54 +205,44 @@ var LabelContainer = _styledComponents["default"].span(_templateObject || (_temp
   return props.theme.fontWeight;
 });
 
-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) {
-  return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
+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  position: relative;\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 18px;\n  width: 18px;\n  border: 2px solid\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") : getEnabledColor(props, "border");
 }, function (props) {
-  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
+  return props.checked ? props.disabled ? getDisabledColor(props, "check") : getEnabledColor(props, "check") : "transparent";
 }, function (props) {
-  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.right ? _variables.spaces[props.margin.right] : "";
+  return props.disabled ? getDisabledColor(props, "background") : getEnabledColor(props, "background");
 }, function (props) {
-  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
 }, function (props) {
-  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
+  return props.disabled && "pointer-events: none;";
+});
+
+var MainContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  gap: ", ";\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  cursor: ", ";\n\n  &:hover ", " {\n    border: 2px solid\n      ", ";\n    background-color: ", ";\n    color: ", ";\n  }\n"])), function (props) {
+  return props.theme.checkLabelSpacing;
 }, function (props) {
   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) {
-  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";
+  return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
-  return props.labelPosition === "after" && props.label ? props.theme.checkLabelSpacing : "0";
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
 }, function (props) {
-  return props.labelPosition === "before" ? "unset" : "1px";
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.right ? _variables.spaces[props.margin.right] : "";
 }, 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");
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, function (props) {
-  return props.labelPosition === "before" ? "unset" : "5px";
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
-  return props.labelPosition === "before" ? "5px" : "unset";
+  return props.disabled ? "not-allowed" : "pointer";
+}, Checkbox, function (props) {
+  return props.disabled ? getDisabledColor(props, "border") : getEnabledColor(props, "hoverBorder");
 }, function (props) {
-  return props.labelPosition === "after" ? "0px" : "";
+  return props.checked ? props.disabled ? getDisabledColor(props, "check") : getEnabledColor(props, "check") : "transparent";
 }, function (props) {
-  return props.labelPosition === "before" ? "0px" : "";
+  return props.disabled ? getDisabledColor(props, "background") : getEnabledColor(props, "hoverBackground");
 });
 
 var _default = DxcCheckbox;