@dxc-technology/halstack-react 0.0.0-b0616f2 → 0.0.0-b063530

package/password-input/PasswordInput.test.js

@@ -1,57 +1,69 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = _interopRequireDefault(require("react"));
-
 var _react2 = require("@testing-library/react");
-
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
-
 var _PasswordInput = _interopRequireDefault(require("./PasswordInput"));
-
+// Mocking DOMRect for Radix Primitive Popover
+global.globalThis = global;
+global.DOMRect = {
+  fromRect: function fromRect() {
+    return {
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 0,
+      width: 0,
+      height: 0
+    };
+  }
+};
+global.ResizeObserver = /*#__PURE__*/function () {
+  function ResizeObserver() {
+    (0, _classCallCheck2["default"])(this, ResizeObserver);
+  }
+  return (0, _createClass2["default"])(ResizeObserver, [{
+    key: "observe",
+    value: function observe() {}
+  }, {
+    key: "unobserve",
+    value: function unobserve() {}
+  }, {
+    key: "disconnect",
+    value: function disconnect() {}
+  }]);
+}();
 describe("Password input component tests", function () {
-  test("Password input renders with label", function () {
+  test("Password input renders with label and helper text", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      label: "Password input label"
-    })),
-        getByText = _render.getByText;
-
+        label: "Password input label",
+        helperText: "Helper text"
+      })),
+      getByText = _render.getByText;
     expect(getByText("Password input label")).toBeTruthy();
-  });
-  test("Password input renders with helper text", function () {
-    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      helperText: "Helper text"
-    })),
-        getByText = _render2.getByText;
-
     expect(getByText("Helper text")).toBeTruthy();
   });
   test("Password input renders error", function () {
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      error: "Error message."
-    })),
-        getByText = _render3.getByText;
-
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+        error: "Error message."
+      })),
+      getByText = _render2.getByText;
     expect(getByText("Error message.")).toBeTruthy();
   });
   test("onChange function is called correctly", function () {
     var onChange = jest.fn();
-
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      label: "Password input",
-      onChange: onChange
-    })),
-        getByRole = _render4.getByRole;
-
-    var passwordInput = getByRole("textbox");
-
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+        label: "Password input",
+        onChange: onChange
+      })),
+      getByLabelText = _render3.getByLabelText;
+    var passwordInput = getByLabelText("Password input");
     _userEvent["default"].type(passwordInput, "Pa$$w0rd");
-
     expect(onChange).toHaveBeenCalledWith({
       value: "P"
     });
@@ -59,122 +71,127 @@ describe("Password input component tests", function () {
   });
   test("onBlur function is called correctly", function () {
     var onBlur = jest.fn();
-
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      label: "Password input",
-      onBlur: onBlur
-    })),
-        getByRole = _render5.getByRole;
-
-    var passwordInput = getByRole("textbox");
-
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+        label: "Password input",
+        onBlur: onBlur
+      })),
+      getByLabelText = _render4.getByLabelText;
+    var passwordInput = getByLabelText("Password input");
     _userEvent["default"].type(passwordInput, "Pa$$w0rd");
-
     _react2.fireEvent.blur(passwordInput);
-
     expect(onBlur).toHaveBeenCalledWith({
       value: "Pa$$w0rd"
     });
     expect(passwordInput.value).toBe("Pa$$w0rd");
   });
