@dxc-technology/halstack-react 0.0.0-5a1e592 → 0.0.0-5b15506

package/alert/Alert.test.js

@@ -1,92 +1,75 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _react = _interopRequireDefault(require("react"));
-
 var _react2 = require("@testing-library/react");
-
 var _Alert = _interopRequireDefault(require("./Alert.tsx"));
-
 describe("Alert component tests", function () {
   test("Info alert renders with correct text", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Alert["default"], {
-      type: "info",
-      inlineText: "info-alert-text"
-    })),
-        getByText = _render.getByText;
-
+        type: "info",
+        inlineText: "info-alert-text"
+      })),
+      getByText = _render.getByText;
     expect(getByText("information")).toBeTruthy();
     expect(getByText("info-alert-text")).toBeTruthy();
   });
   test("Confirm alert renders with correct text", function () {
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Alert["default"], {
-      type: "confirm",
-      inlineText: "confirm-alert-text"
-    })),
-        getByText = _render2.getByText;
-
+        type: "confirm",
+        inlineText: "confirm-alert-text"
+      })),
+      getByText = _render2.getByText;
     expect(getByText("success")).toBeTruthy();
     expect(getByText("confirm-alert-text")).toBeTruthy();
   });
   test("Warning alert renders with correct text", function () {
     var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Alert["default"], {
-      type: "warning",
-      inlineText: "warning-alert-text"
-    })),
-        getByText = _render3.getByText;
-
+        type: "warning",
+        inlineText: "warning-alert-text"
+      })),
+      getByText = _render3.getByText;
     expect(getByText("warning")).toBeTruthy();
     expect(getByText("warning-alert-text")).toBeTruthy();
   });
   test("Error alert renders with correct text", function () {
     var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Alert["default"], {
-      type: "error",
-      inlineText: "error-alert-text"
-    })),
-        getByText = _render4.getByText;
-
+        type: "error",
+        inlineText: "error-alert-text"
+      })),
+      getByText = _render4.getByText;
     expect(getByText("error")).toBeTruthy();
     expect(getByText("error-alert-text")).toBeTruthy();
   });
   test("Alert renders with correct children", function () {
     var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Alert["default"], {
-      inlineText: "alert-text"
-    }, /*#__PURE__*/_react["default"].createElement("p", null, "sample-children"))),
-        getByText = _render5.getByText;
-
+        inlineText: "alert-text"
+      }, /*#__PURE__*/_react["default"].createElement("p", null, "sample-children"))),
+      getByText = _render5.getByText;
     expect(getByText("alert-text")).toBeTruthy();
     expect(getByText("sample-children")).toBeTruthy();
   });
   test("Calls correct function on close", function () {
     var onClose = jest.fn();
-
     var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Alert["default"], {
-      onClose: onClose,
-      inlineText: "info-alert-text"
-    })),
-        getByRole = _render6.getByRole;
-
+        onClose: onClose,
+        inlineText: "info-alert-text"
+      })),
+      getByRole = _render6.getByRole;
     var closeButton = getByRole("button");
-
     _react2.fireEvent.click(closeButton);
-
     expect(onClose).toHaveBeenCalled();
   });
   test("Modal alert calls correct function on close", function () {
     var onClose = jest.fn();
-
     var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Alert["default"], {
-      onClose: onClose,
-      mode: "modal",
-      inlineText: "info-alert-text"
-    })),
-        getByRole = _render7.getByRole;
-
+        onClose: onClose,
+        mode: "modal",
+        inlineText: "info-alert-text"
+      })),
+      getByRole = _render7.getByRole;
     var closeButton = getByRole("button");
-
     _react2.fireEvent.click(closeButton);
-
     expect(onClose).toHaveBeenCalled();
   });
 });

