@dxc-technology/halstack-react 0.0.0-de7c6b0 → 0.0.0-dec566a

package/alert/Alert.js

@@ -1,122 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
 var _variables = require("../common/variables");
-
 var _utils = require("../common/utils");
-
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
-
-var _BackgroundColorContext = require("../BackgroundColorContext");
-
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
-
-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 || _typeof3(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 alertIcons = {
-  close: /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "20",
-    height: "20",
-    viewBox: "0 0 24 24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  })),
-  info: /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "23",
-    height: "23",
-    viewBox: "0 0 24 24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"
-  })),
-  success: /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "23",
-    height: "23",
-    viewBox: "0 0 24 24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
-  })),
-  warning: /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "23",
-    height: "23",
-    viewBox: "0 0 24 24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"
-  })),
-  error: /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "23",
-    height: "23",
-    viewBox: "0 0 24 24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z",
-    fill: "currentColor"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  }))
-};
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcAlert = function DxcAlert(_ref) {
   var _ref$type = _ref.type,
-      type = _ref$type === void 0 ? "info" : _ref$type,
-      _ref$mode = _ref.mode,
-      mode = _ref$mode === void 0 ? "inline" : _ref$mode,
-      _ref$inlineText = _ref.inlineText,
-      inlineText = _ref$inlineText === void 0 ? "" : _ref$inlineText,
-      onClose = _ref.onClose,
-      children = _ref.children,
-      margin = _ref.margin,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? "fitContent" : _ref$size,
-      tabIndex = _ref.tabIndex;
+    type = _ref$type === void 0 ? "info" : _ref$type,
+    _ref$mode = _ref.mode,
+    mode = _ref$mode === void 0 ? "inline" : _ref$mode,
+    _ref$inlineText = _ref.inlineText,
+    inlineText = _ref$inlineText === void 0 ? "" : _ref$inlineText,
+    onClose = _ref.onClose,
+    children = _ref.children,
+    margin = _ref.margin,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? "fitContent" : _ref$size,
+    tabIndex = _ref.tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
-
   var getTypeText = function getTypeText() {
     return type === "info" ? translatedLabels.alert.infoTitleText : type === "confirm" ? translatedLabels.alert.successTitleText : type === "warning" ? translatedLabels.alert.warningTitleText : translatedLabels.alert.errorTitleText;
   };
-
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.alert
   }, /*#__PURE__*/_react["default"].createElement(AlertModal, {
@@ -131,14 +50,21 @@ var DxcAlert = function DxcAlert(_ref) {
     size: size
   }, /*#__PURE__*/_react["default"].createElement(AlertInfo, null, /*#__PURE__*/_react["default"].createElement(AlertIcon, {
     type: type
-  }, type === "info" && alertIcons.info || type === "confirm" && alertIcons.success || type === "warning" && alertIcons.warning || type === "error" && alertIcons.error), /*#__PURE__*/_react["default"].createElement(AlertText, null, /*#__PURE__*/_react["default"].createElement(AlertTitle, null, getTypeText()), inlineText && inlineText !== "" && "-", /*#__PURE__*/_react["default"].createElement(AlertInlineText, null, inlineText)), onClose && /*#__PURE__*/_react["default"].createElement(AlertCloseAction, {
+  }, type === "info" && /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "filled_info"
+  }) || type === "confirm" && /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "filled_check_circle"
+  }) || type === "warning" && /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "filled_warning"
+  }) || type === "error" && /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "filled_cancel"
+  })), /*#__PURE__*/_react["default"].createElement(AlertText, null, /*#__PURE__*/_react["default"].createElement(AlertTitle, null, getTypeText()), inlineText && inlineText !== "" && "-", /*#__PURE__*/_react["default"].createElement(AlertInlineText, null, inlineText)), onClose && /*#__PURE__*/_react["default"].createElement(AlertCloseAction, {
     onClick: onClose,
     tabIndex: tabIndex
-  }, alertIcons.close)), children && /*#__PURE__*/_react["default"].createElement(AlertContent, null, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
-    color: type === "info" && colorsTheme.alert.infoBackgroundColor || type === "confirm" && colorsTheme.alert.successBackgroundColor || type === "warning" && colorsTheme.alert.warningBackgroundColor || type === "error" && colorsTheme.alert.errorBackgroundColor
-  }, children)))));
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "close"
+  }))), children && /*#__PURE__*/_react["default"].createElement(AlertContent, null, children))));
 };
-
 var sizes = {
   small: "280px",
   medium: "480px",
@@ -146,11 +72,9 @@ var sizes = {
   fillParent: "100%",
   fitContent: "fit-content"
 };
-
 var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
-
 var AlertModal = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  width: ", ";\n  height: ", ";\n  justify-content: ", ";\n  align-items: ", ";\n  top: ", ";\n  left: ", ";\n  position: ", ";\n  display: ", ";\n  z-index: ", ";\n"])), function (props) {
   return props.theme.fontSizeBase;
 }, function (props) {
@@ -172,7 +96,6 @@ var AlertModal = _styledComponents["default"].div(_templateObject || (_templateO
 }, function (props) {
   return props.mode === "modal" ? "1200" : "";
 });
-
 var OverlayContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  position: ", ";\n  top: ", ";\n  bottom: ", ";\n  left: ", ";\n  right: ", ";\n"])), function (props) {
   return props.mode === "modal" ? "".concat(props.theme.overlayColor) : "transparent";
 }, function (props) {
@@ -186,7 +109,6 @@ var OverlayContainer = _styledComponents["default"].div(_templateObject2 || (_te
 }, function (props) {
   return props.mode === "modal" ? "0" : "";
 });
-
 var AlertContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  display: ", ";\n  overflow: hidden;\n  box-sizing: border-box;\n\n  background-color: ", ";\n\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n\n  padding-left: 12px;\n  padding-right: 12px;\n  justify-content: ", ";\n  align-items: ", ";\n  max-width: ", ";\n  width: ", ";\n  z-index: ", ";\n"])), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -220,11 +142,9 @@ var AlertContainer = _styledComponents["default"].div(_templateObject3 || (_temp
 }, function (props) {
   return props.mode === "modal" ? "1300" : "";
 });
