@aloudata/aloudata-design 2.8.7 → 2.9.0

package/dist/index.d.ts

@@ -102,5 +102,4 @@ export type { UploadFile, UploadProps } from './Upload';
 export { default as User } from './User';
 export { default as Watermark } from './Watermark';
 export { default as message } from './message';
-export type { MessageArgsProps } from './message';
 export { default as notification } from './notification';

package/dist/index.js

@@ -60,5 +60,5 @@ export { default as User } from "./User";
 export { default as Watermark } from "./Watermark";
 export { default as message } from "./message";
 // alias, keep API the same as antd
-
+// export type { MessageArgsProps } from './message';
 export { default as notification } from "./notification";

package/dist/message/index.d.ts

@@ -1,14 +1,12 @@
-import { MessageArgsProps } from 'antd';
-import { JointContent } from 'antd/lib/message/interface';
-import React from 'react';
-export type { MessageArgsProps };
+import { ToastOptions } from 'react-toastify';
+export type NoticeType = 'info' | 'success' | 'error';
+interface MessageOptions extends ToastOptions {
+    className?: string;
+}
 declare const message: {
-    info: (content: JointContent, duration?: number, onClose?: VoidFunction) => import("antd/es/message/interface").MessageType;
-    success: (content: JointContent, duration?: number, onClose?: VoidFunction) => import("antd/es/message/interface").MessageType;
-    error: (content: JointContent, duration?: number, onClose?: VoidFunction) => import("antd/es/message/interface").MessageType;
-    warning: (content: JointContent, duration?: number, onClose?: VoidFunction) => import("antd/es/message/interface").MessageType;
-    loading: (content: JointContent, duration?: number, onClose?: VoidFunction) => import("antd/es/message/interface").MessageType;
-    open: (args: MessageArgsProps) => import("antd/es/message/interface").MessageType;
-    destroy: (key?: React.Key) => void;
+    success: (message?: string, options?: MessageOptions) => import("react-toastify").Id;
+    error: (message?: string, options?: MessageOptions) => import("react-toastify").Id;
+    info: (message?: string, options?: MessageOptions) => import("react-toastify").Id;
 };
+export type { MessageOptions };
 export default message;

package/dist/message/index.js

@@ -1,134 +1,78 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-import { message as AntdMessage } from 'antd';
+import classNames from 'classnames';
 import React from 'react';
