Add support for hx-disabled-elt

- Update script tag to 1.9.6

src/Common/README.md

@@ -2,4 +2,4 @@
 
 This package contains common code shared between [`Giraffe.Htmx`](https://www.nuget.org/packages/Giraffe.Htmx) and [`Giraffe.ViewEngine.Htmx`](https://www.nuget.org/packages/Giraffe.ViewEngine.Htmx), and will be automatically installed when you install either one.
 
-**htmx version: 1.9.2**
+**htmx version: 1.9.6**

src/Directory.Build.props

@@ -2,8 +2,8 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-        <VersionPrefix>1.9.2</VersionPrefix>
-        <PackageReleaseNotes>Update script tags to pull htmx 1.9.2</PackageReleaseNotes>
+        <VersionPrefix>1.9.6</VersionPrefix>
+        <PackageReleaseNotes>Add support for hx-disabled-elt attribute; update script tags to pull htmx 1.9.6</PackageReleaseNotes>
         <Authors>danieljsummers</Authors>
         <Company>Bit Badger Solutions</Company>
         <PackageProjectUrl>https://github.com/bit-badger/Giraffe.Htmx</PackageProjectUrl>

src/Htmx/Htmx.fs

@@ -94,6 +94,10 @@ module Handlers =
     let withHxNoReplaceUrl : HttpHandler =
         toLowerBool false |> withHxReplaceUrl
     
+    /// Override which portion of the response will be swapped into the target document
+    let withHxReselect : string -> HttpHandler =
+        setHttpHeader "HX-Reselect"
+    
     /// Override the `hx-swap` attribute from the initiating element
     let withHxReswap : string -> HttpHandler =
         setHttpHeader "HX-Reswap"

src/Htmx/README.md

@@ -2,7 +2,7 @@
 
 This package enables server-side support for [htmx](https://htmx.org) within [Giraffe](https://giraffe.wiki) and ASP.NET's `HttpContext`.
 
-**htmx version: 1.9.2**
+**htmx version: 1.9.6**
 
 ### Setup
 

src/Tests/Htmx.fs

@@ -265,6 +265,14 @@ let handlers =
             Expect.isTrue (dic.ContainsKey "HX-Replace-Url") "The HX-Replace-Url header should be present"
             Expect.equal dic["HX-Replace-Url"].[0] "false" "The HX-Replace-Url value was incorrect"
         }
+        testTask "withHxReselect succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxReselect "#test" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Reselect") "The HX-Reselect header should be present"
+            Expect.equal dic["HX-Reselect"].[0] "#test" "The HX-Reselect value was incorrect"
+        } 
         testTask "withHxReswap succeeds" {
             let ctx = Substitute.For<HttpContext> ()
             let dic = HeaderDictionary ()

src/Tests/ViewEngine.fs

@@ -313,6 +313,9 @@ let attributes =
         test "_hxDisable succeeds" {
             p [ _hxDisable ] [] |> shouldRender """<p hx-disable></p>"""
         }
+        test "_hxDisabledElt succeeds" {
+            button [ _hxDiabledElt "this" ] [] |> shouldRender """<button hx-disabled-elt="this"></button>"""
+        }
         test "_hxDisinherit succeeds" {
             strong [ _hxDisinherit "*" ] [] |> shouldRender """<strong hx-disinherit="*"></strong>"""
         }
@@ -422,14 +425,14 @@ let script =
             let html = RenderView.AsString.htmlNode Script.minified
             Expect.equal
                 html
-                """<script src="https://unpkg.com/htmx.org@1.9.2" integrity="sha384-L6OqL9pRWyyFU3+/bjdSri+iIphTN/bvYyM37tICVyOJkWZLpP2vGn6VUEXgzg6h" crossorigin="anonymous"></script>"""
+                """<script src="https://unpkg.com/htmx.org@1.9.6" integrity="sha384-FhXw7b6AlE/jyjlZH5iHa/tTe9EpJ1Y55RjcgPbjeWMskSxZt1v9qkxLJWNJaGni" crossorigin="anonymous"></script>"""
                 "Minified script tag is incorrect"
         }
         test "unminified succeeds" {
             let html = RenderView.AsString.htmlNode Script.unminified
             Expect.equal
                 html
-                """<script src="https://unpkg.com/htmx.org@1.9.2/dist/htmx.js" integrity="sha384-8ADa8Z9mz9MtKHmL1vCmqgEM5Q7eIiradzjEpmeELJ4kex3ibvmnctBNHlpLr/Zl" crossorigin="anonymous"></script>"""
+                """<script src="https://unpkg.com/htmx.org@1.9.6/dist/htmx.js" integrity="sha384-DyaDHx3hlXQ3QqTsQbNECvRW/A/B+4OtEWLCHbsDRPI3oJ98ekMiWJ4Yyrrqimog" crossorigin="anonymous"></script>"""
                 "Unminified script tag is incorrect"
         }
     ]

src/ViewEngine.Htmx/Htmx.fs

@@ -193,6 +193,9 @@ module HtmxAttrs =
     /// Disables htmx processing for the given node and any children nodes
     let _hxDisable    = flag "hx-disable"
     
+    /// Specifies elements that should be disabled when an htmx request is in flight
+    let _hxDiabledElt = attr "hx-disabled-elt"
+
     /// Disinherit all ("*") or specific htmx attributes
     let _hxDisinherit = attr "hx-disinherit"
     
@@ -296,14 +299,14 @@ module Script =
   
     /// Script tag to load the minified version from unpkg.com
     let minified =
-        script [ _src         "https://unpkg.com/htmx.org@1.9.2"
-                 _integrity   "sha384-L6OqL9pRWyyFU3+/bjdSri+iIphTN/bvYyM37tICVyOJkWZLpP2vGn6VUEXgzg6h"
+        script [ _src         "https://unpkg.com/htmx.org@1.9.6"
+                 _integrity   "sha384-FhXw7b6AlE/jyjlZH5iHa/tTe9EpJ1Y55RjcgPbjeWMskSxZt1v9qkxLJWNJaGni"
                  _crossorigin "anonymous" ] []
 
     /// Script tag to load the unminified version from unpkg.com
     let unminified =
-        script [ _src         "https://unpkg.com/htmx.org@1.9.2/dist/htmx.js"
-                 _integrity   "sha384-8ADa8Z9mz9MtKHmL1vCmqgEM5Q7eIiradzjEpmeELJ4kex3ibvmnctBNHlpLr/Zl"
+        script [ _src         "https://unpkg.com/htmx.org@1.9.6/dist/htmx.js"
+                 _integrity   "sha384-DyaDHx3hlXQ3QqTsQbNECvRW/A/B+4OtEWLCHbsDRPI3oJ98ekMiWJ4Yyrrqimog"
                  _crossorigin "anonymous" ] []
 
 

src/ViewEngine.Htmx/README.md

@@ -2,7 +2,7 @@
 
 This package enables [htmx](https://htmx.org) support within the [Giraffe](https://giraffe.wiki) view engine.
 
-**htmx version: 1.9.2**
+**htmx version: 1.9.6**
 
 ### Setup