@dxc-technology/halstack-react 0.0.0-bd24f1d → 0.0.0-beebecd

package/dist/slider/Slider.js

@@ -35,9 +35,39 @@ var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
 
-function _templateObject4() {
+function _templateObject7() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n  label + .MuiInput-formControl {\n    margin-top: 2px;\n  }\n"]);
+
+  _templateObject7 = function _templateObject7() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject6() {
   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"]);
 
+  _templateObject6 = function _templateObject6() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject5() {
+  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: ", ";\n"]);
+
+  _templateObject5 = function _templateObject5() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject4() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 48px;\n  align-items: center;\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      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"]);
+
   _templateObject4 = function _templateObject4() {
     return data;
   };
@@ -46,7 +76,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  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"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -56,7 +86,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  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"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -66,7 +96,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 32px;\n\n  label + .MuiInput-formControl {\n    margin-top: 2px;\n  }\n"]);
+  var data = (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"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -76,7 +106,9 @@ function _templateObject() {
 }
 
 var DxcSlider = function DxcSlider(_ref) {
-  var _ref$minValue = _ref.minValue,
+  var label = _ref.label,
+      helperText = _ref.helperText,
+      _ref$minValue = _ref.minValue,
       minValue = _ref$minValue === void 0 ? 0 : _ref$minValue,
       _ref$maxValue = _ref.maxValue,
       maxValue = _ref$maxValue === void 0 ? 100 : _ref$maxValue,
@@ -139,9 +171,10 @@ var DxcSlider = function DxcSlider(_ref) {
 
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.slider
-  }, _react["default"].createElement(SliderContainer, {
+  }, _react["default"].createElement(Container, {
     margin: margin,
-    size: size,
+    size: size
+  }, _react["default"].createElement(Label, null, label), _react["default"].createElement(HelperText, null, helperText), _react["default"].createElement(SliderContainer, {
     backgroundType: backgroundType
   }, showLimitsValues && _react["default"].createElement(MinLabelContainer, {
     backgroundType: backgroundType,
@@ -167,7 +200,7 @@ var DxcSlider = function DxcSlider(_ref) {
     disabled: disabled,
     onChange: handlerInputChange,
     size: "small"
-  }))));
+  })))));
 };
 
 var sizes = {
@@ -180,9 +213,7 @@ var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
 
-var StyledTextInput = _styledComponents["default"].div(_templateObject());
-
-var SliderContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
+var Container = _styledComponents["default"].div(_templateObject(), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
@@ -194,7 +225,37 @@ var SliderContainer = _styledComponents["default"].div(_templateObject2(), funct
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
   return calculateWidth(props.margin, props.size);
+});
+
+var Label = _styledComponents["default"].label(_templateObject2(), function (props) {
+  return props.theme.labelFontColor;
+}, function (props) {
+  return props.theme.labelFontFamily;
+}, function (props) {
+  return props.theme.labelFontSize;
+}, function (props) {
+  return props.theme.labelFontStyle;
+}, function (props) {
+  return props.theme.labelFontWeight;
+}, function (props) {
+  return props.theme.labelLineHeight;
+});
+
+var HelperText = _styledComponents["default"].span(_templateObject3(), function (props) {
+  return props.theme.helperTextFontColor;
+}, function (props) {
+  return props.theme.helperTextFontFamily;
 }, function (props) {
+  return props.theme.helperTextFontSize;
+}, function (props) {
+  return props.theme.helperTextFontstyle;
+}, function (props) {
+  return props.theme.helperTextFontWeight;
+}, function (props) {
+  return props.theme.helperTextLineHeight;
+});
+
+var SliderContainer = _styledComponents["default"].div(_templateObject4(), function (props) {
   return props.backgroundType === "dark" ? props.theme.disabledThumbBackgroundColorOnDark : props.theme.disabledThumbBackgroundColor;
 }, function (props) {
   return props.theme.thumbHeight;
@@ -234,6 +295,12 @@ var SliderContainer = _styledComponents["default"].div(_templateObject2(), funct
   return props.backgroundType === "dark" ? props.theme.hoverThumbBackgroundColorOnDark : props.theme.hoverThumbBackgroundColor;
 }, function (props) {
   return props.theme.hoverThumbScale;
+}, function (props) {
+  return props.theme.hoverThumbHeight;
+}, function (props) {
+  return props.theme.hoverThumbWidth;
+}, function (props) {
+  return props.theme.hoverThumbVerticalPosition;
 }, function (props) {
   return props.backgroundType === "dark" ? props.theme.activeThumbBackgroundColorOnDark : props.theme.activeThumbBackgroundColor;
 }, function (props) {
@@ -264,7 +331,7 @@ var SliderContainer = _styledComponents["default"].div(_templateObject2(), funct
   return props.theme.tickVerticalPosition;
 });
 
-var MinLabelContainer = _styledComponents["default"].span(_templateObject3(), function (props) {
+var MinLabelContainer = _styledComponents["default"].span(_templateObject5(), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.fontSize;
@@ -276,9 +343,11 @@ var MinLabelContainer = _styledComponents["default"].span(_templateObject3(), fu
   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.theme.floorLabelMarginRight;
 });
 
-var MaxLabelContainer = _styledComponents["default"].span(_templateObject4(), function (props) {
+var MaxLabelContainer = _styledComponents["default"].span(_templateObject6(), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.fontSize;
@@ -291,10 +360,16 @@ var MaxLabelContainer = _styledComponents["default"].span(_templateObject4(), fu
 }, function (props) {
   return props.theme.fontLetterSpacing;
 }, function (props) {
-  return props.step === 1 ? "16px" : "20px";
+  return props.step === 1 ? props.theme.ceilLabelMarginLeft : "1.25rem";
+});
+
+var StyledTextInput = _styledComponents["default"].div(_templateObject7(), function (props) {
+  return props.theme.inputMarginLeft;
 });
 
 DxcSlider.propTypes = {
+  label: _propTypes["default"].string,
+  helperText: _propTypes["default"].string,
   size: _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(sizes))),
   minValue: _propTypes["default"].number,
   maxValue: _propTypes["default"].number,

package/dist/spinner/Spinner.js

@@ -19,8 +19,6 @@ 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"));
 
 var _variables = require("../common/variables.js");
@@ -29,8 +27,88 @@ 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  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  margin-top: ", ";\n  display: ", ";\n  color: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\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;
@@ -40,7 +118,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  margin-top: ", ";\n  color: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\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;
@@ -50,7 +128,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: unset;\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;
@@ -60,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;
@@ -82,29 +160,98 @@ var DxcSpinner = function DxcSpinner(_ref) {
   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, {
-    backgroundType: backgroundType,
     margin: margin,
-    showValue: showValue,
-    label: label,
     mode: mode
-  }, label && mode !== "small" && _react["default"].createElement(SpinnerLabel, {
+  }, _react["default"].createElement(SpinnerContainer, {
     backgroundType: backgroundType,
-    showValue: showValue,
     mode: mode
-  }, label), value && mode !== "small" && _react["default"].createElement(SpinnerProgress, {
+  }, 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
+  }, 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 = {
@@ -120,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.overlayBackgroundColor) : "transparent";
-}, function (props) {
-  return props.mode === "overlay" && "".concat(props.theme.overlayOpacity);
+var DXCSpinner = _styledComponents["default"].div(_templateObject(), function (props) {
+  return props.mode === "overlay" ? "100vh" : "";
 }, function (props) {
-  return props.mode === "overlay" ? "center" : "";
+  return props.mode === "overlay" ? "100vw" : "";
 }, function (props) {
-  return props.mode === "overlay" ? "center" : "";
+  return props.mode === "overlay" ? "flex" : "";
 }, function (props) {
   return props.mode === "overlay" ? "fixed" : "";
 }, function (props) {
@@ -135,21 +280,11 @@ var BackgroundSpinner = _styledComponents["default"].div(_templateObject(), func
 }, function (props) {
   return props.mode === "overlay" ? 0 : "";
 }, function (props) {
-  return props.mode === "overlay" ? 0 : "";
+  return props.mode === "overlay" ? "center" : "";
 }, function (props) {
-  return props.mode === "overlay" ? 0 : "";
+  return props.mode === "overlay" ? "center" : "";
 }, function (props) {
   return props.mode === "overlay" ? 1300 : "";
-});
-
-var DXCSpinner = _styledComponents["default"].div(_templateObject2(), function (props) {
-  return props.mode === "small" && "2px solid ".concat(props.theme.totalCircleColor) || "8.5px solid ".concat(props.theme.totalCircleColor);
-}, function (props) {
-  return props.mode === "small" && "16px" || "120px";
-}, function (props) {
-  return props.mode === "small" && "16px" || "120px";
-}, function (props) {
-  return props.mode === "overlay" ? "100" : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -160,23 +295,55 @@ 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.backgroundType === "dark" ? props.theme.trackCircleColorOnDark : 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 "".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" && "22px !important" || "140px !important";
+  return props.mode !== "small" ? "409" : "38";
 }, function (props) {
-  return props.mode === "small" && "22px !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.backgroundType === "dark" ? props.theme.trackCircleColorOnDark : props.theme.trackCircleColor;
 }, function (props) {
-  return props.label === "" && props.showValue === false && props.mode === "large" ? "-10px" : props.mode === "small" ? "-3px" : props.label !== "" && props.showValue === false ? "-81px" : props.label === "" && props.showValue === true && props.mode === "overlay" ? "-10.75px" : props.label === "" && props.showValue === true && props.mode !== "overlay" ? "-79.75px" : props.label !== "" && props.showValue === true && props.mode === "overlay" ? "-72.5px" : "-90.5px";
+  return !props.isDeterminated ? "50% 50%" : "";
 }, function (props) {
-  return props.mode === "small" && "-3px !important" || "-10px !important";
+  return props.mode !== "small" ? "409" : "38";
 }, function (props) {
-  return props.mode === "small" && "5px" || "2.9px";
+  return props.mode !== "small" ? "8.5px" : "2px";
 }, function (props) {
-  return props.mode === "small" && "18.5" || "20.2";
+  return props.isDeterminated ? props.mode !== "small" ? determinatedValue(props, 409) : determinatedValue(props, 38) : "";
 });
 
-var SpinnerLabel = _styledComponents["default"].div(_templateObject3(), function (props) {
+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;
@@ -184,8 +351,6 @@ var SpinnerLabel = _styledComponents["default"].div(_templateObject3(), function
   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.showValue === false && "52px" || "45px";
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
 }, function (props) {
@@ -194,7 +359,9 @@ var SpinnerLabel = _styledComponents["default"].div(_templateObject3(), function
   return props.mode === "overlay" ? props.theme.overlayLabelLetterSpacing : props.theme.labelLetterSpacing;
 });
 
-var SpinnerProgress = _styledComponents["default"].div(_templateObject4(), function (props) {
+var SpinnerProgress = _styledComponents["default"].p(_templateObject12(), function (props) {
+  return props.value !== "" && props.showValue === true && "block" || "none";
+}, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueFontFamily : props.theme.progressValueFontFamily;
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueFontWeight : props.theme.progressValueFontWeight;
@@ -202,10 +369,6 @@ var SpinnerProgress = _styledComponents["default"].div(_templateObject4(), funct
   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.label === "" && "52px" || "";
-}, function (props) {
-  return props.value !== "" && props.showValue === true && "block" || "none";
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueFontColor : props.backgroundType === "dark" ? props.theme.progressValueFontColorOnDark : props.theme.progressValueFontColor;
 }, function (props) {