@dxc-technology/halstack-react 0.0.0-1d5e7bf → 0.0.0-1da0f40

package/paginator/Paginator.stories.tsx

@@ -2,12 +2,20 @@ import React from "react";
 import DxcPaginator from "./Paginator";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Paginator",
   component: DxcPaginator,
 };
 
+const opinionatedTheme = {
+  paginator: {
+    baseColor: "#f2f2f2",
+    fontColor: "#000000",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -59,5 +67,21 @@ export const Chromatic = () => (
         showGoToPage
       />
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <ExampleContainer>
+          <Title title="Page change and items per page options" theme="light" level={4} />
+          <DxcPaginator
+            currentPage={1}
+            itemsPerPage={10}
+            totalItems={27}
+            onPageChange={() => {}}
+            itemsPerPageOptions={[5, 10, 15]}
+            showGoToPage
+          />
+        </ExampleContainer>
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );

package/paginator/Paginator.test.js

@@ -12,30 +12,37 @@ var _react2 = require("@testing-library/react");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
-var _Paginator = _interopRequireDefault(require("./Paginator"));
+var _Paginator = _interopRequireDefault(require("./Paginator.tsx"));
 
 // 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(cb) {
+  function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
-    this.cb = cb;
   }
 
   (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
-    value: function observe() {
-      this.cb([{
-        borderBoxSize: {
-          inlineSize: 0,
-          blockSize: 0
-        }
-      }]);
-    }
+    value: function observe() {}
   }, {
     key: "unobserve",
     value: function unobserve() {}
+  }, {
+    key: "disconnect",
+    value: function disconnect() {}
   }]);
   return ResizeObserver;
 }();
@@ -77,47 +84,38 @@ describe("Paginator component tests", function () {
     })),
         getByText = _render3.getByText;
 
-    expect(getByText("Items per page")).toBeTruthy();
-  });
-  test("Paginator renders with itemsPerPageOptions", function () {
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
-      currentPage: 1,
-      itemsPerPage: 10,
-      totalItems: 20
-    })),
-        getByText = _render4.getByText;
-
+    expect(getByText("Items per page:")).toBeTruthy();
     expect(getByText("1 to 10 of 20")).toBeTruthy();
     expect(getByText("Page: 1 of 2")).toBeTruthy();
   });
   test("Paginator renders with totalItems", function () {
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       totalItems: 20
     })),
-        getByText = _render5.getByText;
+        getByText = _render4.getByText;
 
     expect(getByText("1 to 5 of 20")).toBeTruthy();
     expect(getByText("Page: 1 of 4")).toBeTruthy();
   });
   test("Paginator renders with correct text in second page", function () {
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       currentPage: 2,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getByText = _render6.getByText;
+        getByText = _render5.getByText;
 
     expect(getByText("11 to 20 of 20")).toBeTruthy();
     expect(getByText("Page: 2 of 2")).toBeTruthy();
   });
   test("Paginator renders goToPage select", function () {
-    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       currentPage: 2,
       showGoToPage: true,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getByText = _render7.getByText;
+        getByText = _render6.getByText;
 
     expect(getByText("Go to page:")).toBeTruthy();
   });
@@ -128,16 +126,15 @@ describe("Paginator component tests", function () {
 
     window.HTMLElement.prototype.scrollTo = function () {};
 
-    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       currentPage: 1,
       itemsPerPage: 10,
       totalItems: 27,
       showGoToPage: true,
       onPageChange: onClick
     })),
