Fix Perf displayName with ES6 classes

tony-shi · Mar 10, 2015 · 29506ce · 29506ce
1 parent 62ee384
commit 29506ce
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/test/ReactDefaultPerf.js b/src/test/ReactDefaultPerf.js
@@ -242,17 +242,12 @@ var ReactDefaultPerf = {
           addValue(entry.inclusive, rootNodeID, totalTime);
         }
 
-        var displayName = null;
-        if (this._instance.constructor.displayName) {
-          displayName = this._instance.constructor.displayName;
-        } else if (this._currentElement.type) {
-          displayName = this._currentElement.type;
-        }
-
         entry.displayNames[rootNodeID] = {
-          current: displayName,
+          current: typeof this._currentElement.type === 'string' ?
+            this._currentElement.type :
+            this.getName(),
           owner: this._currentElement._owner ?
-            this._currentElement._owner._instance.constructor.displayName :
+            this._currentElement._owner.getName() :
             '<root>'
         };