@dxc-technology/halstack-react 8.0.0 → 9.0.1

package/{tabs-nav → nav-tabs}/Tab.js

@@ -23,7 +23,11 @@ var _Badge = _interopRequireDefault(require("../badge/Badge"));
 
 var _NavTabs = require("./NavTabs");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
+
+var _useTheme = _interopRequireDefault(require("../useTheme"));
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 var _excluded = ["href", "active", "icon", "disabled", "notificationNumber", "children"];
 
@@ -50,6 +54,7 @@ var DxcTab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, _ref2) {
       hasIcons = _useContext.hasIcons,
       focusedLabel = _useContext.focusedLabel;
 
+  var colorsTheme = (0, _useTheme["default"])();
   (0, _react.useLayoutEffect)(function () {
     var _tabRef$current;
 
@@ -71,10 +76,12 @@ var DxcTab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, _ref2) {
   return /*#__PURE__*/_react["default"].createElement(TabContainer, {
     active: active,
     role: "tab",
-    "aria-selected": active
+    "aria-selected": active,
+    "aria-disabled": disabled
   }, /*#__PURE__*/_react["default"].createElement(Tab, (0, _extends2["default"])({
     href: !disabled && href ? href : undefined,
     disabled: disabled,
+    active: active,
     iconPosition: iconPosition,
     hasIcon: hasIcons,
     ref: function ref(anchorRef) {
@@ -90,41 +97,54 @@ var DxcTab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, _ref2) {
     tabIndex: active ? tabIndex : -1
   }, otherProps), icon && /*#__PURE__*/_react["default"].createElement(TabIconContainer, {
     iconPosition: iconPosition
-  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(TabIcon, {
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon), /*#__PURE__*/_react["default"].createElement(LabelContainer, null, children, notificationNumber && /*#__PURE__*/_react["default"].createElement(BadgeContainer, null, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
-    notificationText: notificationNumber > 99 ? "+99" : notificationNumber,
+  }) : icon), /*#__PURE__*/_react["default"].createElement(LabelContainer, null, /*#__PURE__*/_react["default"].createElement(_BaseTypography["default"], {
+    color: disabled ? colorsTheme.navTabs.disabledFontColor : active ? colorsTheme.navTabs.selectedFontColor : colorsTheme.navTabs.unselectedFontColor,
+    fontFamily: colorsTheme.navTabs.fontFamily,
+    fontSize: colorsTheme.navTabs.fontSize,
+    fontStyle: colorsTheme.navTabs.fontStyle,
+    fontWeight: colorsTheme.navTabs.fontWeight,
+    textAlign: "center",
+    letterSpacing: "0.025em",
+    lineHeight: "1.715em"
+  }, children), notificationNumber && /*#__PURE__*/_react["default"].createElement(BadgeContainer, null, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+    notificationText: typeof notificationNumber === "number" && notificationNumber > 99 ? "+99" : notificationNumber,
     disabled: disabled
   })))));
 });
 
-var TabContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  border-bottom: 2px solid ", ";\n"])), function (props) {
-  return props.active ? "#6f2c91" : "#0000001a";
+var TabContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  border-bottom: 2px solid ", ";\n  svg {\n    color: ", ";\n  }\n\n  &[aria-selected=\"true\"] {\n    svg {\n      color: ", ";\n    }\n  }\n\n  &[aria-disabled=\"true\"] {\n    svg {\n      color: ", ";\n    }\n  }\n"])), function (props) {
+  return props.active ? props.theme.selectedUnderlineColor : props.theme.dividerColor;
+}, function (props) {
+  return props.theme.unselectedIconColor;
+}, function (props) {
+  return props.theme.selectedIconColor;
+}, function (props) {
+  return props.theme.disabledIconColor;
 });
 