-  test("Clear password input value", function () {
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      label: "Password input",
-      clearable: true
-    })),
-        getAllByRole = _render6.getAllByRole,
-        getByRole = _render6.getByRole;
-
-    var passwordInput = getByRole("textbox");
-
-    _userEvent["default"].type(passwordInput, "Pa$$w0rd");
-
-    expect(passwordInput.value).toBe("Pa$$w0rd");
-    var clearButton = getAllByRole("button")[0];
-
-    _userEvent["default"].click(clearButton);
-
-    expect(passwordInput.value).toBe("");
-  });
-  test("Non clearable password input has no clear icon", function () {
-    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      label: "Password input"
-    })),
-        getAllByRole = _render7.getAllByRole,
-        getByRole = _render7.getByRole;
-
-    var passwordInput = getByRole("textbox");
-
-    _userEvent["default"].type(passwordInput, "Pa$$w0rd");
-
-    expect(passwordInput.value).toBe("Pa$$w0rd");
-    var buttons = getAllByRole("button");
-    expect(buttons.length).toBe(1);
-  });
-  test("Show/hide password input button works correctly", function () {
-    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      label: "Password input",
-      clearable: true
-    })),
-        getAllByRole = _render8.getAllByRole,
-        getByRole = _render8.getByRole;
-
-    var passwordInput = getByRole("textbox");
-
-    _userEvent["default"].type(passwordInput, "Pa$$w0rd");
-
-    expect(passwordInput.value).toBe("Pa$$w0rd");
-    expect(passwordInput.type).toBe("password");
-    var showButton = getAllByRole("button")[1];
-
-    _userEvent["default"].click(showButton);
-
-    expect(passwordInput.type).toBe("text");
-  });
-  test("Password tooltip is correct", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-    var _render9, getAllByRole, getByTitle, queryByTitle, showButton;
-
+  test("Clear password input value", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render5, getAllByRole, getByLabelText, passwordInput, clearButton;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-              label: "Password input",
-              clearable: true,
-              value: "Password"
-            })), getAllByRole = _render9.getAllByRole, getByTitle = _render9.getByTitle, queryByTitle = _render9.queryByTitle;
-            showButton = getAllByRole("button")[1];
-
-            _userEvent["default"].hover(showButton);
-
-            expect(getByTitle("Show password")).toBeTruthy();
-
-            _userEvent["default"].unhover(showButton);
-
-            expect(queryByTitle("Hide password")).toBeFalsy();
-
-          case 6:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+            label: "Password input",
+            clearable: true
+          })), getAllByRole = _render5.getAllByRole, getByLabelText = _render5.getByLabelText;
+          passwordInput = getByLabelText("Password input");
+          _userEvent["default"].type(passwordInput, "Pa$$w0rd");
+          expect(passwordInput.value).toBe("Pa$$w0rd");
+          clearButton = getAllByRole("button")[0];
+          _context.next = 7;
+          return _userEvent["default"].click(clearButton);
+        case 7:
+          expect(passwordInput.value).toBe("");
+        case 8:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   })));
-  test("Password input has correct accesibility attributes", function () {
-    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
-      label: "Password input"
-    })),
-        getByRole = _render10.getByRole;
-
-    var passwordInput = getByRole("textbox");
-    expect(passwordInput.getAttribute("aria-autocomplete")).toBeNull();
-    expect(passwordInput.getAttribute("aria-controls")).toBeNull();
-    expect(passwordInput.getAttribute("aria-expanded")).toBeNull();
-    var showButton = getByRole("button");
-    expect(showButton.getAttribute("aria-label")).toBe("Show password");
-
-    _userEvent["default"].click(showButton);
-
-    expect(showButton.getAttribute("aria-label")).toBe("Hide password");
-  });
+  test("Non clearable password input has no clear icon", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render6, getAllByRole, getByLabelText, passwordInput, buttons;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+            label: "Password input"
+          })), getAllByRole = _render6.getAllByRole, getByLabelText = _render6.getByLabelText;
+          passwordInput = getByLabelText("Password input");
+          _userEvent["default"].type(passwordInput, "Pa$$w0rd");
+          expect(passwordInput.value).toBe("Pa$$w0rd");
+          buttons = getAllByRole("button");
+          expect(buttons.length).toBe(1);
+        case 6:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  test("Show/hide password input button works correctly", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render7, getAllByRole, getByLabelText, passwordInput, showButton;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+            label: "Password input",
+            clearable: true
+          })), getAllByRole = _render7.getAllByRole, getByLabelText = _render7.getByLabelText;
+          passwordInput = getByLabelText("Password input");
+          _userEvent["default"].type(passwordInput, "Pa$$w0rd");
+          expect(passwordInput.value).toBe("Pa$$w0rd");
+          expect(passwordInput.type).toBe("password");
+          showButton = getAllByRole("button")[1];
+          _context3.next = 8;
+          return _userEvent["default"].click(showButton);
+        case 8:
+          expect(passwordInput.type).toBe("text");
+        case 9:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  test("Password tooltip is correct", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _render8, getAllByRole, getByTitle, queryByTitle, showButton;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+            label: "Password input",
+            clearable: true,
+            value: "Password"
+          })), getAllByRole = _render8.getAllByRole, getByTitle = _render8.getByTitle, queryByTitle = _render8.queryByTitle;
+          showButton = getAllByRole("button")[1];
+          _userEvent["default"].hover(showButton);
+          expect(getByTitle("Show password")).toBeTruthy();
+          _userEvent["default"].unhover(showButton);
+          expect(queryByTitle("Hide password")).toBeFalsy();
+        case 6:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+  test("Password input has correct accessibility attributes", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+    var _render9, getByRole, getByLabelText, showButton;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
+            label: "Password input"
+          })), getByRole = _render9.getByRole, getByLabelText = _render9.getByLabelText;
+          showButton = getByRole("button");
+          expect(getByLabelText("Password input")).toBeTruthy();
+          expect(showButton.getAttribute("aria-expanded")).toBe("false");
+          expect(showButton.getAttribute("aria-label")).toBe("Show password");
+          _context5.next = 7;
+          return _userEvent["default"].click(showButton);
+        case 7:
+          expect(showButton.getAttribute("aria-expanded")).toBe("true");
+          expect(showButton.getAttribute("aria-label")).toBe("Hide password");
+        case 9:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  })));
 });

