by default notifications should close when actions are performed

haxeui · Dec 14, 2023 · cc724d0 · cc724d0
1 parent 032192e
commit cc724d0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/haxe/ui/notifications/Notification.hx b/haxe/ui/notifications/Notification.hx
@@ -33,10 +33,14 @@ class Notification extends VBox {
         super();
 
         closeButton.onClick = function(_) {
-            NotificationManager.instance.removeNotification(this);
+            hide();
         }
     }
 
+    public override function hide() {
+        NotificationManager.instance.removeNotification(this);
+    }
+
     private var _notificationData:NotificationData = null;
     public var notificationData(get, set):NotificationData;
     private function get_notificationData():NotificationData {
@@ -87,14 +91,26 @@ class Notification extends VBox {
     }
 
     private function onActionButton(event:MouseEvent) {
+        var closeNotification = true;
+
         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;
+        }
 
         var actionData:NotificationActionData = event.target.userData;
         if (actionData.callback != null) {
-            actionData.callback(actionData);
+            closeNotification = actionData.callback(actionData);
+        }
+
+        if (closeNotification) {
+            hide();
         }
     }
 }
diff --git a/haxe/ui/notifications/NotificationData.hx b/haxe/ui/notifications/NotificationData.hx
@@ -15,5 +15,5 @@ typedef NotificationData = {
 typedef NotificationActionData = {
     @:optional var text:String;
     @:optional var icon:Variant;
-    @:optional var callback:NotificationActionData->Void;
+    @:optional var callback:NotificationActionData->Bool;
 }