package/alert/types.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-declare type Props = {
+type Props = {
     /**
      * Uses on of the available alert types.
      */
@@ -17,7 +17,7 @@ declare type Props = {
      *              There is no overlay layer. Position should be decided by the user.
      *    'modal':  The alert will be displayed in the middle of the screen with an overlay layer behind.
      *              The onClose function will be executed when the X button or the overlay is clicked. d
-     *              The user has the responsibility of hidding the modal in the onClose function, otherwise the modal will remain visible.
+     *              The user has the responsibility of hiding the modal in the onClose function, otherwise the modal will remain visible.
      */
     mode?: "inline" | "modal";
     /**
@@ -42,7 +42,7 @@ declare type Props = {
      */
     size?: "small" | "medium" | "large" | "fillParent" | "fitContent";
     /**
-     * Tabindex value given to the close button.
+     * Value of the tabindex attribute applied to the close button.
      */
     tabIndex?: number;
 };

package/badge/Badge.accessibility.test.js

@@ -0,0 +1,129 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _jestAxe = require("jest-axe");
+var _Badge = _interopRequireDefault(require("./Badge.tsx"));
+var _Flex = _interopRequireDefault(require("../flex/Flex.tsx"));
+var icon = /*#__PURE__*/_react["default"].createElement("svg", {
+  width: "24",
+  height: "24",
+  viewBox: "0 0 24 24",
+  xmlns: "http://www.w3.org/2000/svg",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M11 17H13V11H11V17ZM12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 12 2ZM12 20C7.59 20 4 16.41 4 12C4 7.59 7.59 4 12 4C16.41 4 20 7.59 20 12C20 16.41 16.41 20 12 20ZM11 9H13V7H11V9Z"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M11 7H13V9H11V7ZM11 11H13V17H11V11Z"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 12 2ZM12 20C7.59 20 4 16.41 4 12C4 7.59 7.59 4 12 4C16.41 4 20 7.59 20 12C20 16.41 16.41 20 12 20Z"
+}));
+describe("Badge component accessibility tests", function () {
+  it("Should not have basic accessibility issues for contextual mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            color: "blue",
+            mode: "contextual",
+            label: "Label",
+            size: "small",
+            icon: icon,
+            title: "Badge1"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            color: "green",
+            mode: "contextual",
+            label: "Label",
+            size: "small",
+            icon: icon,
+            title: "Badge1"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            color: "grey",
+            mode: "contextual",
+            label: "Label",
+            size: "small",
+            icon: icon,
+            title: "Badge1"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            color: "orange",
+            mode: "contextual",
+            label: "Label",
+            size: "small",
+            icon: icon,
+            title: "Badge1"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            color: "purple",
+            mode: "contextual",
+            label: "Label",
+            size: "small",
+            icon: icon,
+            title: "Badge1"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            color: "red",
+            mode: "contextual",
+            label: "Label",
+            size: "small",
+            icon: icon,
+            title: "Badge1"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            color: "yellow",
+            mode: "contextual",
+            label: "Label",
+            size: "small",
+            icon: icon,
+            title: "Badge1"
+          }))), container = _render.container;
+          _context.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for notification mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, container, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            mode: "notification",
+            label: 100,
+            size: "large",
+            icon: icon,
+            notificationLimit: 99,
+            title: "Badge2"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            mode: "notification",
+            label: 50,
+            size: "large",
+            icon: icon,
+            notificationLimit: 99,
+            title: "Badge2"
+          }), /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+            mode: "notification",
+            label: 1000000,
+            size: "large",
+            icon: icon,
+            notificationLimit: 99999999,
+            title: "Badge2"
+          }))), container = _render2.container;
+          _context2.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+});

package/badge/Badge.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import BadgePropsType from "./types";
-declare const DxcBadge: ({ notificationText, disabled }: BadgePropsType) => JSX.Element;
+declare const DxcBadge: ({ label, title, mode, color, icon, notificationLimit, size, }: BadgePropsType) => JSX.Element;
 export default DxcBadge;

package/badge/Badge.js

@@ -1,61 +1,161 @@
 "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 _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _react = _interopRequireDefault(require("react"));