-import { AttentionTriangleFill, CheckCircleFill, CloseCircleFill, InformationCircleFill, LoadingLine } from "../Icon";
-function isReactNode(value) {
-  return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' || _typeof(value) === 'symbol' || value === null || value === undefined || /*#__PURE__*/React.isValidElement(value);
-}
+import { Slide, toast } from 'react-toastify';
+import { CheckCircleFill, CloseLLine, DangerFill, InformationCircleFill } from "../Icon";
+var closeX = /*#__PURE__*/React.createElement(CloseLLine, {
+  size: 20,
+  color: "#6B7280"
+});
 var iconMap = {
-  info: {
-    icon: /*#__PURE__*/React.createElement("div", {
-      className: "ald-message-icon-wrap"
-    }, /*#__PURE__*/React.createElement(InformationCircleFill, {
-      color: 'var(--alias-colors-icon-information)',
-      size: 20
-    })),
-    type: 'info'
-  },
-  success: {
-    icon: /*#__PURE__*/React.createElement("div", {
-      className: "ald-message-icon-wrap"
-    }, /*#__PURE__*/React.createElement(CheckCircleFill, {
-      color: 'var(--alias-colors-icon-success)',
-      size: 20
-    })),
-    type: 'success'
-  },
-  error: {
-    icon: /*#__PURE__*/React.createElement("div", {
-      className: "ald-message-icon-wrap"
-    }, /*#__PURE__*/React.createElement(CloseCircleFill, {
-      color: 'var(--alias-colors-icon-danger)',
-      size: 20
-    })),
-    type: 'error'
-  },
-  warning: {
-    icon: /*#__PURE__*/React.createElement("div", {
-      className: "ald-message-icon-wrap"
-    }, /*#__PURE__*/React.createElement(AttentionTriangleFill, {
-      color: 'var(--alias-colors-icon-warning)',
-      size: 20
-    })),
-    type: 'warning'
-  },
-  loading: {
-    icon: /*#__PURE__*/React.createElement("div", {
-      className: "ald-message-icon-wrap"
-    }, /*#__PURE__*/React.createElement(LoadingLine, {
-      className: "ald-loading-spin",
-      size: 20
-    })),
-    type: 'loading'
+  info: /*#__PURE__*/React.createElement(InformationCircleFill, {
+    color: "#fff",
+    size: 20
+  }),
+  success: /*#__PURE__*/React.createElement(CheckCircleFill, {
+    color: "#fff",
+    size: 20
+  }),
+  error: /*#__PURE__*/React.createElement(DangerFill, {
+    color: "#fff",
+    size: 20
+  })
+};
+var defaultOptions = {
+  closeButton: false,
+  pauseOnHover: true,
+  transition: Slide,
+  position: 'bottom-center',
+  autoClose: 3000,
+  //3000
+  hideProgressBar: true,
+  closeOnClick: true,
+  draggable: false,
+  progress: undefined,
+  theme: 'light',
+  containerId: 'message-container',
+  icon: function icon() {
+    return null;
   }
 };
+var getMessage = function getMessage(message, type) {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "ald-message-content"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ald-message-icon-wrap"
+  }, iconMap[type]), /*#__PURE__*/React.createElement("div", {
+    className: "ald-message-text"
+  }, message, " ", closeX));
+};
 var message = {
-  info: function info(content, duration, onClose) {
-    if (isReactNode(content)) {
-      // content 是 React.ReactNode 类型
-      return AntdMessage.info(_objectSpread({
-        content: content,
-        duration: duration,
-        onClose: onClose
-      }, iconMap.info));
-    } else {
-      // content 是 ArgsProps 类型
-      return AntdMessage.info(_objectSpread(_objectSpread({}, content), iconMap.info));
-    }
-  },
-  success: function success(content, duration, onClose) {
-    if (isReactNode(content)) {
-      // content 是 React.ReactNode 类型
-      return AntdMessage.success(_objectSpread({
-        content: content,
-        duration: duration,
-        onClose: onClose
-      }, iconMap.success));
-    } else {
-      // content 是 ArgsProps 类型
-      return AntdMessage.success(_objectSpread(_objectSpread({}, content), iconMap.success));
-    }
-  },
-  error: function error(content, duration, onClose) {
-    if (isReactNode(content)) {
-      // content 是 React.ReactNode 类型
-      return AntdMessage.error(_objectSpread({
-        content: content,
-        duration: duration,
-        onClose: onClose
-      }, iconMap.error));
-    } else {
-      // content 是 ArgsProps 类型
-      return AntdMessage.error(_objectSpread(_objectSpread({}, content), iconMap.error));
-    }
-  },
-  warning: function warning(content, duration, onClose) {
-    if (isReactNode(content)) {
-      // content 是 React.ReactNode 类型
-      return AntdMessage.warning(_objectSpread({
-        content: content,
-        duration: duration,
-        onClose: onClose
-      }, iconMap.warning));
-    } else {
-      // content 是 ArgsProps 类型
-      return AntdMessage.warning(_objectSpread(_objectSpread({}, content), iconMap.warning));
-    }
-  },
-  loading: function loading(content, duration, onClose) {
-    if (isReactNode(content)) {
-      // content 是 React.ReactNode 类型
-      return AntdMessage.loading(_objectSpread({
-        content: content,
-        duration: duration,
-        onClose: onClose
-      }, iconMap.loading));
-    } else {
-      // content 是 ArgsProps 类型
-      return AntdMessage.loading(_objectSpread(_objectSpread({}, content), iconMap.loading));
-    }
+  success: function success(message) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    toast.dismiss();
+    return toast.success(getMessage(message !== null && message !== void 0 ? message : '', 'success'), _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), options), {}, {
+      className: classNames('ald-message ald-message-success', options.className)
+    }));
   },
-  open: function open(args) {
-    var type = args.type || 'info';
-    return AntdMessage.open(_objectSpread(_objectSpread({}, args), iconMap[type]));
+  error: function error(message) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    toast.dismiss();
+    return toast.error(getMessage(message !== null && message !== void 0 ? message : '', 'error'), _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), options), {}, {
+      className: classNames('ald-message ald-message-error', options.className)
+    }));
   },
-  destroy: function destroy(key) {
-    AntdMessage.destroy(key);
+  info: function info(message) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    toast.dismiss();
+    return toast.info(getMessage(message !== null && message !== void 0 ? message : '', 'info'), _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), options), {}, {
+      className: classNames('ald-message ald-message-info', options.className)
+    }));
   }
 };
 export default message;

package/dist/message/style/index.less

