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

Fix merge-props without classes

This commit is contained in:
Anton Chikin 2020-03-07 00:23:30 +03:00
parent 84692f8633
commit bfca4e4d36
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,9 @@
rst))) rst)))
(defn- merge-class [p1 p2] (defn- merge-class [p1 p2]
(assoc p2 :class (class-names (:class p1) (:class p2)))) (if-let [names (class-names (:class p1) (:class p2))]
(assoc p2 :class names)
p2))
(defn- merge-style [p1 p2] (defn- merge-style [p1 p2]
(let [style (when-let [s1 (:style p1)] (let [style (when-let [s1 (:style p1)]

5
test/reagent/impl/util_test.cljs
View File

@ -56,6 +56,11 @@
(util/merge-props {:disabled true :style {:flex 1} :class "foo"} (util/merge-props {:disabled true :style {:flex 1} :class "foo"}
{:disabled false :style {:flex-direction "row"} :class "bar"})))) {:disabled false :style {:flex-direction "row"} :class "bar"}))))
(testing "two arguments without classes"
(is (= {:disabled false :style {:flex 1 :flex-direction "row"}}
(util/merge-props {:disabled true :style {:flex 1}}
{:disabled false :style {:flex-direction "row"}}))))
(testing "n arguments" (testing "n arguments"
(is (= {:disabled false (is (= {:disabled false
:checked true :checked true