From 330df2b6e4eff05288e26feb1558abdd7826dc63 Mon Sep 17 00:00:00 2001
From: Lysec <itslysec@gmail.com>
Date: Tue, 10 Feb 2026 16:54:42 +0100
Subject: [PATCH] Notification: adjust animation on action invoke

---
 Modules/Notification/Notification.qml | 40 +++++++++++++++++++++------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml
index 709cba998..1cff5ab3c 100644
--- a/Modules/Notification/Notification.qml
+++ b/Modules/Notification/Notification.qml
@@ -145,9 +145,12 @@ Variants {
             }
           }
 
-          if (delegate?.animateOut) {
-            delegate.animateOut();
-          } else {
+          try {
+            if (delegate && typeof delegate.animateOut === "function" && !delegate.isRemoving) {
+              delegate.animateOut();
+            }
+          } catch (e) {
+            // Service fallback if delegate is already invalid
             NotificationService.dismissActiveNotification(notificationId);
           }
         };
@@ -305,15 +308,16 @@ Variants {
               onExited: card.hoverCount--
               onClicked: mouse => {
                            if (mouse.button === Qt.RightButton) {
-                             animateOut();
+                             card.animateOut();
                            } else if (mouse.button === Qt.LeftButton) {
                              var actions = model.actionsJson ? JSON.parse(model.actionsJson) : [];
                              var hasDefault = actions.some(function (a) {
                                return a.identifier === "default";
                              });
                              if (hasDefault) {
-                               animateOut();
-                               NotificationService.invokeAction(notificationId, "default");
+                               card.animateOut();
+                               deferredActionTimer.actionId = "default";
+                               deferredActionTimer.start();
                              }
                            }
                          }
@@ -378,6 +382,20 @@ Variants {
               }
             }
 
+            Timer {
+              id: deferredActionTimer
+              interval: 50
+              property string actionId: ""
+              property bool isHistoryRemoval: false
+              onTriggered: {
+                if (isHistoryRemoval) {
+                  NotificationService.removeFromHistory(notificationId);
+                } else {
+                  NotificationService.invokeAction(notificationId, actionId);
+                }
+              }
+            }
+
             onIsRemovingChanged: {
               if (isRemoving) {
                 removalTimer.start();
@@ -544,7 +562,10 @@ Variants {
                         outlined: false
                         implicitHeight: 24
                         onClicked: {
-                          NotificationService.invokeAction(parent.parentNotificationId, actionData.identifier);
+                          card.animateOut();
+                          deferredActionTimer.actionId = actionData.identifier;
+                          deferredActionTimer.isHistoryRemoval = false;
+                          deferredActionTimer.start();
                         }
                       }
                     }
@@ -564,8 +585,9 @@ Variants {
               anchors.rightMargin: Style.marginM
 
               onClicked: {
-                animateOut();
-                NotificationService.removeFromHistory(model.id);
+                card.animateOut();
+                deferredActionTimer.isHistoryRemoval = true;
+                deferredActionTimer.start();
               }
             }
           }