@@ -1,31 +1,75 @@
-@import '../../style/index.less';
-
-.ant-message .ant-message-notice {
-  .ant-message-notice-content {
-    padding: 0;
-    border-radius: var(--alias-radius-75, 6px);
-    border: 1px solid var(--alias-colors-border-strong, #d1d5db);
-    background: var(--alias-colors-bg-skeleton-subtler, #fff);
-    box-shadow: 0 10px 10px -5px rgba(0, 0, 0, 0.04),
-      0 20px 25px -5px rgba(0, 0, 0, 0.1);
-
-    .ant-message-custom-content {
+@import '../../style/components/toastify.less';
+@import '../../Divider/style/index.less';
+/* stylelint-disable selector-class-pattern, keyframes-name-pattern */
+.ald-message {
+  display: flex;
+  align-items: center;
+  padding: 0;
+  border-radius: var(--alias-radius-75, 6px);
+  background: var(--alias-colors-bg-skeleton-subtler, #fff);
+
+  & > svg {
+    flex-shrink: 0;
+  }
+
+  .Toastify__toast-body {
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 20px;
+    margin: 0;
+
+    .ald-message-content {
       display: flex;
-      overflow: hidden;
-      padding: var(--alias-padding-150-minus-1, 12px)
-        var(--alias-padding-200-minus-1, 16px);
       align-items: center;
-      color: var(--alias-colors-text-default, #1f2937);
-      font-size: 14px;
-      font-weight: 500;
-      line-height: 20px;
 
       .ald-message-icon-wrap {
-        display: grid;
-        place-items: center;
-        flex-shrink: 0;
-        font-size: 20px;
-        margin-right: 6px;
+        height: 52px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 44px;
+      }
+
+      .ald-message-text {
+        display: flex;
+        align-items: center;
+        padding: 12px;
+        color: var(--alias-colors-text-default, #1f2937);
+        height: 52px;
+        gap: 12px;
+        border-top-right-radius: var(--alias-radius-75, 6px);
+        border-bottom-right-radius: var(--alias-radius-75, 6px);
+        border-top: var(--alias-stroke-md, 1px) solid
+          var(--alias-colors-border-strong, #d1d5db);
+        border-bottom: var(--alias-stroke-md, 1px) solid
+          var(--alias-colors-border-strong, #d1d5db);
+        border-right: var(--alias-stroke-md, 1px) solid
+          var(--alias-colors-border-strong, #d1d5db);
+      }
+    }
+  }
+
+  &.ald-message-success {
+    .ald-message-content {
+      .ald-message-icon-wrap {
+        background: var(--alias-colors-bg-accent-green-strong, #22c55e);
+      }
+    }
+  }
+
+  &.ald-message-info {
+    .ald-message-content {
+      .ald-message-icon-wrap {
+        background: var(--alias-colors-bg-accent-blue-strong, #2986f4);
+      }
+    }
+  }
+
+  &.ald-message-error {
+    .ald-message-content {
+      .ald-message-icon-wrap {
+        background: var(--alias-colors-bg-accent-red-strong, #ef4444);
       }
     }
   }

package/dist/notification/index.d.ts

@@ -1,14 +1,21 @@
-import type { ArgsProps } from 'antd/lib/notification/interface';
 import React from 'react';
-interface IAldArgsProps extends ArgsProps {
-    footer?: React.ReactNode;
+import { ToastOptions as NotificationOptions, ToastPosition } from 'react-toastify';
+type PlacementPosition = ToastPosition | 'topLeft' | 'topCenter' | 'topRight' | 'bottomCenter' | 'bottomLeft' | 'bottomRight';
+interface IAldArgsProps extends NotificationOptions {
+    placement?: PlacementPosition;
+    message: React.ReactNode;
+    description?: React.ReactNode;
+    duration?: number;
+    className?: string;
+    style?: React.CSSProperties;
 }
 declare const notification: {
-    open: (config: ArgsProps) => void;
-    success: (config: IAldArgsProps) => void;
-    error: (config: IAldArgsProps) => void;
-    warning: (config: IAldArgsProps) => void;
-    info: (config: IAldArgsProps) => void;
-    destroy: (key?: string) => void;
+    open: (config: IAldArgsProps) => import("react-toastify").Id;
+    success: (config: IAldArgsProps) => import("react-toastify").Id;
+    error: (config: IAldArgsProps) => import("react-toastify").Id;
+    info: (config: IAldArgsProps) => import("react-toastify").Id;
+    warning: (config: IAldArgsProps) => import("react-toastify").Id;
+    close: (id: number) => void;
+    closeAll: () => void;
 };
 export default notification;