@dxc-technology/halstack-react 6.2.1 → 7.0.0

package/slider/Slider.js

@@ -100,8 +100,9 @@ var DxcSlider = function DxcSlider(_ref) {
       while (index <= numberOfMarks) {
         ticks.push( /*#__PURE__*/_react["default"].createElement(TickMark, {
           disabled: disabled,
-          stepPosition: step * index / range * 100,
-          backgroundType: backgroundType
+          stepPosition: step * index / range,
+          backgroundType: backgroundType,
+          stepValue: (value !== null && value !== void 0 ? value : innerValue) / maxValue
         }));
         index++;
       }
@@ -110,7 +111,7 @@ var DxcSlider = function DxcSlider(_ref) {
     } else {
       return null;
     }
-  }, [minValue, maxValue, step]);
+  }, [minValue, maxValue, step, value, innerValue]);
 
   var handleSliderChange = function handleSliderChange(event) {
     var valueToCheck = event.target.value;
@@ -321,14 +322,16 @@ var MarksContainer = _styledComponents["default"].div(_templateObject10 || (_tem
   return props.isFirefox ? getFireFoxStyles() : getChromeStyles();
 });
 
-var TickMark = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  background: ", ";\n  height: ", ";\n  width: ", ";\n  border-radius: 18px;\n  left: ", ";\n"])), function (props) {
+var TickMark = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  background: ", ";\n  height: ", ";\n  width: ", ";\n  border-radius: 18px;\n  left: ", ";\n  ", ";\n"])), function (props) {
   return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledTickBackgroundColorOnDark : props.theme.disabledTickBackgroundColor : props.backgroundType === "dark" ? props.theme.tickBackgroundColorOnDark : props.theme.tickBackgroundColor;
 }, function (props) {
   return props.theme.tickHeight;
 }, function (props) {
   return props.theme.tickWidth;
 }, function (props) {
-  return "".concat(props.stepPosition, "%");
+  return "calc(".concat(props.stepPosition, " * 100%)");
+}, function (props) {
+  return !props.disabled ? "z-index: ".concat(props.stepPosition <= props.stepValue ? "0" : "1") : "";
 });
 
 var StyledTextInput = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n  max-width: 70px;\n"])), function (props) {

package/switch/Switch.js

@@ -31,15 +31,13 @@ var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabel
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
-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); }
 
 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,10 +69,6 @@ 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"]);
@@ -89,30 +83,16 @@ var DxcSwitch = function DxcSwitch(_ref) {
         refTrack.current.focus();
         var isChecked = !(checked !== null && checked !== void 0 ? checked : innerChecked);
         setInnerChecked(isChecked);
-
-        if (typeof onChange === "function") {
-          onChange(isChecked);
-        }
-
+        onChange === null || onChange === void 0 ? void 0 : onChange(isChecked);
         break;
     }
   };
 
   var handlerSwitchChange = function handlerSwitchChange(event) {
-    if (checked === undefined) {
-      var _event$target$checked;
-
-      var isChecked = (_event$target$checked = event.target.checked) !== null && _event$target$checked !== void 0 ? _event$target$checked : !innerChecked;
-      setInnerChecked(isChecked);
-
-      if (typeof onChange === "function") {
-        onChange(isChecked);
-      }
-    } else {
-      if (typeof onChange === "function") {
-        onChange(!checked);
-      }
-    }
+    checked !== null && checked !== void 0 ? checked : setInnerChecked(function (innerChecked) {
+      return !innerChecked;
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(checked ? !checked : !innerChecked);
   };
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
@@ -120,47 +100,38 @@ var DxcSwitch = function DxcSwitch(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(SwitchContainer, {
     margin: margin,
     size: size,
-    onKeyDown: handleOnKeyDown
-  }, labelPosition === "before" && hasLabel && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    onKeyDown: handleOnKeyDown,
+    disabled: disabled,
+    onClick: !disabled ? handlerSwitchChange : undefined
+  }, labelPosition === "before" && label && /*#__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,
-    hasLabel: hasLabel,
-    htmlFor: labelId,
-    onClick: disabled === true ? function () {} : handlerSwitchChange
-  }, /*#__PURE__*/_react["default"].createElement(SwitchInput, {
+    label: label
+  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, translatedLabels.formFields.optionalLabel)), /*#__PURE__*/_react["default"].createElement(ValueInput, {
     type: "checkbox",
-    role: "switch",
     name: name,
-    id: labelId,
-    disabled: disabled,
+    "aria-hidden": true,
     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, {
+    disabled: disabled,
+    checked: checked !== null && checked !== void 0 ? checked : innerChecked,
+    readOnly: true
+  }), /*#__PURE__*/_react["default"].createElement(SwitchBase, null, /*#__PURE__*/_react["default"].createElement(SwitchTrack, {
+    role: "switch",
     backgroundType: backgroundType,
-    "data-checked": checked !== null && checked !== void 0 ? checked : innerChecked ? innerChecked : undefined,
-    tabIndex: tabIndex,
+    "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked,
+    "aria-disabled": disabled,
+    disabled: disabled,
+    "aria-labelledby": labelId,
+    tabIndex: !disabled ? tabIndex : -1,
     ref: refTrack
-  })), labelPosition === "after" && hasLabel && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+  })), labelPosition === "after" && label && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
     id: labelId,
     labelPosition: labelPosition,
-    onClick: !disabled ? handlerSwitchChange : undefined,
     disabled: disabled,
     backgroundType: backgroundType,
-    hasLabel: hasLabel
+    label: label
   }, optional && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, translatedLabels.formFields.optionalLabel), " ", label)));
 };
 
