@dxc-technology/halstack-react 0.0.0-f0d662d → 0.0.0-f1bbdfe

package/package.json

@@ -1,43 +1,36 @@
 {
   "name": "@dxc-technology/halstack-react",
-  "version": "0.0.0-f0d662d",
+  "version": "0.0.0-f1bbdfe",
   "description": "DXC Halstack React components library",
   "repository": "dxc-technology/halstack-react",
-  "homepage": "http://developer.dxc.com/tools/react",
+  "homepage": "https://developer.dxc.com/halstack",
   "license": "Apache-2.0",
   "author": {
     "name": "DXC Technology",
     "email": "DigitalInsurance@dxc.com",
-    "url": "https://dxc.com"
+    "url": "https://developer.dxc.com"
   },
   "main": "./main.js",
   "types": "./main.d.ts",
   "peerDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "react": "^18.x",
+    "react-dom": "^18.x",
     "styled-components": "^5.0.1"
   },
   "dependencies": {
-    "@date-io/date-fns": "^1.3.9",
-    "@material-ui/core": "4.11.1",
-    "@material-ui/icons": "4.4.3",
-    "@material-ui/lab": "4.0.0-alpha.17",
-    "@material-ui/pickers": "3.2.2",
-    "@material-ui/styles": "4.0.2",
+    "@radix-ui/react-popover": "0.1.6",
     "@types/styled-components": "^5.1.24",
     "@types/uuid": "^8.3.4",
     "color": "^3.1.3",
-    "date-fns": "^2.0.0-beta.4",
-    "moment": "2.24.0",
-    "prop-types": "^15.7.2",
-    "rgb-hex": "^3.0.0",
+    "dayjs": "^1.11.1",
+    "slugify": "^1.6.5",
     "uuid": "^8.3.2"
   },
   "scripts": {
-    "test": "jest",
+    "test": "jest --env=jsdom",
     "test:watch": "npm test -- --watch --coverage",
     "build": "babel src --extensions .js,.jsx,.ts,.tsx --out-dir ../dist --copy-files --verbose && node ../scripts/build/copy-package.js && tsc ",
-    "build:watch": "babel src --watch --out-dir ../dist --copy-files --verbose",
+    "build:watch": "babel src --watch --extensions .js,.jsx,.ts,.tsx --out-dir ../dist --copy-files --verbose",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook"
   },
@@ -55,8 +48,10 @@
     "@storybook/addon-links": "^6.4.9",
     "@storybook/react": "^6.4.9",
     "@storybook/testing-library": "0.0.7",
-    "@testing-library/react": "^11.2.5",
-    "@testing-library/user-event": "^12.6.3",
+    "@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",
     "chromatic": "^6.3.3",
@@ -70,9 +65,10 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-storybook": "^0.5.5",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^25.5.4",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "jest": "^29.2.2",
+    "jest-environment-jsdom": "^29.3.1",
+    "react": "^18.x",
+    "react-dom": "^18.x",
     "react-test-renderer": "^16.8.6",
     "storybook-addon-pseudo-states": "^1.0.0",
     "styled-components": "^5.0.1",
@@ -82,7 +78,8 @@
     "moduleNameMapper": {
       "\\.(css|less|scss|sass)$": "identity-obj-proxy",
       "\\.(svg)$": "<rootDir>/test/mocks/svgMock.js",
-      "\\.(png)$": "<rootDir>/test/mocks/pngMock.js"
+      "\\.(png)$": "<rootDir>/test/mocks/pngMock.js",
+      "^uuid$": "uuid"
     }
   }
 }

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

@@ -17,6 +17,8 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
+
 var _Button = _interopRequireDefault(require("../button/Button"));
 
 var _Select = _interopRequireDefault(require("../select/Select"));
@@ -25,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); }
 
@@ -49,13 +51,12 @@ var DxcPaginator = function DxcPaginator(_ref) {
   var minItemsPerPage = currentPageInternal === 1 || currentPageInternal === 0 ? currentPageInternal : (currentPageInternal - 1) * itemsPerPage + 1;
   var maxItemsPerPage = minItemsPerPage - 1 + itemsPerPage > totalItems ? totalItems : minItemsPerPage - 1 + itemsPerPage;
   var colorsTheme = (0, _useTheme["default"])();
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     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, "Items per page "), /*#__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(),
@@ -68,33 +69,23 @@ var DxcPaginator = function DxcPaginator(_ref) {
     value: itemsPerPage.toString(),
     size: "fillParent",
     tabIndex: tabIndex
-  }))), /*#__PURE__*/_react["default"].createElement(TotalItemsContainer, null, minItemsPerPage, " to ", maxItemsPerPage, " of ", totalItems), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    size: "small",
+  }))), /*#__PURE__*/_react["default"].createElement(TotalItemsContainer, null, translatedLabels.paginator.minToMaxOfText(minItemsPerPage, maxItemsPerPage, totalItems)), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
     mode: "secondary",
     disabled: currentPageInternal === 1 || currentPageInternal === 0,
