react-dom 15.4.0-rc.3 → 15.4.2

package/lib/ReactPerf.js

@@ -88,13 +88,13 @@ function getExclusive() {
   }
 
   flushHistory.forEach(function (flush) {
-    var measurements = flush.measurements;
-    var treeSnapshot = flush.treeSnapshot;
+    var measurements = flush.measurements,
+        treeSnapshot = flush.treeSnapshot;
 
     measurements.forEach(function (measurement) {
-      var duration = measurement.duration;
-      var instanceID = measurement.instanceID;
-      var timerType = measurement.timerType;
+      var duration = measurement.duration,
+          instanceID = measurement.instanceID,
+          timerType = measurement.timerType;
 
       updateAggregatedStats(treeSnapshot, instanceID, timerType, function (stats) {
         stats.totalDuration += duration;
@@ -125,9 +125,9 @@ function getInclusive() {
   var affectedIDs = {};
 
   function updateAggregatedStats(treeSnapshot, instanceID, applyUpdate) {
-    var _treeSnapshot$instanc = treeSnapshot[instanceID];
-    var displayName = _treeSnapshot$instanc.displayName;
-    var ownerID = _treeSnapshot$instanc.ownerID;
+    var _treeSnapshot$instanc = treeSnapshot[instanceID],
+        displayName = _treeSnapshot$instanc.displayName,
+        ownerID = _treeSnapshot$instanc.ownerID;
 
     var owner = treeSnapshot[ownerID];
     var key = (owner ? owner.displayName + ' > ' : '') + displayName;
@@ -150,8 +150,8 @@ function getInclusive() {
     var measurements = flush.measurements;
 
     measurements.forEach(function (measurement) {
-      var instanceID = measurement.instanceID;
-      var timerType = measurement.timerType;
+      var instanceID = measurement.instanceID,
+          timerType = measurement.timerType;
 
       if (timerType !== 'render') {
         return;
@@ -161,13 +161,13 @@ function getInclusive() {
   });
 
   flushHistory.forEach(function (flush) {
-    var measurements = flush.measurements;
-    var treeSnapshot = flush.treeSnapshot;
+    var measurements = flush.measurements,
+        treeSnapshot = flush.treeSnapshot;
 
     measurements.forEach(function (measurement) {
-      var duration = measurement.duration;
-      var instanceID = measurement.instanceID;
-      var timerType = measurement.timerType;
+      var duration = measurement.duration,
+          instanceID = measurement.instanceID,
+          timerType = measurement.timerType;
 
       if (timerType !== 'render') {
         return;
@@ -210,9 +210,9 @@ function getWasted() {
   var affectedIDs = {};
 
   function updateAggregatedStats(treeSnapshot, instanceID, applyUpdate) {
-    var _treeSnapshot$instanc2 = treeSnapshot[instanceID];
-    var displayName = _treeSnapshot$instanc2.displayName;
-    var ownerID = _treeSnapshot$instanc2.ownerID;
+    var _treeSnapshot$instanc2 = treeSnapshot[instanceID],
+        displayName = _treeSnapshot$instanc2.displayName,
+        ownerID = _treeSnapshot$instanc2.ownerID;
 
     var owner = treeSnapshot[ownerID];
     var key = (owner ? owner.displayName + ' > ' : '') + displayName;
@@ -231,9 +231,9 @@ function getWasted() {
   }
 
   flushHistory.forEach(function (flush) {
-    var measurements = flush.measurements;
-    var treeSnapshot = flush.treeSnapshot;
-    var operations = flush.operations;
+    var measurements = flush.measurements,
+        treeSnapshot = flush.treeSnapshot,
+        operations = flush.operations;
 
     var isDefinitelyNotWastedByID = {};
 
@@ -253,8 +253,8 @@ function getWasted() {
     // These are potential candidates for being wasted renders.
     var renderedCompositeIDs = {};
     measurements.forEach(function (measurement) {
-      var instanceID = measurement.instanceID;
-      var timerType = measurement.timerType;
+      var instanceID = measurement.instanceID,
+          timerType = measurement.timerType;
 
       if (timerType !== 'render') {
         return;
@@ -263,9 +263,9 @@ function getWasted() {
     });
 
     measurements.forEach(function (measurement) {
-      var duration = measurement.duration;
-      var instanceID = measurement.instanceID;
-      var timerType = measurement.timerType;
+      var duration = measurement.duration,
+          instanceID = measurement.instanceID,
+          timerType = measurement.timerType;
 
       if (timerType !== 'render') {
         return;
@@ -318,16 +318,16 @@ function getOperations() {
 
   var stats = [];
   flushHistory.forEach(function (flush, flushIndex) {
-    var operations = flush.operations;
-    var treeSnapshot = flush.treeSnapshot;
+    var operations = flush.operations,
+        treeSnapshot = flush.treeSnapshot;
 
     operations.forEach(function (operation) {
-      var instanceID = operation.instanceID;
-      var type = operation.type;
-      var payload = operation.payload;
-      var _treeSnapshot$instanc3 = treeSnapshot[instanceID];
-      var displayName = _treeSnapshot$instanc3.displayName;
-      var ownerID = _treeSnapshot$instanc3.ownerID;
+      var instanceID = operation.instanceID,
+          type = operation.type,
+          payload = operation.payload;
+      var _treeSnapshot$instanc3 = treeSnapshot[instanceID],
+          displayName = _treeSnapshot$instanc3.displayName,
+          ownerID = _treeSnapshot$instanc3.ownerID;
 
       var owner = treeSnapshot[ownerID];
       var key = (owner ? owner.displayName + ' > ' : '') + displayName;
@@ -353,9 +353,9 @@ function printExclusive(flushHistory) {
 
   var stats = getExclusive(flushHistory);
   var table = stats.map(function (item) {
-    var key = item.key;
-    var instanceCount = item.instanceCount;
-    var totalDuration = item.totalDuration;
+    var key = item.key,
+        instanceCount = item.instanceCount,
+        totalDuration = item.totalDuration;
 
     var renderCount = item.counts.render || 0;
     var renderDuration = item.durations.render || 0;
@@ -380,10 +380,10 @@ function printInclusive(flushHistory) {
 
   var stats = getInclusive(flushHistory);
   var table = stats.map(function (item) {
-    var key = item.key;
-    var instanceCount = item.instanceCount;
-    var inclusiveRenderDuration = item.inclusiveRenderDuration;
-    var renderCount = item.renderCount;
+    var key = item.key,
+        instanceCount = item.instanceCount,
+        inclusiveRenderDuration = item.inclusiveRenderDuration,
+        renderCount = item.renderCount;
 
     return {
       'Owner > Component': key,
@@ -403,10 +403,10 @@ function printWasted(flushHistory) {
 
   var stats = getWasted(flushHistory);
   var table = stats.map(function (item) {
-    var key = item.key;
-    var instanceCount = item.instanceCount;
-    var inclusiveRenderDuration = item.inclusiveRenderDuration;
-    var renderCount = item.renderCount;
+    var key = item.key,
+        instanceCount = item.instanceCount,
+        inclusiveRenderDuration = item.inclusiveRenderDuration,
+        renderCount = item.renderCount;
 
     return {
       'Owner > Component': key,

package/lib/ReactReconciler.js

@@ -19,8 +19,8 @@ var warning = require('fbjs/lib/warning');
  * Helper to call ReactRef.attachRefs with this composite component, split out
  * to avoid allocations in the transaction mount-ready queue.
  */
-function attachRefs(transaction) {
-  ReactRef.attachRefs(this, this._currentElement, transaction);
+function attachRefs() {
+  ReactRef.attachRefs(this, this._currentElement);
 }
 
 var ReactReconciler = {

package/lib/ReactRef.js

@@ -15,12 +15,12 @@ var ReactOwner = require('./ReactOwner');
 
 var ReactRef = {};
 
-function attachRef(ref, component, owner, transaction) {
+function attachRef(ref, component, owner) {
   if (typeof ref === 'function') {
-    ref(component.getPublicInstance(transaction));
+    ref(component.getPublicInstance());
   } else {
     // Legacy ref
-    ReactOwner.addComponentAsRefTo(component, ref, owner, transaction);
+    ReactOwner.addComponentAsRefTo(component, ref, owner);
   }
 }
 
@@ -33,13 +33,13 @@ function detachRef(ref, component, owner) {
   }
 }
 
-ReactRef.attachRefs = function (instance, element, transaction) {
+ReactRef.attachRefs = function (instance, element) {
   if (element === null || typeof element !== 'object') {
     return;
   }
   var ref = element.ref;
   if (ref != null) {
-    attachRef(ref, instance, element._owner, transaction);
+    attachRef(ref, instance, element._owner);
   }
 };
 

package/lib/ReactReifiedYield.js

@@ -11,10 +11,8 @@
 
 'use strict';
 
-var _require = require('./ReactFiber');
-
-var createFiberFromElementType = _require.createFiberFromElementType;
-
+var _require = require('./ReactFiber'),
+    createFiberFromElementType = _require.createFiberFromElementType;
 
 exports.createReifiedYield = function (yieldNode) {
   var fiber = createFiberFromElementType(yieldNode.continuation, yieldNode.key);

package/lib/ReactShallowRenderer.js

@@ -22,10 +22,9 @@ var ReactReconciler = require('./ReactReconciler');
 var ReactUpdates = require('./ReactUpdates');
 
 var emptyObject = require('fbjs/lib/emptyObject');
+var getNextDebugID = require('./getNextDebugID');
 var invariant = require('fbjs/lib/invariant');
 
-var nextDebugID = 1;
-
 var NoopInternalComponent = function () {
   function NoopInternalComponent(element) {
     _classCallCheck(this, NoopInternalComponent);
@@ -34,7 +33,7 @@ var NoopInternalComponent = function () {
     this._currentElement = element;
 
     if (process.env.NODE_ENV !== 'production') {
-      this._debugID = nextDebugID++;
+      this._debugID = getNextDebugID();
     }
   }
 
@@ -61,7 +60,7 @@ var NoopInternalComponent = function () {
 var ShallowComponentWrapper = function (element) {
   // TODO: Consolidate with instantiateReactComponent
   if (process.env.NODE_ENV !== 'production') {
-    this._debugID = nextDebugID++;
+    this._debugID = getNextDebugID();
   }
 
   this.construct(element);

package/lib/ReactTestUtils.js

@@ -69,14 +69,14 @@ function findAllInRenderedTreeInternal(inst, test) {
  * @lends ReactTestUtils
  */
 var ReactTestUtils = {
-  renderIntoDocument: function (instance) {
+  renderIntoDocument: function (element) {
     var div = document.createElement('div');
     // None of our tests actually require attaching the container to the
     // DOM, and doing so creates a mess that we rely on test isolation to
     // clean up, so we're going to stop honoring the name of this method
     // (and probably rename it eventually) if no problems arise.
     // document.documentElement.appendChild(div);
-    return ReactDOM.render(instance, div);
+    return ReactDOM.render(element, div);
   },
 
   isElement: function (element) {

package/lib/ReactVersion.js

@@ -10,4 +10,4 @@
 
 'use strict';
 
-module.exports = '15.4.0-rc.3';
+module.exports = '15.4.2';

package/lib/ResponderTouchHistoryStore.js

@@ -18,9 +18,9 @@ var EventPluginUtils = require('./EventPluginUtils');
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 
-var isEndish = EventPluginUtils.isEndish;
-var isMoveish = EventPluginUtils.isMoveish;
-var isStartish = EventPluginUtils.isStartish;
+var isEndish = EventPluginUtils.isEndish,
+    isMoveish = EventPluginUtils.isMoveish,
+    isStartish = EventPluginUtils.isStartish;
 
 /**
  * Tracks the position and time of each active touch by `touch.identifier`. We

package/lib/SimpleEventPlugin.js

@@ -80,18 +80,6 @@ function isInteractive(tag) {
   return tag === 'button' || tag === 'input' || tag === 'select' || tag === 'textarea';
 }
 
-function shouldPreventMouseEvent(inst) {
-  if (inst) {
-    var disabled = inst._currentElement && inst._currentElement.props.disabled;
-
-    if (disabled) {
-      return isInteractive(inst._tag);
-    }
-  }
-
-  return false;
-}
-
 var SimpleEventPlugin = {
 
   eventTypes: eventTypes,
@@ -162,10 +150,7 @@ var SimpleEventPlugin = {
       case 'topMouseDown':
       case 'topMouseMove':
       case 'topMouseUp':
-        // Disabled elements should not respond to mouse events
-        if (shouldPreventMouseEvent(targetInst)) {
-          return null;
-        }
+      // TODO: Disabled elements should not respond to mouse events
       /* falls through */
       case 'topMouseOut':
       case 'topMouseOver':

package/lib/getNextDebugID.js

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * 
+ */
+
+'use strict';
+
+var nextDebugID = 1;
+
+function getNextDebugID() {
+  return nextDebugID++;
+}
+
+module.exports = getNextDebugID;

package/lib/instantiateReactComponent.js

@@ -17,6 +17,7 @@ var ReactCompositeComponent = require('./ReactCompositeComponent');
 var ReactEmptyComponent = require('./ReactEmptyComponent');
 var ReactHostComponent = require('./ReactHostComponent');
 
+var getNextDebugID = require('./getNextDebugID');
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 
@@ -49,8 +50,6 @@ function isInternalComponentType(type) {
   return typeof type === 'function' && typeof type.prototype !== 'undefined' && typeof type.prototype.mountComponent === 'function' && typeof type.prototype.receiveComponent === 'function';
 }
 
-var nextDebugID = 1;
-
 /**
  * Given a ReactNode, create an instance that will actually be mounted.
  *
@@ -66,7 +65,17 @@ function instantiateReactComponent(node, shouldHaveDebugID) {
     instance = ReactEmptyComponent.create(instantiateReactComponent);
   } else if (typeof node === 'object') {
     var element = node;
-    !(element && (typeof element.type === 'function' || typeof element.type === 'string')) ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s', element.type == null ? element.type : typeof element.type, getDeclarationErrorAddendum(element._owner)) : _prodInvariant('130', element.type == null ? element.type : typeof element.type, getDeclarationErrorAddendum(element._owner)) : void 0;
+    var type = element.type;
+    if (typeof type !== 'function' && typeof type !== 'string') {
+      var info = '';
+      if (process.env.NODE_ENV !== 'production') {
+        if (type === undefined || typeof type === 'object' && type !== null && Object.keys(type).length === 0) {
+          info += ' You likely forgot to export your component from the file ' + 'it\'s defined in.';
+        }
+      }
+      info += getDeclarationErrorAddendum(element._owner);
+      !false ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s', type == null ? type : typeof type, info) : _prodInvariant('130', type == null ? type : typeof type, info) : void 0;
+    }
 
     // Special case string values
     if (typeof element.type === 'string') {
@@ -101,7 +110,7 @@ function instantiateReactComponent(node, shouldHaveDebugID) {
   instance._mountImage = null;
 
   if (process.env.NODE_ENV !== 'production') {
-    instance._debugID = shouldHaveDebugID ? nextDebugID++ : 0;
+    instance._debugID = shouldHaveDebugID ? getNextDebugID() : 0;
   }
 
   // Internal instances should fully constructed at this point, so they should

package/lib/renderSubtreeIntoContainer.js

@@ -6,8 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
-* @providesModule renderSubtreeIntoContainer
-*/
+ */
 
 'use strict';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "15.4.0-rc.3",
+  "version": "15.4.2",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -18,7 +18,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^15.4.0-rc.3"
+    "react": "^15.4.2"
   },
   "files": [
     "LICENSE",