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

Revert "Support for React 16 component paths We rely on reagent.impl.component/component-path to avoid rendering re-frame-trace events to itself (causing infinite loop). This patch copies in a very recent change to Reagent which supports reading of component paths from React 16 components." 

This reverts commit a6cb2abdbc.
This commit is contained in:
Daniel Compton 2017-10-31 09:47:52 +13:00 committed by GitHub
parent a6cb2abdbc
commit 6106489041
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/day8/re_frame/trace.cljs
View File

@ -21,27 +21,8 @@
[devtools.formatters.core :as devtools])) [devtools.formatters.core :as devtools]))
;; from https://github.com/reagent-project/reagent/blob/3fd0f1b1d8f43dbf169d136f0f905030d7e093bd/src/reagent/impl/component.cljs#L274
(defn fiber-component-path [fiber]
(let [name (some-> fiber
($ :type)
($ :displayName))
parent (some-> fiber
($ :return))
path (some-> parent
fiber-component-path
(str " > "))
res (str path name)]
(when-not (empty? res) res)))
(defn component-path [c]
;; Alternative branch for React 16
(if-let [fiber (some-> c ($ :_reactInternalFiber))]
(fiber-component-path fiber)
(component/component-path c)))
(defn comp-name [c] (defn comp-name [c]
(let [n (or (component-path c) (let [n (or (component/component-path c)
(some-> c .-constructor util/fun-name))] (some-> c .-constructor util/fun-name))]
(if-not (empty? n) (if-not (empty? n)
n n
@ -52,8 +33,8 @@
(fn render [] (fn render []
(this-as c (this-as c
(trace/with-trace {:op-type :render (trace/with-trace {:op-type :render
:tags {:component-path (component-path c)} :tags {:component-path (reagent.impl.component/component-path c)}
:operation (last (str/split (component-path c) #" > "))} :operation (last (str/split (reagent.impl.component/component-path c) #" > "))}
(if util/*non-reactive* (if util/*non-reactive*
(reagent.impl.component/do-render c) (reagent.impl.component/do-render c)
(let [rat ($ c :cljsRatom) (let [rat ($ c :cljsRatom)
@ -82,7 +63,7 @@
(let [name (comp-name c)] (let [name (comp-name c)]
(js/console.log c) (js/console.log c)
(trace/with-trace {:op-type :render (trace/with-trace {:op-type :render
:tags {:component-path (component-path c)} :tags {:component-path (reagent.impl.component/component-path c)}
:operation (last (str/split name #" > "))} :operation (last (str/split name #" > "))}
(real-renderer c))))) (real-renderer c)))))
@ -97,7 +78,7 @@
(fn [] (this-as c (fn [] (this-as c
(trace/with-trace {:op-type key (trace/with-trace {:op-type key
:operation (last (str/split (comp-name c) #" > ")) :operation (last (str/split (comp-name c) #" > "))
:tags {:component-path (component-path c) :tags {:component-path (reagent.impl.component/component-path c)
:reaction (interop/reagent-id ($ c :cljsRatom))}}) :reaction (interop/reagent-id ($ c :cljsRatom))}})
(.call (real-custom-wrapper key f) c c))) (.call (real-custom-wrapper key f) c c)))