-    margin: {
-      left: "xxsmall",
-      right: "xxsmall"
-    },
     icon: _Icons.firstIcon,
     tabIndex: tabIndex,
     onClick: function onClick() {
       onPageChange(1);
     }
   }), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    size: "small",
     mode: "secondary",
     disabled: currentPageInternal === 1 || currentPageInternal === 0,
-    margin: {
-      left: "xxsmall",
-      right: "xxsmall"
-    },
     icon: _Icons.previousIcon,
     tabIndex: tabIndex,
     onClick: function onClick() {
       onPageChange(currentPage - 1);
     }
-  }), showGoToPage && /*#__PURE__*/_react["default"].createElement(PageToSelectContainer, null, /*#__PURE__*/_react["default"].createElement(GoToLabel, null, "Go to page: "), /*#__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(),
@@ -107,27 +98,17 @@ var DxcPaginator = function DxcPaginator(_ref) {
     value: currentPage.toString(),
     size: "fillParent",
     tabIndex: tabIndex
-  }))) || /*#__PURE__*/_react["default"].createElement(TextContainer, null, "Page: ", currentPageInternal, " of ", 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,
-    margin: {
-      left: "xxsmall",
-      right: "xxsmall"
-    },
     icon: _Icons.nextIcon,
     tabIndex: tabIndex,
     onClick: function onClick() {
       onPageChange(currentPage + 1);
     }
   }), onPageChange && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    size: "small",
     mode: "secondary",
     disabled: currentPageInternal === totalPages,
-    margin: {
-      left: "xxsmall",
-      right: "xxsmall"
-    },
     icon: _Icons.lastIcon,
     tabIndex: tabIndex,
     onClick: function onClick() {
@@ -136,11 +117,7 @@ var DxcPaginator = function DxcPaginator(_ref) {
   })))));
 };
 
-var DxcPaginatorContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: ", ";\n  width: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  text-transform: ", ";\n  background-color: ", ";\n  color: ", ";\n\n  button {\n    &:disabled {\n      background-color: transparent !important;\n      opacity: 0.3 !important;\n    }\n  }\n"])), function (props) {
-  return props.theme.height;
-}, function (props) {
-  return props.theme.width;
-}, function (props) {
+var DxcPaginatorContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  text-transform: ", ";\n  background-color: ", ";\n  color: ", ";\n  padding: ", " ", ";\n\n  button {\n    &:disabled {\n      background-color: transparent !important;\n      opacity: 0.3 !important;\n    }\n  }\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.fontSize;
@@ -154,19 +131,23 @@ var DxcPaginatorContainer = _styledComponents["default"].div(_templateObject ||
   return props.theme.backgroundColor;
 }, function (props) {
   return props.theme.fontColor;
+}, function (props) {
+  return props.theme.verticalPadding;
+}, function (props) {
+  return props.theme.horizontalPadding;
 });
 
-var SelectContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  max-width: 100px;\n"])));
+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;
 });
 
-var ItemsLabel = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: 15px;\n"])));
+var ItemsLabel = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: 0.5rem;\n"])));
 
-var GoToLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: 10px;\n  margin-left: 10px;\n"])));
+var GoToLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: 0.5rem;\n  margin-left: 0.5rem;\n"])));
 
 var TotalItemsContainer = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return props.theme.totalItemsContainerMarginRight;
@@ -174,19 +155,9 @@ var TotalItemsContainer = _styledComponents["default"].span(_templateObject6 ||
   return props.theme.totalItemsContainerMarginLeft;
 });
 
-var LabelsContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  width: 100%;\n  justify-content: flex-end;\n  align-items: center;\n  margin: 0 ", " 0 ", ";\n"])), function (props) {
-  return props.theme.marginRight;
-}, function (props) {
-  return props.theme.marginLeft;
-});
-
-var PageToSelectContainer = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (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) {
-  return props.theme.pageSelectorMarginRight;
-}, function (props) {
-  return props.theme.pageSelectorMarginLeft;
-});
+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 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>
   </>
 );