@pingux/astro 1.38.0-alpha.8 → 1.38.1

package/lib/cjs/components/Messages/Message.js

@@ -14,7 +14,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports["default"] = exports.ARIA_STATUSES = void 0;
+exports.icons = exports["default"] = exports.ARIA_STATUSES = void 0;
 
 var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
 
@@ -28,17 +28,29 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-c
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _AlertCircleIcon = _interopRequireDefault(require("mdi-react/AlertCircleIcon"));
+
+var _CheckCircleIcon = _interopRequireDefault(require("mdi-react/CheckCircleIcon"));
+
 var _CloseIcon = _interopRequireDefault(require("mdi-react/CloseIcon"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _AlertIcon = _interopRequireDefault(require("mdi-react/AlertIcon"));
 
-var _NoticeIcon = require("../Icon/NoticeIcon");
+var _InformationIcon = _interopRequireDefault(require("mdi-react/InformationIcon"));
+
+var _useStatusClasses4 = _interopRequireDefault(require("../../hooks/useStatusClasses"));
 
 var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
 
-var _useStatusClasses4 = _interopRequireDefault(require("../../hooks/useStatusClasses"));
+var _Box = _interopRequireDefault(require("../Box"));
+
+var _Icon = _interopRequireDefault(require("../Icon"));
+
+var _IconButton = _interopRequireDefault(require("../IconButton"));
 
-var _ = require("../..");
+var _Text = _interopRequireDefault(require("../Text"));
 
 var _react2 = require("@emotion/react");
 
@@ -48,6 +60,13 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 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 icons = {
+  "default": _InformationIcon["default"],
+  success: _CheckCircleIcon["default"],
+  error: _AlertCircleIcon["default"],
+  warning: _AlertIcon["default"]
+};
+exports.icons = icons;
 var ARIA_STATUSES = {
   SUCCESS: 'Success Message',
   ERROR: 'Error Message',
@@ -58,9 +77,9 @@ exports.ARIA_STATUSES = ARIA_STATUSES;
 var CloseButton = function CloseButton(_ref) {
   var color = _ref.color,
       others = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  return (0, _react2.jsx)(_.IconButton, (0, _extends2["default"])({
+  return (0, _react2.jsx)(_IconButton["default"], (0, _extends2["default"])({
     "aria-label": "Close"
-  }, others), (0, _react2.jsx)(_.Icon, {
+  }, others), (0, _react2.jsx)(_Icon["default"], {
     color: color,
     icon: _CloseIcon["default"],
     sx: {
@@ -74,10 +93,10 @@ var CloseButton = function CloseButton(_ref) {
 CloseButton.propTypes = {
   color: _propTypes["default"].string
 };
-var Message = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
-  var className = _ref2.className,
-      item = _ref2.item,
-      onClose = _ref2.onClose;
+var Message = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var className = props.className,
+      item = props.item,
+      onClose = props.onClose;
   var key = item.key,
       itemProps = item.props;
   var children = itemProps.children,
@@ -85,7 +104,8 @@ var Message = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
       status = _itemProps$status === void 0 ? 'default' : _itemProps$status,
       bg = itemProps.bg,
       color = itemProps.color,
-      icon = itemProps.icon,
+      _itemProps$icon = itemProps.icon,
+      icon = _itemProps$icon === void 0 ? icons[status] : _itemProps$icon,
       _itemProps$isHidden = itemProps.isHidden,
       isHidden = _itemProps$isHidden === void 0 ? false : _itemProps$isHidden,
       dataId = itemProps['data-id'];
@@ -127,18 +147,7 @@ var Message = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     return '';
   };
 
-  var messageIconProps = {
-    className: statusClasses,
-    color: color,
-    mr: 'md'
-  };
-  var messageIcon = icon ? (0, _react2.jsx)(_.Icon, (0, _extends2["default"])({
-    icon: icon,
-    "data-testid": "custom-icon-testid"
-  }, messageIconProps)) : (0, _react2.jsx)(_NoticeIcon.NoticeIcon, (0, _extends2["default"])({
-    status: status
-  }, messageIconProps));
-  return (0, _react2.jsx)(_.Box, {
+  return (0, _react2.jsx)(_Box["default"], {
     variant: "messages.transition",
     className: wrapperClasses,
     sx: {
@@ -148,15 +157,20 @@ var Message = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     role: "status",
     "aria-live": "polite",
     "aria-label": ariaStatus(statusClasses)
-  }, (0, _react2.jsx)(_.Box, {
+  }, (0, _react2.jsx)(_Box["default"], {
     ref: innerRef
-  }, (0, _react2.jsx)(_.Box, {
+  }, (0, _react2.jsx)(_Box["default"], {
     ref: ref,
     isRow: true,
     variant: "messages.item",
     className: statusClasses,
     bg: bg
-  }, messageIcon, (0, _react2.jsx)(_.Text, {
+  }, icon && (0, _react2.jsx)(_Icon["default"], {
+    icon: icon,
+    className: statusClasses,
+    color: color,
+    mr: "md"
+  }), (0, _react2.jsx)(_Text["default"], {
     className: statusClasses,
     color: color,
     mr: "md"

package/lib/cjs/components/Messages/Messages.test.js

@@ -24,8 +24,6 @@ var _collections = require("@react-stately/collections");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
-var _AccountIcon = _interopRequireDefault(require("mdi-react/AccountIcon"));
-
 var _testAxe = _interopRequireDefault(require("../../utils/testUtils/testAxe"));
 
 var _testWrapper = require("../../utils/testUtils/testWrapper");
@@ -197,15 +195,4 @@ test('should render messages with multiMessagesReducerStory', function () {
   _.multiMessagesReducerStory.actions.showSuccessMessage();
 
   expect(_testWrapper.screen.getByTestId(testId)).toBeInTheDocument();
-});
-test('should render a custom icon', function () {
-  getWithDynamicList({
-    items: [{
-      key: 'message1',
-      text: 'test text',
-      icon: _AccountIcon["default"]
-    }]
-  });
-
-  _testWrapper.screen.getByTestId('custom-icon-testid');
 });