From 63f37f4f04b0e935014ea7a55a986b6109d8fd48 Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <mail@joshavg.de>
Date: Tue, 2 Oct 2018 10:15:28 +0200
Subject: [PATCH 1/2] add the ability to have multiple options marked as
 selected

This way, multi selectes can be realized where the select tag hast the attribute multiple="multiple"
together with size="x" and users can ctrl-click multiple options
---
 src/hiccup/form.clj       | 12 ++++++++++--
 test/hiccup/form_test.clj | 10 +++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/hiccup/form.clj b/src/hiccup/form.clj
index 7c60fae..1abe445 100644
--- a/src/hiccup/form.clj
+++ b/src/hiccup/form.clj
@@ -74,6 +74,14 @@
              :value value
              :checked checked?}]))
 
+(defn- selected?
+  "If selected is sequential, return whether selected contains x,
+  else return if x is equal to selected"
+  [x selected]
+  (if (sequential? selected)
+    (or (some (partial = x) selected) false)
+    (= x selected)))
+
 (defelem select-options
   "Creates a seq of option tags from a collection."
   ([coll] (select-options coll nil))
@@ -83,8 +91,8 @@
         (let [[text val] x]
           (if (sequential? val)
             [:optgroup {:label text} (select-options val selected)]
-            [:option {:value val :selected (= val selected)} text]))
-        [:option {:selected (= x selected)} x]))))
+            [:option {:value val :selected (selected? val selected)} text]))
+        [:option {:selected (selected? x selected)} x]))))
 
 (defelem drop-down
   "Creates a drop-down box using the `<select>` tag."
diff --git a/test/hiccup/form_test.clj b/test/hiccup/form_test.clj
index def3a8f..2da1485 100644
--- a/test/hiccup/form_test.clj
+++ b/test/hiccup/form_test.clj
@@ -71,7 +71,15 @@
            "<option value=\"2\">baz</option></optgroup>")
     (select-options [["Foo" [1 2]]] 2)
       (str "<optgroup label=\"Foo\"><option>1</option>"
-           "<option selected=\"selected\">2</option></optgroup>")))
+           "<option selected=\"selected\">2</option></optgroup>")
+    (select-options ["foo" "bar" "baz"] ["foo" "bar"])
+      (str "<option selected=\"selected\">foo</option>"
+           "<option selected=\"selected\">bar</option>"
+           "<option>baz</option>")
+    (select-options [["Foo" 1] ["Bar" 2] ["Baz" 3]] [1 3])
+      (str "<option selected=\"selected\" value=\"1\">Foo</option>"
+           "<option value=\"2\">Bar</option>"
+           "<option selected=\"selected\" value=\"3\">Baz</option>")))
 
 
 

From 13f500f443eaa20d41c6141d41818296e858e469 Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <mail@joshavg.de>
Date: Tue, 2 Oct 2018 11:41:40 +0200
Subject: [PATCH 2/2] Add ifn? to selected? for passing predicates

Lists and vectors are also considered IFn's, so the are explicitly
checked and treated as standard data structures using (some ...).
---
 src/hiccup/form.clj       | 12 +++++-------
 test/hiccup/form_test.clj | 10 +++++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/hiccup/form.clj b/src/hiccup/form.clj
index 1abe445..e6e0082 100644
--- a/src/hiccup/form.clj
+++ b/src/hiccup/form.clj
@@ -74,13 +74,11 @@
              :value value
              :checked checked?}]))
 
-(defn- selected?
-  "If selected is sequential, return whether selected contains x,
-  else return if x is equal to selected"
-  [x selected]
-  (if (sequential? selected)
-    (or (some (partial = x) selected) false)
-    (= x selected)))
+(defn- selected? [x selected]
+  (cond (or (list? selected) (vector? selected))
+          (or (some (partial = x) selected) false)
+        (ifn? selected) (selected x)
+        :else (= x selected)))
 
 (defelem select-options
   "Creates a seq of option tags from a collection."
diff --git a/test/hiccup/form_test.clj b/test/hiccup/form_test.clj
index 2da1485..1ed6c85 100644
--- a/test/hiccup/form_test.clj
+++ b/test/hiccup/form_test.clj
@@ -76,10 +76,18 @@
       (str "<option selected=\"selected\">foo</option>"
            "<option selected=\"selected\">bar</option>"
            "<option>baz</option>")
+    (select-options ["foo" "bar" "baz"] '("foo" "bar"))
+      (str "<option selected=\"selected\">foo</option>"
+           "<option selected=\"selected\">bar</option>"
+           "<option>baz</option>")
     (select-options [["Foo" 1] ["Bar" 2] ["Baz" 3]] [1 3])
       (str "<option selected=\"selected\" value=\"1\">Foo</option>"
            "<option value=\"2\">Bar</option>"
-           "<option selected=\"selected\" value=\"3\">Baz</option>")))
+           "<option selected=\"selected\" value=\"3\">Baz</option>")
+    (select-options ["foo" "bar" "baz"] #(= \b (nth % 0)))
+      (str "<option>foo</option>"
+           "<option selected=\"selected\">bar</option>"
+           "<option selected=\"selected\">baz</option>")))