Lookup correct toaster for toast ID

src/core/store.ts

@@ -158,11 +158,13 @@ export const dispatch = (action: Action, toasterId = DEFAULT_TOASTER_ID) => {
   });
 };
 
-export const dispatchAll = (action: Action) => {
-  Object.keys(memoryState).forEach((toasterId) => {
-    dispatch(action, toasterId);
-  });
-};
+export const dispatchAll = (action: Action) =>
+  Object.keys(memoryState).forEach((toasterId) => dispatch(action, toasterId));
+
+export const getToasterIdFromToastId = (toastId: string) =>
+  Object.keys(memoryState).find((toasterId) =>
+    memoryState[toasterId].toasts.some((t) => t.id === toastId)
+  );
 
 export const createDispatch =
   (toasterId = DEFAULT_TOASTER_ID) =>

src/core/toast.ts

@@ -8,7 +8,13 @@ import {
   resolveValue,
 } from './types';
 import { genId } from './utils';
-import { createDispatch, Action, ActionType, dispatchAll } from './store';
+import {
+  createDispatch,
+  Action,
+  ActionType,
+  dispatchAll,
+  getToasterIdFromToastId,
+} from './store';
 
 type Message = ValueOrFunction<Renderable, Toast>;
 
@@ -37,7 +43,11 @@ const createHandler =
   (type?: ToastType): ToastHandler =>
   (message, options) => {
     const toast = createToast(message, type, options);
-    const dispatch = createDispatch(toast.toasterId);
+
+    const dispatch = createDispatch(
+      toast.toasterId || getToasterIdFromToastId(toast.id)
+    );
+
     dispatch({ type: ActionType.UPSERT_TOAST, toast });
     return toast.id;
   };
@@ -84,7 +94,9 @@ toast.remove = (toastId?: string, toasterId?: string) => {
   };
   if (toasterId) {
     createDispatch(toasterId)(action);
+    console.log('dispatch', action, toasterId);
   } else {
+    console.log('dispatchAll', action);
     dispatchAll(action);
   }
 };

test/toast.test.tsx

@@ -419,6 +419,7 @@ describe('Multi-Toaster behavior', () => {
 
     // Now update that toast to success
     act(() => {
+      // Note that we are not providing a toasterId here
       toast.success('Data saved!', {
         id: toastId,
       });