From 3f142ab1465cf2002194c62424b059bb2f62eea0 Mon Sep 17 00:00:00 2001
From: rameel <rameel-b@hotmail.com>
Date: Sun, 9 Aug 2026 22:10:13 +0500
Subject: [PATCH] Reorder trigger timings to match Receive-Swap-Settle order

---
 .../HtmxResponseHeaders.cs                    | 20 +++++++++----------
 src/Ramstack.HtmxToolkit/HtmxTriggerTiming.cs | 12 +++++------
 src/Ramstack.HtmxToolkit/PendingEvents.cs     | 18 ++++++++---------
 .../TagHelpers/HtmxConfigTagHelper.cs         | 12 +++++------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/Ramstack.HtmxToolkit/HtmxResponseHeaders.cs b/src/Ramstack.HtmxToolkit/HtmxResponseHeaders.cs
index 6e355d7..938a9db 100644
--- a/src/Ramstack.HtmxToolkit/HtmxResponseHeaders.cs
+++ b/src/Ramstack.HtmxToolkit/HtmxResponseHeaders.cs
@@ -129,33 +129,33 @@ public IReadOnlyDictionary<string, object> Trigger
     }
 
     /// <summary>
-    /// Gets or sets the <c>HX-Trigger-After-Settle</c> header, which specifies a dictionary of client-side events
-    /// to trigger after the htmx request has settled.
+    /// Gets or sets the <c>HX-Trigger-After-Swap</c> header, which specifies a dictionary of client-side events
+    /// to trigger after the response content has been swapped into the DOM.
     /// </summary>
     /// <remarks>
     /// Event values are accumulated for the current response and serialized into the header immediately
     /// before the response starts.
     /// </remarks>
     [MaybeNull]
-    public IReadOnlyDictionary<string, object> TriggerAfterSettle
+    public IReadOnlyDictionary<string, object> TriggerAfterSwap
     {
-        get => PendingEvents.TryGet(_response)?.GetEvents(HtmxTriggerTiming.AfterSettle);
-        set => PendingEvents.GetOrCreate(_response).SetEvents(HtmxTriggerTiming.AfterSettle, value);
+        get => PendingEvents.TryGet(_response)?.GetEvents(HtmxTriggerTiming.AfterSwap);
+        set => PendingEvents.GetOrCreate(_response).SetEvents(HtmxTriggerTiming.AfterSwap, value);
     }
 
     /// <summary>
-    /// Gets or sets the <c>HX-Trigger-After-Swap</c> header, which specifies a dictionary of client-side events
-    /// to trigger after the response content has been swapped into the DOM.
+    /// Gets or sets the <c>HX-Trigger-After-Settle</c> header, which specifies a dictionary of client-side events
+    /// to trigger after the htmx request has settled.
     /// </summary>
     /// <remarks>
     /// Event values are accumulated for the current response and serialized into the header immediately
     /// before the response starts.
     /// </remarks>
     [MaybeNull]
-    public IReadOnlyDictionary<string, object> TriggerAfterSwap
+    public IReadOnlyDictionary<string, object> TriggerAfterSettle
     {
-        get => PendingEvents.TryGet(_response)?.GetEvents(HtmxTriggerTiming.AfterSwap);
-        set => PendingEvents.GetOrCreate(_response).SetEvents(HtmxTriggerTiming.AfterSwap, value);
+        get => PendingEvents.TryGet(_response)?.GetEvents(HtmxTriggerTiming.AfterSettle);
+        set => PendingEvents.GetOrCreate(_response).SetEvents(HtmxTriggerTiming.AfterSettle, value);
     }
 
     private static string? GetHeader(IHeaderDictionary headers, string key)
diff --git a/src/Ramstack.HtmxToolkit/HtmxTriggerTiming.cs b/src/Ramstack.HtmxToolkit/HtmxTriggerTiming.cs
index 53a7cba..7bba207 100644
--- a/src/Ramstack.HtmxToolkit/HtmxTriggerTiming.cs
+++ b/src/Ramstack.HtmxToolkit/HtmxTriggerTiming.cs
@@ -12,14 +12,14 @@ public enum HtmxTriggerTiming
     Receive,
 
     /// <summary>
-    /// Maps to the <c>HX-Trigger-After-Settle</c> header that is used to trigger an event
-    /// on the client side after the htmx request has settled.
+    /// Maps to the <c>HX-Trigger-After-Swap</c> header that is used to trigger an event
+    /// on the client side after the htmx request has been swapped.
     /// </summary>
-    AfterSettle,
+    AfterSwap,
 
     /// <summary>
-    /// Maps to the <c>HX-Trigger-After-Swap</c> header that is used to trigger an event
-    /// on the client side after the htmx request has been swapped.
+    /// Maps to the <c>HX-Trigger-After-Settle</c> header that is used to trigger an event
+    /// on the client side after the htmx request has settled.
     /// </summary>
