@dxc-technology/halstack-react 0.0.0-a678636 → 0.0.0-a9c6846

package/dist/sidenav/Sidenav.js

@@ -13,9 +13,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
@@ -23,14 +21,12 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
-require("../common/OpenSans.css");
-
-var _utils = require("../common/utils.js");
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
+var _BackgroundColorContext = require("../BackgroundColorContext.js");
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  flex-grow: 1;\n  height: 100%;\n  padding: ", ";\n  margin-left: ", ";\n  transition: margin 0.4s ease-in-out;\n  width: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  text-decoration: ", ";\n  margin: ", ";\n  cursor: pointer;\n\n  :focus-visible {\n    outline: 2px solid ", ";\n    outline-offset: 1px;\n  }\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -40,7 +36,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  position: absolute;\n  left: ", ";\n  top: ", ";\n  width: 42px;\n  min-height: 42px;\n  background-color: ", ";\n  border-radius: 50%;\n  transform: ", ";\n  transition: transform 0.4s ease-in-out;\n  cursor: pointer;\n  & > svg {\n    fill: ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 4px;\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -50,7 +46,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n  width: ", ";\n  box-sizing: border-box;\n  padding: ", ";\n  z-index: ", ";\n  transform: ", ";\n  transition: transform 0.4s ease-in-out;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 16px;\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -60,7 +56,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  position: relative;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n  max-width: 300px;\n  width: ", ";\n  padding: ", ";\n\n  overflow-y: auto;\n  overflow-x: hidden;\n  ::-webkit-scrollbar {\n    width: 2px;\n  }\n  ::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  ::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -70,153 +66,114 @@ function _templateObject() {
 }
 
 var DxcSidenav = function DxcSidenav(_ref) {
-  var navContent = _ref.navContent,
-      pageContent = _ref.pageContent,
-      padding = _ref.padding,
-      mode = _ref.mode,
-      arrowDistance = _ref.arrowDistance,
-      _ref$displayArrow = _ref.displayArrow,
-      displayArrow = _ref$displayArrow === void 0 ? true : _ref$displayArrow;
-  var ref = (0, _react.useRef)(null);
-
-  var _useState = (0, _react.useState)(),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      sidenavSize = _useState2[0],
-      setSidenavSize = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      isShown = _useState4[0],
-      setIsShown = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(),
-      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-      isResponsive = _useState6[0],
-      setIsResponsive = _useState6[1];
-
-  var customTheme = (0, _react.useContext)(_ThemeContext["default"]);
-  var colorsTheme = (0, _react.useMemo)(function () {
-    return (0, _utils.getCustomTheme)(_variables.theme, (0, _utils.getCustomTheme)(_variables.defaultTheme, customTheme));
-  }, [customTheme]);
-
-  var handleVisbility = function handleVisbility(width) {
-    setIsShown(width <= _variables.responsiveSizes.tablet ? false : true);
-  };
-
-  var handleResize = function handleResize(width) {
-    if (width) {
-      setSidenavSize(width);
-      if (width <= _variables.responsiveSizes.tablet ? setIsResponsive(true) : setIsResponsive(false)) ;
-    }
-  };
-
-  var handleEventListener = function handleEventListener() {
-    handleResize(ref.current.offsetWidth);
-  };
-
-  (0, _react.useEffect)(function () {
-    if (ref.current) {
-      window.addEventListener("resize", handleEventListener);
-      handleResize(ref.current.offsetWidth);
-      handleVisbility(ref.current.offsetWidth);
-    }
-
-    return function () {
-      window.removeEventListener("resize", handleEventListener);
-    };
-  }, []);
-
-  var handleSidenav = function handleSidenav() {
-    setIsShown(!isShown);
-  };
-
-  var ArrowIcon = function ArrowIcon() {
-    return _react["default"].createElement("svg", {
-      xmlns: "http://www.w3.org/2000/svg",
-      width: "15.995",
-      height: "10.01",
-      viewBox: "0 0 15.995 10.01"
-    }, _react["default"].createElement("path", {
-      "data-testid": "arrow-to-right",
-      d: "M17.71,11.29l-4-4a1,1,0,0,0-1.42,1.42L14.59,11H3a1,1,0,0,0,0,2H14.59l-2.3,2.29a1,1,0,1,0,1.42,1.42l4-4a1.034,1.034,0,0,0,0-1.42Z",
-      transform: "translate(-2 -6.996)"
-    }));
-  };
-
+  var padding = _ref.padding,
+      children = _ref.children;
+  var colorsTheme = (0, _useTheme["default"])();
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.sidenav
-  }, _react["default"].createElement(SidenavComponent, {
-    ref: ref
-  }, ref.current && _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(Sidenav, {
-    navContent: navContent,
-    isShown: isShown,
-    padding: padding,
-    mode: isResponsive ? "overlay" : mode,
-    sidenavSize: sidenavSize,
-    isResponsive: isResponsive
-  }, navContent, (displayArrow || isResponsive) && _react["default"].createElement(ArrowTrigger, {
-    onClick: handleSidenav,
-    isShown: isShown,
-    sidenavSize: sidenavSize,
-    arrowDistance: arrowDistance
-  }, _react["default"].createElement(ArrowIcon, {
-    isShown: isShown
-  }))), _react["default"].createElement(PageContent, {
-    pageContent: pageContent,
-    padding: padding,
-    isShown: isShown,
-    mode: isResponsive ? "overlay" : mode,
-    sidenavSize: sidenavSize,
-    isResponsive: isResponsive
-  }, pageContent))));
+  }, _react["default"].createElement(SideNavContainer, {
+    padding: padding
+  }, _react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
+    color: colorsTheme.sidenav.backgroundColor
+  }, children)));
 };
 
