@dxc-technology/halstack-react 0.0.0-c908d78 → 0.0.0-ca55cbe

package/slider/Slider.stories.tsx

@@ -0,0 +1,240 @@
+import React from "react";
+import DxcSlider from "./Slider";
+import { BackgroundColorProvider } from "../BackgroundColorContext";
+import Title from "../../.storybook/components/Title";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import DarkContainer from "../../.storybook/components/DarkSection";
+import { HalstackProvider } from "../HalstackContext";
+
+export default {
+  title: "Slider",
+  component: DxcSlider,
+};
+
+const labelFormat = (value) => `${value}E100000000000000000000000`;
+
+const opinionatedTheme = {
+  slider: {
+    baseColor: "#0067b3",
+    fontColor: "#000000",
+    totalLineColor: "#e6e6e6",
+  },
+};
+
+export const Chromatic = () => (
+  <>
+    <Title title="States" theme="light" level={2} />
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active" theme="light" level={4} />
+      <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <DxcSlider label="Slider" helperText="Help message" disabled showLimitsValues />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled discrete slider with input" theme="light" level={4} />
+      <DxcSlider
+        label="Slider"
+        helperText="Help message"
+        disabled
+        defaultValue={40}
+        minValue={0}
+        maxValue={50}
+        showLimitsValues
+        showInput
+        marks
+        step={10}
+      />
+    </ExampleContainer>
+    <Title title="Variants" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Continuous slider" theme="light" level={4} />
+      <DxcSlider defaultValue={65} label="Slider" helperText="Help message" showLimitsValues />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Discrete slider" theme="light" level={4} />
+      <DxcSlider defaultValue={20} label="Slider" helperText="Help message" showLimitsValues marks step={5} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Discrete slider with input" theme="light" level={4} />
+      <DxcSlider
+        defaultValue={20}
+        minValue={0}
+        maxValue={50}
+        label="Slider"
+        helperText="Help message"
+        showLimitsValues
+        showInput
+        marks
+        step={10}
+      />
+    </ExampleContainer>
+    <BackgroundColorProvider color="#333333">
+      <DarkContainer>
+        <Title title="Dark" theme="dark" level={2} />
+        <ExampleContainer pseudoState="pseudo-hover">
+          <Title title="Hovered" theme="dark" level={4} />
+          <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-active">
+          <Title title="Active" theme="dark" level={4} />
+          <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-focus">
+          <Title title="Focused" theme="dark" level={4} />
+          <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled" theme="dark" level={4} />
+          <DxcSlider label="Slider" helperText="Help message" disabled showLimitsValues />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Disabled discrete slider with input" theme="dark" level={4} />
+          <DxcSlider
+            label="Slider"
+            helperText="Help message"
+            disabled
+            defaultValue={40}
+            minValue={0}
+            maxValue={50}
+            showLimitsValues
+            showInput
+            marks
+            step={5}
+          />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Continuous slider" theme="dark" level={4} />
+          <DxcSlider defaultValue={65} label="Slider" helperText="Help message" showLimitsValues />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Discrete slider" theme="dark" level={4} />
+          <DxcSlider defaultValue={20} label="Slider" helperText="Help message" showLimitsValues marks step={5} />
+        </ExampleContainer>
+        <ExampleContainer>
+          <Title title="Discrete slider with input" theme="dark" level={4} />
+          <DxcSlider
+            defaultValue={20}
+            minValue={0}
+            maxValue={50}
+            label="Slider"
+            helperText="Help message"
+            showLimitsValues
+            showInput
+            marks
+            step={10}
+          />
+        </ExampleContainer>
+      </DarkContainer>
+    </BackgroundColorProvider>
+    <Title title="Margins" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Xxsmall" theme="light" level={4} />
+      <DxcSlider label="Xxsmall" margin="xxsmall" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xsmall" theme="light" level={4} />
+      <DxcSlider label="Xsmall" margin="xsmall" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Small" theme="light" level={4} />
+      <DxcSlider label="Small" margin="small" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Medium" theme="light" level={4} />
+      <DxcSlider label="Medium" margin="medium" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Large" theme="light" level={4} />
+      <DxcSlider label="Large" margin="large" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xlarge" theme="light" level={4} />
+      <DxcSlider label="Xlarge" margin="xlarge" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xxlarge" theme="light" level={4} />
+      <DxcSlider label="Xxlarge" margin="xxlarge" />
+    </ExampleContainer>
+    <Title title="Sizes" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Medium" theme="light" level={4} />
+      <DxcSlider label="Medium" size="medium" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Large" theme="light" level={4} />
+      <DxcSlider label="Large" size="large" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="FillParent" theme="light" level={4} />
+      <DxcSlider label="FillParent" size="fillParent" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Large limit values labels" theme="light" level={4} />
+      <DxcSlider
+        label="Slider"
+        helperText="Help message"
+        showLimitsValues
+        labelFormatCallback={labelFormat}
+        size="large"
+      />
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSlider label="Slider" helperText="Help message" showLimitsValues />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled discrete slider with input" theme="light" level={4} />{" "}
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSlider
+          label="Slider"
+          helperText="Help message"
+          disabled
+          defaultValue={40}
+          minValue={0}
+          maxValue={50}
+          showLimitsValues
+          showInput
+          marks
+          step={10}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Continuous slider" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSlider defaultValue={65} label="Slider" helperText="Help message" showLimitsValues />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Discrete slider" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSlider defaultValue={20} label="Slider" helperText="Help message" showLimitsValues marks step={5} />
+      </HalstackProvider>
+    </ExampleContainer>
+  </>
+);

