@dxc-technology/halstack-react 0.0.0-a7043e2 → 0.0.0-a799608

package/slider/Slider.test.js

@@ -6,19 +6,26 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+
 var _Slider = _interopRequireDefault(require("./Slider"));
 
 describe("Slider component tests", function () {
-  test("Slider renders with correct text", function () {
+  test("Slider renders with correct text and label id", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      label: "label",
       minValue: 0,
       maxValue: 100,
       showLimitsValues: true
     })),
-        getByText = _render.getByText;
+        getByText = _render.getByText,
+        getByRole = _render.getByRole;
 
     expect(getByText("0")).toBeTruthy();
     expect(getByText("100")).toBeTruthy();
+    var sliderId = getByText("label").getAttribute("id");
+    expect(getByRole("slider").getAttribute("aria-labelledby")).toBe(sliderId);
+    expect(getByRole("slider").getAttribute("aria-orientation")).toBe("horizontal");
   });
   test("Slider renders with correct initial value when it is uncontrolled", function () {
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
@@ -35,10 +42,37 @@ describe("Slider component tests", function () {
     expect(slider.getAttribute("aria-valuenow")).toBe("30");
     expect(input.value).toBe("30");
   });
+  test("Slider correct limit values", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      defaultValue: 125,
+      minValue: 30,
+      maxValue: 125,
+      showLimitsValues: true
+    })),
+        getByRole = _render3.getByRole,
+        getByText = _render3.getByText;
+
+    var slider = getByRole("slider");
+    expect(slider.getAttribute("aria-valuemin")).toBe("30");
+    expect(slider.getAttribute("aria-valuemax")).toBe("125");
+
+    _userEvent["default"].tab();
+
+    _react2.fireEvent.keyDown(slider, {
+      key: "ArrowRight",
+      code: "ArrowRight",
+      keyCode: 39,
+      charCode: 39
+    });
+
+    expect(slider.getAttribute("aria-valuenow")).toBe("125");
+    expect(getByText("30")).toBeTruthy();
+    expect(getByText("125")).toBeTruthy();
+  });
   test("Calls correct function onChange in controlled slider", function () {
     var onChange = jest.fn();
 
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
@@ -46,7 +80,7 @@ describe("Slider component tests", function () {
       value: 13,
       showInput: true
     })),
-        getByRole = _render3.getByRole;
+        getByRole = _render4.getByRole;
 
     expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("13");
     expect(getByRole("textbox").value).toBe("13");
@@ -64,14 +98,14 @@ describe("Slider component tests", function () {
   test("Calls correct function onChange in uncontrolled slider", function () {
     var onChange = jest.fn();
 
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
       showLimitsValues: true,
       showInput: true
     })),
-        getByRole = _render4.getByRole;
+        getByRole = _render5.getByRole;
 
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
@@ -84,10 +118,10 @@ describe("Slider component tests", function () {
     expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("25");
     expect(getByRole("textbox").value).toBe("25");
   });
-  test("Disabled slider have disabled input", function () {
+  test("Disabled slider have disabled input and slider", function () {
     var onChange = jest.fn();
 
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
@@ -96,7 +130,7 @@ describe("Slider component tests", function () {
       showInput: true,
       value: 13
     })),
-        getByRole = _render5.getByRole;
+        getByRole = _render6.getByRole;
 
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
@@ -107,33 +141,64 @@ describe("Slider component tests", function () {
     });
     expect(getByRole("textbox").hasAttribute("disabled")).toBeTruthy();
     expect(getByRole("textbox").value).toBe("13");
+    expect(getByRole("slider").hasAttribute("disabled")).toBeTruthy();
   });
-  test("Calls correct function onDragEnd", function () {
+  test("Calls correct function onDragEnd when it is uncontrolled", function () {
     var onDragEnd = jest.fn();
 
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
-      maxValue: 100,
-      showLimitsValues: true,
-      showInput: true,
+      maxValue: 150,
       onDragEnd: onDragEnd,
-      value: 25
+      showInput: true
     })),
-        getByRole = _render6.getByRole;
+        getByRole = _render7.getByRole;
 
+    var slider = getByRole("slider");
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseDown(slider);
+    });
     (0, _react2.act)(function () {
-      _react2.fireEvent.mouseDown(getByRole("slider"));
+      _react2.fireEvent.mouseUp(slider, {
+        target: {
+          value: 120
+        }
+      });
+    });
+    expect(onDragEnd).toHaveBeenCalledWith("120");
+  });
+  test("Calls correct function onDragEnd when it is controlled", function () {
+    var onDragEnd = jest.fn();
 
-      _react2.fireEvent.mouseUp(getByRole("slider"));
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 150,
+      value: 50,
+      onDragEnd: onDragEnd,
+      showInput: true
+    })),
+        getByRole = _render8.getByRole;
+
+    var slider = getByRole("slider");
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseDown(slider);
     });