@@ -176,8 +147,60 @@ 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  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) {
+var getDisabledColor = function getDisabledColor(props, element, subelement) {
+  switch (element) {
+    case "track":
+      switch (subelement) {
+        case "check":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledCheckedTrackBackgroundColorOnDark : props.theme.disabledCheckedTrackBackgroundColor;
+
+        case "uncheck":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledUncheckedTrackBackgroundColorOnDark : props.theme.disabledUncheckedTrackBackgroundColor;
+      }
+
+    case "thumb":
+      switch (subelement) {
+        case "check":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledCheckedThumbBackgroundColorOnDark : props.theme.disabledCheckedThumbBackgroundColor;
+
+        case "uncheck":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledUncheckedThumbBackgroundColorOnDark : props.theme.disabledUncheckedThumbBackgroundColor;
+      }
+
+    case "label":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledLabelFontColorOnDark : props.theme.disabledLabelFontColor;
+  }
+};
+
+var getNotDisabledColor = function getNotDisabledColor(props, element, subelement) {
+  switch (element) {
+    case "track":
+      switch (subelement) {
+        case "check":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.checkedTrackBackgroundColorOnDark : props.theme.checkedTrackBackgroundColor;
+
+        case "uncheck":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.uncheckedTrackBackgroundColorOnDark : props.theme.uncheckedTrackBackgroundColor;
+      }
+
+    case "thumb":
+      switch (subelement) {
+        case "check":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.checkedThumbBackgroundColorOnDark : props.theme.checkedThumbBackgroundColor;
+
+        case "uncheck":
+          return props.backgroundType && props.backgroundType === "dark" ? props.theme.uncheckedThumbBackgroundColorOnDark : props.theme.uncheckedThumbBackgroundColor;
+      }
+
+    case "label":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
+  }
+};
+
+var SwitchContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  width: ", ";\n  height: 40px;\n  cursor: ", ";\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.disabled === true ? "not-allowed" : "pointer";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -190,8 +213,8 @@ var SwitchContainer = _styledComponents["default"].div(_templateObject || (_temp
   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;
+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\n  ", ";\n\n  ", "\n"])), function (props) {
+  return props.disabled ? getDisabledColor(props, "label") : getNotDisabledColor(props, "label");
 }, function (props) {
   return props.theme.labelFontFamily;
 }, function (props) {
@@ -201,23 +224,21 @@ var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_tem
 }, function (props) {
   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, ";");
+  return !props.label ? "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 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: 0px 12px;\n"])));
 
-var SwitchInput = _styledComponents["default"].input(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  opacity: 0;\n  width: 0;\n  height: 0;\n  margin: 0px;\n"])));
+var ValueInput = _styledComponents["default"].input(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\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) {
+var SwitchTrack = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  border-radius: 15px;\n  width: ", ";\n  height: ", ";\n  position: relative;\n  cursor: ", ";\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    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  &[aria-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 props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
   return "".concat(props.backgroundType === "dark" ? props.theme.thumbFocusColorOnDark : props.theme.thumbFocusColor, " solid 2px");
 }, function (props) {
@@ -225,27 +246,16 @@ var SwitchTrack = _styledComponents["default"].span(_templateObject5 || (_templa
 }, function (props) {
   return props.theme.thumbHeight;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.uncheckedThumbBackgroundColorOnDark : props.theme.uncheckedThumbBackgroundColor;
+  return props.disabled ? getDisabledColor(props, "thumb", "uncheck") : getNotDisabledColor(props, "thumb", "uncheck");
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.uncheckedTrackBackgroundColorOnDark : props.theme.uncheckedTrackBackgroundColor;
+  return props.disabled ? getDisabledColor(props, "track", "uncheck") : getNotDisabledColor(props, "track", "uncheck");
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.checkedTrackBackgroundColorOnDark : props.theme.checkedTrackBackgroundColor;
+  return props.disabled ? getDisabledColor(props, "track", "check") : getNotDisabledColor(props, "track", "check");
 }, function (props) {
   return props.theme.thumbShift;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.checkedThumbBackgroundColorOnDark : props.theme.checkedThumbBackgroundColor;
+  return props.disabled ? getDisabledColor(props, "thumb", "check") : getNotDisabledColor(props, "thumb", "check");
 });
 
-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.backgroundType === "dark" ? props.theme.disabledUncheckedThumbBackgroundColorOnDark : props.theme.disabledUncheckedThumbBackgroundColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledCheckedTrackBackgroundColorOnDark : props.theme.disabledCheckedTrackBackgroundColor;
-}, function (props) {
-  return props.theme.thumbShift;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledCheckedThumbBackgroundColorOnDark : props.theme.disabledCheckedThumbBackgroundColor;
-});
 var _default = DxcSwitch;
 exports["default"] = _default;

package/switch/Switch.test.js

@@ -185,28 +185,41 @@ describe("Switch component tests", function () {
     expect(onChange.mock.calls[1][0]).toBe(false);
   });
   test("Renders with correct initial value and initial state when it is uncontrolled", function () {
-    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
+    var component = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
       label: "Default label",
       defaultChecked: true,
-      value: "test-defaultChecked"
+      value: "test-defaultChecked",
+      name: "test"
+    }));
+    var switchEl = component.getByRole("switch");
+    var inputEl = component.container.querySelector("input[name=\"test\"]");
+    expect(inputEl.value).toBe("test-defaultChecked");
+    expect(switchEl.getAttribute("aria-checked")).toBe("true");
+  });
+  test("Renders with correct aria attributes", function () {
+    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
+      label: "Default label"
     })),
