Merge pull request #26415 from storybookjs/norbert/optimize-clear-not…

…ification Core: Optimize clearNotification
storybookjs · Mar 12, 2024 · 0402f64 · 0402f64
2 parents 7dd433d + ac63ab2
commit 0402f64
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/code/lib/manager-api/src/modules/notifications.ts b/code/lib/manager-api/src/modules/notifications.ts
@@ -37,11 +37,13 @@ export const init: ModuleFn = ({ store }) => {
     clearNotification: (id) => {
       const { notifications } = store.getState();
 
-      store.setState({ notifications: notifications.filter((n) => n.id !== id) });
-
       const notification = notifications.find((n) => n.id === id);
-      if (notification && notification.onClear) {
-        notification.onClear({ dismissed: false });
+
+      if (notification) {
+        store.setState({ notifications: notifications.filter((n) => n.id !== id) });
+        if (notification.onClear) {
+          notification.onClear({ dismissed: false });
+        }
       }
     },
   };