@pingux/astro 1.38.0-alpha.7 → 1.38.0-alpha.9

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

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

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

@@ -24,6 +24,8 @@ 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");
@@ -195,4 +197,15 @@ 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');
 });

package/lib/cjs/components/TextField/TextField.stories.js

@@ -99,7 +99,7 @@ var Default = function Default(_ref) {
   var variant = _ref.variant,
       args = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   return (0, _react2.jsx)(_["default"], (0, _extends2["default"])({
-    id: "custom-id",
+    id: "default-id",
     name: "custom-name",
     label: "Example Label"
   }, variant && {
@@ -113,7 +113,7 @@ exports.Default = Default;
 
 var SmallVariant = function SmallVariant() {
   return (0, _react2.jsx)(_["default"], {
-    id: "custom-id",
+    id: "small-variant-id",
     name: "custom-name",
     label: "Example Label",
     controlProps: {
@@ -268,7 +268,7 @@ exports.Warning = Warning;
 
 var WithHelpHint = function WithHelpHint() {
   return (0, _react2.jsx)(_["default"], {
-    id: "custom-id",
+    id: "with-help-hint-id",
     name: "custom-name",
     hintText: "Example Hint",
     label: "Example Label"