status-im
/
reagent
mirror of https://github.com/status-im/reagent.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow passing :class nil explicitly

This commit is contained in:
Anton Chikin 2020-03-20 13:17:44 +03:00
parent bfca4e4d36
commit 18cdfe9c2b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/reagent/impl/util.cljs
View File

@ -147,8 +147,8 @@
rst)))
(defn- merge-class [p1 p2]
(if-let [names (class-names (:class p1) (:class p2))]
(assoc p2 :class names)
(if (or (contains? p1 :class) (contains? p2 :class))
(assoc p2 :class (class-names (:class p1) (:class p2)))
p2))
(defn- merge-style [p1 p2]