Fix #433, support className property with keyword class shortcut

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fixed merge-props adding `:class` property to result even if no argument
 defined `:class` ([#479](https://github.com/reagent-project/reagent/pull/479))
+- Fix using `:className` property together with keyword class shortcut ([#433](https://github.com/reagent-project/reagent/issues/433))
 
 ## 0.10.0 (2020-03-06)
 

src/reagent/impl/template.cljs

@@ -109,7 +109,10 @@
 
       ;; Merge classes
       class
-      (assoc :class (util/class-names class (:class props))))))
+      ;; Note: someone might use React-style :className property,
+      ;; this is the only place where that needs special case. Using
+      ;; :class and :className together is not supported.
+      (assoc :class (util/class-names class (or (:class props) (:className props)))))))
 
 (defn convert-props [props ^clj id-class]
   (let [class (:class props)

test/reagenttest/testreagent.cljs

@@ -302,6 +302,10 @@
          (as-string [:div.foo {:class "bar"}])))
   (is (= "<div class=\"foo bar\"></div>"
          (as-string [:div.foo.bar])))
+  (is (= "<div class=\"foo bar\"></div>"
+         (as-string [:div.foo {:className "bar"}])))
+  (is (= "<div class=\"foo bar\"></div>"
+         (as-string [:div {:className "foo bar"}])))
   (is (re-find #"id=.foo"
                (as-string [:div#foo.foo.bar])))
   (is (re-find #"class=.xxx bar"