package/slider/Slider.test.js

@@ -0,0 +1,250 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+
+var _Slider = _interopRequireDefault(require("./Slider.tsx"));
+
+describe("Slider component tests", function () {
+  test("Slider renders with correct text and label id", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      label: "label",
+      minValue: 0,
+      maxValue: 100,
+      showLimitsValues: true
+    })),
+        getByText = _render.getByText,
+        getByRole = _render.getByRole;
+
+    expect(getByText("0")).toBeTruthy();
+    expect(getByText("100")).toBeTruthy();
+    var sliderId = getByText("label").getAttribute("id");
+    expect(getByRole("slider").getAttribute("aria-labelledby")).toBe(sliderId);
+    expect(getByRole("slider").getAttribute("aria-orientation")).toBe("horizontal");
+  });
+  test("Slider renders with correct initial value when it is uncontrolled", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      defaultValue: 30,
+      minValue: 0,
+      maxValue: 100,
+      showLimitsValues: true,
+      showInput: true
+    })),
+        getByRole = _render2.getByRole;
+
+    var slider = getByRole("slider");
+    var input = getByRole("textbox");
+    expect(slider.getAttribute("aria-valuenow")).toBe("30");
+    expect(input.value).toBe("30");
+  });
+  test("Slider correct limit values", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      defaultValue: 125,
+      minValue: 30,
+      maxValue: 125,
+      showLimitsValues: true
+    })),
+        getByRole = _render3.getByRole,
+        getByText = _render3.getByText;
+
+    var slider = getByRole("slider");
+    expect(slider.getAttribute("aria-valuemin")).toBe("30");
+    expect(slider.getAttribute("aria-valuemax")).toBe("125");
+
+    _userEvent["default"].tab();
+
+    _react2.fireEvent.keyDown(slider, {
+      key: "ArrowRight",
+      code: "ArrowRight",
+      keyCode: 39,
+      charCode: 39
+    });
+
+    expect(slider.getAttribute("aria-valuenow")).toBe("125");
+    expect(getByText("30")).toBeTruthy();
+    expect(getByText("125")).toBeTruthy();
+  });
+  test("Calls correct function onChange in controlled slider", function () {
+    var onChange = jest.fn();
+
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      value: 13,
+      showInput: true
+    })),
+        getByRole = _render4.getByRole;
+
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("13");
+    expect(getByRole("textbox").value).toBe("13");
+    (0, _react2.act)(function () {
+      _react2.fireEvent.change(getByRole("textbox"), {
+        target: {
+          value: 25
+        }
+      });
+    });
+    expect(onChange).toHaveBeenCalledWith(25);
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("13");
+    expect(getByRole("textbox").value).toBe("13");
+  });
+  test("Calls correct function onChange in uncontrolled slider", function () {
+    var onChange = jest.fn();
+
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      showInput: true
+    })),
+        getByRole = _render5.getByRole;
+
+    (0, _react2.act)(function () {
+      _react2.fireEvent.change(getByRole("textbox"), {
+        target: {
+          value: 25
+        }
+      });
+    });
+    expect(onChange).toHaveBeenCalledWith(25);
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("25");
+    expect(getByRole("textbox").value).toBe("25");
+  });
+  test("Disabled slider have disabled input and slider", function () {
+    var onChange = jest.fn();
+
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      disabled: true,
+      showInput: true,
+      value: 13
+    })),
+        getByRole = _render6.getByRole;
+
+    (0, _react2.act)(function () {
+      _react2.fireEvent.change(getByRole("textbox"), {
+        target: {
+          value: 25
+        }
+      });
+    });
+    expect(getByRole("textbox").hasAttribute("disabled")).toBeTruthy();
+    expect(getByRole("textbox").value).toBe("13");
+    expect(getByRole("slider").hasAttribute("disabled")).toBeTruthy();
+  });
+  test("Calls correct function onDragEnd when it is uncontrolled", function () {
+    var onDragEnd = jest.fn();
+
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 150,
+      onDragEnd: onDragEnd,
+      showInput: true
+    })),
+        getByRole = _render7.getByRole;
+
+    var slider = getByRole("slider");
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseDown(slider);
+    });
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseUp(slider, {
+        target: {
+          value: 120
+        }
+      });
+    });
+    expect(onDragEnd).toHaveBeenCalledWith("120");
+  });
+  test("Calls correct function onDragEnd when it is controlled", function () {
+    var onDragEnd = jest.fn();
+
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 150,
+      value: 50,
+      onDragEnd: onDragEnd,
+      showInput: true
+    })),
+        getByRole = _render8.getByRole;
+
+    var slider = getByRole("slider");
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseDown(slider);
+    });
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseUp(slider, {
+        target: {
+          value: 120
+        }
+      });
+    });
+    expect(onDragEnd).toHaveBeenCalledWith("120");
+    expect(slider.getAttribute("aria-valuenow")).toBe("50");
+  });
+  test("Calls correct function labelFormatCallback", function () {
+    var labelFormatCallback = jest.fn(function (x) {
+      return "".concat(x, "$");
+    });
+
+    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      showLimitsValues: true,
+      showInput: true,
+      value: 25,
+      labelFormatCallback: labelFormatCallback
+    })),
+        getByText = _render9.getByText;
+
+    expect(getByText("0$")).toBeTruthy();
+    expect(getByText("100$")).toBeTruthy();
+    expect(labelFormatCallback).toHaveBeenCalledTimes(2);
+  });
+  test("Change value correctly to 0 from external function", function () {
+    var onChange = jest.fn();
+
+    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      value: 13,
+      showInput: true
+    })),
+        rerender = _render10.rerender,
+        getByRole = _render10.getByRole;
+
+    var slider = getByRole("slider");
+
+    _userEvent["default"].tab();
+
+    _react2.fireEvent.keyDown(slider, {
+      key: "ArrowRight",
+      code: "ArrowRight",
+      keyCode: 39,
+      charCode: 39
+    });
+
+    rerender( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      value: 0,
+      showInput: true
+    }));
+    expect(slider.getAttribute("aria-valuenow")).toBe("0");
+  });
+});

