@dxc-technology/halstack-react 0.0.0-c1253f5 → 0.0.0-c1a6e05

package/paragraph/Paragraph.js

@@ -11,21 +11,21 @@ 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"));
 
+var _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
+
 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 DxcParagraph = function DxcParagraph(_ref) {
   var children = _ref.children;
   var colorsTheme = (0, _useTheme["default"])();
   var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
-  return /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_BaseTypography["default"], {
     as: "p",
     display: colorsTheme.paragraph.display,
     fontSize: colorsTheme.paragraph.fontSize,
@@ -34,5 +34,5 @@ var Paragraph = function Paragraph(_ref) {
   }, children);
 };
 
-var _default = Paragraph;
+var _default = DxcParagraph;
 exports["default"] = _default;

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.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 _variables = require("../common/variables");
 
 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;

package/progress-bar/ProgressBar.stories.jsx

@@ -2,21 +2,34 @@ import React from "react";
 import DxcProgressBar from "./ProgressBar";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "ProgressBar",
   component: DxcProgressBar,
 };
 
+const opinionatedTheme = {
+  progressBar: {
+    accentColor: "#5f249f",
+    baseColor: "#e6e6e6",
+    fontColor: "#000000",
+    overlayColor: "#000000b3",
+    overlayFontColor: "#ffffff",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
       <Title title="Without labels" theme="light" level={4} />
       <DxcProgressBar value={50} showValue />
       <Title title="With helperText" theme="light" level={4} />
-      <DxcProgressBar helperText="Helper text" value={50} showValue />
+      <DxcProgressBar helperText="Helper text" value={24} showValue />
       <Title title="Without default value" theme="light" level={4} />
       <DxcProgressBar label="Loading..." showValue />
+      <Title title="With full value" theme="light" level={4} />
+      <DxcProgressBar label="Loading..." value={100} showValue />
     </ExampleContainer>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
@@ -44,15 +57,37 @@ export const Chromatic = () => (
       <DxcProgressBar label="Margin xlarge" margin="xlarge" value={50} showValue />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="XxLarge margin" theme="light" level={4} />
+      <Title title="Xxlarge margin" theme="light" level={4} />
       <DxcProgressBar label="Margin xxlarge" margin="xxlarge" value={50} showValue />
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Label and helper text" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcProgressBar label="Loading..." helperText="Helper text" value={24} showValue />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Without default value" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcProgressBar label="Loading..." helperText="Helper text" showValue />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 
 export const ProgressBarOverlay = () => (
   <ExampleContainer>
     <Title title="Overlay" theme="dark" level={4} />
-    <DxcProgressBar label="Overlay" helperText="Helper text" overlay={true} showValue value={50} />
+    <DxcProgressBar label="Overlay" helperText="Helper text" overlay showValue value={50} />
+  </ExampleContainer>
+);
+
+export const ProgressBarOverlayOpinionated = () => (
+  <ExampleContainer>
+    <Title title="Overlay" theme="dark" level={4} />
+    <HalstackProvider theme={opinionatedTheme}>
+      <DxcProgressBar label="Overlay" helperText="Helper text" overlay showValue value={50} />
+    </HalstackProvider>
   </ExampleContainer>
 );

package/progress-bar/ProgressBar.test.js

@@ -6,60 +6,105 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _ProgressBar = _interopRequireDefault(require("./ProgressBar"));
+var _ProgressBar = _interopRequireDefault(require("./ProgressBar.tsx"));
 
 describe("ProgressBar component tests", function () {
-  test("ProgressBar renders with label", function () {
+  test("ProgressBar renders with label and helperText", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
-      label: "test-label"
+      label: "test-label",
+      helperText: "helper-text"
     })),
         getByText = _render.getByText;
 
     expect(getByText("test-label")).toBeTruthy();
+    expect(getByText("helper-text")).toBeTruthy();
   });
-  test("Overlay progressBar renders with label", function () {
+  test("ProgressBar renders with default value", function () {
+    var value = 0;
+
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
-      label: "test-label",
-      overlay: true
+      showValue: true
     })),
-        getByText = _render2.getByText;
+        getByText = _render2.getByText,
+        getByRole = _render2.getByRole;
 
-    expect(getByText("test-label")).toBeTruthy();
+    var progressBar = getByRole("progressbar");
+    expect(getByText("0 %")).toBeTruthy();
+    expect(progressBar.getAttribute("aria-valuenow")).toEqual(value.toString());
   });
-  test("ProgressBar renders with default value", function () {
+  test("ProgressBar renders with value", function () {
+    var value = 25;
+
     var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
-      showValue: true
+      showValue: true,
+      value: value
     })),
-        getByText = _render3.getByText;
+        getByText = _render3.getByText,
+        getByRole = _render3.getByRole;
 
-    expect(getByText("0 %")).toBeTruthy();
+    var progressBar = getByRole("progressbar");
+    expect(getByText("25 %")).toBeTruthy();
+    expect(progressBar.getAttribute("aria-valuenow")).toEqual(value.toString());
   });
-  test("Overlay progressBar renders with default value", function () {
+  test("ProgressBar renders with negative value", function () {
+    var value = 0;
+
     var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
       showValue: true,
-      overlay: true
+      value: -20
     })),
-        getByText = _render4.getByText;
+        getByText = _render4.getByText,
+        getByRole = _render4.getByRole;
 
+    var progressBar = getByRole("progressbar");
     expect(getByText("0 %")).toBeTruthy();
+    expect(progressBar.getAttribute("aria-valuenow")).toEqual(value.toString());
   });
