@dxc-technology/halstack-react 0.0.0-dcd93c4 → 0.0.0-dddc3c4

package/slider/Slider.js

@@ -17,8 +17,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _Slider = _interopRequireDefault(require("@material-ui/lab/Slider"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _TextInput = _interopRequireDefault(require("../text-input/TextInput"));
@@ -31,9 +29,7 @@ var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
-var _uuid = require("uuid");
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
 
 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); }
 
@@ -74,28 +70,57 @@ var DxcSlider = function DxcSlider(_ref) {
       innerValue = _useState2[0],
       setInnerValue = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      dragging = _useState4[0],
+      setDragging = _useState4[1];
+
   var colorsTheme = (0, _useTheme["default"])();
   var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
-
-  var _useState3 = (0, _react.useState)("label-".concat((0, _uuid.v4)())),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
-      labelId = _useState4[0];
-
+  var labelId = "slider" + (0, _react.useId)();
   var minLabel = (0, _react.useMemo)(function () {
     return labelFormatCallback ? labelFormatCallback(minValue) : minValue;
   }, [labelFormatCallback, minValue]);
   var maxLabel = (0, _react.useMemo)(function () {
     return labelFormatCallback ? labelFormatCallback(maxValue) : maxValue;
   }, [labelFormatCallback, maxValue]);
+  var tickMarks = (0, _react.useMemo)(function () {
+    var ticks = [];
+    var numberOfMarks = Math.floor(maxValue / step - minValue / step);
+    var index = 0;
+    var range = maxValue - minValue;
+
+    if (marks) {
+      while (index <= numberOfMarks) {
+        ticks.push( /*#__PURE__*/_react["default"].createElement(TickMark, {
+          disabled: disabled,
+          stepPosition: step * index / range * 100,
+          backgroundType: backgroundType
+        }));
+        index++;
+      }
+
+      return ticks;
+    } else {
+      return null;
+    }
+  }, [minValue, maxValue, step]);
+
+  var handleSliderChange = function handleSliderChange(event) {
+    var valueToCheck = event.target.value;
+    (valueToCheck !== value || valueToCheck !== innerValue) && setInnerValue(valueToCheck);
+    onChange === null || onChange === void 0 ? void 0 : onChange(valueToCheck);
+  };
 
-  var handlerSliderChange = function handlerSliderChange(event, newValue) {
-    var valueToCheck = value !== null && value !== void 0 ? value : innerValue;
-    valueToCheck !== newValue && setInnerValue(newValue);
-    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  var handleSliderDragging = function handleSliderDragging() {
+    setDragging(true);
   };
 
-  var handleSliderOnChangeCommited = function handleSliderOnChangeCommited(event, selectedValue) {
-    onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd(selectedValue);
+  var handleSliderOnChangeCommited = function handleSliderOnChangeCommited(event) {
+    if (dragging) {
+      setDragging(false);
+      onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd(event.target.value);
+    }
   };
 
   var handlerInputChange = function handlerInputChange(event) {
@@ -110,6 +135,7 @@ var DxcSlider = function DxcSlider(_ref) {
     }
   };
 
+  var isFirefox = navigator.userAgent.indexOf("Firefox") !== -1;
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.slider
   }, /*#__PURE__*/_react["default"].createElement(Container, {
@@ -122,28 +148,36 @@ var DxcSlider = function DxcSlider(_ref) {
   }, label), /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled,
     backgroundType: backgroundType
-  }, helperText), /*#__PURE__*/_react["default"].createElement(SliderContainer, {
-    backgroundType: backgroundType
-  }, showLimitsValues && /*#__PURE__*/_react["default"].createElement(MinLabelContainer, {
+  }, helperText), /*#__PURE__*/_react["default"].createElement(SliderContainer, null, showLimitsValues && /*#__PURE__*/_react["default"].createElement(MinLabelContainer, {
     backgroundType: backgroundType,
     disabled: disabled
-  }, minLabel), /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
-    value: value != null && value >= 0 && value || innerValue,
+  }, minLabel), /*#__PURE__*/_react["default"].createElement(SliderInputContainer, null, /*#__PURE__*/_react["default"].createElement(SliderInput, {
+    role: "slider",
+    type: "range",
+    value: value != null && value >= 0 ? value : innerValue,
     min: minValue,
     max: maxValue,
-    onChange: handlerSliderChange,
-    onChangeCommitted: handleSliderOnChangeCommited,
     step: step,
-    marks: marks || [],
+    marks: marks,
     disabled: disabled,
-    "aria-labelledby": labelId
-  }), showLimitsValues && /*#__PURE__*/_react["default"].createElement(MaxLabelContainer, {
+    "aria-labelledby": labelId,
+    "aria-orientation": "horizontal",
+    "aria-valuemax": maxValue,
+    "aria-valuemin": minValue,
+    "aria-valuenow": value != null && value >= 0 ? value : innerValue,
+    onChange: handleSliderChange,
+    onMouseUp: handleSliderOnChangeCommited,
+    onMouseDown: handleSliderDragging,
+    backgroundType: backgroundType
+  }), marks && /*#__PURE__*/_react["default"].createElement(MarksContainer, {
+    isFirefox: isFirefox
+  }, tickMarks)), showLimitsValues && /*#__PURE__*/_react["default"].createElement(MaxLabelContainer, {
     backgroundType: backgroundType,
     disabled: disabled,
     step: step
   }, maxLabel), showInput && /*#__PURE__*/_react["default"].createElement(StyledTextInput, null, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
     name: name,
-    value: value != null && value >= 0 && value.toString() || innerValue.toString(),
+    value: value != null && value >= 0 ? value.toString() : innerValue.toString(),
     disabled: disabled,
     onChange: handlerInputChange,
     size: "fillParent"
@@ -160,6 +194,14 @@ 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 getChromeStyles = function getChromeStyles() {
+  return "\n  width: 100%;\n  margin-right: 4px;";
+};
+
+var getFireFoxStyles = function getFireFoxStyles() {
+  return "\n  width: calc(100% - 16px);\n  margin-right: 3px;";
+};
+
 var Container = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n"])), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -188,7 +230,7 @@ var Label = _styledComponents["default"].label(_templateObject2 || (_templateObj
   return props.theme.labelLineHeight;
 });
 