-var Tab = _styledComponents["default"].a(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  justify-content: center;\n  align-items: center;\n\n  font-family: \"Open Sans\";\n  font-style: normal;\n  font-weight: 400;\n  font-size: 1rem;\n  color: ", ";\n  text-decoration-color: transparent;\n  cursor: ", ";\n\n  height: ", ";\n  min-width: 164px;\n  margin: 0.5rem;\n  padding: 0.375rem;\n\n  border-radius: 4px;\n\n  ", "\n"])), function (props) {
+var Tab = _styledComponents["default"].a(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  justify-content: center;\n  align-items: center;\n  height: ", ";\n  min-width: 164px;\n  margin: 0.5rem;\n  padding: 0.375rem;\n  border-radius: 4px;\n  background: ", ";\n  text-decoration-color: transparent;\n  cursor: ", ";\n\n  ", "\n"])), function (props) {
   return props.hasIcon && props.iconPosition === "top" ? "column" : "row";
 }, function (props) {
-  return props.disabled ? "#0000004D" : "#333333";
+  return props.hasIcon && props.iconPosition === "top" ? "66px" : "32px";
 }, function (props) {
-  return props.disabled ? "not-allowed" : "pointer";
+  return props.active ? props.theme.selectedBackgroundColor : props.theme.unselectedBackgroundColor;
 }, function (props) {
-  return props.hasIcon && props.iconPosition === "top" ? "66px" : "32px";
+  return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
-  return !props.disabled && ":hover {\n    background: #0000000D;\n  }\n\n  :focus {\n    outline: 2px solid #33aaff};\n  }\n\n  :active {\n    background: #0000001A;\n    outline: 2px solid #33aaff};\n  }";
+  return !props.disabled && "\n      :hover {\n        background: ".concat(props.theme.hoverBackgroundColor, ";\n      }\n      :focus {\n        outline: 2px solid ").concat(props.theme.focusOutline, ";\n      }\n      :active {\n        background: ").concat(props.theme.pressedBackgroundColor, ";\n        outline: 2px solid #33aaff};\n      }\n  ");
 });
 
-var TabIcon = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var TabIconContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 24px;\n  max-width: 24px;\n  margin-bottom: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  display: flex;\n  align-items: center;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
+var TabIconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  margin-bottom: ", ";\n  margin-right: ", ";\n\n  img,\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n"])), function (props) {
   return props.iconPosition === "top" && "0.375rem";
 }, function (props) {
   return props.iconPosition === "left" && "0.625rem";
 });
 
-var LabelContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n"])));
+var LabelContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n"])));
 
-var BadgeContainer = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 0.5rem;\n"])));
+var BadgeContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 0.5rem;\n"])));
 
 var _default = DxcTab;
 exports["default"] = _default;

package/number-input/NumberInput.test.js

@@ -8,7 +8,7 @@ var _react2 = require("@testing-library/react");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
-var _NumberInput = _interopRequireDefault(require("./NumberInput"));
+var _NumberInput = _interopRequireDefault(require("./NumberInput.tsx"));
 
 describe("Number input component tests", function () {
   test("Number input renders with label", function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxc-technology/halstack-react",
-  "version": "8.0.0",
+  "version": "9.0.1",
   "description": "DXC Halstack React components library",
   "repository": "dxc-technology/halstack-react",
   "homepage": "https://developer.dxc.com/halstack",
@@ -23,7 +23,6 @@
     "@types/uuid": "^8.3.4",
     "color": "^3.1.3",
     "dayjs": "^1.11.1",
-    "rgb-hex": "^3.0.0",
     "slugify": "^1.6.5",
     "uuid": "^8.3.2"
   },
@@ -51,6 +50,7 @@
     "@storybook/testing-library": "0.0.7",
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^13.0.0",
+    "@types/color": "^3.0.3",
     "@types/react": "^18.0.18",
     "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.6",

package/paginator/Icons.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare const firstIcon: JSX.Element;
+export declare const previousIcon: JSX.Element;
+export declare const nextIcon: JSX.Element;
+export declare const lastIcon: JSX.Element;

package/paginator/Icons.js

@@ -11,56 +11,44 @@ var _react = _interopRequireDefault(require("react"));
 
 var firstIcon = /*#__PURE__*/_react["default"].createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
-  width: "12.41",
-  height: "12",
-  viewBox: "0 0 12.41 12"
+  height: "24",
+  width: "24",
+  fill: "currentColor"
 }, /*#__PURE__*/_react["default"].createElement("path", {
-  id: "Path_2463",
-  "data-name": "Path 2463",
-  d: "M18.41,16.59,13.82,12l4.59-4.59L17,6l-6,6,6,6ZM6,6H8V18H6Z",
-  transform: "translate(-6 -6)"
+  d: "M6 18V6h2v12Zm11 0-6-6 6-6 1.4 1.4-4.6 4.6 4.6 4.6Z"
 }));
 
 exports.firstIcon = firstIcon;
 
 var previousIcon = /*#__PURE__*/_react["default"].createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