package/slider/types.d.ts

@@ -1,4 +1,3 @@
-declare type Size = "medium" | "large" | "fillParent";
 declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
 declare type Margin = {
     top?: Space;
@@ -15,6 +14,10 @@ declare type Props = {
      * Name attribute of the input element.
      */
     name?: string;
+    /**
+     * Initial value of the slider, only when it is uncontrolled.
+     */
+    defaultValue?: number;
     /**
      * The selected value. If undefined, the component will be uncontrolled and the value will be managed internally by the component.
      */
@@ -65,7 +68,7 @@ declare type Props = {
      * This function will be used to format the labels displayed next to the slider.
      * The value will be passed as parameter and the function must return the formatted value.
      */
-    labelFormatCallback?: (value: number) => void;
+    labelFormatCallback?: (value: number) => string;
     /**
      * Size of the margin to be applied to the component ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
      * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
@@ -74,10 +77,10 @@ declare type Props = {
     /**
      * Size of the component.
      */
-    size?: Size;
-    /**
-     * Value of the tabindex attribute.
-     */
-    tabIndex?: number;
+    size?: "medium" | "large" | "fillParent";
 };
+/**
+ * Reference to the component.
+ */
+export declare type RefType = HTMLDivElement;
 export default Props;

package/spinner/Spinner.js

@@ -17,11 +17,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
 
@@ -46,11 +46,8 @@ var DxcSpinner = function DxcSpinner(_ref) {
     margin: margin,
     mode: mode
   }, /*#__PURE__*/_react["default"].createElement(SpinnerContainer, {
-    backgroundType: backgroundType,
-    mode: mode
-  }, mode === "overlay" && /*#__PURE__*/_react["default"].createElement(BackOverlay, null), /*#__PURE__*/_react["default"].createElement(BackgroundSpinner, {
     mode: mode
-  }, mode !== "small" && /*#__PURE__*/_react["default"].createElement(SVGBackground, {
+  }, mode === "overlay" && /*#__PURE__*/_react["default"].createElement(BackOverlay, null), /*#__PURE__*/_react["default"].createElement(BackgroundSpinner, null, mode !== "small" && /*#__PURE__*/_react["default"].createElement(SVGBackground, {
     viewBox: "0 0 140 140"
   }, /*#__PURE__*/_react["default"].createElement(CircleBackground, {
     cx: "70",
@@ -65,8 +62,7 @@ var DxcSpinner = function DxcSpinner(_ref) {
     r: "6",
     mode: mode
   }))), value >= 0 && value <= 100 ? /*#__PURE__*/_react["default"].createElement(Spinner, {
-    role: "progressbar",
-    mode: mode
+    role: "progressbar"
   }, mode !== "small" && /*#__PURE__*/_react["default"].createElement(SVGSpinner, {
     viewBox: "0 0 140 140",
     isDeterminated: true
@@ -90,8 +86,7 @@ var DxcSpinner = function DxcSpinner(_ref) {
     isDeterminated: true,
     value: value
   }))) : /*#__PURE__*/_react["default"].createElement(Spinner, {
-    role: "progressbar",
-    mode: mode
+    role: "progressbar"
   }, mode !== "small" && /*#__PURE__*/_react["default"].createElement(SVGSpinner, {
     viewBox: "0 0 140 140",
     isDeterminated: false
@@ -101,7 +96,8 @@ var DxcSpinner = function DxcSpinner(_ref) {
     r: "65",
     backgroundType: backgroundType,
     mode: mode,
-    isDeterminated: false
+    isDeterminated: false,
+    value: value
   })), mode === "small" && /*#__PURE__*/_react["default"].createElement(SVGSpinner, {
     viewBox: "0 0 16 16",
     isDeterminated: false
@@ -111,26 +107,24 @@ var DxcSpinner = function DxcSpinner(_ref) {
     r: "6",
     backgroundType: backgroundType,
     mode: mode,
-    isDeterminated: false
-  }))), mode !== "small" && /*#__PURE__*/_react["default"].createElement(LabelsContainer, {
-    label: label,
-    value: value,
-    showValue: showValue
-  }, /*#__PURE__*/_react["default"].createElement(SpinnerLabel, {
+    isDeterminated: false,
+    value: value
+  }))), mode !== "small" && /*#__PURE__*/_react["default"].createElement(LabelsContainer, null, /*#__PURE__*/_react["default"].createElement(SpinnerLabel, {
     backgroundType: backgroundType,
     mode: mode
   }, label), (value || value === 0) && showValue && /*#__PURE__*/_react["default"].createElement(SpinnerProgress, {
+    value: value,
     backgroundType: backgroundType,
     mode: mode,
     showValue: showValue
   }, value, "%")))));
 };
 
-var determinatedValue = function determinatedValue(props, strokeDashArray) {
+var determinatedValue = function determinatedValue(value, strokeDashArray) {
   var val = 0;
 
-  if (props.value >= 0 && props.value <= 100) {
-    val = strokeDashArray * (1 - props.value / 100);
+  if (value >= 0 && value <= 100) {
+    val = strokeDashArray * (1 - value / 100);
   }
 
   return val;
@@ -178,7 +172,7 @@ var BackOverlay = _styledComponents["default"].div(_templateObject3 || (_templat
   return "".concat(props.theme.overlayOpacity);
 });
 
-var BackgroundSpinner = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: absolute;\n  z-index: 1;\n"])));
+var BackgroundSpinner = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: absolute;\n"])));
 
 var SVGBackground = _styledComponents["default"].svg(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n"])));
 
@@ -190,7 +184,7 @@ var CircleBackground = _styledComponents["default"].circle(_templateObject6 || (
   return props.mode !== "small" ? "8.5px" : "2px";
 });
 
-var Spinner = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: relative;\n  z-index: 2;\n"])));
+var Spinner = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: relative;\n"])));
 
 var SVGSpinner = _styledComponents["default"].svg(_templateObject8 || (_templateObject8 = (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"])), function (props) {
   return !props.isDeterminated ? "1.4s linear infinite both spinner-svg" : "";
@@ -199,7 +193,7 @@ var SVGSpinner = _styledComponents["default"].svg(_templateObject8 || (_template
 var CircleSpinner = _styledComponents["default"].circle(_templateObject9 || (_templateObject9 = (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"])), 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;
+  return props.backgroundType === "dark" || props.mode === "overlay" ? props.theme.trackCircleColorOverlay : props.theme.trackCircleColor;
 }, function (props) {
   return !props.isDeterminated ? "50% 50%" : "";
 }, function (props) {
@@ -207,7 +201,7 @@ var CircleSpinner = _styledComponents["default"].circle(_templateObject9 || (_te
 }, function (props) {
   return props.mode !== "small" ? "8.5px" : "2px";
 }, function (props) {
-  return props.isDeterminated ? props.mode !== "small" ? determinatedValue(props, 409) : determinatedValue(props, 38) : "";
+  return props.isDeterminated ? props.mode !== "small" ? determinatedValue(props.value, 409) : determinatedValue(props.value, 38) : "";
 });
 
 var LabelsContainer = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  display: block;\n  margin: 0 auto;\n  position: absolute;\n  text-align: center;\n  width: 110px;\n"])));
@@ -229,7 +223,7 @@ var SpinnerLabel = _styledComponents["default"].p(_templateObject11 || (_templat
 });
 
 var SpinnerProgress = _styledComponents["default"].p(_templateObject12 || (_templateObject12 = (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"])), function (props) {
-  return props.value !== "" && props.showValue === true && "block" || "none";
+  return props.value && props.showValue === true && "block" || "none";
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueFontFamily : props.theme.progressValueFontFamily;
 }, function (props) {