-var HelperText = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), function (props) {
+var HelperText = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), function (props) {
   return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledHelperTextFontColorOnDark : props.theme.disabledHelperTextFontColor : props.backgroundType === "dark" ? props.theme.helperTextFontColorOnDark : props.theme.helperTextFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -202,83 +244,51 @@ var HelperText = _styledComponents["default"].span(_templateObject3 || (_templat
   return props.theme.helperTextLineHeight;
 });
 
-var SliderContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 48px;\n  align-items: center;\n\n  .MuiSlider-root {\n    min-width: 15rem;\n  }\n  .MuiSlider-container {\n    padding: 30px 24px;\n  }\n  .MuiSlider-root.Mui-disabled {\n    color: ", ";\n    cursor: not-allowed;\n  }\n  .Mui-disabled {\n    & .MuiSlider-thumb {\n      height: ", ";\n      width: ", ";\n      background-color: ", ";\n      top: ", ";\n    }\n    & .MuiSlider-track {\n      background-color: ", ";\n    }\n    & .MuiSlider-rail {\n      background-color: ", ";\n    }\n    & > .MuiSlider-mark.MuiSlider-markActive {\n      background-color: ", " !important;\n    }\n    & > .MuiSlider-mark {\n      background-color: ", ";\n      height: ", ";\n      width: ", ";\n      border-radius: 18px;\n      top: ", ";\n    }\n  }\n  .MuiSlider-thumb {\n    height: ", ";\n    width: ", ";\n    background-color: ", ";\n    top: ", ";\n    border-radius: 9999px;\n\n    :hover,\n    &.Mui-focusVisible {\n      box-shadow: none;\n    }\n    &.MuiSlider-active {\n      box-shadow: none;\n    }\n    :focus {\n      outline: ", "\n        auto 1px;\n      outline-offset: 2px;\n      background-color: ", ";\n    }\n    :hover {\n      background-color: ", ";\n      transform: scale(", ");\n      transform-origin: center;\n      height: ", ";\n      width: ", ";\n      top: ", ";\n    }\n    :active {\n      background-color: ", ";\n      transform: scale(", ");\n      transform-origin: center;\n    }\n  }\n  .MuiSlider-track {\n    background-color: ", ";\n    height: ", ";\n    top: ", ";\n    border-radius: 9999px;\n  }\n  .MuiSlider-track.MuiSlider-trackAfter {\n    background-color: ", ";\n  }\n  .MuiSlider-rail {\n    background-color: ", ";\n    height: ", ";\n    top: ", ";\n  }\n  .MuiSlider-mark.MuiSlider-markActive {\n    background-color: ", ";\n  }\n  .MuiSlider-mark {\n    background-color: ", ";\n    height: ", ";\n    width: ", ";\n    border-radius: 18px;\n    top: ", ";\n  }\n"])), function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledThumbBackgroundColorOnDark : props.theme.disabledThumbBackgroundColor;
-}, function (props) {
-  return props.theme.thumbHeight;
-}, function (props) {
-  return props.theme.thumbWidth;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledThumbBackgroundColorOnDark : props.theme.disabledThumbBackgroundColor;
-}, function (props) {
-  return props.theme.disabledThumbVerticalPosition;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledTrackLineColorOnDark : props.theme.disabledTrackLineColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledTotalLineColorOnDark : props.theme.disabledTotalLineColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledTickBackgroundColorOnDark : props.theme.disabledTickBackgroundColor;
+var SliderInput = _styledComponents["default"].input(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n  min-width: 240px;\n  height: ", ";\n  display: inline-block;\n  vertical-align: middle;\n  -webkit-appearance: none;\n  background-color: ", ";\n  background-image: ", ";\n  background-repeat: no-repeat;\n  background-size: ", ";\n  border-radius: 5px;\n  z-index: 1;\n  cursor: ", ";\n  &::-webkit-slider-runnable-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n    margin: 0px -8px;\n  }\n\n  &::-webkit-slider-thumb {\n    -webkit-appearance: none;\n    border: none;\n    height: ", ";\n    width: ", ";\n    border-radius: 25px;\n    background: ", ";\n    &:active {\n      ", "\n    }\n    &:hover {\n      ", "\n    }\n  }\n  &::-moz-range-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n  }\n  &::-moz-range-thumb {\n    -webkit-appearance: none;\n    border: none;\n    height: ", ";\n    width: ", ";\n    border-radius: 25px;\n    background: ", ";\n    &:active {\n      background: ", ";\n      transform: scale(1.16667);\n    }\n    &:hover {\n      ", "\n    }\n  }\n  &:focus {\n    outline: none;\n    &::-webkit-slider-thumb {\n      outline: ", "\n        auto 1px;\n      outline-offset: 2px;\n    }\n    &::-moz-range-thumb {\n      outline: ", "\n        auto 1px;\n      outline-offset: 2px;\n    }\n  }\n"])), function (props) {
+  return props.theme.trackLineThickness;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.disabledTickBackgroundColorOnDark : props.theme.disabledTickBackgroundColor;
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledTotalLineColorOnDark + "61" : props.theme.disabledTotalLineColor + "61" : props.backgroundType === "dark" ? props.theme.totalLineColorOnDark + "61" : props.theme.totalLineColor + "61";
 }, function (props) {
-  return props.theme.tickHeight;
+  return props.disabled ? props.backgroundType === "dark" ? "linear-gradient(".concat(props.theme.disabledTrackLineColorOnDark, ", ").concat(props.theme.disabledTrackLineColorOnDark, ")") : "linear-gradient(".concat(props.theme.disabledTrackLineColor, ", ").concat(props.theme.disabledTrackLineColor, ")") : props.backgroundType === "dark" ? "linear-gradient(".concat(props.theme.trackLineColorOnDark, ", ").concat(props.theme.trackLineColorOnDark, ")") : "linear-gradient(".concat(props.theme.trackLineColor, ", ").concat(props.theme.trackLineColor, ")");
 }, function (props) {
-  return props.theme.tickWidth;
+  return (props.value - props.min) * 100 / (props.max - props.min) + "% 100%";
 }, function (props) {
-  return props.theme.disabledTickVerticalPosition;
+  return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
   return props.theme.thumbHeight;
 }, function (props) {
   return props.theme.thumbWidth;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.thumbBackgroundColorOnDark : props.theme.thumbBackgroundColor;
-}, function (props) {
-  return props.theme.thumbVerticalPosition;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledThumbBackgroundColorOnDark : props.theme.disabledThumbBackgroundColor : props.backgroundType === "dark" ? props.theme.thumbBackgroundColorOnDark : props.theme.thumbBackgroundColor;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.focusThumbBackgroundColorOnDark : props.theme.focusThumbBackgroundColor;
+  if (!props.disabled) {
+    return "\n          background: ".concat(props.backgroundType === "dark" ? props.theme.activeThumbBackgroundColorOnDark : props.theme.activeThumbBackgroundColor, ";\n            transform: scale(1.16667);");
+  }
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.hoverThumbBackgroundColorOnDark : props.theme.hoverThumbBackgroundColor;
+  if (!props.disabled) {
+    return "height: ".concat(props.theme.hoverThumbHeight, ";\n          width: ").concat(props.theme.hoverThumbWidth, ";\n          transform: scale(1.16667);\n          transform-origin: center center;\n          background: ").concat(props.backgroundType === "dark" ? props.theme.hoverThumbBackgroundColorOnDark : props.theme.hoverThumbBackgroundColor, ";");
+  }
 }, function (props) {
-  return props.theme.hoverThumbScale;
-}, function (props) {
-  return props.theme.hoverThumbHeight;
+  return props.theme.thumbHeight;
 }, function (props) {
-  return props.theme.hoverThumbWidth;
+  return props.theme.thumbWidth;
 }, function (props) {
-  return props.theme.hoverThumbVerticalPosition;
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledThumbBackgroundColorOnDark : props.theme.disabledThumbBackgroundColor : props.backgroundType === "dark" ? props.theme.thumbBackgroundColorOnDark : props.theme.thumbBackgroundColor;
 }, function (props) {
   return props.backgroundType === "dark" ? props.theme.activeThumbBackgroundColorOnDark : props.theme.activeThumbBackgroundColor;
 }, function (props) {
-  return props.theme.activeThumbScale;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.trackLineColorOnDark : props.theme.trackLineColor;
+  if (!props.disabled) {
+    return "height: ".concat(props.theme.hoverThumbHeight, ";\n          width: ").concat(props.theme.hoverThumbWidth, ";\n          transform: scale(1.16667);\n          transform-origin: center center;\n          background: ").concat(props.backgroundType === "dark" ? props.theme.hoverThumbBackgroundColorOnDark : props.theme.hoverThumbBackgroundColor, ";");
+  }
 }, function (props) {
-  return props.theme.trackLineThickness;
-}, function (props) {
-  return props.theme.trackLineVerticalPosition;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.trackLineColorOnDark : props.theme.trackLineColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.totalLineColorOnDark : props.theme.totalLineColor;
-}, function (props) {
-  return props.theme.totalLineThickness;
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledFocusColorOnDark : props.theme.disabledFocusColor : props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
 }, function (props) {
-  return props.theme.totalLineVerticalPosition;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.tickBackgroundColorOnDark : props.theme.tickBackgroundColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.tickBackgroundColorOnDark : props.theme.tickBackgroundColor;
-}, function (props) {
-  return props.theme.tickHeight;
-}, function (props) {
-  return props.theme.tickWidth;
-}, function (props) {
-  return props.theme.tickVerticalPosition;
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledFocusColorOnDark : props.theme.disabledFocusColor : props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
 });
 