package/password-input/types.d.ts

@@ -1,13 +1,13 @@
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-declare type Props = {
+type Props = {
     /**
-     * Text to be placed above the password.
+     * Text to be placed above the password input.
      */
     label?: string;
     /**
@@ -39,7 +39,8 @@ declare type Props = {
     /**
      * This function will be called when the input element loses the focus.
      * An object including the input value and the error (if the value entered is
-     * not valid) will be passed to this function. If there is no error, error will not be defined.
+     * not valid) will be passed to this function. If there is no error, error will
+     * not be defined.
      */
     onBlur?: (val: {
         value: string;
@@ -65,7 +66,7 @@ declare type Props = {
      */
     pattern?: string;
     /**
-     * Specifies the minimun length allowed by the password input.
+     * Specifies the minimum length allowed by the password input.
      * This will be checked both when the input element loses the
      * focus and while typing within it. If the string entered does not
      * comply the minimum length, the onBlur and onChange functions will be called
@@ -106,5 +107,5 @@ declare type Props = {
 /**
  * Reference to the component.
  */
-export declare type RefType = HTMLDivElement;
+export type RefType = HTMLDivElement;
 export default Props;

package/progress-bar/ProgressBar.accessibility.test.d.ts

@@ -0,0 +1 @@
+export {};

package/progress-bar/ProgressBar.accessibility.test.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _ProgressBar = _interopRequireDefault(require("./ProgressBar"));
+describe("ProgressBar component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
+            label: "test-label",
+            helperText: "helper-text",
+            margin: "medium",
+            value: 50,
+            showValue: true,
+            overlay: true
+          })), container = _render.container;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+});

package/progress-bar/ProgressBar.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { Props } from "./types";
-declare const DxcProgressBar: ({ label, helperText, overlay, value, showValue, margin, }: Props) => JSX.Element;
+import ProgressBarPropsType from "./types";
+declare const DxcProgressBar: ({ label, helperText, overlay, value, showValue, margin, }: ProgressBarPropsType) => JSX.Element;
 export default DxcProgressBar;

package/progress-bar/ProgressBar.js

@@ -1,55 +1,37 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 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"));
-
-var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
-
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcProgressBar = function DxcProgressBar(_ref) {
   var _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
-      _ref$helperText = _ref.helperText,
-      helperText = _ref$helperText === void 0 ? "" : _ref$helperText,
-      _ref$overlay = _ref.overlay,
-      overlay = _ref$overlay === void 0 ? false : _ref$overlay,
-      value = _ref.value,
-      _ref$showValue = _ref.showValue,
-      showValue = _ref$showValue === void 0 ? false : _ref$showValue,
-      margin = _ref.margin;
+    label = _ref$label === void 0 ? "" : _ref$label,
+    _ref$helperText = _ref.helperText,
+    helperText = _ref$helperText === void 0 ? "" : _ref$helperText,
+    _ref$overlay = _ref.overlay,
+    overlay = _ref$overlay === void 0 ? false : _ref$overlay,
+    value = _ref.value,
+    _ref$showValue = _ref.showValue,
+    showValue = _ref$showValue === void 0 ? false : _ref$showValue,
+    margin = _ref.margin;
   var colorsTheme = (0, _useTheme["default"])();
-  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
-
   var _useState = (0, _react.useState)(0),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      valueProgressBar = _useState2[0],
-      setValueProgressBar = _useState2[1];
-
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    valueProgressBar = _useState2[0],
+    setValueProgressBar = _useState2[1];
   (0, _react.useEffect)(function () {
     setValueProgressBar(value === null || value === undefined || value < 0 ? 0 : value >= 0 && value <= 100 ? value : 100);
   }, [value]);
@@ -61,35 +43,31 @@ var DxcProgressBar = function DxcProgressBar(_ref) {
     overlay: overlay,
     margin: margin
   }, /*#__PURE__*/_react["default"].createElement(InfoProgressBar, null, /*#__PURE__*/_react["default"].createElement(ProgressBarLabel, {
-    overlay: overlay,
-    backgroundType: backgroundType,
-    "aria-label": label || undefined
+    overlay: overlay
   }, label), /*#__PURE__*/_react["default"].createElement(ProgressBarProgress, {
     overlay: overlay,
     showValue: showValue,
-    backgroundType: backgroundType,
     value: valueProgressBar
   }, valueProgressBar, " %")), /*#__PURE__*/_react["default"].createElement(LinearProgress, {
     role: "progressbar",
     helperText: helperText,
-    "aria-valuenow": showValue ? valueProgressBar : undefined
+    "aria-valuenow": showValue ? valueProgressBar : undefined,
+    "aria-valuemin": 0,
+    "aria-valuemax": 100,
+    "aria-label": label || "Progress Bar"
   }, /*#__PURE__*/_react["default"].createElement(LinearProgressBar, {
-    backgroundType: backgroundType,
     variant: value === null || value === undefined ? "indeterminate" : "determinate",
     container: "first",
     value: valueProgressBar
   })), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
-    overlay: overlay,
-    backgroundType: backgroundType
+    overlay: overlay
   }, helperText))));
 };
