@dxc-technology/halstack-react 0.0.0-c680086 → 0.0.0-c713b1b

package/checkbox/Checkbox.js

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

package/checkbox/Checkbox.stories.tsx

@@ -4,7 +4,7 @@ import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DarkContainer from "../../.storybook/components/DarkSection";
-import { userEvent, within } from "@storybook/testing-library";
+import { userEvent } from "@storybook/testing-library";
 
 export default {
   title: "Checkbox",
@@ -13,128 +13,124 @@ export default {
 
 const Checkbox = () => (
   <>
-    <>
-      <ExampleContainer>
-        <Title title="Default" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Focused" theme="light" level={4} />
-        <DxcCheckbox label="Focused" />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Checked" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" checked />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Required" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" required />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Disabled and checked" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" disabled checked />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Disabled and required" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" disabled required />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Disabled, required and checked" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" disabled required checked />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Label after" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" labelPosition="after" />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Checked with label after" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" checked labelPosition="after" />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Required with label after" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" required labelPosition="after" />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Disabled and checked with label after" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" disabled checked labelPosition="after" />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Disabled and required with label after" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" disabled required labelPosition="after" />
-      </ExampleContainer>
-      <ExampleContainer>
-        <Title title="Disabled, required and checked with label after" theme="light" level={4} />
-        <DxcCheckbox label="Checkbox" disabled required checked labelPosition="after" />
-      </ExampleContainer>
-      <ExampleContainer pseudoState="pseudo-hover">
-        <Title title="Hovered" theme="light" level={4} />
-        <DxcCheckbox label="Hovered" />
-      </ExampleContainer>
-      <ExampleContainer pseudoState="pseudo-hover">
-        <Title title="Hovered and checked" theme="light" level={4} />
-        <DxcCheckbox label="Hovered" checked />
-      </ExampleContainer>
-    </>
+    <ExampleContainer>
+      <Title title="Default" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Focused" theme="light" level={4} />
+      <DxcCheckbox label="Focused" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Checked" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" defaultChecked />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Optional" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" optional />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled and checked" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled defaultChecked />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled and optional" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled optional />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled, optional and checked" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled optional defaultChecked />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Label after" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" labelPosition="after" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Checked with label after" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" defaultChecked labelPosition="after" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Optional with label after" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" optional labelPosition="after" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled and checked with label after" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled defaultChecked labelPosition="after" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled and optional with label after" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled optional labelPosition="after" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled, optional and checked with label after" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled optional defaultChecked labelPosition="after" />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcCheckbox label="Hovered" />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered and checked" theme="light" level={4} />
+      <DxcCheckbox label="Hovered" defaultChecked />
+    </ExampleContainer>
     <BackgroundColorProvider color="#333333">
       <DarkContainer>
-        <>
-          <ExampleContainer>
-            <Title title="Default" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Checked" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" checked />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Required" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" required />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Disabled and checked" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" disabled checked />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Disabled and required" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" disabled required />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Disabled, required and checked" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" disabled required checked />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Label after" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" labelPosition="after" />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Checked with label after" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" checked labelPosition="after" />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Required with label after" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" required labelPosition="after" />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Disabled and checked with label after" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" disabled checked labelPosition="after" />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Disabled and required with label after" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" disabled required labelPosition="after" />
-          </ExampleContainer>
-          <ExampleContainer>
-            <Title title="Disabled, required and checked with label after" theme="dark" level={4} />
-            <DxcCheckbox label="Checkbox" disabled required checked labelPosition="after" />
-          </ExampleContainer>
-          <ExampleContainer pseudoState="pseudo-hover">
-            <Title title="Hovered" theme="dark" level={4} />
-            <DxcCheckbox label="Hovered" />
-          </ExampleContainer>
-          <ExampleContainer pseudoState="pseudo-hover">
-            <Title title="Hovered and checked" theme="dark" level={4} />
-            <DxcCheckbox label="Hovered" checked />
-          </ExampleContainer>
-        </>
+        <ExampleContainer>
+          <Title title="Default" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Checked" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" defaultChecked />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Optional" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" optional />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled and checked" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled defaultChecked />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled and optional" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled optional />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled, optional and checked" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled optional defaultChecked />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Label after" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" labelPosition="after" />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Checked with label after" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" defaultChecked labelPosition="after" />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Optional with label after" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" optional labelPosition="after" />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled and checked with label after" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled defaultChecked labelPosition="after" />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled and optional with label after" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled optional labelPosition="after" />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled, optional and checked with label after" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled optional defaultChecked labelPosition="after" />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-hover">
+          <Title title="Hovered" theme="dark" level={4} />
+          <DxcCheckbox label="Hovered" />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-hover">
+          <Title title="Hovered and checked" theme="dark" level={4} />
+          <DxcCheckbox label="Hovered" defaultChecked />
+        </ExampleContainer>
       </DarkContainer>
     </BackgroundColorProvider>
     <Title title="Sizes" theme="light" level={2} />
@@ -156,31 +152,31 @@ const Checkbox = () => (
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall" theme="light" level={4} />
-      <DxcCheckbox label="Xxsmall" margin={"xxsmall"} />
+      <DxcCheckbox label="Xxsmall" margin="xxsmall" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xsmall" theme="light" level={4} />
-      <DxcCheckbox label="Xsmall" margin={"xsmall"} />
+      <DxcCheckbox label="Xsmall" margin="xsmall" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Small" theme="light" level={4} />
-      <DxcCheckbox label="Small" margin={"small"} />
+      <DxcCheckbox label="Small" margin="small" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium" theme="light" level={4} />
-      <DxcCheckbox label="Medium" margin={"medium"} />
+      <DxcCheckbox label="Medium" margin="medium" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large" theme="light" level={4} />
-      <DxcCheckbox label="Large" margin={"large"} />
+      <DxcCheckbox label="Large" margin="large" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xlarge" theme="light" level={4} />
-      <DxcCheckbox label="Xlarge" margin={"xlarge"} />
+      <DxcCheckbox label="Xlarge" margin="xlarge" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xxlarge" theme="light" level={4} />
-      <DxcCheckbox label="Xxlarge" margin={"xxlarge"} />
+      <DxcCheckbox label="Xxlarge" margin="xxlarge" />
     </ExampleContainer>
   </>
 );

package/checkbox/Checkbox.test.js

@@ -0,0 +1,78 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Checkbox = _interopRequireDefault(require("./Checkbox"));
+
+describe("Checkbox component tests", function () {
+  test("Checkbox renders with correct text", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox"
+    })),
+        getByText = _render.getByText;
+
+    expect(getByText("Checkbox")).toBeTruthy();
+  });
+  test("Calls correct function on click", function () {
+    var onChange = jest.fn();
+
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      onChange: onChange
+    })),
+        getByText = _render2.getByText;
+
+    _react2.fireEvent.click(getByText("Checkbox"));
+
+    expect(onChange).toHaveBeenCalled();
+  });
+  test("Uncontrolled checkbox", function () {
+    var onChange = jest.fn();
+    var component = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      onChange: onChange
+    }));
+    var visibleCheckbox = component.getByText("Checkbox");
+    var input = component.getByRole("checkbox");
+    expect(input.checked).toBe(false);
+
+    _react2.fireEvent.click(visibleCheckbox);
+
+    expect(onChange).toHaveBeenCalled();
+    expect(onChange).toHaveBeenCalledWith(true);
+    expect(input.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
+    }));
+    var input = component.getByRole("checkbox");
+    var visibleCheckbox = component.getByText("Checkbox");
+
+    _react2.fireEvent.click(visibleCheckbox);
+
+    expect(onChange).toHaveBeenCalled();
+    expect(onChange).toHaveBeenCalledWith(true);
+    expect(input.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"], {
+      label: "Default label",
+      defaultChecked: true,
+      value: "test-defaultChecked"
+    })),
+        getByRole = _render3.getByRole;
+
+    var input = getByRole("checkbox");
+    expect(input.checked).toBe(true);
+    expect(input.value).toBe("test-defaultChecked");
+    expect(input.getAttribute("aria-checked")).toBe("true");
+  });
+});

package/checkbox/types.d.ts

@@ -6,6 +6,10 @@ declare type Margin = {
     right?: Space;
 };
 declare type Props = {
+    /**
+     * Initial state of the checkbox, only when it is uncontrolled.
+     */
+    defaultChecked?: boolean;
     /**
      * If true, the component is checked. If undefined the component will be
      * uncontrolled and the value will be managed internally by the component.
@@ -33,14 +37,14 @@ declare type Props = {
      */
     disabled?: boolean;
     /**
-     * If true, the checkbox will change its appearence, showing that the value is required.
+     * If true, the component will display '(Optional)' next to the label.
      */
-    required?: boolean;
+    optional?: boolean;
     /**
      * This function will be called when the user clicks the checkbox.
      * The new value will be passed as a parameter.
      */
-    onChange?: (val: boolean) => void;
+    onChange?: (value: boolean) => void;
     /**
      * Size of the margin to be applied to the component
      * ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').