-
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _useTheme = _interopRequireDefault(require("../useTheme"));
-
-var _templateObject;
-
-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 DxcBadge = function DxcBadge(_ref) {
-  var notificationText = _ref.notificationText,
-      disabled = _ref.disabled;
-  var colorsTheme = (0, _useTheme["default"])();
-  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.tabs
-  }, /*#__PURE__*/_react["default"].createElement(StyledDxcBadge, {
-    notificationText: notificationText,
-    disabled: disabled
-  }, /*#__PURE__*/_react["default"].createElement("span", null, notificationText)));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _Flex = _interopRequireDefault(require("../flex/Flex"));
+var _coreTokens = _interopRequireDefault(require("../common/coreTokens"));
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _templateObject, _templateObject2, _templateObject3;
+var contextualColorMap = {
+  grey: {
+    background: _coreTokens["default"].color_grey_200,
+    text: _coreTokens["default"].color_grey_900
+  },
+  blue: {
+    background: _coreTokens["default"].color_blue_200,
+    text: _coreTokens["default"].color_blue_900
+  },
+  green: {
+    background: _coreTokens["default"].color_green_200,
+    text: _coreTokens["default"].color_green_900
+  },
+  orange: {
+    background: _coreTokens["default"].color_orange_200,
+    text: _coreTokens["default"].color_orange_900
+  },
+  red: {
+    background: _coreTokens["default"].color_red_200,
+    text: _coreTokens["default"].color_red_900
+  },
+  yellow: {
+    background: _coreTokens["default"].color_yellow_200,
+    text: _coreTokens["default"].color_yellow_900
+  },
+  purple: {
+    background: _coreTokens["default"].color_purple_200,
+    text: _coreTokens["default"].color_purple_900
+  }
 };
