@dxc-technology/halstack-react 0.0.0-f46d22a → 0.0.0-f4bae62

package/dist/spinner/Spinner.js

@@ -19,20 +19,96 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
-var _utils = require("../common/utils.js");
-
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
+
+function _templateObject12() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0;\n  width: 100%;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: ", ";\n  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n    color: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\n"]);
+
+  _templateObject12 = function _templateObject12() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject11() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0;\n  width: 100%;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  color: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\n"]);
+
+  _templateObject11 = function _templateObject11() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject10() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: block;\n  margin: 0 auto;\n  position: absolute;\n  text-align: center;\n  width: 110px;\n"]);
+
+  _templateObject10 = function _templateObject10() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject9() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  fill: transparent;\n  stroke-linecap: initial;\n  vector-effect: non-scaling-stroke;\n  animation: ", ";\n  stroke: ", ";\n  transform-origin: ", ";\n  stroke-dasharray: ", ";\n  stroke-width: ", ";\n  stroke-dashoffset: ", ";\n"]);
+
+  _templateObject9 = function _templateObject9() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject8() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  transform: rotate(-90deg);\n  top: 0;\n  left: 0;\n  transform-origin: center;\n  overflow: visible;\n  animation: ", ";\n"]);
+
+  _templateObject8 = function _templateObject8() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject7() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: relative;\n  z-index: 2;\n"]);
+
+  _templateObject7 = function _templateObject7() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject6() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  animation: none;\n  fill: transparent;\n  stroke: ", ";\n  stroke-dasharray: ", ";\n  stroke-linecap: initial;\n  stroke-width: ", ";\n  transform-origin: 50% 50%;\n  vector-effect: non-scaling-stroke;\n"]);
+
+  _templateObject6 = function _templateObject6() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject5() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n"]);
+
+  _templateObject5 = function _templateObject5() {
+    return data;
+  };
+
+  return data;
+}
+
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-top: ", ";\n  display: ", ";\n  color: ", ";\n  font-size: 12px;\n  text-align: center;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: absolute;\n  z-index: 1;\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -42,7 +118,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-top: ", ";\n  color: ", ";\n  text-transform: uppercase;\n  font-size: 12px;\n  text-align: center;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100vw;\n  height: 100vh;\n  opacity: 1;\n  transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;\n  position: fixed;\n  top: 0;\n  left: 0;\n  background-color: ", ";\n  opacity: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -52,7 +128,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: \"Open Sans\", sans-serif;\n  border-radius: 80px;\n  border: ", ";\n  width: ", ";\n  height: ", ";\n  z-index: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  .MuiCircularProgress-colorPrimary {\n    color: ", ";\n    width: ", ";\n    height: ", ";\n    margin-top: ", ";\n    margin-left: ", ";\n  }\n\n  .MuiCircularProgress-circle {\n    stroke-width: ", ";\n    r: ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  align-items: center;\n  display: flex;\n  height: ", ";\n  width: ", ";\n  justify-content: center;\n  position: relative;\n  background-color: transparent;\n\n  @keyframes spinner-svg {\n    0% {\n      transform: rotateZ(0deg);\n    }\n    100% {\n      transform: rotateZ(360deg);\n    }\n  }\n  @keyframes svg-circle-large {\n    0% {\n      stroke-dashoffset: 400;\n      transform: rotate(0);\n    }\n\n    50% {\n      stroke-dashoffset: 75;\n      transform: rotate(45deg);\n    }\n\n    100% {\n      stroke-dashoffset: 400;\n      transform: rotate(360deg);\n    }\n  }\n  @keyframes svg-circle-small {\n    0% {\n      stroke-dashoffset: 35;\n      transform: rotate(0);\n    }\n\n    50% {\n      stroke-dashoffset: 8;\n      transform: rotate(45deg);\n    }\n\n    100% {\n      stroke-dashoffset: 35;\n      transform: rotate(360deg);\n    }\n  }\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -62,7 +138,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  opacity: ", ";\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: ", ";\n  align-items: ", ";\n  position: ", ";\n  top: ", ";\n  left: ", ";\n  right: ", ";\n  bottom: ", ";\n  z-index: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  display: ", ";\n  position: ", ";\n  top: ", ";\n  left: ", ";\n  justify-content: ", ";\n  align-items: ", ";\n  z-index: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -81,28 +157,101 @@ var DxcSpinner = function DxcSpinner(_ref) {
       mode = _ref$mode === void 0 ? "large" : _ref$mode,
       margin = _ref.margin;
   var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.spinner
