From 494e3e4d5b09ce0803f5a2232ac2da3c2471e203 Mon Sep 17 00:00:00 2001
From: julians <julians@microsoft.com>
Date: Thu, 17 Apr 2025 00:49:07 -0700
Subject: [PATCH 1/2] fix: Remove toasts from the waiting queue if they are
 dismiss()ed.

---
 playground/src/components/App.tsx | 12 +++++++++++-
 src/core/containerObserver.ts     |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/playground/src/components/App.tsx b/playground/src/components/App.tsx
index acde3d51..9abfd8e9 100644
--- a/playground/src/components/App.tsx
+++ b/playground/src/components/App.tsx
@@ -22,7 +22,7 @@ window.toast = toast;
 
 class App extends React.Component {
   state = App.getDefaultState();
-  toastId: Id;
+  toastId: Id = -1;
   resolvePromise = true;
 
   static getDefaultState() {
@@ -42,6 +42,11 @@ class App extends React.Component {
       ...App.getDefaultState()
     });
 
+  clearLast = () => {
+    toast.dismiss(this.toastId);
+    this.toastId = -1;
+  };
+
   clearAll = () => toast.dismiss();
 
   showToast = () => {
@@ -229,6 +234,11 @@ class App extends React.Component {
                   Update
                 </button>
               </li>
+              <li>
+                <button className="btn" onClick={this.clearLast}>
+                  Clear Last
+                </button>
+              </li>
               <li>
                 <button className="btn bg-red" onClick={this.clearAll}>
                   <span role="img" aria-label="clear all">
diff --git a/src/core/containerObserver.ts b/src/core/containerObserver.ts
index 4d0ce09c..527206e4 100644
--- a/src/core/containerObserver.ts
+++ b/src/core/containerObserver.ts
@@ -60,6 +60,9 @@ export function createContainerObserver(
     } else {
       const t = toasts.get(id);
       if (t) markAsRemoved(t);
+      const countBefore = queue.length;
+      queue = queue.filter(t => id !== t.props.toastId);
+      toastCount -= countBefore - queue.length;
     }
     notify();
   };

From 2fe6743f92515056d47b5d8d357c299108c9657c Mon Sep 17 00:00:00 2001
From: JulianSelman <julians@microsoft.com>
Date: Thu, 17 Apr 2025 08:28:09 -0700
Subject: [PATCH 2/2] Rename duplicate local 't' to 'entry'

---
 src/core/containerObserver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/containerObserver.ts b/src/core/containerObserver.ts
index 527206e4..7a0983e9 100644
--- a/src/core/containerObserver.ts
+++ b/src/core/containerObserver.ts
@@ -61,7 +61,7 @@ export function createContainerObserver(
       const t = toasts.get(id);
       if (t) markAsRemoved(t);
       const countBefore = queue.length;
-      queue = queue.filter(t => id !== t.props.toastId);
+      queue = queue.filter(entry => id !== entry.props.toastId);
       toastCount -= countBefore - queue.length;
     }
     notify();