Merge pull request #62 from Runek00/hx-reswap

Issue #56: add reswap to HtmxResponse
wimdeblauwe · Aug 23, 2023 · 26f1bda · 26f1bda
2 parents c84b09b + 5a2e956
commit 26f1bda
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 2 deletions.
diff --git a/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxResponse.java b/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxResponse.java
@@ -30,6 +30,7 @@ final public class HtmxResponse {
     private boolean headerRefresh;
     private String headerRedirect;
     private String headerPushHistory;
+    private String headerReswap;
 
     public HtmxResponse() {
         this.templates = new LinkedHashSet<>();
@@ -170,6 +171,18 @@ public HtmxResponse retarget(String cssSelector) {
         return this;
     }
 
+    /**
+     * Set a new swap to specify how the response will be swapped
+     *
+     * @param swapType must not be {@literal null}.
+     * @return same HtmxResponse for chaining
+     */
+    public HtmxResponse reswap(HxSwapType swapType) {
+        Assert.notNull(swapType, "swapType should not be null");
+        this.headerReswap = swapType.getValue();
+        return this;
+    }
+
     /**
      *
      * @param otherResponse Another HtmxResponse that will be merged into this response.
@@ -199,6 +212,9 @@ public HtmxResponse and(HtmxResponse otherResponse){
         if(otherResponse.getHeaderRedirect() != null) {
             this.headerRedirect = otherResponse.getHeaderRedirect();
         }
+        if(otherResponse.getHeaderReswap() != null) {
+            this.headerReswap = otherResponse.getHeaderReswap();
+        }
 
         return this;
     }
@@ -272,4 +288,8 @@ String getHeaderRedirect() {
      String getHeaderPushHistory() {
         return headerPushHistory;
     }
+
+    public String getHeaderReswap() {
+        return headerReswap;
+    }
 }
diff --git a/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxResponseHeader.java b/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxResponseHeader.java
@@ -7,7 +7,8 @@ public enum HtmxResponseHeader {
     HX_RETARGET("HX-Retarget"),
     HX_TRIGGER("HX-Trigger"),
     HX_TRIGGER_AFTER_SETTLE("HX-Trigger-After-Settle"),
-    HX_TRIGGER_AFTER_SWAP("HX-Trigger-After-Swap");
+    HX_TRIGGER_AFTER_SWAP("HX-Trigger-After-Swap"),
+    HX_RESWAP("HX-Reswap");
 
     private final String value;
 

diff --git a/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxViewHandlerInterceptor.java b/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxViewHandlerInterceptor.java
@@ -111,6 +111,9 @@ private void addHxHeaders(HtmxResponse htmxResponse, HttpServletResponse respons
         if (htmxResponse.getHeaderRetarget() != null) {
             response.setHeader(HtmxResponseHeader.HX_RETARGET.getValue(), htmxResponse.getHeaderRetarget());
         }
+        if (htmxResponse.getHeaderReswap() != null) {
+            response.setHeader(HtmxResponseHeader.HX_RESWAP.getValue(), htmxResponse.getHeaderReswap());
+        }
     }
 
     private void setTriggerHeader(HxTriggerLifecycle triggerHeader, Map<String, String> triggers,

diff --git a/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HxSwapType.java b/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HxSwapType.java
@@ -0,0 +1,25 @@
+package io.github.wimdeblauwe.hsbt.mvc;
+
+public enum HxSwapType {
+
+    INNER_HTML("innerHTML"),
+    OUTER_HTML("outerHTML"),
+    BEFORE_BEGIN("beforebegin"),
+    AFTER_BEGIN("afterbegin"),
+    BEFORE_END("beforeend"),
+    AFTER_END("afterend"),
+    DELETE("delete"),
+    NONE("none");
+
+
+    private final String value;
+
+    HxSwapType(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}
diff --git a/src/test/java/io/github/wimdeblauwe/hsbt/mvc/HtmxResponseTest.java b/src/test/java/io/github/wimdeblauwe/hsbt/mvc/HtmxResponseTest.java
@@ -72,12 +72,14 @@ public void extraHxHeaders() {
         sut.pushHistory("/a/history")
            .browserRedirect("/a/new/page")
            .browserRefresh(true)
-           .retarget("#theThing");
+           .retarget("#theThing")
+           .reswap(HxSwapType.AFTER_BEGIN);
 
         assertThat(sut.getHeaderPushHistory()).isEqualTo("/a/history");
         assertThat(sut.getHeaderRedirect()).isEqualTo("/a/new/page");
         assertThat(sut.getHeaderRefresh()).isTrue();
         assertThat(sut.getHeaderRetarget()).isEqualTo("#theThing");
+        assertThat(sut.getHeaderReswap()).isEqualTo("afterbegin");
     }
 
     /**