-
 var AlertInfo = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  height: calc(48px - calc(", " * 2));\n  align-items: center;\n  width: 100%;\n"])), function (props) {
   return props.theme.borderThickness;
 });
-
 var AlertTitle = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: 8px;\n  padding-right: ", ";\n  padding-left: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  text-transform: ", ";\n"])), function (props) {
   return props.theme.titlePaddingRight;
 }, function (props) {
@@ -242,7 +162,6 @@ var AlertTitle = _styledComponents["default"].div(_templateObject5 || (_template
 }, function (props) {
   return props.theme.titleTextTransform;
 });
-
 var AlertInlineText = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 8px;\n  padding-right: ", ";\n  padding-left: ", ";\n  flex-grow: 1;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n"])), function (props) {
   return props.theme.inlineTextPaddingRight;
 }, function (props) {
@@ -258,8 +177,7 @@ var AlertInlineText = _styledComponents["default"].div(_templateObject6 || (_tem
 }, function (props) {
   return props.theme.inlineTextFontColor;
 });
-
-var AlertIcon = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  margin-right: 12px;\n  padding-right: ", ";\n  padding-left: ", ";\n\n  color: ", ";\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
+var AlertIcon = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  margin-right: 12px;\n  padding-right: ", ";\n  padding-left: ", ";\n\n  color: ", ";\n\n  font-size: ", ";\n"])), function (props) {
   return props.theme.iconPaddingRight;
 }, function (props) {
   return props.theme.iconPaddingLeft;
@@ -267,23 +185,16 @@ var AlertIcon = _styledComponents["default"].span(_templateObject7 || (_template
   return props.type === "info" && props.theme.infoIconColor || props.type === "confirm" && props.theme.successIconColor || props.type === "warning" && props.theme.warningIconColor || props.type === "error" && props.theme.errorIconColor;
 }, function (props) {
   return props.theme.iconSize;
-}, function (props) {
-  return props.theme.iconSize;
 });
-
 var AlertText = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  flex-grow: 1;\n  align-items: center;\n  overflow: hidden;\n"])));
-
 var AlertContent = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  flex: 1 1 auto;\n  padding: ", ";\n  overflow-y: auto;\n"])), function (props) {
   return "".concat(props.theme.contentPaddingTop, " ").concat(props.theme.contentPaddingRight, " ").concat(props.theme.contentPaddingBottom, " ").concat(props.theme.contentPaddingLeft);
 });
-
-var AlertCloseAction = _styledComponents["default"].button(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  border: 1px solid transparent;\n  border-radius: 2px;\n  box-shadow: 0 0 0 2px transparent;\n  padding: 3px;\n  margin-left: 12px;\n  background-color: transparent;\n  color: #000000;\n  cursor: pointer;\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus,\n  &:focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
+var AlertCloseAction = _styledComponents["default"].button(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  justify-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 20px;\n  border: 1px solid transparent;\n  border-radius: 2px;\n  box-shadow: 0 0 0 2px transparent;\n  padding: 3px;\n  margin-left: 12px;\n  background-color: transparent;\n  color: #000000;\n  cursor: pointer;\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus,\n  &:focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
   return props.theme.hoverActionBackgroundColor;
 }, function (props) {
   return props.theme.focusActionBorderColor;
 }, function (props) {
   return props.theme.activeActionBackgroundColor;
 });
-
-var _default = DxcAlert;
-exports["default"] = _default;
+var _default = exports["default"] = DxcAlert;

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.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,159 @@
 "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 _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;
-}, function (props) {
-  return props.theme.badgeFontSize;
+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("img", {
+    src: icon,
+    alt: title
+  }) : 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.badgeFontStyle;
+  return getBackgroundColor(props.mode, props.color);
 }, function (props) {
-  return props.theme.badgeFontWeight;
+  return sizeMap[props.size].borderRadius;
 }, function (props) {
-  return props.theme.badgeFontColor;
+  return !props.label && props.mode === "notification" ? sizeMap[props.size].width : "fit-content";
 }, function (props) {
-  return props.theme.badgeLetterSpacing;
+  return props.mode === "notification" && sizeMap[props.size].minWidth;
 }, function (props) {
-  return props.notificationText === true ? props.theme.badgeWidth : props.theme.badgeWidthWithNotificationNumber;
+  return sizeMap[props.size].height;
 }, function (props) {
-  return props.notificationText === true ? props.theme.badgeHeight : props.theme.badgeHeightWithNotificationNumber;
+  return props.label ? getPadding(props.mode, props.size) : "";
+});
+var IconContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  img,\n  svg {\n    height: ", ";\n    width: ", ";\n  }\n"])), function (props) {
+  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;