Consolidate hook events

src/isomorphic/hooks/ReactComponentTreeHook.js

@@ -39,11 +39,11 @@ function remove(id) {
   delete itemByKey[key];
 }
 
-function create(id, element) {
+function create(id, element, parentID) {
   var key = getKeyFromID(id);
   itemByKey[key] = {
     element,
-    parentID: null,
+    parentID,
     text: null,
     childIDs: [],
     isMounted: false,
@@ -133,22 +133,17 @@ var ReactComponentTreeHook = {
       }
       invariant(
         nextChild.parentID === id,
-        'Expected onSetParent() and onSetChildren() to be consistent (%s ' +
-        'has parents %s and %s).',
+        'Expected onBeforeMountComponent() parent and onSetChildren() to ' +
+        'be consistent (%s has parents %s and %s).',
         nextChildID,
         nextChild.parentID,
         id
       );
     }
   },
 
-  onSetParent(id, parentID) {
-    var item = get(id);
-    item.parentID = parentID;
-  },
-
-  onInstantiateComponent(id, element) {
-    create(id, element);
+  onBeforeMountComponent(id, element, parentID) {
+    create(id, element, parentID);
   },
 
   onBeforeUpdateComponent(id, element) {
@@ -182,7 +177,14 @@ var ReactComponentTreeHook = {
 
   onUnmountComponent(id) {
     var item = get(id);
-    item.isMounted = false;
+    if (item) {
+      // We need to check if it exists.
+      // `item` might not exist if it is inside an error boundary, and a sibling
+      // error boundary child threw while mounting. Then this instance never
+      // got a chance to mount, but it still gets an unmounting event during
+      // the error boundary cleanup.
+      item.isMounted = false;
+    }
     unmountedIDs[id] = true;
     delete rootIDs[id];
   },

src/renderers/dom/client/ReactMount.js

@@ -109,12 +109,17 @@ function mountComponentIntoNode(
     console.time(markerName);
   }
 
+  var parentDebugID;
+  if (__DEV__) {
+    parentDebugID = 0; // top-level component has no parent
+  }
   var markup = ReactReconciler.mountComponent(
     wrapperInstance,
     transaction,
     null,
     ReactDOMContainerInfo(wrapperInstance, container),
-    context
+    context,
+    parentDebugID
   );
 
   if (markerName) {

src/renderers/dom/server/ReactServerRendering.js

@@ -42,12 +42,17 @@ function renderToStringImpl(element, makeStaticMarkup) {
 
     return transaction.perform(function() {
       var componentInstance = instantiateReactComponent(element, true);
+      var parentDebugID;
+      if (__DEV__) {
+        parentDebugID = 0; // top-level component has no parent
+      }
       var markup = ReactReconciler.mountComponent(
         componentInstance,
         transaction,
         null,
         ReactDOMContainerInfo(),
-        emptyObject
+        emptyObject,
+        parentDebugID
       );
       if (__DEV__) {
         ReactInstrumentation.debugTool.onUnmountComponent(

src/renderers/dom/shared/ReactDOMComponent.js

@@ -274,8 +274,7 @@ if (__DEV__) {
       ReactInstrumentation.debugTool.onBeforeUpdateComponent(contentDebugID, content);
       ReactInstrumentation.debugTool.onUpdateComponent(contentDebugID);
     } else {
-      ReactInstrumentation.debugTool.onInstantiateComponent(contentDebugID, content);
-      ReactInstrumentation.debugTool.onSetParent(contentDebugID, debugID);
+      ReactInstrumentation.debugTool.onBeforeMountComponent(contentDebugID, content, debugID);
       ReactInstrumentation.debugTool.onMountComponent(contentDebugID);
       ReactInstrumentation.debugTool.onSetChildren(debugID, [contentDebugID]);
     }

src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js

@@ -39,7 +39,7 @@ function handleElement(debugID, element) {
 }
 
 var ReactDOMNullInputValuePropHook = {
-  onInstantiateComponent(debugID, element) {
+  onBeforeMountComponent(debugID, element) {
     handleElement(debugID, element);
   },
   onBeforeUpdateComponent(debugID, element) {

src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js

@@ -140,7 +140,7 @@ function handleElement(debugID, element) {
 }
 
 var ReactDOMUnknownPropertyHook = {
-  onInstantiateComponent(debugID, element) {
+  onBeforeMountComponent(debugID, element) {
     handleElement(debugID, element);
   },
   onBeforeUpdateComponent(debugID, element) {

src/renderers/native/ReactNativeMount.js

@@ -51,12 +51,17 @@ function mountComponentIntoNode(
     componentInstance,
     containerTag,
     transaction) {
+  var parentDebugID;
+  if (__DEV__) {
+    parentDebugID = 0; // top-level component has no parent
+  }
   var markup = ReactReconciler.mountComponent(
     componentInstance,
     transaction,
     null,
     ReactNativeContainerInfo(containerTag),
-    emptyObject
+    emptyObject,
+    parentDebugID
   );
   componentInstance._renderedComponent._topLevelWrapper = componentInstance;
   ReactNativeMount._mountImageIntoNode(markup, containerTag);

src/renderers/shared/ReactDebugTool.js

@@ -109,7 +109,10 @@ function resetMeasurements() {
   currentFlushMeasurements = [];
 }
 
-function checkDebugID(debugID) {
+function checkDebugID(debugID, allowRoot = false) {
+  if (allowRoot && debugID === 0) {
+    return;
+  }
   if (!debugID) {
     warning(false, 'ReactDebugTool: debugID may not be empty.');
   }
@@ -272,21 +275,14 @@ var ReactDebugTool = {
     childDebugIDs.forEach(checkDebugID);
     emitEvent('onSetChildren', debugID, childDebugIDs);
   },
-  onSetParent(debugID, parentDebugID) {
-    checkDebugID(debugID);
-    emitEvent('onSetParent', debugID, parentDebugID);
-  },
-  onInstantiateComponent(debugID, element) {
-    checkDebugID(debugID);
-    emitEvent('onInstantiateComponent', debugID, element);
-  },
   onMountRootComponent(debugID) {
     checkDebugID(debugID);
     emitEvent('onMountRootComponent', debugID);
   },
-  onBeforeMountComponent(debugID) {
+  onBeforeMountComponent(debugID, element, parentDebugID) {
     checkDebugID(debugID);
-    emitEvent('onBeforeMountComponent', debugID);
+    checkDebugID(parentDebugID, true);
+    emitEvent('onBeforeMountComponent', debugID, element, parentDebugID);
   },
   onMountComponent(debugID) {
     checkDebugID(debugID);

src/renderers/shared/stack/reconciler/ReactChildReconciler.js

@@ -117,7 +117,9 @@ var ReactChildReconciler = {
     transaction,
     hostParent,
     hostContainerInfo,
-    context) {
+    context,
+    selfDebugID // __DEV__ only
+  ) {
     // We currently don't have a way to track moves here but if we use iterators
     // instead of for..in we can zip the iterators and check if an item has
     // moved.
@@ -156,7 +158,8 @@ var ReactChildReconciler = {
           transaction,
           hostParent,
           hostContainerInfo,
-          context
+          context,
+          selfDebugID
         );
         mountImages.push(nextChildMountImage);
       }

src/renderers/shared/stack/reconciler/ReactCompositeComponent.js

@@ -525,21 +525,18 @@ var ReactCompositeComponentMixin = {
       nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */
     );
     this._renderedComponent = child;
+
+    var selfDebugID;
     if (__DEV__) {
-      if (child._debugID !== 0 && this._debugID !== 0) {
-        ReactInstrumentation.debugTool.onSetParent(
-          child._debugID,
-          this._debugID
-        );
-      }
+      selfDebugID = this._debugID;
     }
-
     var markup = ReactReconciler.mountComponent(
       child,
       transaction,
       hostParent,
       hostContainerInfo,
-      this._processChildContext(context)
+      this._processChildContext(context),
+      selfDebugID
     );
 
     if (__DEV__) {
@@ -1047,21 +1044,18 @@ var ReactCompositeComponentMixin = {
         nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */
       );
       this._renderedComponent = child;
+
+      var selfDebugID;
       if (__DEV__) {
-        if (child._debugID !== 0 && this._debugID !== 0) {
-          ReactInstrumentation.debugTool.onSetParent(
-            child._debugID,
-            this._debugID
-          );
-        }
+        selfDebugID = this._debugID;
       }
-
       var nextMarkup = ReactReconciler.mountComponent(
         child,
         transaction,
         this._hostParent,
         this._hostContainerInfo,
-        this._processChildContext(context)
+        this._processChildContext(context),
+        selfDebugID
       );
 
       if (__DEV__) {

src/renderers/shared/stack/reconciler/ReactMultiChild.js

@@ -140,7 +140,6 @@ function processQueue(inst, updateQueue) {
   );
 }
 
-var setParentForInstrumentation = emptyFunction;
 var setChildrenForInstrumentation = emptyFunction;
 if (__DEV__) {
   var getDebugID = function(inst) {
@@ -153,14 +152,6 @@ if (__DEV__) {
     }
     return inst._debugID;
   };
-  setParentForInstrumentation = function(child) {
-    if (child._debugID !== 0) {
-      ReactInstrumentation.debugTool.onSetParent(
-        child._debugID,
-        getDebugID(this)
-      );
-    }
-  };
   setChildrenForInstrumentation = function(children) {
     var debugID = getDebugID(this);
     // TODO: React Native empty components are also multichild.
@@ -193,11 +184,12 @@ var ReactMultiChild = {
 
     _reconcilerInstantiateChildren: function(nestedChildren, transaction, context) {
       if (__DEV__) {
+        var selfDebugID = getDebugID(this);
         if (this._currentElement) {
           try {
             ReactCurrentOwner.current = this._currentElement._owner;
             return ReactChildReconciler.instantiateChildren(
-              nestedChildren, transaction, context, this._debugID
+              nestedChildren, transaction, context, selfDebugID
             );
           } finally {
             ReactCurrentOwner.current = null;
@@ -218,11 +210,14 @@ var ReactMultiChild = {
       context
     ) {
       var nextChildren;
+      var selfDebugID;
+
       if (__DEV__) {
+        selfDebugID = getDebugID(this);
         if (this._currentElement) {
           try {
             ReactCurrentOwner.current = this._currentElement._owner;
-            nextChildren = flattenChildren(nextNestedChildrenElements, this._debugID);
+            nextChildren = flattenChildren(nextNestedChildrenElements, selfDebugID);
           } finally {
             ReactCurrentOwner.current = null;
           }
@@ -234,12 +229,13 @@ var ReactMultiChild = {
             transaction,
             this,
             this._hostContainerInfo,
-            context
+            context,
+            selfDebugID
           );
           return nextChildren;
         }
       }
-      nextChildren = flattenChildren(nextNestedChildrenElements);
+      nextChildren = flattenChildren(nextNestedChildrenElements, selfDebugID);
       ReactChildReconciler.updateChildren(
         prevChildren,
         nextChildren,
@@ -248,7 +244,8 @@ var ReactMultiChild = {
         transaction,
         this,
         this._hostContainerInfo,
-        context
+        context,
+        selfDebugID
       );
       return nextChildren;
     },
@@ -272,15 +269,17 @@ var ReactMultiChild = {
       for (var name in children) {
         if (children.hasOwnProperty(name)) {
           var child = children[name];
+          var selfDebugID;
           if (__DEV__) {
-            setParentForInstrumentation.call(this, child);
+            selfDebugID = getDebugID(this);
           }
           var mountImage = ReactReconciler.mountComponent(
             child,
             transaction,
             this,
             this._hostContainerInfo,
-            context
+            context,
+            selfDebugID
           );
           child._mountIndex = index++;
           mountImages.push(mountImage);

src/renderers/shared/stack/reconciler/ReactReconciler.js

@@ -42,20 +42,24 @@ var ReactReconciler = {
     transaction,
     hostParent,
     hostContainerInfo,
-    context
+    context,
+    parentDebugID // __DEV__ only
   ) {
     if (__DEV__) {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onBeforeMountComponent(
-          internalInstance._debugID
+          internalInstance._debugID,
+          internalInstance._currentElement,
+          parentDebugID
         );
       }
     }
     var markup = internalInstance.mountComponent(
       transaction,
       hostParent,
       hostContainerInfo,
-      context
+      context,
+      parentDebugID
     );
     if (internalInstance._currentElement &&
         internalInstance._currentElement.ref != null) {

src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js

@@ -23,14 +23,16 @@ Object.assign(ReactSimpleEmptyComponent.prototype, {
     transaction,
     hostParent,
     hostContainerInfo,
-    context
+    context,
+    parentDebugID // __DEV__ only
   ) {
     return ReactReconciler.mountComponent(
       this._renderedComponent,
       transaction,
       hostParent,
       hostContainerInfo,
-      context
+      context,
+      parentDebugID
     );
   },
   receiveComponent: function() {