Support returning a render function from defstyled

As seen with reagent form-2 components.

Author: plexus

CHANGELOG.md

@@ -1,10 +1,8 @@
 # Unreleased
 
-## Added
-
 ## Fixed
 
-## Changed
+- Support using `defstyled` components as reagent form-2 components
 
 # 0.9.87 (2023-04-15 / dac82f4)
 
@@ -74,4 +72,4 @@
 
 ## Added
 
-- Initial implementation
+- Initial implementation

src/lambdaisland/ornament.cljc

@@ -420,7 +420,11 @@
   attributes passed in via the `::attrs` property."
   [tag css-class args component]
   (if component
-    (expand-hiccup-tag-simple tag css-class (apply component args) (::attrs (first args)))
+    (let [result (apply component args)]
+      (if (fn? result)
+        (fn [& args]
+          (expand-hiccup-tag-simple tag css-class (apply result args) (::attrs (first args))))
+        (expand-hiccup-tag-simple tag css-class result (::attrs (first args)))))
     (expand-hiccup-tag-simple tag css-class (seq args) nil)))
 
 (defn styled

test/lambdaisland/ornament_test.cljc

@@ -131,6 +131,12 @@
    :color "#cff9cf"
    :text-decoration "underline"})
 
+(o/defstyled form-2 :div
+  ([a]
+   (fn [b]
+     [:<> "hello"])))
+
+
 #?(:clj
    (deftest css-test
      (is (= ".ot__simple{color:#fff}"
@@ -248,6 +254,8 @@
      [:a] [:a] [:a] [:a] [:a] [:a] [:a] [:a] [:a] [:a] [:a]
      [:a] [:a] [:a] [:a]]
     "<span class=\"ot__simple\"><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a><a></a></span>"
+    [(form-2 7) {::o/attrs {:data-a 11}}]
+    "<div data-a=\"11\" class=\"ot-form-2\">hello</div>"
 
     ))