Pull memoizedInteractions from DataType instead of Fiber

Author: marvinhagemeister

agent/Agent.js

@@ -380,9 +380,9 @@ class Agent extends EventEmitter {
     this.emit('root', id);
   }
 
-  rootCommitted(renderer: RendererID, internalInstance: OpaqueNodeHandle) {
+  rootCommitted(renderer: RendererID, internalInstance: OpaqueNodeHandle, data: DataType) {
     var id = this.getId(internalInstance);
-    this.emit('rootCommitted', id, internalInstance);
+    this.emit('rootCommitted', id, internalInstance, data);
   }
 
   onMounted(renderer: RendererID, component: OpaqueNodeHandle, data: DataType) {

agent/inject.js

@@ -28,7 +28,7 @@ module.exports = function(hook: Hook, agent: Agent) {
 
     // Required by Profiler plugin
     hook.sub('root', ({renderer, internalInstance}) => agent.addRoot(renderer, internalInstance)),
-    hook.sub('rootCommitted', ({renderer, internalInstance}) => agent.rootCommitted(renderer, internalInstance)),
+    hook.sub('rootCommitted', ({renderer, internalInstance, data}) => agent.rootCommitted(renderer, internalInstance, data)),
     hook.sub('updateProfileTimes', ({renderer, internalInstance, data}) => agent.onUpdatedProfileTimes(internalInstance, data)),
   ];
 

backend/attachRendererFiber.js

@@ -184,6 +184,7 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
     var actualDuration = null;
     var actualStartTime = null;
     var treeBaseDuration = null;
+    var memoizedInteractions = null;
 
     var resolvedType = type;
     if (typeof type === 'object' && type !== null) {
@@ -207,6 +208,7 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
           if (context && Object.keys(context).length === 0) {
             context = null;
           }
+          memoizedInteractions = publicInstance.memoizedInteractions;
         }
         const inst = publicInstance;
         if (inst) {
@@ -381,6 +383,7 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
       text,
       updater,
       publicInstance,
+      memoizedInteractions,
 
       // Profiler data
       actualDuration,
@@ -550,6 +553,7 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
   function markRootCommitted(fiber) {
     pendingEvents.push({
       internalInstance: getOpaqueNode(fiber),
+      data: getDataFiber(fiber),
       renderer: rid,
       type: 'rootCommitted',
     });

plugins/Profiler/ProfileCollector.js

@@ -48,8 +48,8 @@ class ProfileCollector {
   }
 
   _takeCommitSnapshotForRoot(id: string, data: any) {
-    const interactionsArray = data.stateNode.memoizedInteractions != null
-      ? Array.from(data.stateNode.memoizedInteractions)
+    const interactionsArray = data.memoizedInteractions != null
+      ? Array.from(data.memoizedInteractions)
       : [];
 
     // Map interaction start times to when we started profiling.
@@ -95,7 +95,7 @@ class ProfileCollector {
     this._maxActualDuration = Math.max(this._maxActualDuration, data.actualDuration);
   };
 
-  _onRootCommitted = (id: string, data: any) => {
+  _onRootCommitted = (id: string, internalInstance: any, data: any) => {
     if (!this._isRecording) {
       return;
     }