-        getByText = _render8.getByText,
-        getAllByRole = _render8.getAllByRole,
-        getByRole = _render8.getByRole;
+        getByText = _render7.getByText,
+        getAllByRole = _render7.getAllByRole;
 
     var goToPageSelect = getAllByRole("combobox")[0];
     (0, _react2.act)(function () {
@@ -152,13 +149,13 @@ describe("Paginator component tests", function () {
   test("Call correct goToPageFunction", function () {
     var onClick = jest.fn();
 
-    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       onPageChange: onClick,
       currentPage: 1,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getAllByRole = _render9.getAllByRole;
+        getAllByRole = _render8.getAllByRole;
 
     var nextButton = getAllByRole("button")[2];
 
@@ -173,15 +170,15 @@ describe("Paginator component tests", function () {
 
     window.HTMLElement.prototype.scrollTo = function () {};
 
-    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       currentPage: 1,
       itemsPerPage: 10,
       itemsPerPageOptions: [10, 15],
       itemsPerPageFunction: onClick,
       totalItems: 20
     })),
-        getAllByText = _render10.getAllByText,
-        getByText = _render10.getByText;
+        getAllByText = _render9.getAllByText,
+        getByText = _render9.getByText;
 
     var select = getAllByText("10")[0];
     (0, _react2.act)(function () {
@@ -196,13 +193,13 @@ describe("Paginator component tests", function () {
   test("Next button is disable in last page", function () {
     var onClick = jest.fn();
 
-    var _render11 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       onPageChange: onClick,
       currentPage: 2,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getAllByRole = _render11.getAllByRole;
+        getAllByRole = _render10.getAllByRole;
 
     var nextButton = getAllByRole("button")[2];
     expect(nextButton.hasAttribute("disabled")).toBeTruthy();
@@ -214,13 +211,13 @@ describe("Paginator component tests", function () {
   test("Last button is disable in last page", function () {
     var onClick = jest.fn();
 
-    var _render12 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render11 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       onPageChange: onClick,
       currentPage: 2,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getAllByRole = _render12.getAllByRole;
+        getAllByRole = _render11.getAllByRole;
 
     var lastButton = getAllByRole("button")[3];
     expect(lastButton.hasAttribute("disabled")).toBeTruthy();
@@ -232,13 +229,13 @@ describe("Paginator component tests", function () {
   test("First button is disable in first page", function () {
     var onClick = jest.fn();
 
-    var _render13 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render12 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       onPageChange: onClick,
       currentPage: 1,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getAllByRole = _render13.getAllByRole;
+        getAllByRole = _render12.getAllByRole;
 
     var lastButton = getAllByRole("button")[0];
     expect(lastButton.hasAttribute("disabled")).toBeTruthy();
@@ -250,13 +247,13 @@ describe("Paginator component tests", function () {
   test("Previous button is disable in first page", function () {
     var onClick = jest.fn();
 
-    var _render14 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render13 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       onPageChange: onClick,
       currentPage: 1,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getAllByRole = _render14.getAllByRole;
+        getAllByRole = _render13.getAllByRole;
 
     var lastButton = getAllByRole("button")[1];
     expect(lastButton.hasAttribute("disabled")).toBeTruthy();
@@ -268,13 +265,13 @@ describe("Paginator component tests", function () {
   test("Last and next buttons are disable in last page", function () {
     var onClick = jest.fn();
 
-    var _render15 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render14 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       onPageChange: onClick,
       currentPage: 2,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getAllByRole = _render15.getAllByRole;
+        getAllByRole = _render14.getAllByRole;
 
     var firstButton = getAllByRole("button")[0];
     var prevButton = getAllByRole("button")[1];
@@ -288,13 +285,13 @@ describe("Paginator component tests", function () {
   test("First and previous buttons are disable in first page", function () {
     var onClick = jest.fn();
 
-    var _render16 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+    var _render15 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
       onPageChange: onClick,
       currentPage: 1,
       itemsPerPage: 10,
       totalItems: 20
     })),
-        getAllByRole = _render16.getAllByRole;
+        getAllByRole = _render15.getAllByRole;
 
     var firstButton = getAllByRole("button")[0];
     var prevButton = getAllByRole("button")[1];

package/paragraph/Paragraph.d.ts

@@ -0,0 +1,6 @@
+import React from "react";
+declare type ParagraphPropsType = {
+    children: React.ReactNode;
+};
+declare const Paragraph: ({ children }: ParagraphPropsType) => JSX.Element;
+export default Paragraph;

package/paragraph/Paragraph.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Typography = _interopRequireDefault(require("../typography/Typography"));
+
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
+
+var _useTheme = _interopRequireDefault(require("../useTheme"));
+
+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 || _typeof(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; }
+
+var Paragraph = function Paragraph(_ref) {
+  var children = _ref.children;
+  var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+  return /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+    as: "p",
+    display: colorsTheme.paragraph.display,
+    fontSize: colorsTheme.paragraph.fontSize,
+    fontWeight: colorsTheme.paragraph.fontWeight,
+    color: backgroundType && backgroundType === "dark" ? colorsTheme.paragraph.fontColorOnDark : colorsTheme.paragraph.fontColor
+  }, children);
+};
+
+var _default = Paragraph;
+exports["default"] = _default;

package/paragraph/Paragraph.stories.tsx

@@ -0,0 +1,44 @@
+import React from "react";
+import Title from "../../.storybook/components/Title";
+import DxcParagraph from "./Paragraph";
+import { BackgroundColorProvider } from "../BackgroundColorContext";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import DarkContainer from "../../.storybook/components/DarkSection";
+
+export default {
+  title: "Paragraph",
+  component: DxcParagraph,
+};
+
+export const Chromatic = () => (
+  <>
+    <ExampleContainer>
+      <Title title="Default Paragraph" level={4} />
+      <DxcParagraph>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla id tortor sit amet velit auctor cursus id eget
+        nisl. Vivamus luctus egestas eros, at mattis libero eleifend ac. Integer vel urna rutrum, pretium arcu
+        dignissim, fringilla turpis. Nullam luctus odio quis magna finibus, a pharetra magna euismod. Nullam efficitur
+        semper pellentesque. Nulla eget arcu ac diam fringilla vehicula. In imperdiet nisl hendrerit, elementum metus
+        eu, ornare risus. Aenean neque nibh, vestibulum vitae elit vel, imperdiet suscipit leo. Curabitur blandit
+        iaculis pretium. Fusce id imperdiet dui, ut laoreet justo. Sed maximus sollicitudin ipsum, et varius massa
+        condimentum eget. Vivamus id mauris et nisl mattis consequat et id lectus. Quisque mollis lacinia nisl.
+        Suspendisse sed quam tincidunt, commodo dolor vel, tincidunt nisl.
+      </DxcParagraph>
+    </ExampleContainer>
+    <BackgroundColorProvider color="#333333">
+      <DarkContainer>
+        <Title title="Default Paragraph" theme="dark" level={4} />
+        <DxcParagraph>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla id tortor sit amet velit auctor cursus id eget
+          nisl. Vivamus luctus egestas eros, at mattis libero eleifend ac. Integer vel urna rutrum, pretium arcu
+          dignissim, fringilla turpis. Nullam luctus odio quis magna finibus, a pharetra magna euismod. Nullam efficitur
+          semper pellentesque. Nulla eget arcu ac diam fringilla vehicula. In imperdiet nisl hendrerit, elementum metus
+          eu, ornare risus. Aenean neque nibh, vestibulum vitae elit vel, imperdiet suscipit leo. Curabitur blandit
+          iaculis pretium. Fusce id imperdiet dui, ut laoreet justo. Sed maximus sollicitudin ipsum, et varius massa
+          condimentum eget. Vivamus id mauris et nisl mattis consequat et id lectus. Quisque mollis lacinia nisl.
+          Suspendisse sed quam tincidunt, commodo dolor vel, tincidunt nisl.
+        </DxcParagraph>
+      </DarkContainer>
+    </BackgroundColorProvider>
+  </>
+);

package/password-input/PasswordInput.test.js

@@ -12,7 +12,7 @@ var _react2 = require("@testing-library/react");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
-var _PasswordInput = _interopRequireDefault(require("./PasswordInput"));
+var _PasswordInput = _interopRequireDefault(require("./PasswordInput.tsx"));
 
 describe("Password input component tests", function () {
   test("Password input renders with label", function () {
@@ -46,9 +46,9 @@ describe("Password input component tests", function () {
       label: "Password input",
       onChange: onChange
     })),
-        getByRole = _render4.getByRole;
+        getByLabelText = _render4.getByLabelText;
 
-    var passwordInput = getByRole("textbox");
+    var passwordInput = getByLabelText("Password input");
 
     _userEvent["default"].type(passwordInput, "Pa$$w0rd");
 
@@ -64,9 +64,9 @@ describe("Password input component tests", function () {
       label: "Password input",
       onBlur: onBlur
     })),
-        getByRole = _render5.getByRole;
+        getByLabelText = _render5.getByLabelText;
 
-    var passwordInput = getByRole("textbox");
+    var passwordInput = getByLabelText("Password input");
 
     _userEvent["default"].type(passwordInput, "Pa$$w0rd");
 
@@ -83,9 +83,9 @@ describe("Password input component tests", function () {
       clearable: true
     })),
         getAllByRole = _render6.getAllByRole,
-        getByRole = _render6.getByRole;
+        getByLabelText = _render6.getByLabelText;
 
-    var passwordInput = getByRole("textbox");
+    var passwordInput = getByLabelText("Password input");
 
     _userEvent["default"].type(passwordInput, "Pa$$w0rd");
 
@@ -101,9 +101,9 @@ describe("Password input component tests", function () {
       label: "Password input"
     })),
         getAllByRole = _render7.getAllByRole,
-        getByRole = _render7.getByRole;
+        getByLabelText = _render7.getByLabelText;
 
-    var passwordInput = getByRole("textbox");
+    var passwordInput = getByLabelText("Password input");
 
     _userEvent["default"].type(passwordInput, "Pa$$w0rd");
 
@@ -117,9 +117,9 @@ describe("Password input component tests", function () {
       clearable: true
     })),
         getAllByRole = _render8.getAllByRole,
-        getByRole = _render8.getByRole;
+        getByLabelText = _render8.getByLabelText;
 
-    var passwordInput = getByRole("textbox");
+    var passwordInput = getByLabelText("Password input");
 
     _userEvent["default"].type(passwordInput, "Pa$$w0rd");
 
@@ -164,9 +164,10 @@ describe("Password input component tests", function () {
     var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_PasswordInput["default"], {
       label: "Password input"
     })),
-        getByRole = _render10.getByRole;
+        getByRole = _render10.getByRole,
+        getByLabelText = _render10.getByLabelText;
 
-    var passwordInput = getByRole("textbox");
+    var passwordInput = getByLabelText("Password input");
     expect(passwordInput.getAttribute("aria-autocomplete")).toBeNull();
     expect(passwordInput.getAttribute("aria-controls")).toBeNull();
     expect(passwordInput.getAttribute("aria-expanded")).toBeNull();

package/progress-bar/ProgressBar.d.ts

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

package/progress-bar/ProgressBar.js

@@ -13,19 +13,19 @@ 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 _LinearProgress = _interopRequireDefault(require("@material-ui/core/LinearProgress"));
-
 var _variables = require("../common/variables.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+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); }
 
@@ -44,72 +44,56 @@ var DxcProgressBar = function DxcProgressBar(_ref) {
       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];
+
+  (0, _react.useEffect)(function () {
+    setValueProgressBar(value === null || value === undefined || value < 0 ? 0 : value >= 0 && value <= 100 ? value : 100);
+  }, [value]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.progressBar
   }, /*#__PURE__*/_react["default"].createElement(BackgroundProgressBar, {
     overlay: overlay
-  }, /*#__PURE__*/_react["default"].createElement(DXCProgressBar, {
+  }, /*#__PURE__*/_react["default"].createElement(ProgressBarContainer, {
     overlay: overlay,
-    margin: margin,
-    backgroundType: backgroundType
+    margin: margin
   }, /*#__PURE__*/_react["default"].createElement(InfoProgressBar, null, /*#__PURE__*/_react["default"].createElement(ProgressBarLabel, {
     overlay: overlay,
-    backgroundType: backgroundType
+    backgroundType: backgroundType,
+    "aria-label": label || undefined
   }, label), /*#__PURE__*/_react["default"].createElement(ProgressBarProgress, {
     overlay: overlay,
     showValue: showValue,
-    backgroundType: backgroundType
-  }, value === null || value === undefined ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100, " %")), /*#__PURE__*/_react["default"].createElement(_LinearProgress["default"], {
-    variant: showValue ? "determinate" : "indeterminate",
-    value: value === null || value === undefined ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100
-  }), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
+    backgroundType: backgroundType,
+    value: valueProgressBar
+  }, valueProgressBar, " %")), /*#__PURE__*/_react["default"].createElement(LinearProgress, {
+    role: "progressbar",
+    helperText: helperText,
+    "aria-valuenow": showValue ? valueProgressBar : undefined
+  }, /*#__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
   }, helperText))));
 };
 
-var BackgroundProgressBar = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  opacity: ", ";\n  width: ", ";\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: ", ";\n  height: ", ";\n  align-items: ", ";\n  min-width: 100px;\n  max-width: ", ";\n  position: ", ";\n  top: ", ";\n  bottom: ", ";\n  left: ", ";\n  right: ", ";\n  z-index: ", ";\n  width: 100%;\n"])), function (props) {
-  return props.overlay === true ? "".concat(props.theme.overlayColor) : "transparent";
-}, function (props) {
-  return props.overlay === true && "0.8";
-}, function (props) {
-  return props.overlay === true ? "100%" : "";
-}, function (props) {
-  return props.overlay === true ? "center" : "";
-}, function (props) {
-  return props.overlay === true ? "100vh" : "";
-}, function (props) {
-  return props.overlay === true ? "center" : "";
-}, function (props) {
-  return props.overlay === true ? "100%" : "";
-}, function (props) {
-  return props.overlay === true ? "fixed" : "";
-}, function (props) {
-  return props.overlay === true ? "0" : "";
-}, function (props) {
-  return props.overlay === true ? "0" : "";
-}, function (props) {
-  return props.overlay === true ? "0" : "";
-}, function (props) {
-  return props.overlay === true ? "0" : "";
-}, function (props) {
-  return props.overlay ? 1300 : "";
+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      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 DXCProgressBar = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: ", ";\n  width: ", ";\n  .MuiLinearProgress-root {\n    height: ", ";\n    background-color: ", ";\n    border-radius: ", ";\n    margin-bottom: ", ";\n  }\n  .MuiLinearProgress-bar {\n    background-color: ", ";\n  }\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
+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) {
   return props.overlay === true ? "80%" : "100%";
-}, function (props) {
-  return props.theme.thickness;
-}, function (props) {
-  return props.theme.totalLineColor;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.helperText !== "" && "8px";
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.trackLineColorOnDark : props.theme.trackLineColor;
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -135,7 +119,7 @@ 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.backgroundType === "dark" ? props.theme.labelFontColorOnDark : 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) {
@@ -149,13 +133,13 @@ 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.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.overlay === true ? props.theme.overlayFontColor : props.theme.valueFontColor;
 }, function (props) {
-  return props.value !== "" && props.showValue === true && "block" || "none";
+  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.backgroundType === "dark" ? props.theme.helperTextFontColorOnDark : props.overlay === true ? props.theme.overlayFontColor : props.theme.helperTextFontColor;
 }, function (props) {
   return props.theme.helperTextFontFamily;
 }, function (props) {
@@ -166,5 +150,27 @@ var HelperText = _styledComponents["default"].span(_templateObject6 || (_templat
   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) {
+  return props.theme.totalLineColor;
+}, function (props) {
+  return props.theme.borderRadius;
+}, 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;
+}, function (props) {
+  return "translateX(-".concat(props.variant === "determinate" ? 100 - props.value : 0, "%)");
+}, function (props) {
+  return props.variant === "determinate" ? "transform .4s linear" : "transform 0.2s linear";
+}, function (props) {
+  return props.variant === "indeterminate" && "width: auto;";
+}, 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;