An opinionated toast component for React.
Introduce unstyled prop (#187)
Emil Kowalski3f72e0da81e5
diff --git a/src/index.tsx b/src/index.tsxindex 71fbb8c..0723998 100644--- a/src/index.tsx+++ b/src/index.tsx@@ -45,6 +45,7 @@ interface ToastProps {style?: React.CSSProperties;duration?: number;className?: string;+ unstyled?: boolean;descriptionClassName?: string;}@@ -213,7 +214,7 @@ const Toast = (props: ToastProps) => {ref={toastRef}className={className + ' ' + toastClassname}data-sonner-toast=""- data-styled={!Boolean(toast.jsx)}+ data-styled={!Boolean(toast.jsx || toast.unstyled)}data-mounted={mounted}data-promise={Boolean(toast.promise)}data-removed={removed}diff --git a/src/state.ts b/src/state.tsindex 21ec865..06da87a 100644--- a/src/state.ts+++ b/src/state.ts@@ -1,12 +1,5 @@import React from 'react';-import type {- ExternalToast,- ToastT,- PromiseData,- PromiseT,- ToastToDismiss,- ToastTypes,-} from './types';+import type { ExternalToast, ToastT, PromiseData, PromiseT, ToastToDismiss, ToastTypes } from './types';let toastsCounter = 1;@@ -20,9 +13,7 @@ class Observer {}// We use arrow functions to maintain the correct `this` reference- subscribe = (- subscriber: (toast: ToastT | ToastToDismiss) => void,- ) => {+ subscribe = (subscriber: (toast: ToastT | ToastToDismiss) => void) => {this.subscribers.push(subscriber);return () => {@@ -48,15 +39,11 @@ class Observer {},) => {const { message, ...rest } = data;- const id =- typeof data?.id === 'number' || data.id?.length > 0- ? data.id- : toastsCounter++;+ const id = typeof data?.id === 'number' || data.id?.length > 0 ? data.id : toastsCounter++;const alreadyExists = this.toasts.find((toast) => {return toast.id === id;});- const dismissible =- data.dismissible === undefined ? true : data.dismissible;+ const dismissible = data.dismissible === undefined ? true : data.dismissible;if (alreadyExists) {this.toasts = this.toasts.map((toast) => {@@ -83,50 +70,31 @@ class Observer {dismiss = (id?: number | string) => {if (!id) {this.toasts.forEach((toast) => {- this.subscribers.forEach((subscriber) =>- subscriber({ id: toast.id, dismiss: true }),- );+ this.subscribers.forEach((subscriber) => subscriber({ id: toast.id, dismiss: true }));});}- this.subscribers.forEach((subscriber) =>- subscriber({ id, dismiss: true }),- );+ this.subscribers.forEach((subscriber) => subscriber({ id, dismiss: true }));return id;};- message = (- message: string | React.ReactNode,- data?: ExternalToast,- ) => {+ message = (message: string | React.ReactNode, data?: ExternalToast) => {return this.create({ ...data, message });};- error = (- message: string | React.ReactNode,- data?: ExternalToast,- ) => {+ error = (message: string | React.ReactNode, data?: ExternalToast) => {return this.create({ ...data, message, type: 'error' });};- success = (- message: string | React.ReactNode,- data?: ExternalToast,- ) => {+ success = (message: string | React.ReactNode, data?: ExternalToast) => {return this.create({ ...data, type: 'success', message });};- loading = (- message: string | React.ReactNode,- data?: ExternalToast,- ) => {+ loading = (message: string | React.ReactNode, data?: ExternalToast) => {return this.create({ ...data, type: 'loading', message });};- promise = <ToastData>(- promise: PromiseT<ToastData>,- data?: PromiseData<ToastData>,- ) => {+ promise = <ToastData>(promise: PromiseT<ToastData>, data?: PromiseData<ToastData>) => {if (!data) {// Nothing to showreturn;@@ -174,10 +142,7 @@ class Observer {};// We can't provide the toast we just created as a prop as we didn't create it yet, so we can create a default toast object, I just don't know how to use function in argument when calling()?- custom = (- jsx: (id: number | string) => React.ReactElement,- data?: ExternalToast,- ) => {+ custom = (jsx: (id: number | string) => React.ReactElement, data?: ExternalToast) => {const id = data?.id || toastsCounter++;this.publish({ jsx: jsx(id), id, ...data });};@@ -186,10 +151,7 @@ class Observer {export const ToastState = new Observer();// bind this to the toast function-const toastFunction = (- message: string | React.ReactNode,- data?: ExternalToast,-) => {+const toastFunction = (message: string | React.ReactNode, data?: ExternalToast) => {const id = data?.id || toastsCounter++;ToastState.addToast({diff --git a/src/types.ts b/src/types.tsindex 97a61e4..3fd30ab 100644--- a/src/types.ts+++ b/src/types.ts@@ -35,6 +35,7 @@ export interface ToastT {onAutoClose?: (toast: ToastT) => void;promise?: PromiseT;style?: React.CSSProperties;+ unstyled?: boolean;className?: string;descriptionClassName?: string;position?: Position;@@ -51,6 +52,7 @@ interface ToastOptions {descriptionClassName?: string;style?: React.CSSProperties;duration?: number;+ unstyled?: boolean;}export interface ToasterProps {diff --git a/website/src/pages/toast.mdx b/website/src/pages/toast.mdxindex d95f063..843115a 100644--- a/website/src/pages/toast.mdx+++ b/website/src/pages/toast.mdx@@ -167,3 +167,4 @@ toast.dismiss(toastId);| id | Custom id for the toast. | `-` || onDismiss | The function gets called when either the close button is clicked, or the toast is swiped. | `-` || onAutoClose | Function that gets called when the toast disappears automatically after it's timeout (duration` prop). | `-` |+| unstyled | Removes the default styling, which allows for easier customization. | `false` |