-    expect(onDragEnd).toHaveBeenCalled();
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseUp(slider, {
+        target: {
+          value: 120
+        }
+      });
+    });
+    expect(onDragEnd).toHaveBeenCalledWith("120");
+    expect(slider.getAttribute("aria-valuenow")).toBe("50");
   });
   test("Calls correct function labelFormatCallback", function () {
     var labelFormatCallback = jest.fn(function (x) {
       return "".concat(x, "$");
     });
 
-    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       showLimitsValues: true,
@@ -141,10 +206,45 @@ describe("Slider component tests", function () {
       value: 25,
       labelFormatCallback: labelFormatCallback
     })),
-        getByText = _render7.getByText;
+        getByText = _render9.getByText;
 
     expect(getByText("0$")).toBeTruthy();
     expect(getByText("100$")).toBeTruthy();
     expect(labelFormatCallback).toHaveBeenCalledTimes(2);
   });
+  test("Change value correctly to 0 from external function", function () {
+    var onChange = jest.fn();
+
+    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      value: 13,
+      showInput: true
+    })),
+        rerender = _render10.rerender,
+        getByRole = _render10.getByRole;
+
+    var slider = getByRole("slider");
+
+    _userEvent["default"].tab();
+
+    _react2.fireEvent.keyDown(slider, {
+      key: "ArrowRight",
+      code: "ArrowRight",
+      keyCode: 39,
+      charCode: 39
+    });
+
+    rerender( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      value: 0,
+      showInput: true
+    }));
+    expect(slider.getAttribute("aria-valuenow")).toBe("0");
+  });
 });

package/slider/types.d.ts

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

package/switch/Switch.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import SwitchPropsType from "./types";
+import { SwitchPropsType } from "./types";
 declare const DxcSwitch: ({ defaultChecked, checked, value, label, labelPosition, name, disabled, optional, onChange, margin, size, tabIndex, }: SwitchPropsType) => JSX.Element;
 export default DxcSwitch;

package/switch/Switch.js

@@ -19,8 +19,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _core = require("@material-ui/core");
-
 var _uuid = require("uuid");
 
 var _variables = require("../common/variables.js");
