refactor: remove activeToasts array

fkhadra · Dec 1, 2024 · 2de661b · 2de661b
1 parent b51a5f1
commit 2de661b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 38 deletions.
diff --git a/src/core/containerObserver.ts b/src/core/containerObserver.ts
@@ -10,20 +10,8 @@ import {
 } from '../types';
 import { canBeRendered, getAutoCloseDelay, isFn, isNum, isStr, parseClassName, toToastItem } from '../utils';
 
-interface QueuedToast {
-  content: ToastContent<any>;
-  props: ToastProps;
-  staleId?: Id;
-}
-
 type Notify = () => void;
 
-interface ActiveToast {
-  content: ToastContent<any>;
-  props: ToastProps;
-  staleId?: Id;
-}
-
 export type ContainerObserver = ReturnType<typeof createContainerObserver>;
 
 export function createContainerObserver(
@@ -33,8 +21,7 @@ export function createContainerObserver(
 ) {
   let toastKey = 1;
   let toastCount = 0;
-  let queue: QueuedToast[] = [];
-  let activeToasts: Id[] = [];
+  let queue: Toast[] = [];
   let snapshot: Toast[] = [];
   let props = containerProps;
   const toasts = new Map<Id, Toast>();
@@ -63,8 +50,18 @@ export function createContainerObserver(
     });
   };
 
+  const markAsRemoved = (v: Toast) => {
+    v.props?.onClose?.(v.removedByUser);
+    v.isActive = false;
+  };
+
   const removeToast = (id?: Id) => {
-    activeToasts = id == null ? [] : activeToasts.filter(v => v !== id);
+    if (id == null) {
+      toasts.forEach(markAsRemoved);
+    } else {
+      const t = toasts.get(id);
+      if (t) markAsRemoved(t);
+    }
     notify();
   };
 
@@ -73,14 +70,14 @@ export function createContainerObserver(
     queue = [];
   };
 
-  const addActiveToast = (toast: ActiveToast) => {
+  const addActiveToast = (toast: Toast) => {
     const { toastId, updateId } = toast.props;
     const isNew = updateId == null;
 
     if (toast.staleId) toasts.delete(toast.staleId);
+    toast.isActive = true;
 
     toasts.set(toastId, toast);
-    activeToasts = [...activeToasts, toastId].filter(v => v !== toast.staleId);
     notify();
     dispatchChanges(toToastItem(toast, isNew ? 'added' : 'updated'));
 
@@ -93,7 +90,6 @@ export function createContainerObserver(
     const { toastId, updateId, data, staleId, delay } = options;
     const closeToast = (removedByUser?: true) => {
       toasts.get(toastId)!.removedByUser = removedByUser;
-      toasts.get(toastId)!.props.onClose?.(removedByUser);
       removeToast(toastId);
     };
 
@@ -116,7 +112,9 @@ export function createContainerObserver(
       progressClassName: parseClassName(options.progressClassName || props.progressClassName),
       autoClose: options.isLoading ? false : getAutoCloseDelay(options.autoClose, props.autoClose),
       deleteToast() {
-        const toastToRemove = toasts.get(toastId)!;
+        const toastToRemove = toasts.get(toastId);
+
+        if (toastToRemove == null) return;
 
         dispatchChanges(toToastItem(toastToRemove, 'removed'));
         toasts.delete(toastId);
@@ -125,7 +123,7 @@ export function createContainerObserver(
         if (toastCount < 0) toastCount = 0;
 
         if (queue.length > 0) {
-          addActiveToast(queue.shift() as ActiveToast);
+          addActiveToast(queue.shift());
           return;
         }
 
@@ -157,7 +155,7 @@ export function createContainerObserver(
       content: toastContent,
       props: toastProps,
       staleId
-    };
+    } as Toast;
 
     // not handling limit + delay by design. Waiting for user feedback first
     if (props.limit && props.limit > 0 && toastCount > props.limit && isNotAnUpdate) {
@@ -187,7 +185,7 @@ export function createContainerObserver(
       const t = toasts.get(id);
       if (t) t.toggle = fn;
     },
-    isToastActive: (id: Id) => activeToasts.some(v => v === id),
+    isToastActive: (id: Id) => toasts.get(id)?.isActive,
     getSnapshot: () => snapshot
   };
 }
diff --git a/src/core/toast.ts b/src/core/toast.ts
@@ -10,7 +10,7 @@ import {
   TypeOptions,
   UpdateOptions
 } from '../types';
-import { Type, isFn, isNum, isStr } from '../utils';
+import { isFn, isNum, isStr, Type } from '../utils';
 import { genToastId } from './genToastId';
 import { clearWaitingQueue, getToast, isToastActive, onChange, pushToast, removeToast, toggleToast } from './store';
 

diff --git a/src/utils/mapper.ts b/src/utils/mapper.ts
@@ -1,19 +1,16 @@
 import { Toast, ToastItem, ToastItemStatus } from '../types';
 
 export function toToastItem(toast: Toast, status: ToastItemStatus): ToastItem {
-  return toast != null
-    ? {
-        content: toast.content,
-        containerId: toast.props.containerId,
-        id: toast.props.toastId,
-        theme: toast.props.theme,
-        type: toast.props.type,
-        data: toast.props.data || {},
-        isLoading: toast.props.isLoading,
-        icon: toast.props.icon,
-        removedByUser: toast.removedByUser,
-        status
-      }
-    : // monkey patch for now
-      ({} as ToastItem);
+  return {
+    content: toast.content,
+    containerId: toast.props.containerId,
+    id: toast.props.toastId,
+    theme: toast.props.theme,
+    type: toast.props.type,
+    data: toast.props.data || {},
+    isLoading: toast.props.isLoading,
+    icon: toast.props.icon,
+    removedByUser: toast.removedByUser,
+    status
+  };
 }