Skip to content

An opinionated toast component for React.

add finally to toast.promise (#118)

Arnau Jiménez3eb957fc95f6
diff --git a/src/state.ts b/src/state.ts
index a9d18ee..fa1ae70 100644
--- a/src/state.ts
+++ b/src/state.ts
@@ -83,10 +83,12 @@ class Observer {
p.then((promiseData) => {
const message = typeof data.success === 'function' ? data.success(promiseData) : data.success;
this.create({ id, type: 'success', message });
- }).catch((error) => {
- const message = typeof data.error === 'function' ? data.error(error) : data.error;
- this.create({ id, type: 'error', message });
- });
+ })
+ .catch((error) => {
+ const message = typeof data.error === 'function' ? data.error(error) : data.error;
+ this.create({ id, type: 'error', message });
+ })
+ .finally(data.finally);
return id;
};
diff --git a/src/types.ts b/src/types.ts
index fd36f35..5cf043a 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -8,6 +8,7 @@ export type PromiseData<ToastData = any> = ExternalToast & {
loading: string | React.ReactNode;
success: string | React.ReactNode | ((data: ToastData) => React.ReactNode | string);
error: string | React.ReactNode | ((error: any) => React.ReactNode | string);
+ finally?: () => void | Promise<void>;
};
export interface ToastT {
diff --git a/test/src/app/page.tsx b/test/src/app/page.tsx
index 495ec4c..4bc0061 100644
--- a/test/src/app/page.tsx
+++ b/test/src/app/page.tsx
@@ -9,6 +9,7 @@ export default function Home({ searchParams }: any) {
const [showAutoClose, setShowAutoClose] = React.useState(false);
const [showDismiss, setShowDismiss] = React.useState(false);
const [theme, setTheme] = React.useState(searchParams.theme || 'light');
+ const [isFinally, setIsFinally] = React.useState(false);
return (
<>
@@ -60,12 +61,14 @@ export default function Home({ searchParams }: any) {
</button>
<button
data-testid="promise"
+ data-finally={isFinally ? '1' : '0'}
className="button"
onClick={() =>
toast.promise(promise, {
loading: 'Loading...',
success: 'Loaded',
error: 'Error',
+ finally: () => setIsFinally(true),
})
}
>
diff --git a/test/tests/basic.spec.ts b/test/tests/basic.spec.ts
index 357cfb3..1abc59a 100644
--- a/test/tests/basic.spec.ts
+++ b/test/tests/basic.spec.ts
@@ -26,6 +26,7 @@ test.describe('Basic functionality', () => {
await page.getByTestId('promise').click();
await expect(page.getByText('Loading...')).toHaveCount(1);
await expect(page.getByText('Loaded')).toHaveCount(1);
+ await expect(page.getByTestId('promise')).toHaveAttribute('data-finally', '1');
});
test('render custom jsx in toast', async ({ page }) => {