-  }, _react["default"].createElement(BackgroundSpinner, {
-    mode: mode
   }, _react["default"].createElement(DXCSpinner, {
     margin: margin,
-    showValue: showValue,
-    label: label,
     mode: mode
-  }, label && mode !== "small" && _react["default"].createElement(SpinnerLabel, {
-    showValue: showValue,
+  }, _react["default"].createElement(SpinnerContainer, {
+    backgroundType: backgroundType,
+    mode: mode
+  }, mode === "overlay" && _react["default"].createElement(BackOverlay, null), _react["default"].createElement(BackgroundSpinner, {
+    mode: mode
+  }, mode !== "small" && _react["default"].createElement(SVGBackground, {
+    viewBox: "0 0 140 140"
+  }, _react["default"].createElement(CircleBackground, {
+    cx: "70",
+    cy: "70",
+    r: "65",
+    mode: mode
+  })), mode === "small" && _react["default"].createElement(SVGBackground, {
+    viewBox: "0 0 16 16"
+  }, _react["default"].createElement(CircleBackground, {
+    cx: "8",
+    cy: "8",
+    r: "6",
+    mode: mode
+  }))), value >= 0 && value <= 100 ? _react["default"].createElement(Spinner, {
+    role: "progressbar",
     mode: mode
-  }, label), value && mode !== "small" && _react["default"].createElement(SpinnerProgress, {
+  }, mode !== "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 140 140",
+    isDeterminated: true
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "70",
+    cy: "70",
+    r: "65",
+    backgroundType: backgroundType,
     mode: mode,
-    showValue: showValue,
-    label: label
-  }, value === "" ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100, "%"), _react["default"].createElement(_CircularProgress["default"], {
-    variant: showValue ? "static" : "indeterminate",
-    value: value === "" ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100,
+    isDeterminated: true,
+    value: value
+  })), mode === "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 16 16",
+    isDeterminated: true
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "8",
+    cy: "8",
+    r: "6",
+    backgroundType: backgroundType,
     mode: mode,
-    label: label
-  }))));
+    isDeterminated: true,
+    value: value
+  }))) : _react["default"].createElement(Spinner, {
+    role: "progressbar",
+    mode: mode
+  }, mode !== "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 140 140",
+    isDeterminated: false
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "70",
+    cy: "70",
+    r: "65",
+    backgroundType: backgroundType,
+    mode: mode,
+    isDeterminated: false
+  })), mode === "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 16 16",
+    isDeterminated: false
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "8",
+    cy: "8",
+    r: "6",
+    backgroundType: backgroundType,
+    mode: mode,
+    isDeterminated: false
+  }))), mode !== "small" && _react["default"].createElement(LabelsContainer, {
+    label: label,
+    value: value,
+    showValue: showValue
+  }, _react["default"].createElement(SpinnerLabel, {
+    backgroundType: backgroundType,
+    mode: mode
+  }, label), (value || value === 0) && showValue && _react["default"].createElement(SpinnerProgress, {
+    backgroundType: backgroundType,
+    mode: mode,
+    showValue: showValue
+  }, value, "%")))));
+};
+
+var determinatedValue = function determinatedValue(props, strokeDashArray) {
+  var val = 0;
+
+  if (props.value >= 0 && props.value <= 100) {
+    val = strokeDashArray * (1 - props.value / 100);
+  }
+
+  return val;
 };
 
 DxcSpinner.propTypes = {
@@ -118,14 +267,12 @@ DxcSpinner.propTypes = {
   }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
 };
 