-  test("ProgressBar renders with value", function () {
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
+  test("ProgressBar renders as indeterminate", function () {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], null)),
+        getByRole = _render5.getByRole;
+
+    var progressBar = getByRole("progressbar");
+    expect(progressBar.getAttribute("aria-valuenow")).toBe(null);
+  });
+  test("Overlay progressBar renders with label and helperText", function () {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
+      label: "test-label",
+      helperText: "helper-text",
+      overlay: true
+    })),
+        getByText = _render6.getByText;
+
+    expect(getByText("test-label")).toBeTruthy();
+    expect(getByText("helper-text")).toBeTruthy();
+  });
+  test("Overlay progressBar renders with default value", function () {
+    var value = 0;
+
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
       showValue: true,
-      value: 25
+      overlay: true
     })),
-        getByText = _render5.getByText;
+        getByText = _render7.getByText,
+        getByRole = _render7.getByRole;
 
-    expect(getByText("25 %")).toBeTruthy();
+    var progressBar = getByRole("progressbar");
+    expect(getByText("0 %")).toBeTruthy();
+    expect(progressBar.getAttribute("aria-valuenow")).toEqual(value.toString());
   });
   test("Overlay progressBar renders with value", function () {
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
+    var value = 25;
+
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ProgressBar["default"], {
       showValue: true,
-      value: 25,
+      value: value,
       overlay: true
     })),
-        getByText = _render6.getByText;
+        getByText = _render8.getByText,
+        getByRole = _render8.getByRole;
 
+    var progressBar = getByRole("progressbar");
     expect(getByText("25 %")).toBeTruthy();
+    expect(progressBar.getAttribute("aria-valuenow")).toEqual(value.toString());
   });
 });

package/quick-nav/QuickNav.js

@@ -48,13 +48,10 @@ var DxcQuickNav = function DxcQuickNav(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
     level: 4,
     text: title || translatedLabels.quickNav.contentTitle
-  }), /*#__PURE__*/_react["default"].createElement(ListColumn, null, /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
-    direction: "column",
-    gap: "0.5rem"
-  }, links.map(function (link) {
+  }), /*#__PURE__*/_react["default"].createElement(ListColumn, null, links.map(function (link) {
     var _link$links;
 
-    return /*#__PURE__*/_react["default"].createElement(ListRow, {
+    return /*#__PURE__*/_react["default"].createElement("li", {
       key: link.label
     }, /*#__PURE__*/_react["default"].createElement(_Inset["default"], {
       space: "0.25rem"
@@ -62,18 +59,20 @@ var DxcQuickNav = function DxcQuickNav(_ref) {
       href: "#".concat((0, _slugify["default"])(link === null || link === void 0 ? void 0 : link.label, {
         lower: true
       }))
-    }, link === null || link === void 0 ? void 0 : link.label), (_link$links = link.links) === null || _link$links === void 0 ? void 0 : _link$links.map(function (sublink) {
-      return /*#__PURE__*/_react["default"].createElement(ListRow, {
+    }, link === null || link === void 0 ? void 0 : link.label), /*#__PURE__*/_react["default"].createElement(ListSecondColumn, null, (_link$links = link.links) === null || _link$links === void 0 ? void 0 : _link$links.map(function (sublink) {
+      return /*#__PURE__*/_react["default"].createElement("li", {
         key: sublink.label
       }, /*#__PURE__*/_react["default"].createElement(_Inset["default"], {
         horizontal: "0.5rem"
       }, /*#__PURE__*/_react["default"].createElement(_Typography["default"], null, /*#__PURE__*/_react["default"].createElement(Link, {
-        href: "#".concat((0, _slugify["default"])(sublink === null || sublink === void 0 ? void 0 : sublink.label, {
+        href: "#".concat((0, _slugify["default"])(link === null || link === void 0 ? void 0 : link.label, {
+          lower: true
+        }), "-").concat((0, _slugify["default"])(sublink === null || sublink === void 0 ? void 0 : sublink.label, {
           lower: true
         }))
       }, sublink === null || sublink === void 0 ? void 0 : sublink.label))));
-    }))));
-  }))))));
+    })))));
+  })))));
 };
 
 var QuickNavContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  border-left: 2px solid ", ";\n"])), function (props) {
@@ -88,9 +87,9 @@ var QuickNavContainer = _styledComponents["default"].div(_templateObject || (_te
   return props.theme.dividerBorderColor;
 });
 
-var ListColumn = _styledComponents["default"].ul(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  list-style-type: none;\n  margin: 0;\n  padding: 0;\n  width: 100%;\n"])));
+var ListColumn = _styledComponents["default"].ul(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  gap: 0.5rem;\n  margin: 0;\n  padding: 0;\n  list-style-type: none;\n"])));
 
-var ListRow = _styledComponents["default"].li(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n"])));
+var ListSecondColumn = _styledComponents["default"].ul(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  margin: 0;\n  padding: 0;\n  list-style-type: none;\n"])));
 
 var Link = _styledComponents["default"].a(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  text-decoration: none;\n  font-size: ", ";\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  display: block;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n  width: fit-content;\n  max-width: 100%;\n\n  &:hover {\n    color: ", ";\n  }\n  &:focus {\n    outline-color: ", ";\n    outline-style: ", ";\n    outline-width: ", ";\n    border-radius: ", ";\n  }\n"])), function (props) {
   return props.theme.fontSize;