-
 var BackgroundProgressBar = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n  display: flex;\n  flex-wrap: wrap;\n  min-width: 100px;\n  width: 100%;\n"])), function (_ref2) {
   var overlay = _ref2.overlay,
-      theme = _ref2.theme;
-  return overlay ? "background-color: ".concat(theme.overlayColor, ";\n      opacity: 0.8;\n      width: 100%;\n      justify-content: center;\n      height: 100vh;\n      align-items: center;\n      max-width: 100%;\n      position: fixed;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      z-index: 1300;") : "background-color: \"transparent\";";
+    theme = _ref2.theme;
+  return overlay ? "background-color: ".concat(theme.overlayColor, ";\n      width: 100%;\n      justify-content: center;\n      height: 100vh;\n      align-items: center;\n      max-width: 100%;\n      position: fixed;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      z-index: 1300;") : "background-color: \"transparent\";";
 });
-
 var ProgressBarContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: ", ";\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return props.overlay === true && "100" || "0";
 }, function (props) {
@@ -105,9 +83,7 @@ var ProgressBarContainer = _styledComponents["default"].div(_templateObject2 ||
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
-
 var InfoProgressBar = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  width: 685px;\n  flex-wrap: wrap;\n  width: 100%;\n  margin-bottom: 8px;\n  align-items: baseline;\n  justify-content: space-between;\n"])));
-
 var ProgressBarLabel = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-style: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  text-transform: ", ";\n  color: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n"])), function (props) {
   return props.theme.labelFontFamily;
 }, function (props) {
@@ -119,9 +95,8 @@ var ProgressBarLabel = _styledComponents["default"].div(_templateObject4 || (_te
 }, function (props) {
   return props.theme.labelFontTextTransform;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.overlay === true ? "#FFFFFF" : props.theme.labelFontColor;
+  return props.overlay === true ? props.theme.overlayFontColor : props.theme.labelFontColor;
 });
-
 var ProgressBarProgress = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-style: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  text-transform: ", ";\n  color: ", ";\n  display: ", ";\n  flex-shrink: 0;\n"])), function (props) {
   return props.theme.valueFontFamily;
 }, function (props) {
@@ -133,13 +108,12 @@ var ProgressBarProgress = _styledComponents["default"].div(_templateObject5 || (
 }, function (props) {
   return props.theme.valueFontTextTransform;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.overlay === true ? "#FFFFFF" : props.theme.valueFontColor;
+  return props.overlay === true ? props.theme.overlayFontColor : props.theme.valueFontColor;
 }, function (props) {
   return props.value !== undefined && props.value !== null && props.showValue === true && "block" || "none";
 });
-
 var HelperText = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n"])), function (props) {
-  return props.backgroundType === "dark" ? props.theme.helperTextFontColorOnDark : props.overlay === true ? "#FFFFFF" : props.theme.helperTextFontColor;
+  return props.overlay === true ? props.theme.overlayFontColor : props.theme.helperTextFontColor;
 }, function (props) {
   return props.theme.helperTextFontFamily;
 }, function (props) {
@@ -149,7 +123,6 @@ var HelperText = _styledComponents["default"].span(_templateObject6 || (_templat
 }, function (props) {
   return props.theme.helperTextFontWeight;
 });
-
 var LinearProgress = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n  margin-bottom: ", ";\n  overflow: hidden;\n  position: relative;\n"])), function (props) {
   return props.theme.thickness;
 }, function (props) {
@@ -159,9 +132,8 @@ var LinearProgress = _styledComponents["default"].div(_templateObject7 || (_temp
 }, function (props) {
   return props.helperText !== "" && "8px";
 });
-
 var LinearProgressBar = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  transform: ", ";\n  top: 0;\n  left: 0;\n  width: 100%;\n  bottom: 0;\n  position: absolute;\n  transition: ", ";\n  transform-origin: left;\n  ", ";\n  ", ";\n\n  @keyframes keyframes-indeterminate-first {\n    0% {\n      left: -35%;\n      right: 100%;\n    }\n    60% {\n      left: 100%;\n      right: -90%;\n    }\n    100% {\n      left: 100%;\n      right: -90%;\n    }\n  }\n\n  @keyframes keyframes-indeterminate-second {\n    0% {\n      left: -200%;\n      right: 100%;\n    }\n    60% {\n      left: 107%;\n      right: -8%;\n    }\n    100% {\n      left: 107%;\n      right: -8%;\n    }\n  }\n"])), function (props) {
-  return props.backgroundType === "dark" ? props.theme.trackLineColorOnDark : props.theme.trackLineColor;
+  return props.theme.trackLineColor;
 }, function (props) {
   return "translateX(-".concat(props.variant === "determinate" ? 100 - props.value : 0, "%)");
 }, function (props) {
@@ -171,6 +143,4 @@ var LinearProgressBar = _styledComponents["default"].span(_templateObject8 || (_
 }, function (props) {
   return props.variant === "indeterminate" ? props.container === "first" ? "animation: keyframes-indeterminate-first 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite;" : "animation: keyframes-indeterminate-second 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) 1.15s infinite;" : "";
 });
-
-var _default = DxcProgressBar;
-exports["default"] = _default;
+var _default = exports["default"] = DxcProgressBar;