Fix #19: add support for keyword spread operator

lilactown · Mar 3, 2020 · de145d9 · de145d9
1 parent cbe31a0
commit de145d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/dev/workshop/core.cljs b/dev/workshop/core.cljs
@@ -129,7 +129,8 @@
   (let [div "div"
         props {:style {:color "blue"}}
         children '("foo" "bar")]
-    ($ div {& props} children "baz")))
+    (<> "&" ($ div {& props} children "baz")
+        ":&" ($ div {:& props} children "baz"))))
 
 (dc/defcard dynamic
   ($ dynamic-test))

diff --git a/src/helix/impl/props.cljc b/src/helix/impl/props.cljc
@@ -74,9 +74,11 @@
 
 
 (defn -native-props
-  ([m] #?(:clj (if-let [spread-sym (get m '&)]
-                 `(merge-obj ~(-native-props (dissoc m '&) (primitive-obj))
-                             (-native-props ~spread-sym))
+  ([m] #?(:clj (if-let [spread-sym (cond
+                                     (contains? m '&) '&
+                                     (contains? m :&) :&)]
+                 `(merge-obj ~(-native-props (dissoc m spread-sym) (primitive-obj))
+                             (-native-props ~(get m spread-sym)))
                  (-native-props m (primitive-obj)))
           :cljs (-native-props m (primitive-obj))))
   ([m o]