-var BackgroundSpinner = _styledComponents["default"].div(_templateObject(), function (props) {
-  return props.mode === "overlay" ? "".concat(props.theme.overlayColor) : "transparent";
+var DXCSpinner = _styledComponents["default"].div(_templateObject(), function (props) {
+  return props.mode === "overlay" ? "100vh" : "";
 }, function (props) {
-  return props.mode === "overlay" && "0.8";
+  return props.mode === "overlay" ? "100vw" : "";
 }, function (props) {
-  return props.mode === "overlay" ? "center" : "";
-}, function (props) {
-  return props.mode === "overlay" ? "center" : "";
+  return props.mode === "overlay" ? "flex" : "";
 }, function (props) {
   return props.mode === "overlay" ? "fixed" : "";
 }, function (props) {
@@ -133,21 +280,11 @@ var BackgroundSpinner = _styledComponents["default"].div(_templateObject(), func
 }, function (props) {
   return props.mode === "overlay" ? 0 : "";
 }, function (props) {
-  return props.mode === "overlay" ? 0 : "";
-}, function (props) {
-  return props.mode === "overlay" ? 0 : "";
-}, function (props) {
-  return props.mode === "overlay" ? 1000 : "";
-});
-
-var DXCSpinner = _styledComponents["default"].div(_templateObject2(), function (props) {
-  return props.mode === "small" && "6px solid".concat(props.theme.totalCircleColor) || "8.5px solid ".concat(props.theme.totalCircleColor);
-}, function (props) {
-  return props.mode === "small" && "30px" || "120px";
+  return props.mode === "overlay" ? "center" : "";
 }, function (props) {
-  return props.mode === "small" && "30px" || "120px";
+  return props.mode === "overlay" ? "center" : "";
 }, function (props) {
-  return props.mode === "overlay" ? "100" : "";
+  return props.mode === "overlay" ? 1300 : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -158,34 +295,86 @@ var DXCSpinner = _styledComponents["default"].div(_templateObject2(), function (
   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 SpinnerContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
+  return props.mode === "small" ? "16px" : "140px";
 }, function (props) {
-  return props.theme.trackCircleColor;
+  return props.mode === "small" ? "16px" : "140px";
+});
+
+var BackOverlay = _styledComponents["default"].div(_templateObject3(), function (props) {
+  return "".concat(props.theme.overlayBackgroundColor);
 }, function (props) {
-  return props.mode === "small" && "44px !important" || "140px !important";
+  return "".concat(props.theme.overlayOpacity);
+});
+
+var BackgroundSpinner = _styledComponents["default"].div(_templateObject4());
+
+var SVGBackground = _styledComponents["default"].svg(_templateObject5());
+
+var CircleBackground = _styledComponents["default"].circle(_templateObject6(), function (props) {
+  return "".concat(props.theme.totalCircleColor);
+}, function (props) {
+  return props.mode !== "small" ? "409" : "38";
 }, function (props) {
-  return props.mode === "small" && "44px !important" || "140px !important";
+  return props.mode !== "small" ? "8.5px" : "2px";
+});
+
+var Spinner = _styledComponents["default"].div(_templateObject7());
+
+var SVGSpinner = _styledComponents["default"].svg(_templateObject8(), function (props) {
+  return !props.isDeterminated ? "1.4s linear infinite both spinner-svg" : "";
+});
+
+var CircleSpinner = _styledComponents["default"].circle(_templateObject9(), function (props) {
+  return props.isDeterminated ? "none" : props.mode !== "small" ? "1.4s ease-in-out infinite both svg-circle-large" : "1.4s ease-in-out infinite both svg-circle-small";
 }, function (props) {
-  return props.label === "" && props.showValue === false && props.mode === "large" ? "-10px" : props.mode === "small" ? "-7px" : props.label !== "" && props.showValue === false ? "-78.5px" : props.label === "" && props.showValue === true ? "-78.75px" : "-88.5px";
+  return props.backgroundType === "dark" ? props.theme.trackCircleColorOnDark : props.theme.trackCircleColor;
 }, function (props) {
-  return props.mode === "small" && "-7px !important" || "-10px !important";
+  return !props.isDeterminated ? "50% 50%" : "";
 }, function (props) {
-  return props.mode === "small" && "6.2px" || "2.7px";
+  return props.mode !== "small" ? "409" : "38";
 }, function (props) {
-  return props.mode === "small" && "18.2" || "20.2";
+  return props.mode !== "small" ? "8.5px" : "2px";
+}, function (props) {
+  return props.isDeterminated ? props.mode !== "small" ? determinatedValue(props, 409) : determinatedValue(props, 38) : "";
 });
 
-var SpinnerLabel = _styledComponents["default"].div(_templateObject3(), function (props) {
-  return props.showValue === false && "52px" || "45px";
+var LabelsContainer = _styledComponents["default"].div(_templateObject10());
+
+var SpinnerLabel = _styledComponents["default"].p(_templateObject11(), function (props) {
+  return props.mode === "overlay" ? props.theme.overlayLabelFontFamily : props.theme.labelFontFamily;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayLabelFontWeight : props.theme.labelFontWeight;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayLabelFontSize : props.theme.labelFontSize;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayLabelFontStyle : props.theme.labelFontStyle;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayLabelTextAlign : props.theme.labelTextAlign;
 }, function (props) {
-  return props.mode === "overlay" ? "#FFFFFF" : props.theme.fontColor;
+  return props.mode === "overlay" ? props.theme.overlayLabelLetterSpacing : props.theme.labelLetterSpacing;
 });
 
-var SpinnerProgress = _styledComponents["default"].div(_templateObject4(), function (props) {
-  return props.label === "" && "52px" || "";
-}, function (props) {
+var SpinnerProgress = _styledComponents["default"].p(_templateObject12(), function (props) {
   return props.value !== "" && props.showValue === true && "block" || "none";
 }, function (props) {
-  return props.mode === "overlay" ? "#FFFFFF" : props.theme.fontColor;
+  return props.mode === "overlay" ? props.theme.overlayProgressValueFontFamily : props.theme.progressValueFontFamily;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayProgressValueFontWeight : props.theme.progressValueFontWeight;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayProgressValueFontSize : props.theme.progressValueFontSize;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayProgressValueFontStyle : props.theme.progressValueFontStyle;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayProgressValueFontColor : props.backgroundType === "dark" ? props.theme.progressValueFontColorOnDark : props.theme.progressValueFontColor;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayProgressValueTextAlign : props.theme.progressValueTextAlign;
+}, function (props) {
+  return props.mode === "overlay" ? props.theme.overlayProgressValueLetterSpacing : props.theme.progressValueLetterSpacing;
 });
 
 var _default = DxcSpinner;

package/dist/switch/Switch.js

@@ -27,16 +27,16 @@ var _core = require("@material-ui/core");
 
 var _RequiredComponent = _interopRequireDefault(require("../common/RequiredComponent"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
+
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  cursor: ", ";\n  font-family: \"Open Sans\", sans-serif;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  opacity: 1;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  cursor: ", ";\n  ", "\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -46,7 +46,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n\n  display: inline-flex;\n  align-items: center;\n  flex-direction: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  cursor: ", ";\n  .MuiSwitch-root {\n    align-items: center;\n    width: 60px;\n    height: 45px;\n    margin: 3px;\n\n    .Mui-focusVisible {\n      border: ", ";\n      padding: 7px;\n    }\n\n    .MuiSwitch-track {\n      /*Enabled and unchecked bar*/\n      background-color: ", ";\n      height: 12px;\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: 24px;\n        height: 24px;\n      }\n      color: ", ";\n      &:hover {\n        background-color: transparent;\n      }\n      &.Mui-disabled {\n        /*Disabled*/\n        + .MuiSwitch-track {\n          /*Disabled and unchecked bar*/\n          background-color: ", ";\n        }\n      }\n      &.Mui-checked {\n        /*Enabled and checked*/\n        color: ", ";\n        transform: translateX(40%);\n        &:hover {\n          background-color: transparent;\n        }\n        + .MuiSwitch-track {\n          /*Enabled and checked bar*/\n          background-color: ", ";\n          opacity: 1;\n        }\n      }\n    }\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  display: inline-flex;\n  align-items: center;\n  flex-direction: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n  opacity: 1;\n  \n  .MuiSwitch-root {\n    align-items: center;\n    width: ", ";\n    height: 45px;\n    margin: 3px;\n\n    .Mui-focusVisible {\n      border: ", ";\n      padding: 7px;\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"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -69,7 +69,9 @@ var DxcSwitch = function DxcSwitch(_ref) {
       required = _ref$required === void 0 ? false : _ref$required,
       margin = _ref.margin,
       _ref$size = _ref.size,
-      size = _ref$size === void 0 ? "fitContent" : _ref$size;
+      size = _ref$size === void 0 ? "fitContent" : _ref$size,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
   var _useState = (0, _react.useState)(0),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -77,6 +79,7 @@ var DxcSwitch = function DxcSwitch(_ref) {
       setInnerChecked = _useState2[1];
 
   var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
 
   var handlerSwitchChange = function handlerSwitchChange(newValue) {
     if (checked === undefined) {
@@ -99,11 +102,13 @@ var DxcSwitch = function DxcSwitch(_ref) {
     margin: margin,
     disabled: disabled,
     labelPosition: labelPosition,
-    size: size
+    size: size,
+    backgroundType: backgroundType
   }, _react["default"].createElement(_core.Switch, {
     checked: checked != undefined ? checked : innerChecked,
-    inputProps: name = {
-      name: name
+    inputProps: {
+      name: name,
+      tabIndex: tabIndex
     },
     onChange: handlerSwitchChange,
     value: value,
@@ -111,9 +116,9 @@ var DxcSwitch = function DxcSwitch(_ref) {
     disableRipple: true
   }), _react["default"].createElement(LabelContainer, {
     labelPosition: labelPosition,
-    brightness: _variables.componentTokens,
     onClick: disabled === true ? function () {} : handlerSwitchChange,
-    disabled: disabled
+    disabled: disabled,
+    backgroundType: backgroundType
   }, required && _react["default"].createElement(_RequiredComponent["default"], null), label)));
 };
 
@@ -148,25 +153,51 @@ var SwitchContainer = _styledComponents["default"].div(_templateObject(), functi
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
-  return props.disabled === true ? "not-allowed" : "default";
+  return props.disabled ? "not-allowed" : "default";
+}, function (props) {
+  return props.theme.trackWidth;
+}, function (props) {
+  return "".concat(props.backgroundType === "dark" ? props.theme.thumbFocusColorOnDark : props.theme.thumbFocusColor, " solid 2px");
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.uncheckedTrackBackgroundColorOnDark : props.theme.uncheckedTrackBackgroundColor;
+}, function (props) {
+  return props.theme.trackHeight;
+}, function (props) {
+  return props.theme.thumbWidth;
 }, function (props) {
-  return props.theme.focusColor + " solid 2px";
+  return props.theme.thumbHeight;
 }, function (props) {
-  return props.disabled ? props.theme.disabledCheckedTrackBackgroundColor : props.theme.uncheckedTrackBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.uncheckedThumbBackgroundColorOnDark : props.theme.uncheckedThumbBackgroundColor;
 }, function (props) {
-  return props.theme.uncheckedThumbBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.disabledUncheckedThumbBackgroundColorOnDark : props.theme.disabledUncheckedThumbBackgroundColor;
 }, function (props) {
-  return props.disabled ? props.theme.disabledUncheckedTrackBackgroundColor : props.theme.uncheckedTrackBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.disabledUncheckedTrackBackgroundColorOnDark : props.theme.disabledUncheckedTrackBackgroundColor;
 }, function (props) {
-  return props.theme.checkedThumbBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.disabledCheckedThumbBackgroundColorOnDark : props.theme.disabledCheckedThumbBackgroundColor;
 }, function (props) {
-  return props.disabled ? props.theme.disabledCheckedTrackBackgroundColor : props.theme.checkedTrackBackgroundColor;
+  return props.backgroundType === "dark" ? props.theme.disabledCheckedTrackBackgroundColorOnDark : props.theme.disabledCheckedTrackBackgroundColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.checkedThumbBackgroundColorOnDark : props.theme.checkedThumbBackgroundColor;
+}, function (props) {
+  return props.theme.thumbShift;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.checkedTrackBackgroundColorOnDark : props.theme.checkedTrackBackgroundColor;
 });
 
 var LabelContainer = _styledComponents["default"].span(_templateObject2(), function (props) {
-  return props.disabled ? props.theme.disabledFontColor : props.theme.fontColor;
+  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;
+}, function (props) {
+  return props.theme.labelFontWeight;
 }, function (props) {
   return props.disabled === true ? "not-allowed" : "pointer";
+}, function (props) {
+  return props.labelPosition === "after" ? "margin-left: ".concat(props.theme.spaceBetweenLabelSwitch, ";") : "margin-right: ".concat(props.theme.spaceBetweenLabelSwitch, ";");
 });
 
 DxcSwitch.propTypes = {
@@ -184,7 +215,8 @@ DxcSwitch.propTypes = {
     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)))])
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcSwitch;
 exports["default"] = _default;