Skip to content

An opinionated toast component for React.

Add loading icon prop (#219)

Emil Kowalskif8c7128b2c02
diff --git a/src/index.tsx b/src/index.tsx
index 0c2af4a..d4a07ca 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -47,6 +47,7 @@ interface ToastProps {
className?: string;
unstyled?: boolean;
descriptionClassName?: string;
+ loadingIcon?: React.ReactNode;
}
const Toast = (props: ToastProps) => {
@@ -68,6 +69,7 @@ const Toast = (props: ToastProps) => {
duration: durationFromToaster,
position,
gap = GAP,
+ loadingIcon: loadingIconProp,
expandByDefault,
} = props;
const [mounted, setMounted] = React.useState(false);
@@ -206,6 +208,17 @@ const Toast = (props: ToastProps) => {
}
}, [deleteToast, toast.delete]);
+ function getLoadingIcon() {
+ if (loadingIconProp) {
+ return (
+ <div className="loader" data-visible={toastType === 'loading'}>
+ {loadingIconProp}
+ </div>
+ );
+ }
+ return <Loader visible={toastType === 'loading'} />;
+ }
+
return (
<li
aria-live={toast.important ? 'assertive' : 'polite'}
@@ -327,9 +340,7 @@ const Toast = (props: ToastProps) => {
<>
{toastType || toast.icon || toast.promise ? (
<div data-icon="">
- {(toast.promise || toast.type === 'loading') && !toast.icon ? (
- <Loader visible={toastType === 'loading'} />
- ) : null}
+ {(toast.promise || toast.type === 'loading') && !toast.icon ? getLoadingIcon() : null}
{toast.icon || getAsset(toastType)}
</div>
) : null}
@@ -404,6 +415,7 @@ const Toaster = (props: ToasterProps) => {
toastOptions,
dir = getDocumentDirection(),
gap,
+ loadingIcon,
} = props;
const [toasts, setToasts] = React.useState<ToastT[]>([]);
const possiblePositions = React.useMemo(() => {
@@ -618,6 +630,7 @@ const Toaster = (props: ToasterProps) => {
setHeights={setHeights}
expandByDefault={expand}
gap={gap}
+ loadingIcon={loadingIcon}
expanded={expanded}
/>
))}
diff --git a/src/styles.css b/src/styles.css
index a2014d0..01a6c78 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -27,10 +27,8 @@ html[dir='rtl'],
[data-sonner-toaster] {
position: fixed;
width: var(--width);
- font-family: ui-sans-serif, system-ui, -apple-system,
- BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue,
- Arial, Noto Sans, sans-serif, Apple Color Emoji,
- Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
+ font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial,
+ Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
--gray1: hsl(0, 0%, 99%);
--gray2: hsl(0, 0%, 97.3%);
--gray3: hsl(0, 0%, 95.1%);
@@ -83,8 +81,7 @@ html[dir='rtl'],
/* https://stackoverflow.com/questions/48124372/pointermove-event-not-working-with-touch-why-not */
touch-action: none;
will-change: transform, opacity, height;
- transition: transform 400ms, opacity 400ms, height 400ms,
- box-shadow 200ms;
+ transition: transform 400ms, opacity 400ms, height 400ms, box-shadow 200ms;
box-sizing: border-box;
outline: none;
overflow-wrap: anywhere;
@@ -105,8 +102,7 @@ html[dir='rtl'],
}
[data-sonner-toast]:focus-visible {
- box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1),
- 0 0 0 2px rgba(0, 0, 0, 0.2);
+ box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1), 0 0 0 2px rgba(0, 0, 0, 0.2);
}
[data-sonner-toast][data-y-position='top'] {
@@ -222,13 +218,11 @@ html[dir='rtl'],
opacity: 0;
cursor: pointer;
z-index: 1;
- transition: opacity 100ms, background 200ms,
- border-color 200ms;
+ transition: opacity 100ms, background 200ms, border-color 200ms;
}
[data-sonner-toast] [data-close-button]:focus-visible {
- box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1),
- 0 0 0 2px rgba(0, 0, 0, 0.2);
+ box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1), 0 0 0 2px rgba(0, 0, 0, 0.2);
}
[data-sonner-toast] [data-disabled='true'] {
@@ -296,10 +290,7 @@ html[dir='rtl'],
[data-sonner-toast][data-expanded='false'][data-front='false'] {
--scale: var(--toasts-before) * 0.05 + 1;
- --y: translateY(
- calc(var(--lift-amount) * var(--toasts-before))
- )
- scale(calc(-1 * var(--scale)));
+ --y: translateY(calc(var(--lift-amount) * var(--toasts-before))) scale(calc(-1 * var(--scale)));
height: var(--front-toast-height);
}
@@ -307,8 +298,7 @@ html[dir='rtl'],
transition: opacity 400ms;
}
-[data-sonner-toast][data-expanded='false'][data-front='false'][data-styled='true']
- > * {
+[data-sonner-toast][data-expanded='false'][data-front='false'][data-styled='true'] > * {
opacity: 0;
}
@@ -328,9 +318,7 @@ html[dir='rtl'],
}
[data-sonner-toast][data-removed='true'][data-front='false'][data-swipe-out='false'][data-expanded='true'] {
- --y: translateY(
- calc(var(--lift) * var(--offset) + var(--lift) * -100%)
- );
+ --y: translateY(calc(var(--lift) * var(--offset) + var(--lift) * -100%));
opacity: 0;
}
@@ -357,21 +345,12 @@ html[dir='rtl'],
@keyframes swipe-out {
from {
- transform: translateY(
- calc(
- var(--lift) * var(--offset) + var(--swipe-amount)
- )
- );
+ transform: translateY(calc(var(--lift) * var(--offset) + var(--swipe-amount)));
opacity: 1;
}
to {
- transform: translateY(
- calc(
- var(--lift) * var(--offset) + var(--swipe-amount) +
- var(--lift) * -100%
- )
- );
+ transform: translateY(calc(var(--lift) * var(--offset) + var(--swipe-amount) + var(--lift) * -100%));
opacity: 0;
}
}
@@ -432,15 +411,13 @@ html[dir='rtl'],
--error-text: hsl(360, 100%, 45%);
}
-[data-sonner-toaster][data-theme='light']
- [data-sonner-toast][data-invert='true'] {
+[data-sonner-toaster][data-theme='light'] [data-sonner-toast][data-invert='true'] {
--normal-bg: #000;
--normal-border: hsl(0, 0%, 20%);
--normal-text: var(--gray1);
}
-[data-sonner-toaster][data-theme='dark']
- [data-sonner-toast][data-invert='true'] {
+[data-sonner-toaster][data-theme='dark'] [data-sonner-toast][data-invert='true'] {
--normal-bg: #fff;
--normal-border: var(--gray3);
--normal-text: var(--gray12);
@@ -468,61 +445,49 @@ html[dir='rtl'],
--error-text: hsl(358, 100%, 81%);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='success'] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='success'] {
background: var(--success-bg);
border-color: var(--success-border);
color: var(--success-text);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='success']
- [data-close-button] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='success'] [data-close-button] {
background: var(--success-bg);
border-color: var(--success-border);
color: var(--success-text);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='info'] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='info'] {
background: var(--info-bg);
border-color: var(--info-border);
color: var(--info-text);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='info']
- [data-close-button] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='info'] [data-close-button] {
background: var(--info-bg);
border-color: var(--info-border);
color: var(--info-text);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='warning'] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='warning'] {
background: var(--warning-bg);
border-color: var(--warning-border);
color: var(--warning-text);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='warning']
- [data-close-button] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='warning'] [data-close-button] {
background: var(--warning-bg);
border-color: var(--warning-border);
color: var(--warning-text);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='error'] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='error'] {
background: var(--error-bg);
border-color: var(--error-border);
color: var(--error-text);
}
-[data-rich-colors='true']
- [data-sonner-toast][data-type='error']
- [data-close-button] {
+[data-rich-colors='true'] [data-sonner-toast][data-type='error'] [data-close-button] {
background: var(--error-bg);
border-color: var(--error-border);
color: var(--error-text);
@@ -661,3 +626,17 @@ html[dir='rtl'],
animation: none !important;
}
}
+
+.loader {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ transform-origin: center;
+ transition: opacity 200ms, transform 200ms;
+}
+
+.loader[data-visible='false'] {
+ opacity: 0;
+ transform: scale(0.8) translate(-50%, -50%);
+}
diff --git a/src/types.ts b/src/types.ts
index 51eec33..7e41004 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -71,6 +71,7 @@ export interface ToasterProps {
style?: React.CSSProperties;
offset?: string | number;
dir?: 'rtl' | 'ltr' | 'auto';
+ loadingIcon?: React.ReactNode;
}
export enum SwipeStateTypes {
diff --git a/test/src/app/page.tsx b/test/src/app/page.tsx
index 73181ea..f4b4cf0 100644
--- a/test/src/app/page.tsx
+++ b/test/src/app/page.tsx
@@ -132,8 +132,8 @@ export default function Home({ searchParams }: any) {
onClick={() => {
const toastId = toast('My Unupdated Toast', {
duration: 10000,
- });
- toast('My Updated Toast', {
+ });
+ toast('My Updated Toast', {
id: toastId,
duration: 10000,
});
diff --git a/website/src/pages/toaster.mdx b/website/src/pages/toaster.mdx
index a1e43bc..17776b4 100644
--- a/website/src/pages/toaster.mdx
+++ b/website/src/pages/toaster.mdx
@@ -63,3 +63,4 @@ Changes the directionality of the toast's text.
| invert | Dark toasts in light mode and vice versa. | `false` |
| toastOptions | These will act as default options for all toasts. See [toast()](/toast) for all available options. | `4000` |
| gap | Gap between toasts when expanded | `14` |
+| loadingIcon | Changes the default loading icon | `-` |