@@ -33,13 +31,15 @@ var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabel
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
 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 DxcSwitch = function DxcSwitch(_ref) {
+  var _ref2;
+
   var defaultChecked = _ref.defaultChecked,
       checked = _ref.checked,
       value = _ref.value,
@@ -71,9 +71,32 @@ var DxcSwitch = function DxcSwitch(_ref) {
       innerChecked = _useState4[0],
       setInnerChecked = _useState4[1];
 
+  var _useState5 = (0, _react.useState)((_ref2 = label !== "" && label !== null && label !== undefined) !== null && _ref2 !== void 0 ? _ref2 : false),
+      _useState6 = (0, _slicedToArray2["default"])(_useState5, 1),
+      hasLabel = _useState6[0];
+
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+  var refTrack = (0, _react.useRef)(null);
+
+  var handleOnKeyDown = function handleOnKeyDown(event) {
+    switch (event.key) {
+      case "Enter":
+      case " ":
+        //Space
+        event.preventDefault();
+        refTrack.current.focus();
+        var isChecked = !(checked !== null && checked !== void 0 ? checked : innerChecked);
+        setInnerChecked(isChecked);
+
+        if (typeof onChange === "function") {
+          onChange(isChecked);
+        }
+
+        break;
+    }
+  };
 
   var handlerSwitchChange = function handlerSwitchChange(event) {
     if (checked === undefined) {
@@ -81,40 +104,64 @@ var DxcSwitch = function DxcSwitch(_ref) {
 
       var isChecked = (_event$target$checked = event.target.checked) !== null && _event$target$checked !== void 0 ? _event$target$checked : !innerChecked;
       setInnerChecked(isChecked);
-      onChange === null || onChange === void 0 ? void 0 : onChange(isChecked);
-    } else onChange === null || onChange === void 0 ? void 0 : onChange(!checked);
-  };
 
-  var labelComponent = /*#__PURE__*/_react["default"].createElement(LabelContainer, {
-    id: labelId,
-    labelPosition: labelPosition,
-    onClick: !disabled && handlerSwitchChange,
-    disabled: disabled,
-    backgroundType: backgroundType
-  }, 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, translatedLabels.formFields.optionalLabel), " ", label));
+      if (typeof onChange === "function") {
+        onChange(isChecked);
+      }
+    } else {
+      if (typeof onChange === "function") {
+        onChange(!checked);
+      }
+    }
+  };
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme["switch"]
   }, /*#__PURE__*/_react["default"].createElement(SwitchContainer, {
     margin: margin,
+    size: size,
+    onKeyDown: handleOnKeyDown
+  }, labelPosition === "before" && hasLabel && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
+    labelPosition: labelPosition,
+    onClick: !disabled ? handlerSwitchChange : undefined,
     disabled: disabled,
+    backgroundType: backgroundType,
+    hasLabel: hasLabel
+  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, translatedLabels.formFields.optionalLabel)), /*#__PURE__*/_react["default"].createElement(SwitchBase, {
     labelPosition: labelPosition,
-    size: size,
-    backgroundType: backgroundType
-  }, labelPosition === "before" && labelComponent, /*#__PURE__*/_react["default"].createElement(_core.Switch, {
-    checked: checked !== null && checked !== void 0 ? checked : innerChecked,
-    inputProps: {
-      name: name,
-      "aria-labelledby": labelId,
-      role: "switch",
-      "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked,
-      tabIndex: tabIndex
-    },
-    onChange: handlerSwitchChange,
+    hasLabel: hasLabel,
+    htmlFor: labelId,
+    onClick: disabled === true ? function () {} : handlerSwitchChange
+  }, /*#__PURE__*/_react["default"].createElement(SwitchInput, {
+    type: "checkbox",
+    role: "switch",
+    name: name,
+    id: labelId,
+    disabled: disabled,
     value: value,
+    "aria-labelledby": labelId,
+    "aria-label": hasLabel ? label : undefined,
+    "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked,
+    defaultChecked: defaultChecked !== null && defaultChecked !== void 0 ? defaultChecked : undefined,
+    tabIndex: -1
+  }), disabled ? /*#__PURE__*/_react["default"].createElement(DisabledSwitchTrack, {
+    backgroundType: backgroundType,
+    "data-checked": checked !== null && checked !== void 0 ? checked : innerChecked ? innerChecked : undefined,
+    tabIndex: -1
+  }) : /*#__PURE__*/_react["default"].createElement(SwitchTrack, {
+    backgroundType: backgroundType,
+    "data-checked": checked !== null && checked !== void 0 ? checked : innerChecked ? innerChecked : undefined,
+    tabIndex: tabIndex,
+    ref: refTrack
+  })), labelPosition === "after" && hasLabel && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
+    labelPosition: labelPosition,
+    onClick: !disabled ? handlerSwitchChange : undefined,
     disabled: disabled,
-    disableRipple: true
-  }), labelPosition === "after" && labelComponent));
+    backgroundType: backgroundType,
+    hasLabel: hasLabel
+  }, optional && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, translatedLabels.formFields.optionalLabel), " ", label)));
 };
 
 var sizes = {
@@ -129,7 +176,7 @@ var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
 
-var SwitchContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  display: inline-flex;\n  align-items: center;\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n\n  .MuiSwitch-root {\n    align-items: center;\n    width: ", ";\n    height: 45px;\n    margin: 3px;\n\n    .Mui-focusVisible {\n      outline: ", ";\n      outline-offset: -3px;\n    }\n\n    .MuiSwitch-track {\n      /*Enabled and unchecked bar*/\n      background-color: ", ";\n      height: ", ";\n    }\n\n    .MuiSwitch-switchBase + .MuiSwitch-track {\n      opacity: 1;\n    }\n\n    .MuiIconButton-root {\n      /*Enabled and unchecked*/\n      top: unset;\n      .MuiSwitch-thumb {\n        /*Only for thumb in all states*/\n        width: ", ";\n        height: ", ";\n      }\n      color: ", ";\n      &:hover {\n        background-color: transparent;\n      }\n      &.Mui-disabled {\n        /*Disabled and unchecked*/\n        color: ", ";\n        + .MuiSwitch-track {\n          /*Disabled and unchecked bar*/\n          background-color: ", ";\n        }\n      }\n      &.Mui-disabled.Mui-checked {\n        /*Disabled and checked*/\n        color: ", ";\n        + .MuiSwitch-track {\n          /*Disabled and checked bar*/\n          background-color: ", ";\n        }\n      }\n      &.Mui-checked {\n        /*Enabled and checked*/\n        color: ", ";\n        transform: translateX(", ");\n        &:hover {\n          background-color: transparent;\n        }\n        + .MuiSwitch-track {\n          /*Enabled and checked bar*/\n          background-color: ", ";\n        }\n      }\n    }\n  }\n"])), function (props) {
+var SwitchContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  width: ", ";\n  height: 40px;\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -141,16 +188,38 @@ var SwitchContainer = _styledComponents["default"].div(_templateObject || (_temp
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
+});
+
+var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  color: ", ";\n  opacity: 1;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  cursor: ", ";\n\n  ", ";\n\n  ", "\n"])), function (props) {
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledLabelFontColorOnDark : props.theme.disabledLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
 }, function (props) {
-  return props.disabled ? "not-allowed" : "default";
+  return props.theme.labelFontFamily;
 }, function (props) {
-  return props.theme.trackWidth;
+  return props.theme.labelFontSize;
 }, function (props) {
-  return "".concat(props.backgroundType === "dark" ? props.theme.thumbFocusColorOnDark : props.theme.thumbFocusColor, " solid 2px");
+  return props.disabled ? props.theme.disabledLabelFontStyle : props.theme.labelFontStyle;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.uncheckedTrackBackgroundColorOnDark : props.theme.uncheckedTrackBackgroundColor;
+  return props.theme.labelFontWeight;
+}, function (props) {
+  return props.disabled === true ? "not-allowed" : "pointer";
+}, function (props) {
+  return !props.hasLabel ? "margin: 0px;" : props.labelPosition === "after" ? "margin-left: ".concat(props.theme.spaceBetweenLabelSwitch, ";") : "margin-right: ".concat(props.theme.spaceBetweenLabelSwitch, ";");
+}, function (props) {
+  return props.labelPosition === "before" && "order: -1";
+});
+
+var SwitchBase = _styledComponents["default"].label(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  cursor: pointer;\n  margin: ", ";\n"])), function (props) {
+  return !props.hasLabel ? "0px 4px" : props.labelPosition === "before" ? "0 4px 0 12px" : "0 12px 0 4px";
+});
+
+var SwitchInput = _styledComponents["default"].input(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  opacity: 0;\n  width: 0;\n  height: 0;\n  margin: 0px;\n"])));
+
+var SwitchTrack = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  border-radius: 15px;\n  width: ", ";\n  height: ", ";\n  position: relative;\n  transition: transform 0.2s ease;\n\n  &:focus-visible {\n    outline: none;\n    ::before {\n      outline: ", ";\n      outline-offset: 6px;\n    }\n  }\n\n  /* Thumb element */\n  ::before {\n    content: \"\";\n    transform: initial;\n    transition: transform 0.2s ease;\n    position: absolute;\n    width: ", ";\n    height: ", ";\n    border-radius: 50%;\n    z-index: 1;\n    box-shadow: 0px 2px 1px -1px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%);\n    bottom: -6px;\n    left: -4px;\n    transform: translateX(0px);\n    background-color: ", ";\n  }\n\n  /* Unchecked */\n  background-color: ", ";\n\n  /* Checked */\n  &[data-checked=\"true\"] {\n    background-color: ", ";\n    ::before {\n      transform: translateX(", ");\n      background-color: ", ";\n    }\n  }\n"])), function (props) {
+  return props.theme.trackWidth;
 }, function (props) {
   return props.theme.trackHeight;
+}, function (props) {
+  return "".concat(props.backgroundType === "dark" ? props.theme.thumbFocusColorOnDark : props.theme.thumbFocusColor, " solid 2px");
 }, function (props) {
   return props.theme.thumbWidth;
 }, function (props) {
@@ -158,38 +227,25 @@ var SwitchContainer = _styledComponents["default"].div(_templateObject || (_temp
 }, function (props) {
   return props.backgroundType === "dark" ? props.theme.uncheckedThumbBackgroundColorOnDark : props.theme.uncheckedThumbBackgroundColor;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledUncheckedThumbBackgroundColorOnDark : props.theme.disabledUncheckedThumbBackgroundColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledUncheckedTrackBackgroundColorOnDark : props.theme.disabledUncheckedTrackBackgroundColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledCheckedThumbBackgroundColorOnDark : props.theme.disabledCheckedThumbBackgroundColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledCheckedTrackBackgroundColorOnDark : props.theme.disabledCheckedTrackBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.uncheckedTrackBackgroundColorOnDark : props.theme.uncheckedTrackBackgroundColor;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.checkedThumbBackgroundColorOnDark : props.theme.checkedThumbBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.checkedTrackBackgroundColorOnDark : props.theme.checkedTrackBackgroundColor;
 }, function (props) {
   return props.theme.thumbShift;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.checkedTrackBackgroundColorOnDark : props.theme.checkedTrackBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.checkedThumbBackgroundColorOnDark : props.theme.checkedThumbBackgroundColor;
 });
 
-var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  color: ", ";\n  opacity: 1;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  cursor: ", ";\n  ", "\n\n  ", "\n"])), function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledLabelFontColorOnDark : props.theme.disabledLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
-}, function (props) {
-  return props.theme.labelFontFamily;
-}, function (props) {
-  return props.theme.labelFontSize;
-}, function (props) {
-  return props.disabled ? props.theme.disabledLabelFontStyle : props.theme.labelFontStyle;
+var DisabledSwitchTrack = (0, _styledComponents["default"])(SwitchTrack)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: not-allowed;\n\n  /* Unchecked */\n  background-color: ", ";\n\n  ::before {\n    background-color: ", ";\n  }\n\n  /* Checked */\n  &[data-checked=\"true\"] {\n    background-color: ", ";\n\n    ::before {\n      transform: translateX(", ");\n      background-color: ", ";\n    }\n  }\n"])), function (props) {
+  return props.backgroundType === "dark" ? props.theme.disabledUncheckedTrackBackgroundColorOnDark : props.theme.disabledUncheckedTrackBackgroundColor;
 }, function (props) {
-  return props.theme.labelFontWeight;
+  return props.backgroundType === "dark" ? props.theme.disabledUncheckedThumbBackgroundColorOnDark : props.theme.disabledUncheckedThumbBackgroundColor;
 }, function (props) {
-  return props.disabled === true ? "not-allowed" : "pointer";
+  return props.backgroundType === "dark" ? props.theme.disabledCheckedTrackBackgroundColorOnDark : props.theme.disabledCheckedTrackBackgroundColor;
 }, function (props) {
-  return props.labelPosition === "after" ? "margin-left: ".concat(props.theme.spaceBetweenLabelSwitch, ";") : "margin-right: ".concat(props.theme.spaceBetweenLabelSwitch, ";");
+  return props.theme.thumbShift;
 }, function (props) {
-  return props.labelPosition === "before" && "order: -1";
+  return props.backgroundType === "dark" ? props.theme.disabledCheckedThumbBackgroundColorOnDark : props.theme.disabledCheckedThumbBackgroundColor;
 });
