Merge pull request #18 from Ademking/main

fix(notification & message): icon
vechai · Jul 7, 2021 · f555b17 · f555b17
2 parents ca4353c + 5783822
commit f555b17
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/packages/message/src/message.tsx b/packages/message/src/message.tsx
@@ -10,12 +10,20 @@ import { cx as clsx, __DEV__ } from "@vechaiui/utils";
 import * as React from "react";
 
 const statuses = {
- info: { icon: InfoIcon, cx: "message-icon-info", label: "info" },
- success: { icon: XCricleIcon, cx: "message-icon-success", label: "x-circle" },
- error: {
+ info: {
+ icon: InfoIcon,
+ cx: "message-icon-info",
+ label: "info"
+ },
+ success: {
  icon: CheckCircleIcon,
+ cx: "message-icon-success",
+ label: "check-circle"
+ },
+ error: {
+ icon: XCricleIcon,
  cx: "message-icon-error",
- label: "check-circle",
+ label: "x-circle"
  },
  warning: {
  icon: ExclamationIcon,
@@ -32,7 +40,7 @@ type OmittedTypes =
  | "undoText"
  | "description";
 
-export interface MessageProps extends Omit<useToastOptions, OmittedTypes> {}
+export interface MessageProps extends Omit<useToastOptions, OmittedTypes> { }
 
 const Message = React.forwardRef<HTMLDivElement, MessageProps>(
  ({ message, className, icon: customIcon, status = "" }, ref) => {

diff --git a/packages/notification/src/notification.tsx b/packages/notification/src/notification.tsx
@@ -12,13 +12,21 @@ import { cx as clsx, __DEV__ } from "@vechaiui/utils";
 import * as React from "react";
 
 const statuses = {
- info: { icon: InfoIcon, cx: "notification-icon-info", label: "info" },
- success: { icon: XCricleIcon, cx: "notification-icon-success", label: "x-circle" },
- error: {
+ info: {
+ icon: InfoIcon,
+ cx: "notification-icon-info",
+ label: "info"
+ },
+ success: {
  icon: CheckCircleIcon,
- cx: "notification-icon-error",
+ cx: "notification-icon-success",
  label: "check-circle",
  },
+ error: {
+ icon: XCricleIcon,
+ cx: "notification-icon-error",
+ label: "x-circle"
+ },
  warning: {
  icon: ExclamationIcon,
  cx: "notification-icon-warning",
@@ -29,7 +37,7 @@ const statuses = {
 type OmittedTypes = "message";
 
 export interface NotificationProps
- extends Omit<useToastOptions, OmittedTypes> {}
+ extends Omit<useToastOptions, OmittedTypes> { }
 
 const Notification = React.forwardRef<HTMLDivElement, NotificationProps>(
  (props, ref) => {