-
-var StyledDxcBadge = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  width: ", ";\n  height: ", ";\n  border-radius: ", ";\n  display: flex;\n  padding-bottom: 1px;\n  padding-right: 1px;\n  flex-wrap: wrap;\n  box-sizing: border-box;\n  align-items: center;\n  line-height: 1;\n  align-content: center;\n  flex-direction: row;\n  justify-content: center;\n"])), function (props) {
-  return props.disabled ? props.theme.disabledBadgeBackgroundColor : props.theme.badgeBackgroundColor;
-}, function (props) {
-  return props.theme.badgeFontFamily;
+var sizeMap = {
+  small: {
+    height: "20px",
+    width: "20px",
+    minWidth: "20px",
+    fontSize: _coreTokens["default"].type_scale_01,
+    borderRadius: _coreTokens["default"].spacing_12,
+    iconSize: "14px",
+    padding: {
+      contextual: "".concat(_coreTokens["default"].spacing_4),
+      notification: "".concat(_coreTokens["default"].spacing_0, " ").concat(_coreTokens["default"].spacing_4)
+    }
+  },
+  medium: {
+    height: "24px",
+    width: "24px",
+    minWidth: "24px",
+    fontSize: _coreTokens["default"].type_scale_02,
+    borderRadius: _coreTokens["default"].spacing_12,
+    iconSize: "16px",
+    padding: {
+      contextual: "".concat(_coreTokens["default"].spacing_4, " ").concat(_coreTokens["default"].spacing_8),
+      notification: "".concat(_coreTokens["default"].spacing_0, " ").concat(_coreTokens["default"].spacing_4)
+    }
+  },
+  large: {
+    height: "32px",
+    width: "32px",
+    minWidth: "32px",
+    fontSize: _coreTokens["default"].type_scale_04,
+    borderRadius: _coreTokens["default"].spacing_24,
+    iconSize: "24px",
+    padding: {
+      contextual: "".concat(_coreTokens["default"].spacing_4, " ").concat(_coreTokens["default"].spacing_8),
+      notification: "".concat(_coreTokens["default"].spacing_0, " ").concat(_coreTokens["default"].spacing_8)
+    }
+  }
+};
+var Label = function Label(_ref) {
+  var label = _ref.label,
+    notificationLimit = _ref.notificationLimit,
+    size = _ref.size;
+  return /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    size: size
+  }, typeof label === "number" ? label > notificationLimit ? "+" + notificationLimit : label : label);
+};
+var DxcBadge = function DxcBadge(_ref2) {
+  var label = _ref2.label,
+    title = _ref2.title,
+    _ref2$mode = _ref2.mode,
+    mode = _ref2$mode === void 0 ? "contextual" : _ref2$mode,
+    _ref2$color = _ref2.color,
+    color = _ref2$color === void 0 ? "grey" : _ref2$color,
+    icon = _ref2.icon,
+    _ref2$notificationLim = _ref2.notificationLimit,
+    notificationLimit = _ref2$notificationLim === void 0 ? 99 : _ref2$notificationLim,
+    _ref2$size = _ref2.size,
+    size = _ref2$size === void 0 ? "medium" : _ref2$size;
+  return /*#__PURE__*/_react["default"].createElement(BadgeContainer, {
+    label: label,
+    mode: mode,
+    color: mode === "contextual" && color || undefined,
+    size: size,
+    title: title,
+    "aria-label": title
+  }, mode === "contextual" && /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
+    gap: "0.125rem",
+    alignItems: "center"
+  }, icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+    size: size
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: icon
+  }) : icon), /*#__PURE__*/_react["default"].createElement(Label, {
+    label: label,
+    notificationLimit: notificationLimit,
+    size: size
+  })) || /*#__PURE__*/_react["default"].createElement(Label, {
+    label: label,
+    notificationLimit: notificationLimit,
+    size: size
+  }));
+};
+var getColor = function getColor(mode, color) {
+  return mode === "contextual" ? contextualColorMap[color].text : _coreTokens["default"].color_white;
+};
+var getBackgroundColor = function getBackgroundColor(mode, color) {
+  return mode === "contextual" ? contextualColorMap[color].background : _coreTokens["default"].color_red_700;
+};
+var getPadding = function getPadding(mode, size) {
+  return mode === "contextual" ? sizeMap[size].padding.contextual : sizeMap[size].padding.notification;
+};
+var BadgeContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  color: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n  width: ", ";\n  min-width: ", ";\n  height: ", ";\n  padding: ", ";\n  align-items: center;\n  justify-content: center;\n  box-sizing: border-box;\n"])), function (props) {
+  return getColor(props.mode, props.color);
 }, function (props) {
-  return props.theme.badgeFontSize;
+  return getBackgroundColor(props.mode, props.color);
 }, function (props) {
-  return props.theme.badgeFontStyle;
+  return sizeMap[props.size].borderRadius;
 }, function (props) {
-  return props.theme.badgeFontWeight;
+  return !props.label && props.mode === "notification" ? sizeMap[props.size].width : "fit-content";
 }, function (props) {
-  return props.theme.badgeFontColor;
+  return props.mode === "notification" && sizeMap[props.size].minWidth;
 }, function (props) {
-  return props.theme.badgeLetterSpacing;
+  return sizeMap[props.size].height;
 }, function (props) {
-  return props.notificationText === true ? props.theme.badgeWidth : props.theme.badgeWidthWithNotificationNumber;
+  return props.label ? getPadding(props.mode, props.size) : "";
+});
+var IconContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  font-size: ", ";\n\n  svg {\n    height: ", ";\n    width: ", ";\n  }\n"])), function (props) {
+  return sizeMap[props.size].iconSize;
 }, function (props) {
-  return props.notificationText === true ? props.theme.badgeHeight : props.theme.badgeHeightWithNotificationNumber;
+  return sizeMap[props.size].iconSize;
 }, function (props) {
-  return props.notificationText === true ? props.theme.badgeRadius : props.theme.badgeRadiusWithNotificationNumber;
+  return sizeMap[props.size].iconSize;
 });
-
-var _default = DxcBadge;
-exports["default"] = _default;
+var LabelContainer = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  white-space: nowrap;\n"])), _coreTokens["default"].type_sans, function (props) {
+  return sizeMap[props.size].fontSize;
+}, _coreTokens["default"].type_semibold);
+var _default = exports["default"] = DxcBadge;