-var SidenavComponent = _styledComponents["default"].div(_templateObject());
+var Title = function Title(_ref2) {
+  var children = _ref2.children;
+  return _react["default"].createElement(SideNavMenuTitle, null, children);
+};
+
+var Subtitle = function Subtitle(_ref3) {
+  var children = _ref3.children;
+  return _react["default"].createElement(SideNavMenuSubTitle, null, children);
+};
+
+var Link = function Link(_ref4) {
+  var href = _ref4.href,
+      onClick = _ref4.onClick,
+      children = _ref4.children;
+  return _react["default"].createElement(SideNavMenuLink, {
+    href: href,
+    onClick: onClick
+  }, children);
+};
 
-var Sidenav = _styledComponents["default"].div(_templateObject2(), function (props) {
+var SideNavContainer = _styledComponents["default"].div(_templateObject(), function (props) {
   return props.theme.backgroundColor;
 }, function (props) {
-  return props.sidenavSize <= _variables.responsiveSizes.tablet ? "60%" : "300px";
+  return props.padding ? "calc(300px - ".concat(_variables.spaces[props.padding], " - ").concat(_variables.spaces[props.padding], ")") : "300px";
 }, function (props) {
   return props.padding ? _variables.spaces[props.padding] : "";
 }, function (props) {
-  return props.mode === "overlay" ? "400" : "auto";
+  return props.theme.scrollBarTrackColor;
 }, function (props) {
-  return props.isShown ? "translateX(0)" : !props.isShown ? "translateX(-100%)" : "";
+  return props.theme.scrollBarThumbColor;
 });
 
-var ArrowTrigger = _styledComponents["default"].div(_templateObject3(), function (props) {
-  return props.sidenavSize <= _variables.responsiveSizes.tablet ? "calc(100% - 21px)" : "279px";
+var SideNavMenuTitle = _styledComponents["default"].div(_templateObject2(), function (props) {
+  return props.theme.titleFontFamily;
 }, function (props) {
-  return props.arrowDistance ? props.arrowDistance : "calc(50% - 21px)";
+  return props.theme.titleFontSize;
 }, function (props) {
-  return "".concat(props.theme.arrowContainerColor).concat(props.theme.arrowContainerOpacity);
+  return props.theme.titleFontStyle;
 }, function (props) {
-  return props.isShown ? "rotate(-180deg)" : "rotate(0deg)";
+  return props.theme.titleFontWeight;
 }, function (props) {
-  return props.theme.arrowColor;
+  return props.theme.titleFontColor;
+}, function (props) {
+  return props.theme.titleFontLetterSpacing;
+}, function (props) {
+  return props.theme.titleFontTextTransform;
 });
 
-var PageContent = _styledComponents["default"].div(_templateObject4(), function (props) {
-  return props.padding ? _variables.spaces[props.padding] : "";
+var SideNavMenuSubTitle = _styledComponents["default"].div(_templateObject3(), function (props) {
+  return props.theme.subtitleFontFamily;
+}, function (props) {
+  return props.theme.subtitleFontSize;
+}, function (props) {
+  return props.theme.subtitleFontStyle;
+}, function (props) {
+  return props.theme.subtitleFontWeight;
+}, function (props) {
+  return props.theme.subtitleFontColor;
+}, function (props) {
+  return props.theme.subtitleFontLetterSpacing;
+}, function (props) {
+  return props.theme.subtitleFontTextTransform;
+});
+
+var SideNavMenuLink = _styledComponents["default"].a(_templateObject4(), function (props) {
+  return props.theme.linkFontFamily;
+}, function (props) {
+  return props.theme.linkFontSize;
+}, function (props) {
+  return props.theme.linkFontStyle;
+}, function (props) {
+  return props.theme.linkFontWeight;
+}, function (props) {
+  return props.theme.linkFontColor;
+}, function (props) {
+  return props.theme.linkFontLetterSpacing;
+}, function (props) {
+  return props.theme.linkFontTextTransform;
+}, function (props) {
+  return props.theme.linkTextDecoration;
 }, function (props) {
-  return props.isShown && props.mode === "push" && !props.isResponsive ? "" : !props.isResponsive ? "-300px" : "-60%";
+  return "".concat(props.theme.linkMarginTop, " ").concat(props.theme.linkMarginRight, " ").concat(props.theme.linkMarginBottom, " ").concat(props.theme.linkMarginLeft);
 }, function (props) {
-  return props.isShown && props.mode === "push" ? "calc(100% - 300px)" : "calc(100%)";
+  return props.theme.linkFocusColor;
 });
 
 DxcSidenav.propTypes = {
-  mode: _propTypes["default"].oneOf(["overlay", "push", ""]),
   padding: _propTypes["default"].oneOfType([_propTypes["default"].shape({
     top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
-  navContent: _propTypes["default"].object,
-  pageContent: _propTypes["default"].object,
-  arrowDistance: _propTypes["default"].string,
-  displayArrow: _propTypes["default"].bool
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
 };
+DxcSidenav.Title = Title;
+DxcSidenav.Subtitle = Subtitle;
+DxcSidenav.Link = Link;
 var _default = DxcSidenav;
 exports["default"] = _default;

package/dist/slider/Slider.js

@@ -9,12 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -25,18 +25,18 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-require("../common/OpenSans.css");
-
 var _InputText = _interopRequireDefault(require("../input-text/InputText"));
 
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: \"Open Sans\", sans-serif;\n  color: inherit;\n  font-size: 16px;\n  margin-left: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -46,7 +46,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: \"Open Sans\", sans-serif;\n  color: inherit;\n  font-size: 16px;\n  margin-right: 15px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  margin-right: 16px;\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -56,7 +56,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  width: ", ";\n\n  .MultiSlider-root {\n    display: flex;\n    align-items: center;\n  }\n  .MuiSlider-container {\n    padding: 30px 24px;\n  }\n\n  .MuiSlider-root.Mui-disabled {\n    opacity: ", ";\n    color: ", ";\n    cursor: not-allowed;\n  }\n\n  .Mui-disabled {\n    & .MuiSlider-thumb {\n      height: 14px;\n      width: 14px;\n      background-color: ", ";\n      top: 35%;\n    }\n    & .MuiSlider-track {\n      background-color: ", ";\n    }\n    & > .MuiSlider-mark.MuiSlider-markActive {\n      background-color: ", " !important;\n    }\n    & > .MuiSlider-mark {\n      background-color: ", ";\n      width: 6px;\n      height: 6px;\n      border-radius: 18px;\n    }\n    & .MuiSlider-rail {\n      opacity: 1;\n      opacity: ", ";\n    }\n  }\n  .MuiSlider-thumb {\n    height: 14px;\n    width: 14px;\n    background-color: ", ";\n    top: 45%;\n    :hover,\n    &.Mui-focusVisible {\n      box-shadow: none;\n    }\n    &.MuiSlider-active {\n      box-shadow: none;\n    }\n    :hover:not(:active) {\n      box-shadow: \"0px 0px 0px 18px #66666633\";\n    }\n    :active {\n      box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.2);\n      background-color: ", ";\n      top: 45%;\n      transform: scale(1.25);\n      transform-origin: center;\n    }\n    &:focus {\n      outline: ", " auto 1px;\n    }\n  }\n  .MuiSlider-track {\n    background-color: ", ";\n    height: 2px;\n    top: 50%;\n  }\n\n  .MuiSlider-track.MuiSlider-trackAfter {\n    background-color: ", ";\n  }\n  .MuiSlider-rail {\n    background-color: ", ";\n    top: 50%;\n    opacity: ", ";\n  }\n  .MuiSlider-mark.MuiSlider-markActive {\n    background-color: ", ";\n  }\n  .MuiSlider-mark {\n    background-color: ", ";\n    width: 6px;\n    height: 6px;\n    border-radius: 18px;\n    top: 42%;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n\n  .MultiSlider-root {\n    display: flex;\n    align-items: center;\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    }\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"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -66,7 +66,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  .MuiTextField-root {\n    font-size: 16px;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 32px;\n\n  label + .MuiInput-formControl {\n    margin-top: 2px;\n  }\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -94,6 +94,7 @@ var DxcSlider = function DxcSlider(_ref) {
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
       _ref$marks = _ref.marks,
       marks = _ref$marks === void 0 ? false : _ref$marks,
+      labelFormatCallback = _ref.labelFormatCallback,
       margin = _ref.margin,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "fillParent" : _ref$size;
@@ -103,10 +104,14 @@ var DxcSlider = function DxcSlider(_ref) {
       innerValue = _useState2[0],
       setInnerValue = _useState2[1];
 
-  var customTheme = (0, _react.useContext)(_ThemeContext["default"]);
-  var colorsTheme = (0, _react.useMemo)(function () {
-    return (0, _utils.getCustomTheme)(_variables.theme, (0, _utils.getCustomTheme)(_variables.defaultTheme, customTheme));
-  }, [customTheme]);
+  var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+  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 handlerSliderChange = function handlerSliderChange(event, newValue) {
     if (value == null) {
@@ -136,10 +141,12 @@ var DxcSlider = function DxcSlider(_ref) {
     theme: colorsTheme.slider
   }, _react["default"].createElement(SliderContainer, {
     margin: margin,
-    size: size
+    size: size,
+    backgroundType: backgroundType
   }, showLimitsValues && _react["default"].createElement(MinLabelContainer, {
+    backgroundType: backgroundType,
     disabled: disabled
-  }, minValue), _react["default"].createElement(_Slider["default"], {
+  }, minLabel), _react["default"].createElement(_Slider["default"], {
     value: value != null && value >= 0 && value || innerValue,
     min: minValue,
     max: maxValue,
@@ -151,17 +158,15 @@ var DxcSlider = function DxcSlider(_ref) {
     marks: marks || [],
     disabled: disabled
   }), showLimitsValues && _react["default"].createElement(MaxLabelContainer, {
+    backgroundType: backgroundType,
     disabled: disabled,
     step: step
-  }, maxValue), showInput && _react["default"].createElement(StyledTextInput, null, _react["default"].createElement(_InputText["default"], {
+  }, maxLabel), showInput && _react["default"].createElement(StyledTextInput, null, _react["default"].createElement(_InputText["default"], {
     name: name,
     value: value != null && value >= 0 && value || innerValue,
     disabled: disabled,
     onChange: handlerInputChange,
-    size: "small",
-    margin: {
-      left: "medium"
-    }
+    size: "small"
   }))));
 };
 
@@ -172,32 +177,7 @@ var sizes = {
 };
 
 var calculateWidth = function calculateWidth(margin, size) {
-  if (size === "fillParent") {
-    return "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
-  }
-
-  return sizes[size];
-};
-
-DxcSlider.propTypes = {
-  size: _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(sizes))),
-  minValue: _propTypes["default"].number,
-  maxValue: _propTypes["default"].number,
-  step: _propTypes["default"].number,
-  value: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
-  showLimitsValues: _propTypes["default"].bool,
-  showInput: _propTypes["default"].bool,
-  name: _propTypes["default"].string,
-  onChange: _propTypes["default"].func,
-  onDragEnd: _propTypes["default"].func,
-  disabled: _propTypes["default"].bool,
-  marks: _propTypes["default"].bool,
-  margin: _propTypes["default"].oneOfType([_propTypes["default"].shape({
-    top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
+  return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
 
 var StyledTextInput = _styledComponents["default"].div(_templateObject());
@@ -215,44 +195,125 @@ var SliderContainer = _styledComponents["default"].div(_templateObject2(), funct
 }, function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
-  return props.theme.disabledthumbBackgroundColor;
+  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;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.disabledTickBackgroundColorOnDark : props.theme.disabledTickBackgroundColor;
+}, function (props) {
+  return props.theme.tickHeight;
+}, function (props) {
+  return props.theme.tickWidth;
+}, function (props) {
+  return props.theme.disabledTickVerticalPosition;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.thumbHeight;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.thumbWidth;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.thumbBackgroundColorOnDark : props.theme.thumbBackgroundColor;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.thumbVerticalPosition;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
 }, function (props) {
-  return props.theme.disabledtotalLine;
+  return props.backgroundType === "dark" ? props.theme.focusThumbBackgroundColorOnDark : props.theme.focusThumbBackgroundColor;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.hoverThumbBackgroundColorOnDark : props.theme.hoverThumbBackgroundColor;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.hoverThumbScale;
 }, function (props) {
-  return props.theme.focusColor;
+  return props.backgroundType === "dark" ? props.theme.activeThumbBackgroundColorOnDark : props.theme.activeThumbBackgroundColor;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.activeThumbScale;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.trackLineColorOnDark : props.theme.trackLineColor;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.trackLineThickness;
 }, function (props) {
-  return props.theme.totalLine;
+  return props.theme.trackLineVerticalPosition;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.trackLineColorOnDark : props.theme.trackLineColor;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.totalLineColorOnDark : props.theme.totalLineColor;
+}, function (props) {
+  return props.theme.totalLineThickness;
+}, 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;
 });
 
-var MinLabelContainer = _styledComponents["default"].span(_templateObject3());
+var MinLabelContainer = _styledComponents["default"].span(_templateObject3(), function (props) {
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.fontSize;
+}, function (props) {
+  return props.theme.fontStyle;
+}, function (props) {
+  return props.theme.fontWeight;
+}, function (props) {
+  return props.disabled ? props.theme.disabledFontColor : props.backgroundType === "dark" ? props.theme.fontColorOnDark : props.theme.fontColor;
+}, function (props) {
+  return props.theme.fontLetterSpacing;
+});
 
 var MaxLabelContainer = _styledComponents["default"].span(_templateObject4(), function (props) {
-  return props.step === 1 ? "15px" : "20px";
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.fontSize;
+}, function (props) {
+  return props.theme.fontStyle;
+}, function (props) {
+  return props.theme.fontWeight;
+}, function (props) {
+  return props.disabled ? props.theme.disabledFontColor : props.backgroundType === "dark" ? props.theme.fontColorOnDark : props.theme.fontColor;
+}, function (props) {
+  return props.theme.fontLetterSpacing;
+}, function (props) {
+  return props.step === 1 ? "16px" : "20px";
 });
 
+DxcSlider.propTypes = {
+  size: _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(sizes))),
+  minValue: _propTypes["default"].number,
+  maxValue: _propTypes["default"].number,
+  step: _propTypes["default"].number,
+  value: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
+  showLimitsValues: _propTypes["default"].bool,
+  showInput: _propTypes["default"].bool,
+  name: _propTypes["default"].string,
+  onChange: _propTypes["default"].func,
+  onDragEnd: _propTypes["default"].func,
+  disabled: _propTypes["default"].bool,
+  marks: _propTypes["default"].bool,
+  labelFormatCallback: _propTypes["default"].func,
+  margin: _propTypes["default"].oneOfType([_propTypes["default"].shape({
+    top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
+    bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
+    left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
+    right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
+};
 var _default = DxcSlider;
 exports["default"] = _default;