-  width: "7.41",
-  height: "12",
-  viewBox: "0 0 7.41 12"
+  height: "24",
+  width: "24",
+  fill: "currentColor"
 }, /*#__PURE__*/_react["default"].createElement("path", {
-  id: "Path_2459",
-  "data-name": "Path 2459",
-  d: "M15.41,7.41,14,6,8,12l6,6,1.41-1.41L10.83,12Z",
-  transform: "translate(-8 -6)"
+  d: "m14 18-6-6 6-6 1.4 1.4-4.6 4.6 4.6 4.6Z"
 }));
 
 exports.previousIcon = previousIcon;
 
 var nextIcon = /*#__PURE__*/_react["default"].createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
-  width: "7.41",
-  height: "12",
-  viewBox: "0 0 7.41 12"
+  height: "24",
+  width: "24",
+  fill: "currentColor"
 }, /*#__PURE__*/_react["default"].createElement("path", {
-  id: "Path_2461",
-  "data-name": "Path 2461",
-  d: "M10,6,8.59,7.41,13.17,12,8.59,16.59,10,18l6-6Z",
-  transform: "translate(-8.59 -6)"
+  d: "M9.4 18 8 16.6l4.6-4.6L8 7.4 9.4 6l6 6Z"
 }));
 
 exports.nextIcon = nextIcon;
 
 var lastIcon = /*#__PURE__*/_react["default"].createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
-  width: "12.41",
-  height: "12",
-  viewBox: "0 0 12.41 12"
+  height: "24",
+  width: "24",
+  fill: "currentColor"
 }, /*#__PURE__*/_react["default"].createElement("path", {
-  id: "Path_2465",
-  "data-name": "Path 2465",
-  d: "M5.59,7.41,10.18,12,5.59,16.59,7,18l6-6L7,6ZM16,6h2V18H16Z",
-  transform: "translate(-5.59 -6)"
+  d: "m7 18-1.4-1.4 4.6-4.6-4.6-4.6L7 6l6 6Zm9 0V6h2v12Z"
 }));
 
 exports.lastIcon = lastIcon;

package/paginator/Paginator.js

@@ -27,7 +27,7 @@ var _Icons = require("./Icons");
 
 var _BackgroundColorContext = require("../BackgroundColorContext");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+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); }
 
@@ -56,9 +56,7 @@ var DxcPaginator = function DxcPaginator(_ref) {
     theme: colorsTheme.paginator
   }, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
     color: colorsTheme.paginator.backgroundColor