-    AfterSwap
+    AfterSettle
 }
diff --git a/src/Ramstack.HtmxToolkit/PendingEvents.cs b/src/Ramstack.HtmxToolkit/PendingEvents.cs
index 6b08225..ec56acb 100644
--- a/src/Ramstack.HtmxToolkit/PendingEvents.cs
+++ b/src/Ramstack.HtmxToolkit/PendingEvents.cs
@@ -13,8 +13,8 @@ namespace Ramstack.HtmxToolkit;
 internal sealed class PendingEvents(HttpResponse response)
 {
     private Dictionary<string, object>? _receive;
-    private Dictionary<string, object>? _afterSettle;
     private Dictionary<string, object>? _afterSwap;
+    private Dictionary<string, object>? _afterSettle;
 
     /// <summary>
     /// Adds the specified events to the pending set for the given <paramref name="timing"/>.
@@ -27,8 +27,8 @@ public void AddEvents(HtmxTriggerTiming timing, IReadOnlyDictionary<string, obje
         var current = timing switch
         {
             HtmxTriggerTiming.Receive => _receive ??= new Dictionary<string, object>(),
-            HtmxTriggerTiming.AfterSettle => _afterSettle ??= new Dictionary<string, object>(),
-            _ => _afterSwap ??= new Dictionary<string, object>()
+            HtmxTriggerTiming.AfterSwap => _afterSwap ??= new Dictionary<string, object>(),
+            _ => _afterSettle ??= new Dictionary<string, object>(),
         };
 
         if (events is Dictionary<string, object> dictionary)
@@ -55,8 +55,8 @@ public void AddEvents(HtmxTriggerTiming timing, IReadOnlyDictionary<string, obje
         return timing switch
         {
             HtmxTriggerTiming.Receive => _receive,
-            HtmxTriggerTiming.AfterSettle => _afterSettle,
-            _ => _afterSwap
+            HtmxTriggerTiming.AfterSwap => _afterSwap,
+            _ => _afterSettle,
         };
     }
 
@@ -73,11 +73,11 @@ public void SetEvents(HtmxTriggerTiming timing, IReadOnlyDictionary<string, obje
             case HtmxTriggerTiming.Receive:
                 _receive = replacement;
                 break;
-            case HtmxTriggerTiming.AfterSettle:
-                _afterSettle = replacement;
+            case HtmxTriggerTiming.AfterSwap:
+                _afterSwap = replacement;
                 break;
             default:
-                _afterSwap = replacement;
+                _afterSettle = replacement;
                 break;
         }
     }
@@ -88,8 +88,8 @@ public void SetEvents(HtmxTriggerTiming timing, IReadOnlyDictionary<string, obje
     public void Flush()
     {
         SetHeader(HtmxResponseHeaderNames.Trigger, _receive);
-        SetHeader(HtmxResponseHeaderNames.TriggerAfterSettle, _afterSettle);
         SetHeader(HtmxResponseHeaderNames.TriggerAfterSwap, _afterSwap);
+        SetHeader(HtmxResponseHeaderNames.TriggerAfterSettle, _afterSettle);
     }
 
     /// <summary>
diff --git a/src/Ramstack.HtmxToolkit/TagHelpers/HtmxConfigTagHelper.cs b/src/Ramstack.HtmxToolkit/TagHelpers/HtmxConfigTagHelper.cs
index a7567fc..6315fed 100644
--- a/src/Ramstack.HtmxToolkit/TagHelpers/HtmxConfigTagHelper.cs
+++ b/src/Ramstack.HtmxToolkit/TagHelpers/HtmxConfigTagHelper.cs
@@ -87,18 +87,18 @@ public sealed class HtmxConfigTagHelper(IAntiforgery antiforgery) : TagHelper
     [HtmlAttributeName("added-class")]
     public string? AddedClass { get; set; }
 
-    /// <summary>
-    /// Gets or sets the settling class. Defaults to <c>htmx-settling</c>.
-    /// </summary>
-    [HtmlAttributeName("settling-class")]
-    public string? SettlingClass { get; set; }
-
     /// <summary>
     /// Gets or sets the swapping class. Defaults to <c>htmx-swapping</c>.
     /// </summary>
     [HtmlAttributeName("swapping-class")]
     public string? SwappingClass { get; set; }
 
+    /// <summary>
+    /// Gets or sets the settling class. Defaults to <c>htmx-settling</c>.
+    /// </summary>
+    [HtmlAttributeName("settling-class")]
+    public string? SettlingClass { get; set; }
+
     /// <summary>
     /// Gets or sets a value indicating whether eval is allowed.
     /// Defaults to <see langword="true" />.