+        getByText = _render10.getByText,
         getByRole = _render10.getByRole;
 
-    var inputEl = getByRole("switch");
-    expect(inputEl.checked).toBe(true);
-    expect(inputEl.value).toBe("test-defaultChecked");
-    expect(inputEl.getAttribute("aria-checked")).toBe("true");
+    var switchEl = getByRole("switch");
+    var label = getByText("Default label");
+    expect(switchEl.getAttribute("aria-labelledby")).toBe(label.id);
+    expect(switchEl.getAttribute("aria-checked")).toBe("false");
   });
-  test("Renders with correct aria attributes", function () {
+  test("Renders disabled switch correctly", function () {
     var _render11 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
-      label: "Default label"
+      label: "Default label",
+      disabled: true
     })),
-        getByRole = _render11.getByRole,
-        getByText = _render11.getByText;
+        getByText = _render11.getByText,
+        getByRole = _render11.getByRole;
 
-    var inputEl = getByRole("switch");
+    var switchEl = getByRole("switch");
     var label = getByText("Default label");
-    expect(inputEl.getAttribute("aria-labelledby")).toBe(label.id);
-    expect(inputEl.getAttribute("aria-checked")).toBe("false");
+    expect(switchEl.getAttribute("aria-labelledby")).toBe(label.id);
+    expect(switchEl.getAttribute("aria-checked")).toBe("false");
+    expect(switchEl.getAttribute("aria-disabled")).toBe("true");
   });
 });

package/table/Table.js

@@ -66,7 +66,7 @@ var DxcTableContainer = _styledComponents["default"].div(_templateObject || (_te
   return props.theme.scrollBarTrackColor;
 });
 
-var DxcTableContent = _styledComponents["default"].table(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  border-collapse: collapse;\n  width: 100%;\n\n  & tr {\n    border-bottom: ", ";\n  }\n  & td {\n    background-color: ", ";\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    text-transform: ", ";\n    text-align: ", ";\n    line-height: ", ";\n    padding: ", ";\n  }\n  & th {\n    background-color: ", ";\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    text-transform: ", ";\n    text-align: ", ";\n    line-height: ", ";\n    padding: ", ";\n  }\n  & th:first-child {\n    border-top-left-radius: ", ";\n  }\n  & th:last-child {\n    border-top-right-radius: ", ";\n  }\n"])), function (props) {
+var DxcTableContent = _styledComponents["default"].table(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  border-collapse: collapse;\n  width: 100%;\n\n  & tr {\n    border-bottom: ", ";\n    height: 60px;\n  }\n  & td {\n    background-color: ", ";\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    text-transform: ", ";\n    text-align: ", ";\n    line-height: ", ";\n    padding: ", ";\n  }\n  & th {\n    background-color: ", ";\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    text-transform: ", ";\n    text-align: ", ";\n    line-height: ", ";\n    padding: ", ";\n  }\n  & th:first-child {\n    border-top-left-radius: ", ";\n  }\n  & th:last-child {\n    border-top-right-radius: ", ";\n  }\n  & td:last-child {\n    padding-right: 40px;\n  }\n"])), function (props) {
   return "".concat(props.theme.rowSeparatorThickness, " ").concat(props.theme.rowSeparatorStyle, " ").concat(props.theme.rowSeparatorColor);
 }, function (props) {
   return props.theme.dataBackgroundColor;