react 15.1.0 → 15.2.1

package/lib/ReactNativeBridgeEventPlugin.js

@@ -17,7 +17,7 @@ var _extends = _assign || function (target) { for (var i = 1; i < arguments.leng
 
 var EventPropagators = require('./EventPropagators');
 var SyntheticEvent = require('./SyntheticEvent');
-var UIManager = require('UIManager');
+var UIManager = require('react-native/lib/UIManager');
 
 var warning = require('fbjs/lib/warning');
 

package/lib/ReactNativeComponentTree.js

@@ -11,18 +11,20 @@
 
 'use strict';
 
+var _prodInvariant = require('./reactProdInvariant');
+
 var invariant = require('fbjs/lib/invariant');
 
 var instanceCache = {};
 
 /**
- * Drill down (through composites and empty components) until we get a native or
- * native text component.
+ * Drill down (through composites and empty components) until we get a host or
+ * host text component.
  *
  * This is pretty polymorphic but unavoidable with the current structure we have
  * for `_renderedChildren`.
  */
-function getRenderedNativeOrTextFromComponent(component) {
+function getRenderedHostOrTextFromComponent(component) {
   var rendered;
   while (rendered = component._renderedComponent) {
     component = rendered;
@@ -31,11 +33,11 @@ function getRenderedNativeOrTextFromComponent(component) {
 }
 
 /**
- * Populate `_nativeNode` on the rendered native/text component with the given
+ * Populate `_hostNode` on the rendered host/text component with the given
  * DOM node. The passed `inst` can be a composite.
  */
 function precacheNode(inst, tag) {
-  var nativeInst = getRenderedNativeOrTextFromComponent(inst);
+  var nativeInst = getRenderedHostOrTextFromComponent(inst);
   instanceCache[tag] = nativeInst;
 }
 
@@ -51,7 +53,7 @@ function getInstanceFromTag(tag) {
 }
 
 function getTagFromInstance(inst) {
-  !inst._rootNodeID ? process.env.NODE_ENV !== 'production' ? invariant(false, 'All native instances should have a tag.') : invariant(false) : void 0;
+  !inst._rootNodeID ? process.env.NODE_ENV !== 'production' ? invariant(false, 'All native instances should have a tag.') : _prodInvariant('17') : void 0;
   return inst._rootNodeID;
 }
 

package/lib/ReactNativeDOMIDOperations.js

@@ -7,13 +7,12 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule ReactNativeDOMIDOperations
- * 
  */
 'use strict';
 
 var ReactNativeComponentTree = require('./ReactNativeComponentTree');
 var ReactMultiChildUpdateTypes = require('./ReactMultiChildUpdateTypes');
-var UIManager = require('UIManager');
+var UIManager = require('react-native/lib/UIManager');
 
 /**
  * Updates a component's children by processing a series of updates.

package/lib/ReactNativeDefaultInjection.js

@@ -18,17 +18,19 @@
  * TODO: require this in packager, not in React #10932517
  */
 
-require('InitializeJavaScriptAppEngine');
+var _prodInvariant = require('./reactProdInvariant');
+
+require('react-native/lib/InitializeJavaScriptAppEngine');
 
 var EventPluginHub = require('./EventPluginHub');
 var EventPluginUtils = require('./EventPluginUtils');
-var RCTEventEmitter = require('RCTEventEmitter');
+var RCTEventEmitter = require('react-native/lib/RCTEventEmitter');
 var ReactComponentEnvironment = require('./ReactComponentEnvironment');
 var ReactDefaultBatchingStrategy = require('./ReactDefaultBatchingStrategy');
 var ReactElement = require('./ReactElement');
 var ReactEmptyComponent = require('./ReactEmptyComponent');
 var ReactNativeBridgeEventPlugin = require('./ReactNativeBridgeEventPlugin');
-var ReactNativeComponent = require('./ReactNativeComponent');
+var ReactHostComponent = require('./ReactHostComponent');
 var ReactNativeComponentEnvironment = require('./ReactNativeComponentEnvironment');
 var ReactNativeComponentTree = require('./ReactNativeComponentTree');
 var ReactNativeEventEmitter = require('./ReactNativeEventEmitter');
@@ -74,7 +76,7 @@ function inject() {
 
   var EmptyComponent = function (instantiate) {
     // Can't import View at the top because it depends on React to make its composite
-    var View = require('View');
+    var View = require('react-native/lib/View');
     return new ReactSimpleEmptyComponent(ReactElement.createElement(View, {
       collapsable: true,
       style: { position: 'absolute' }
@@ -83,14 +85,14 @@ function inject() {
 
   ReactEmptyComponent.injection.injectEmptyComponentFactory(EmptyComponent);
 
-  ReactNativeComponent.injection.injectTextComponentClass(ReactNativeTextComponent);
-  ReactNativeComponent.injection.injectGenericComponentClass(function (tag) {
+  ReactHostComponent.injection.injectTextComponentClass(ReactNativeTextComponent);
+  ReactHostComponent.injection.injectGenericComponentClass(function (tag) {
     // Show a nicer error message for non-function tags
     var info = '';
     if (typeof tag === 'string' && /^[a-z]/.test(tag)) {
       info += ' Each component name should start with an uppercase letter.';
     }
-    !false ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Expected a component class, got %s.%s', tag, info) : invariant(false) : void 0;
+    !false ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Expected a component class, got %s.%s', tag, info) : _prodInvariant('18', tag, info) : void 0;
   });
 }
 

package/lib/ReactNativeGlobalResponderHandler.js

@@ -10,7 +10,7 @@
  */
 'use strict';
 
-var UIManager = require('UIManager');
+var UIManager = require('react-native/lib/UIManager');
 
 var ReactNativeGlobalResponderHandler = {
   onChange: function (from, to, blockNativeResponder) {

package/lib/ReactNativeMount.js

@@ -18,7 +18,7 @@ var ReactNativeTagHandles = require('./ReactNativeTagHandles');
 var ReactReconciler = require('./ReactReconciler');
 var ReactUpdateQueue = require('./ReactUpdateQueue');
 var ReactUpdates = require('./ReactUpdates');
-var UIManager = require('UIManager');
+var UIManager = require('react-native/lib/UIManager');
 
 var emptyObject = require('fbjs/lib/emptyObject');
 var instantiateReactComponent = require('./instantiateReactComponent');
@@ -89,7 +89,7 @@ var ReactNativeMount = {
       var prevWrappedElement = prevComponent._currentElement;
       var prevElement = prevWrappedElement.props;
       if (shouldUpdateReactComponent(prevElement, nextElement)) {
-        ReactUpdateQueue.enqueueElementInternal(prevComponent, nextWrappedElement);
+        ReactUpdateQueue.enqueueElementInternal(prevComponent, nextWrappedElement, emptyObject);
         if (callback) {
           ReactUpdateQueue.enqueueCallbackInternal(prevComponent, callback);
         }
@@ -106,19 +106,9 @@ var ReactNativeMount = {
 
     ReactNativeTagHandles.assertRootTag(containerTag);
 
-    var instance = instantiateReactComponent(nextWrappedElement);
+    var instance = instantiateReactComponent(nextWrappedElement, false);
     ReactNativeMount._instancesByContainerID[containerTag] = instance;
 
-    if (process.env.NODE_ENV !== 'production') {
-      // Mute future events from the top level wrapper.
-      // It is an implementation detail that devtools should not know about.
-      instance._debugID = 0;
-
-      if (process.env.NODE_ENV !== 'production') {
-        ReactInstrumentation.debugTool.onBeginFlush();
-      }
-    }
-
     // The initial render is synchronous but any updates that happen during
     // rendering, in componentWillMount or componentDidMount, will be batched
     // according to the current batching strategy.
@@ -127,7 +117,6 @@ var ReactNativeMount = {
     if (process.env.NODE_ENV !== 'production') {
       // The instance here is TopLevelWrapper so we report mount for its child.
       ReactInstrumentation.debugTool.onMountRootComponent(instance._renderedComponent._debugID);
-      ReactInstrumentation.debugTool.onEndFlush();
     }
     var component = instance.getPublicInstance();
     if (callback) {

package/lib/ReactNativeReconcileTransaction.js

@@ -16,6 +16,8 @@ var _assign = require('object-assign');
 var CallbackQueue = require('./CallbackQueue');
 var PooledClass = require('./PooledClass');
 var Transaction = require('./Transaction');
+var ReactInstrumentation = require('./ReactInstrumentation');
+var ReactUpdateQueue = require('./ReactUpdateQueue');
 
 /**
  * Provides a `CallbackQueue` queue for collecting `onDOMReady` callbacks during
@@ -44,6 +46,13 @@ var ON_DOM_READY_QUEUEING = {
  */
 var TRANSACTION_WRAPPERS = [ON_DOM_READY_QUEUEING];
 
+if (process.env.NODE_ENV !== 'production') {
+  TRANSACTION_WRAPPERS.push({
+    initialize: ReactInstrumentation.debugTool.onBeginFlush,
+    close: ReactInstrumentation.debugTool.onEndFlush
+  });
+}
+
 /**
  * Currently:
  * - The order that these are listed in the transaction is critical:
@@ -83,6 +92,13 @@ var Mixin = {
     return this.reactMountReady;
   },
 
+  /**
+   * @return {object} The queue to collect React async events.
+   */
+  getUpdateQueue: function () {
+    return ReactUpdateQueue;
+  },
+
   /**
    * `PooledClass` looks for this, and will invoke this before allowing this
    * instance to be reused.

package/lib/ReactNativeTagHandles.js

@@ -11,6 +11,8 @@
  */
 'use strict';
 
+var _prodInvariant = require('./reactProdInvariant');
+
 var invariant = require('fbjs/lib/invariant');
 
 /**
@@ -42,7 +44,7 @@ var ReactNativeTagHandles = {
   },
 
   assertRootTag: function (tag) {
-    !this.reactTagIsNativeTopRootID(tag) ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Expect a native root tag, instead got %s', tag) : invariant(false) : void 0;
+    !this.reactTagIsNativeTopRootID(tag) ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Expect a native root tag, instead got %s', tag) : _prodInvariant('19', tag) : void 0;
   },
 
   reactTagIsNativeTopRootID: function (reactTag) {

package/lib/ReactNativeTextComponent.js

@@ -11,12 +11,13 @@
 
 'use strict';
 
-var _assign = require('object-assign');
+var _prodInvariant = require('./reactProdInvariant'),
+    _assign = require('object-assign');
 
 var ReactInstrumentation = require('./ReactInstrumentation');
 var ReactNativeComponentTree = require('./ReactNativeComponentTree');
 var ReactNativeTagHandles = require('./ReactNativeTagHandles');
-var UIManager = require('UIManager');
+var UIManager = require('react-native/lib/UIManager');
 
 var invariant = require('fbjs/lib/invariant');
 
@@ -24,23 +25,23 @@ var ReactNativeTextComponent = function (text) {
   // This is really a ReactText (ReactNode), not a ReactElement
   this._currentElement = text;
   this._stringText = '' + text;
-  this._nativeParent = null;
+  this._hostParent = null;
   this._rootNodeID = null;
 };
 
 _assign(ReactNativeTextComponent.prototype, {
 
-  mountComponent: function (transaction, nativeParent, nativeContainerInfo, context) {
+  mountComponent: function (transaction, hostParent, hostContainerInfo, context) {
     if (process.env.NODE_ENV !== 'production') {
       ReactInstrumentation.debugTool.onSetText(this._debugID, this._stringText);
     }
 
-    // TODO: nativeParent should have this context already. Stop abusing context.
-    !context.isInAParentText ? process.env.NODE_ENV !== 'production' ? invariant(false, 'RawText "%s" must be wrapped in an explicit <Text> component.', this._stringText) : invariant(false) : void 0;
-    this._nativeParent = nativeParent;
+    // TODO: hostParent should have this context already. Stop abusing context.
+    !context.isInAParentText ? process.env.NODE_ENV !== 'production' ? invariant(false, 'RawText "%s" must be wrapped in an explicit <Text> component.', this._stringText) : _prodInvariant('20', this._stringText) : void 0;
+    this._hostParent = hostParent;
     var tag = ReactNativeTagHandles.allocateTag();
     this._rootNodeID = tag;
-    var nativeTopRootTag = nativeContainerInfo._tag;
+    var nativeTopRootTag = hostContainerInfo._tag;
     UIManager.createView(tag, 'RCTRawText', nativeTopRootTag, { text: this._stringText });
 
     ReactNativeComponentTree.precacheNode(this, tag);
@@ -48,7 +49,7 @@ _assign(ReactNativeTextComponent.prototype, {
     return tag;
   },
 
-  getNativeNode: function () {
+  getHostNode: function () {
     return this._rootNodeID;
   },
 

package/lib/ReactNativeTreeTraversal.js

@@ -20,23 +20,23 @@
 
 function getLowestCommonAncestor(instA, instB) {
   var depthA = 0;
-  for (var tempA = instA; tempA; tempA = tempA._nativeParent) {
+  for (var tempA = instA; tempA; tempA = tempA._hostParent) {
     depthA++;
   }
   var depthB = 0;
-  for (var tempB = instB; tempB; tempB = tempB._nativeParent) {
+  for (var tempB = instB; tempB; tempB = tempB._hostParent) {
     depthB++;
   }
 
   // If A is deeper, crawl up.
   while (depthA - depthB > 0) {
-    instA = instA._nativeParent;
+    instA = instA._hostParent;
     depthA--;
   }
 
   // If B is deeper, crawl up.
   while (depthB - depthA > 0) {
-    instB = instB._nativeParent;
+    instB = instB._hostParent;
     depthB--;
   }
 
@@ -46,8 +46,8 @@ function getLowestCommonAncestor(instA, instB) {
     if (instA === instB) {
       return instA;
     }
-    instA = instA._nativeParent;
-    instB = instB._nativeParent;
+    instA = instA._hostParent;
+    instB = instB._hostParent;
   }
   return null;
 }
@@ -60,7 +60,7 @@ function isAncestor(instA, instB) {
     if (instB === instA) {
       return true;
     }
-    instB = instB._nativeParent;
+    instB = instB._hostParent;
   }
   return false;
 }
@@ -69,7 +69,7 @@ function isAncestor(instA, instB) {
  * Return the parent instance of the passed-in instance.
  */
 function getParentInstance(inst) {
-  return inst._nativeParent;
+  return inst._hostParent;
 }
 
 /**
@@ -79,7 +79,7 @@ function traverseTwoPhase(inst, fn, arg) {
   var path = [];
   while (inst) {
     path.push(inst);
-    inst = inst._nativeParent;
+    inst = inst._hostParent;
   }
   var i;
   for (i = path.length; i-- > 0;) {
@@ -102,12 +102,12 @@ function traverseEnterLeave(from, to, fn, argFrom, argTo) {
   var pathFrom = [];
   while (from && from !== common) {
     pathFrom.push(from);
-    from = from._nativeParent;
+    from = from._hostParent;
   }
   var pathTo = [];
   while (to && to !== common) {
     pathTo.push(to);
-    to = to._nativeParent;
+    to = to._hostParent;
   }
   var i;
   for (i = 0; i < pathFrom.length; i++) {

package/lib/ReactNodeTypes.js

@@ -7,16 +7,19 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule ReactNodeTypes
+ * 
  */
 
 'use strict';
 
+var _prodInvariant = require('./reactProdInvariant');
+
 var ReactElement = require('./ReactElement');
 
 var invariant = require('fbjs/lib/invariant');
 
 var ReactNodeTypes = {
-  NATIVE: 0,
+  HOST: 0,
   COMPOSITE: 1,
   EMPTY: 2,
 
@@ -27,10 +30,10 @@ var ReactNodeTypes = {
       if (typeof node.type === 'function') {
         return ReactNodeTypes.COMPOSITE;
       } else {
-        return ReactNodeTypes.NATIVE;
+        return ReactNodeTypes.HOST;
       }
     }
-    !false ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Unexpected node: %s', node) : invariant(false) : void 0;
+    !false ? process.env.NODE_ENV !== 'production' ? invariant(false, 'Unexpected node: %s', node) : _prodInvariant('26', node) : void 0;
   }
 };
 

package/lib/ReactNoop.js

@@ -0,0 +1,173 @@
+/**
+ * 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.
+ *
+ * @providesModule ReactNoop
+ * 
+ */
+
+/**
+ * This is a renderer of React that doesn't have a render target output.
+ * It is useful to demonstrate the internals of the reconciler in isolation
+ * and for testing semantics of reconciliation separate from the host
+ * environment.
+ */
+
+'use strict';
+
+var ReactFiberReconciler = require('./ReactFiberReconciler');
+
+var scheduledHighPriCallback = null;
+var scheduledLowPriCallback = null;
+
+var TERMINAL_TAG = 99;
+
+var instanceCounter = 0;
+
+function recursivelyAppendChildren(flatArray, child) {
+  if (!child) {
+    return;
+  }
+  if (child.tag === TERMINAL_TAG) {
+    flatArray.push(child);
+  } else {
+    var node = child;
+    do {
+      recursivelyAppendChildren(flatArray, node.output);
+    } while (node = node.sibling);
+  }
+}
+
+function flattenChildren(children) {
+  var flatArray = [];
+  recursivelyAppendChildren(flatArray, children);
+  return flatArray;
+}
+
+var NoopRenderer = ReactFiberReconciler({
+  updateContainer: function (containerInfo, children) {
+    console.log('Update container #' + containerInfo.rootID);
+    containerInfo.children = flattenChildren(children);
+  },
+  createInstance: function (type, props, children) {
+    console.log('Create instance #' + instanceCounter);
+    var inst = {
+      tag: TERMINAL_TAG,
+      id: instanceCounter++,
+      type: type,
+      children: flattenChildren(children)
+    };
+    // Hide from unit tests
+    Object.defineProperty(inst, 'tag', { value: inst.tag, enumerable: false });
+    Object.defineProperty(inst, 'id', { value: inst.id, enumerable: false });
+    return inst;
+  },
+  prepareUpdate: function (instance, oldProps, newProps, children) {
+    console.log('Prepare for update on #' + instance.id);
+    return true;
+  },
+  commitUpdate: function (instance, oldProps, newProps, children) {
+    console.log('Commit update on #' + instance.id);
+    instance.children = flattenChildren(children);
+  },
+  deleteInstance: function (instance) {
+    console.log('Delete #' + instance.id);
+  },
+  scheduleHighPriCallback: function (callback) {
+    scheduledHighPriCallback = callback;
+  },
+  scheduleLowPriCallback: function (callback) {
+    scheduledLowPriCallback = callback;
+  }
+});
+
+var rootContainer = { rootID: 0, children: [] };
+
+var root = null;
+
+var ReactNoop = {
+
+  root: rootContainer,
+
+  render: function (element) {
+    if (!root) {
+      root = NoopRenderer.mountContainer(element, rootContainer);
+    } else {
+      NoopRenderer.updateContainer(element, root);
+    }
+  },
+  flushHighPri: function () {
+    var cb = scheduledHighPriCallback;
+    if (cb === null) {
+      return;
+    }
+    scheduledHighPriCallback = null;
+    cb();
+  },
+  flushLowPri: function () {
+    var timeout = arguments.length <= 0 || arguments[0] === undefined ? Infinity : arguments[0];
+
+    var cb = scheduledLowPriCallback;
+    if (cb === null) {
+      return;
+    }
+    scheduledLowPriCallback = null;
+    var timeRemaining = timeout;
+    cb({
+      timeRemaining: function () {
+        // Simulate a fix amount of time progressing between each call.
+        timeRemaining -= 5;
+        if (timeRemaining < 0) {
+          timeRemaining = 0;
+        }
+        return timeRemaining;
+      }
+    });
+  },
+  flush: function () {
+    ReactNoop.flushHighPri();
+    ReactNoop.flushLowPri();
+  },
+
+
+  // Logs the current state of the tree.
+  dumpTree: function () {
+    if (!root) {
+      console.log('Nothing rendered yet.');
+      return;
+    }
+
+    function logHostInstances(children, depth) {
+      for (var i = 0; i < children.length; i++) {
+        var child = children[i];
+        console.log('  '.repeat(depth) + '- ' + child.type + '#' + child.id);
+        logHostInstances(child.children, depth + 1);
+      }
+    }
+    function logContainer(container, depth) {
+      console.log('  '.repeat(depth) + '- [root#' + container.rootID + ']');
+      logHostInstances(container.children, depth + 1);
+    }
+
+    function logFiber(fiber, depth) {
+      console.log('  '.repeat(depth) + '- ' + (fiber.type ? fiber.type.name || fiber.type : '[root]'), '[' + fiber.pendingWorkPriority + (fiber.pendingProps ? '*' : '') + ']');
+      if (fiber.child) {
+        logFiber(fiber.child, depth + 1);
+      }
+      if (fiber.sibling) {
+        logFiber(fiber.sibling, depth);
+      }
+    }
+
+    console.log('HOST INSTANCES:');
+    logContainer(rootContainer, 0);
+    console.log('FIBERS:');
+    logFiber(root.stateNode.current, 0);
+  }
+};
+
+module.exports = ReactNoop;