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

Report component-path when errors happen during render

This commit is contained in:
Dan Holmsand 2015-08-31 18:56:27 +02:00
parent b77b182d67
commit 41384d5438
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/reagent/impl/component.cljs
View File

@ -27,32 +27,48 @@
(and (fn? c)
(some? (.' c :cljsReactClass))))
(defn do-render-sub [c]
(let [f (.' c :cljsRender)
_ (assert (ifn? f))
p (.' c :props)
res (if (nil? (.' c :reagentRender))
(f c)
(let [argv (.' p :argv)
n (count argv)]
(case n
1 (f)
2 (f (nth argv 1))
3 (f (nth argv 1) (nth argv 2))
4 (f (nth argv 1) (nth argv 2) (nth argv 3))
5 (f (nth argv 1) (nth argv 2) (nth argv 3) (nth argv 4))
(apply f (subvec argv 1)))))]
(if (vector? res)
(as-element res)
(if (ifn? res)
(let [f (if (reagent-class? res)
(fn [& args]
(as-element (apply vector res args)))
res)]
(.! c :cljsRender f)
(recur c))
res))))
(declare comp-name)
(defn do-render [c]
(binding [*current-component* c]
(let [f (.' c :cljsRender)
_ (assert (ifn? f))
p (.' c :props)
res (if (nil? (.' c :reagentRender))
(f c)
(let [argv (.' p :argv)
n (count argv)]
(case n
1 (f)
2 (f (nth argv 1))
3 (f (nth argv 1) (nth argv 2))
4 (f (nth argv 1) (nth argv 2) (nth argv 3))
5 (f (nth argv 1) (nth argv 2) (nth argv 3) (nth argv 4))
(apply f (subvec argv 1)))))]
(if (vector? res)
(as-element res)
(if (ifn? res)
(let [f (if (reagent-class? res)
(fn [& args]
(as-element (apply vector res args)))
res)]
(.! c :cljsRender f)
(do-render c))
res)))))
(if (dev?)
;; Log errors, without using try/catch (and mess up call stack)
(let [ok (array false)]
(try
(let [res (do-render-sub c)]
(aset ok 0 true)
res)
(finally
(when-not (aget ok 0)
(js/console.error (str "Error rendering component "
(comp-name)))))))
(do-render-sub c))))
;;; Method wrapping