-  }, /*#__PURE__*/_react["default"].createElement(DxcPaginatorContainer, {
-    disabled: currentPageInternal === 1
-  }, /*#__PURE__*/_react["default"].createElement(LabelsContainer, null, itemsPerPageOptions && /*#__PURE__*/_react["default"].createElement(ItemsPageContainer, null, /*#__PURE__*/_react["default"].createElement(ItemsLabel, null, translatedLabels.paginator.itemsPerPageText), /*#__PURE__*/_react["default"].createElement(SelectContainer, null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(DxcPaginatorContainer, null, /*#__PURE__*/_react["default"].createElement(LabelsContainer, null, itemsPerPageOptions && /*#__PURE__*/_react["default"].createElement(ItemsPageContainer, null, /*#__PURE__*/_react["default"].createElement(ItemsLabel, null, translatedLabels.paginator.itemsPerPageText), /*#__PURE__*/_react["default"].createElement(SelectContainer, null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
     options: itemsPerPageOptions.map(function (num) {
       return {
         label: num.toString(),
@@ -72,7 +70,6 @@ var DxcPaginator = function DxcPaginator(_ref) {
     size: "fillParent",
     tabIndex: tabIndex
   }))), /*#__PURE__*/_react["default"].createElement(TotalItemsContainer, null, translatedLabels.paginator.minToMaxOfText(minItemsPerPage, maxItemsPerPage, totalItems)), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    size: "small",
     mode: "secondary",
     disabled: currentPageInternal === 1 || currentPageInternal === 0,
     icon: _Icons.firstIcon,
@@ -81,7 +78,6 @@ var DxcPaginator = function DxcPaginator(_ref) {
       onPageChange(1);
     }
   }), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    size: "small",
     mode: "secondary",
     disabled: currentPageInternal === 1 || currentPageInternal === 0,
     icon: _Icons.previousIcon,
@@ -89,7 +85,7 @@ var DxcPaginator = function DxcPaginator(_ref) {
     onClick: function onClick() {
       onPageChange(currentPage - 1);
     }
-  }), showGoToPage && /*#__PURE__*/_react["default"].createElement(PageToSelectContainer, null, /*#__PURE__*/_react["default"].createElement(GoToLabel, null, translatedLabels.paginator.goToPageText, " "), /*#__PURE__*/_react["default"].createElement(SelectContainer, null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+  }), showGoToPage ? /*#__PURE__*/_react["default"].createElement(PageToSelectContainer, null, /*#__PURE__*/_react["default"].createElement(GoToLabel, null, translatedLabels.paginator.goToPageText, " "), /*#__PURE__*/_react["default"].createElement(SelectContainer, null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
     options: Array.from(Array(totalPages), function (e, num) {
       return {
         label: (num + 1).toString(),
@@ -102,8 +98,7 @@ var DxcPaginator = function DxcPaginator(_ref) {
     value: currentPage.toString(),
     size: "fillParent",
     tabIndex: tabIndex
-  }))) || /*#__PURE__*/_react["default"].createElement(TextContainer, null, translatedLabels.paginator.pageOfText(currentPageInternal, totalPages)), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    size: "small",
+  }))) : /*#__PURE__*/_react["default"].createElement("span", null, translatedLabels.paginator.pageOfText(currentPageInternal, totalPages)), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
     mode: "secondary",
     disabled: currentPageInternal === totalPages,
     icon: _Icons.nextIcon,
@@ -112,7 +107,6 @@ var DxcPaginator = function DxcPaginator(_ref) {
       onPageChange(currentPage + 1);
     }
   }), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    size: "small",
     mode: "secondary",
     disabled: currentPageInternal === totalPages,
     icon: _Icons.lastIcon,
@@ -145,7 +139,7 @@ var DxcPaginatorContainer = _styledComponents["default"].div(_templateObject ||
 
 var SelectContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  min-width: 5.25rem;\n"])));
 
-var ItemsPageContainer = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  margin-right: ", ";\n  margin-left: ", ";\n\n  label {\n    height: 0px;\n  }\n  label + .MuiInput-formControl {\n    margin-top: 0px;\n  }\n"])), function (props) {
+var ItemsPageContainer = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  margin-right: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return props.theme.itemsPerPageSelectorMarginRight;
 }, function (props) {
   return props.theme.itemsPerPageSelectorMarginLeft;
@@ -163,9 +157,7 @@ var TotalItemsContainer = _styledComponents["default"].span(_templateObject6 ||
 
 var LabelsContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  gap: 0.5rem;\n  width: 100%;\n  justify-content: flex-end;\n  align-items: center;\n"])));
 
-var PageToSelectContainer = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  margin-right: 0.5rem;\n\n  label {\n    height: 0px;\n  }\n  label + .MuiInput-formControl {\n    margin-top: 0px;\n  }\n"])));
-
-var TextContainer = _styledComponents["default"].span(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])([""])));
+var PageToSelectContainer = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  margin-right: 0.5rem;\n"])));
 
 var _default = DxcPaginator;
 exports["default"] = _default;

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;
 }();
@@ -78,46 +85,37 @@ 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("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

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

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;