-var MinLabelContainer = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  white-space: nowrap;\n  margin-right: ", ";\n"])), function (props) {
+var SliderContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 48px;\n  align-items: center;\n"])));
+
+var LimitLabelContainer = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  white-space: nowrap;\n"])), function (props) {
   return props.disabled ? props.theme.disabledLimitValuesFontColor : props.backgroundType === "dark" ? props.theme.limitValuesFontColorOnDark : props.theme.limitValuesFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -290,27 +300,32 @@ var MinLabelContainer = _styledComponents["default"].span(_templateObject5 || (_
   return props.theme.limitValuesFontWeight;
 }, function (props) {
   return props.theme.limitValuesFontLetterSpacing;
-}, function (props) {
+});
+
+var MinLabelContainer = (0, _styledComponents["default"])(LimitLabelContainer)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: ", ";\n"])), function (props) {
   return props.theme.floorLabelMarginRight;
 });
+var MaxLabelContainer = (0, _styledComponents["default"])(LimitLabelContainer)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n"])), function (props) {
+  return props.step === 1 ? props.theme.ceilLabelMarginLeft : "1.25rem";
+});
 
-var MaxLabelContainer = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  white-space: nowrap;\n  margin-left: ", ";\n"])), function (props) {
-  return props.disabled ? props.theme.disabledLimitValuesFontColor : props.backgroundType === "dark" ? props.theme.limitValuesFontColorOnDark : props.theme.limitValuesFontColor;
-}, function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
-  return props.theme.limitValuesFontSize;
-}, function (props) {
-  return props.theme.limitValuesFontStyle;
+var SliderInputContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  width: 100%;\n  height: 24px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  margin-right: -2px;\n  padding-top: 1px;\n"])));
+
+var MarksContainer = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n  position: absolute;\n  pointer-events: none;\n  height: 100%;\n  display: flex;\n  align-items: center;\n"])), function (props) {
+  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) {
+  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.limitValuesFontWeight;
+  return props.theme.tickHeight;
 }, function (props) {
-  return props.theme.limitValuesFontLetterSpacing;
+  return props.theme.tickWidth;
 }, function (props) {
-  return props.step === 1 ? props.theme.ceilLabelMarginLeft : "1.25rem";
+  return "".concat(props.stepPosition, "%");
 });
 
-var StyledTextInput = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n  label + .MuiInput-formControl {\n    margin-top: 2px;\n  }\n  max-width: 70px;\n"])), function (props) {
+var StyledTextInput = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n  max-width: 70px;\n"])), function (props) {
   return props.theme.inputMarginLeft;
 });
 

package/slider/Slider.stories.tsx

@@ -171,7 +171,13 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large limit values labels" theme="light" level={4} />
-      <DxcSlider label="Slider" helperText="Help message" showLimitsValues labelFormatCallback={labelFormat} size="large" />
+      <DxcSlider
+        label="Slider"
+        helperText="Help message"
+        showLimitsValues
+        labelFormatCallback={labelFormat}
+        size="large"
+      />
     </ExampleContainer>
   </>
 );

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;