@unitedstatespowersquadrons/components 1.2.12 → 1.2.14

package/Toasts/toastHelpers.ts

@@ -19,13 +19,13 @@ export function handleToasts<T extends AppStateWithToasts>(draft: Draft<T>, toas
 }
 
 export function addToast<T extends AppStateWithToasts>(draft: Draft<T>, toastOptions: Toast) {
-  const { body, status, timeout, title } = toastOptions;
+  const { body, id, status, timeout, title } = toastOptions;
 
   // Increment current toastId to prevent collisions
-  const id = draft.toastId ? draft.toastId + 1 : 1;
-  draft.toastId = id;
+  const toastId = draft.toastId ? draft.toastId + 1 : 1;
+  draft.toastId = toastId;
 
-  const toast = { body, id, status, timeout, title } as ToastProps;
+  const toast = { body, id: id || toastId, status, timeout, title } as ToastProps;
 
   // Initialize toasts array if not provided by the server
   if (!draft.toasts) draft.toasts = [];
@@ -41,3 +41,22 @@ export function addToast<T extends AppStateWithToasts>(draft: Draft<T>, toastOpt
 
   draft.toasts.push(toast);
 }
+
+export function removeToast<T extends AppStateWithToasts>(draft: Draft<T>, toast: Toast) {
+  const beforeToasts: ToastProps[] = [];
+  const afterToasts: ToastProps[] = [];
+  let beforeToast = true;
+
+  // draft.toasts.splice was removing toasts too quickly
+  draft.toasts.forEach(t => {
+    if (t === toast) {
+      beforeToast = false;
+    } else if (beforeToast) {
+      beforeToasts.push(t);
+    } else {
+      afterToasts.push(t);
+    }
+
+    draft.toasts = beforeToasts.concat(afterToasts);
+  });
+}

package/Toasts/types.ts

@@ -12,6 +12,7 @@ export type ToastAppAction =
   | ToastRemoveAppAction;
 
 export interface Toast {
+  id?: number;
   status: Toast_Status;
   title: string;
   body: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unitedstatespowersquadrons/components",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "description": "USPS shared React components library",
   "main": "index.tsx",
   "scripts": {