-
 var _default = DxcSwitch;
 exports["default"] = _default;

package/switch/Switch.stories.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import { userEvent, within } from "@storybook/testing-library";
 import DxcSwitch from "./Switch";
 import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
@@ -21,6 +20,10 @@ export const Chromatic = () => (
       <Title title="Without label" theme="light" level={4} />
       <DxcSwitch />
     </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus-visible">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcSwitch label="Switch" labelPosition="after" />
+    </ExampleContainer>
     <ExampleContainer>
       <Title title="Checked" theme="light" level={4} />
       <DxcSwitch label="Switch" defaultChecked />
@@ -47,6 +50,10 @@ export const Chromatic = () => (
           <Title title="With label" theme="dark" level={4} />
           <DxcSwitch label="Switch" />
         </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-focus-visible">
+          <Title title="Focused" theme="dark" level={4} />
+          <DxcSwitch label="Switch" labelPosition="after" />
+        </ExampleContainer>
         <ExampleContainer>
           <Title title="Checked" theme="dark" level={4} />
           <DxcSwitch label="Switch" defaultChecked />
@@ -129,32 +136,3 @@ export const Chromatic = () => (
     </ExampleContainer>
   </>
 );
-
-const Switch = () => (
-  <ExampleContainer>
-    <Title title="Focused" theme="light" level={4} />
-    <DxcSwitch label="Switch" />
-  </ExampleContainer>
-);
-export const FocusedSwitch = Switch.bind({});
-FocusedSwitch.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  canvas.getByRole("switch").focus();
-};
-
-const DarkSwitch = () => (
-  <BackgroundColorProvider color="#333333">
-    <DarkContainer>
-      <ExampleContainer>
-        <Title title="Focused" theme="dark" level={4} />
-        <DxcSwitch label="Switch" />
-      </ExampleContainer>
-    </DarkContainer>
-  </BackgroundColorProvider>
-);
-
-export const FocusedSwitchOnDark = DarkSwitch.bind({});
-FocusedSwitchOnDark.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  canvas.getByRole("switch").focus();
-};