notification event should include actionData (if applicable)

haxeui · Jun 3, 2024 · b6b9c05 · b6b9c05
1 parent cfab100
commit b6b9c05
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/haxe/ui/events/NotificationEvent.hx b/haxe/ui/events/NotificationEvent.hx
@@ -1,5 +1,6 @@
 package haxe.ui.events;
 
+import haxe.ui.notifications.NotificationData.NotificationActionData;
 import haxe.ui.notifications.Notification;
 
 class NotificationEvent extends UIEvent {
@@ -8,10 +9,12 @@ class NotificationEvent extends UIEvent {
     public static final ACTION:EventType<ScrollEvent> = EventType.name("notificationaction");
 
     public var notification:Notification = null;
+    public var actionData:NotificationActionData = null;
 
     public override function clone():NotificationEvent {
         var c:NotificationEvent = new NotificationEvent(this.type);
         c.notification = this.notification;
+        c.actionData = this.actionData;
         c.type = this.type;
         c.bubble = this.bubble;
         c.target = this.target;

diff --git a/haxe/ui/notifications/Notification.hx b/haxe/ui/notifications/Notification.hx
@@ -92,19 +92,22 @@ class Notification extends VBox {
 
     private function onActionButton(event:MouseEvent) {
         var closeNotification = true;
+        var actionData:NotificationActionData = event.target.userData;
 
-        var notificationEvent = new NotificationEvent(NotificationEvent.ACTION);
-        notificationEvent.notification = this;
-        dispatch(notificationEvent);
-        if (notificationEvent.canceled) {
-            closeNotification = false;
-        }
-        NotificationManager.instance.dispatch(notificationEvent, this);
-        if (notificationEvent.canceled) {
-            closeNotification = false;
+        if (actionData.callback == null) {
+            var notificationEvent = new NotificationEvent(NotificationEvent.ACTION);
+            notificationEvent.notification = this;
+            notificationEvent.actionData = actionData;
+            dispatch(notificationEvent);
+            if (notificationEvent.canceled) {
+                closeNotification = false;
+            }
+            NotificationManager.instance.dispatch(notificationEvent, this);
+            if (notificationEvent.canceled) {
+                closeNotification = false;
+            }
         }
 
-        var actionData:NotificationActionData = event.target.userData;
         if (actionData.callback != null) {
             closeNotification = actionData.callback(actionData);
         }