@dxc-technology/halstack-react 0.0.0-ecc45e2 → 0.0.0-ede733c

package/checkbox/Checkbox.js

@@ -19,11 +19,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox"));
+var _variables = require("../common/variables");
 
-var _variables = require("../common/variables.js");
-
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 var _uuid = require("uuid");
 
@@ -33,13 +31,22 @@ 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 DxcCheckbox = function DxcCheckbox(_ref) {
+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 = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var checked = _ref.checked,
       _ref$defaultChecked = _ref.defaultChecked,
       defaultChecked = _ref$defaultChecked === void 0 ? false : _ref$defaultChecked,
@@ -61,96 +68,86 @@ 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,
+    checked: checked !== null && checked !== void 0 ? checked : innerChecked,
     backgroundType: backgroundType,
-    isLabelHovered: isLabelHovered
-  }, label && labelPosition === "before" && labelComponent, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    ref: ref
+  }, label && labelPosition === "before" && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
+    disabled: disabled,
+    backgroundType: backgroundType
+  }, label, optional && " ".concat(translatedLabels.formFields.optionalLabel)), /*#__PURE__*/_react["default"].createElement(ValueInput, {
+    type: "checkbox",
     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,
+    name: name,
+    "aria-hidden": "true",
     value: value,
     disabled: disabled,
-    disableRipple: true,
-    className: "test",
-    tabIndex: tabIndex
-  }), /*#__PURE__*/_react["default"].createElement(CheckboxBlackBack, {
-    labelPosition: labelPosition,
-    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 = {
   small: "120px",
   medium: "240px",
   large: "480px",
   fillParent: "100%",
-  fitContent: "unset"
+  fitContent: "fit-content"
 };
 
 var calculateWidth = function calculateWidth(margin, size) {
@@ -177,7 +174,7 @@ var getDisabledColor = function getDisabledColor(props, element) {
   }
 };
 
-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;
@@ -185,72 +182,68 @@ 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) {
-  return props.disabled ? getDisabledColor(props, "label") : getNotDisabledColor(props, "label");
+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) {
   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  .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";
+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  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.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;

package/checkbox/Checkbox.stories.tsx

@@ -4,42 +4,55 @@ import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DarkContainer from "../../.storybook/components/DarkSection";
-import { userEvent } from "@storybook/testing-library";
+import styled from "styled-components";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Checkbox",
   component: DxcCheckbox,
 };
 
+const opinionatedTheme = {
+  checkbox: {
+    baseColor: "#0067b3",
+    checkColor: "#ffffff",
+    fontColor: "#000000",
+  },
+};
+
 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" defaultChecked />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Optional" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" optional />
+      <Title title="Disabled" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Disabled and checked" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled defaultChecked />
+      <Title title="Disabled, checked and optional" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled defaultChecked optional />
     </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Disabled and optional" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled optional />
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcCheckbox label="Focused" />
+    </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>
     <ExampleContainer>
-      <Title title="Disabled, optional and checked" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled optional defaultChecked />
+      <Title title="Optional" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" optional />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Label after" theme="light" level={4} />
@@ -53,25 +66,9 @@ const Checkbox = () => (
       <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 />
+      <DxcCheckbox label="Checkbox" disabled labelPosition="after" optional />
     </ExampleContainer>
     <BackgroundColorProvider color="#333333">
       <DarkContainer>
@@ -84,20 +81,28 @@ const Checkbox = () => (
           <DxcCheckbox label="Checkbox" defaultChecked />
         </ExampleContainer>
         <ExampleContainer>
-          <Title title="Optional" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" optional />
+          <Title title="Disabled" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled />
         </ExampleContainer>
         <ExampleContainer>
-          <Title title="Disabled and checked" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled defaultChecked />
+          <Title title="Disabled, checked and optional" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled defaultChecked optional />
         </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled and optional" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled optional />
+        <ExampleContainer pseudoState="pseudo-focus">
+          <Title title="Focused" theme="dark" level={4} />
+          <DxcCheckbox label="Focused" />
+        </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>
         <ExampleContainer>
-          <Title title="Disabled, optional and checked" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled optional defaultChecked />
+          <Title title="Optional" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" optional />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Label after" theme="dark" level={4} />
@@ -111,25 +116,9 @@ const Checkbox = () => (
           <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 />
+          <DxcCheckbox label="Checkbox" disabled labelPosition="after" optional />
         </ExampleContainer>
       </DarkContainer>
     </BackgroundColorProvider>
@@ -178,11 +167,94 @@ const Checkbox = () => (
       <Title title="Xxlarge" theme="light" level={4} />
       <DxcCheckbox label="Xxlarge" margin="xxlarge" />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Overflow container" theme="light" level={4} />
+      <ScrollableContainer id="scroll-container">
+        <DxcCheckbox label="Checkbox" defaultChecked />
+        <DxcCheckbox label="Checkbox" defaultChecked />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" defaultChecked />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" defaultChecked />
+      </ScrollableContainer>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Label overflow" theme="light" level={4} />
+      <SmallContainer>
+        <DxcCheckbox label="Very long label to check its overflowing" defaultChecked />
+        <DxcCheckbox label="Very long label to check its overflowing" labelPosition="after" />
+      </SmallContainer>
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Default" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" defaultChecked disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Focused" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Hovered" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered and checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Hovered" defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 
 export const Chromatic = Checkbox.bind({});
+
 Chromatic.play = async () => {
-  await userEvent.tab();
-  await userEvent.tab();
+  const listEl = document.getElementById("scroll-container");
+  listEl?.scrollTo?.({ top: 50 });
 };
+
+const ScrollableContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+  width: 200px;
+  height: 200px;
+  border: 1px solid #000;
+  padding: 14px;
+  overflow: auto;
+`;
+
+const SmallContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+  width: 150px;
+  height: 150px;
+`;