react 0.13.0-beta.2 → 0.13.1

package/lib/ReactFragment.js

@@ -39,13 +39,13 @@ if ("production" !== process.env.NODE_ENV) {
     Object.defineProperty(
       {},
       fragmentKey,
-      { enumerable: false, value: true }
+      {enumerable: false, value: true}
     );
 
     Object.defineProperty(
       {},
       'key',
-      { enumerable: true, get: dummy }
+      {enumerable: true, get: dummy}
     );
 
     canWarnForReactFragment = true;
@@ -96,14 +96,22 @@ var ReactFragment = {
   // of its properties.
   create: function(object) {
     if ("production" !== process.env.NODE_ENV) {
-      if (typeof object !== 'object' || !object) {
+      if (typeof object !== 'object' || !object || Array.isArray(object)) {
         ("production" !== process.env.NODE_ENV ? warning(
           false,
-          'React.addons.createFragment only accepts a single object. Not %s',
+          'React.addons.createFragment only accepts a single object.',
           object
         ) : null);
         return object;
       }
+      if (ReactElement.isValidElement(object)) {
+        ("production" !== process.env.NODE_ENV ? warning(
+          false,
+          'React.addons.createFragment does not accept a ReactElement ' +
+          'without a wrapper object.'
+        ) : null);
+        return object;
+      }
       if (canWarnForReactFragment) {
         var proxy = {};
         Object.defineProperty(proxy, fragmentKey, {
@@ -133,7 +141,8 @@ var ReactFragment = {
           ("production" !== process.env.NODE_ENV ? warning(
             didWarnForFragment(fragment),
             'Any use of a keyed object should be wrapped in ' +
-            'React.addons.createFragment(object) before passed as a child.'
+            'React.addons.createFragment(object) before being passed as a ' +
+            'child.'
           ) : null);
           return fragment;
         }

package/lib/ReactMount.js

@@ -279,7 +279,7 @@ function batchedMountComponentIntoNode(
 }
 
 /**
- * Mounting is the process of initializing a React component by creatings its
+ * Mounting is the process of initializing a React component by creating its
  * representative DOM elements and inserting them into a supplied `container`.
  * Any prior content inside `container` is destroyed in the process.
  *
@@ -370,13 +370,13 @@ var ReactMount = {
 
   /**
    * Render a new component into the DOM.
-   * @param {ReactComponent} nextComponent component instance to render
+   * @param {ReactElement} nextElement element to render
    * @param {DOMElement} container container to render into
    * @param {boolean} shouldReuseMarkup if we should skip the markup insertion
    * @return {ReactComponent} nextComponent
    */
   _renderNewRootComponent: function(
-    nextComponent,
+    nextElement,
     container,
     shouldReuseMarkup
   ) {
@@ -391,7 +391,7 @@ var ReactMount = {
       'componentDidUpdate.'
     ) : null);
 
-    var componentInstance = instantiateReactComponent(nextComponent, null);
+    var componentInstance = instantiateReactComponent(nextElement, null);
     var reactRootID = ReactMount._registerComponent(
       componentInstance,
       container

package/lib/ReactPropTypes.js

@@ -12,6 +12,7 @@
 'use strict';
 
 var ReactElement = require("./ReactElement");
+var ReactFragment = require("./ReactFragment");
 var ReactPropTypeLocationNames = require("./ReactPropTypeLocationNames");
 
 var emptyFunction = require("./emptyFunction");
@@ -291,6 +292,7 @@ function isNode(propValue) {
   switch (typeof propValue) {
     case 'number':
     case 'string':
+    case 'undefined':
       return true;
     case 'boolean':
       return !propValue;
@@ -298,9 +300,10 @@ function isNode(propValue) {
       if (Array.isArray(propValue)) {
         return propValue.every(isNode);
       }
-      if (ReactElement.isValidElement(propValue)) {
+      if (propValue === null || ReactElement.isValidElement(propValue)) {
         return true;
       }
+      propValue = ReactFragment.extractIfFragment(propValue);
       for (var k in propValue) {
         if (!isNode(propValue[k])) {
           return false;

package/lib/ReactReconciler.js

@@ -86,7 +86,6 @@ var ReactReconciler = {
     }
 
     var refsChanged = ReactRef.shouldUpdateRefs(
-      this,
       prevElement,
       nextElement
     );

package/lib/ReactRef.js

@@ -40,7 +40,7 @@ ReactRef.attachRefs = function(instance, element) {
   }
 };
 
-ReactRef.shouldUpdateRefs = function(instance, prevElement, nextElement) {
+ReactRef.shouldUpdateRefs = function(prevElement, nextElement) {
   // If either the owner or a `ref` has changed, make sure the newest owner
   // has stored a reference to `this`, and the previous owner (if different)
   // has forgotten the reference to `this`. We use the element instead

package/lib/ReactTestUtils.js

@@ -16,6 +16,7 @@ var EventPluginHub = require("./EventPluginHub");
 var EventPropagators = require("./EventPropagators");
 var React = require("./React");
 var ReactElement = require("./ReactElement");
+var ReactEmptyComponent = require("./ReactEmptyComponent");
 var ReactBrowserEventEmitter = require("./ReactBrowserEventEmitter");
 var ReactCompositeComponent = require("./ReactCompositeComponent");
 var ReactInstanceHandles = require("./ReactInstanceHandles");
@@ -64,7 +65,7 @@ var ReactTestUtils = {
   isDOMComponent: function(inst) {
     // TODO: Fix this heuristic. It's just here because composites can currently
     // pretend to be DOM components.
-    return !!(inst && inst.getDOMNode && inst.tagName);
+    return !!(inst && inst.tagName && inst.getDOMNode);
   },
 
   isDOMComponentElement: function(inst) {
@@ -169,7 +170,7 @@ var ReactTestUtils = {
     var all =
       ReactTestUtils.scryRenderedDOMComponentsWithClass(root, className);
     if (all.length !== 1) {
-      throw new Error('Did not find exactly one match '+
+      throw new Error('Did not find exactly one match ' +
         '(found: ' + all.length + ') for class:' + className
       );
     }
@@ -322,14 +323,17 @@ var ReactShallowRenderer = function() {
 ReactShallowRenderer.prototype.getRenderOutput = function() {
   return (
     (this._instance && this._instance._renderedComponent &&
-     this._instance._renderedComponent._currentElement)
+     this._instance._renderedComponent._renderedOutput)
     || null
   );
 };
 
 var NoopInternalComponent = function(element) {
-  this._currentElement = element;
-}
+  this._renderedOutput = element;
+  this._currentElement = element === null || element === false ?
+    ReactEmptyComponent.emptyElement :
+    element;
+};
 
 NoopInternalComponent.prototype = {
 
@@ -337,11 +341,13 @@ NoopInternalComponent.prototype = {
   },
 
   receiveComponent: function(element) {
-    this._currentElement = element;
+    this._renderedOutput = element;
+    this._currentElement = element === null || element === false ?
+      ReactEmptyComponent.emptyElement :
+      element;
   },
 
   unmountComponent: function() {
-
   }
 
 };
@@ -366,6 +372,12 @@ ReactShallowRenderer.prototype.render = function(element, context) {
   ReactUpdates.ReactReconcileTransaction.release(transaction);
 };
 
+ReactShallowRenderer.prototype.unmount = function() {
+  if (this._instance) {
+    this._instance.unmountComponent();
+  }
+};
+
 ReactShallowRenderer.prototype._render = function(element, transaction, context) {
   if (!this._instance) {
     var rootID = ReactInstanceHandles.createReactRootID();

package/lib/Transaction.js

@@ -61,7 +61,7 @@ var invariant = require("./invariant");
  *   content.
  * - (Future use case): Wrapping particular flushes of the `ReactWorker` queue
  *   to preserve the `scrollTop` (an automatic scroll aware DOM).
- * - (Future use case): Layout calculations before and after DOM upates.
+ * - (Future use case): Layout calculations before and after DOM updates.
  *
  * Transactional plugin API:
  * - A module that has an `initialize` method that returns any precomputation.

package/lib/cloneWithProps.js

@@ -6,7 +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.
  *
- * @typechecks
+ * @typechecks static-only
  * @providesModule cloneWithProps
  */
 
@@ -24,10 +24,10 @@ var CHILDREN_PROP = keyOf({children: null});
  * Sometimes you want to change the props of a child passed to you. Usually
  * this is to add a CSS class.
  *
- * @param {object} child child component you'd like to clone
+ * @param {ReactElement} child child element you'd like to clone
  * @param {object} props props you'd like to modify. className and style will be
  * merged automatically.
- * @return {object} a clone of child with props merged in.
+ * @return {ReactElement} a clone of child with props merged in.
  */
 function cloneWithProps(child, props) {
   if ("production" !== process.env.NODE_ENV) {

package/lib/createFullPageComponent.js

@@ -33,6 +33,7 @@ function createFullPageComponent(tag) {
   var elementFactory = ReactElement.createFactory(tag);
 
   var FullPageComponent = ReactClass.createClass({
+    tagName: tag.toUpperCase(),
     displayName: 'ReactFullPageComponent' + tag,
 
     componentWillUnmount: function() {

package/lib/cx.js

@@ -24,7 +24,22 @@
  * @param [string ...]  Variable list of classNames in the string case.
  * @return string       Renderable space-separated CSS className.
  */
+
+'use strict';
+var warning = require("./warning");
+
+var warned = false;
+
 function cx(classNames) {
+  if ("production" !== process.env.NODE_ENV) {
+    ("production" !== process.env.NODE_ENV ? warning(
+      warned,
+      'React.addons.classSet will be deprecated in a future version. See ' +
+      'http://fb.me/react-addons-classset'
+    ) : null);
+    warned = true;
+  }
+
   if (typeof classNames == 'object') {
     return Object.keys(classNames).filter(function(className) {
       return classNames[className];

package/lib/findDOMNode.js

@@ -11,11 +11,14 @@
  */
 
 'use strict';
+
+var ReactCurrentOwner = require("./ReactCurrentOwner");
 var ReactInstanceMap = require("./ReactInstanceMap");
 var ReactMount = require("./ReactMount");
 
 var invariant = require("./invariant");
 var isNode = require("./isNode");
+var warning = require("./warning");
 
 /**
  * Returns the DOM node rendered by this element.
@@ -24,6 +27,21 @@ var isNode = require("./isNode");
  * @return {DOMElement} The root node of this element.
  */
 function findDOMNode(componentOrElement) {
+  if ("production" !== process.env.NODE_ENV) {
+    var owner = ReactCurrentOwner.current;
+    if (owner !== null) {
+      ("production" !== process.env.NODE_ENV ? warning(
+        owner._warnedAboutRefsInRender,
+        '%s is accessing getDOMNode or findDOMNode inside its render(). ' +
+        'render() should be a pure function of props and state. It should ' +
+        'never access something that requires stale data from the previous ' +
+        'render, such as refs. Move this logic to componentDidMount and ' +
+        'componentDidUpdate instead.',
+        owner.getName() || 'A component'
+      ) : null);
+      owner._warnedAboutRefsInRender = true;
+    }
+  }
   if (componentOrElement == null) {
     return null;
   }

package/lib/instantiateReactComponent.js

@@ -116,6 +116,7 @@ function instantiateReactComponent(node, parentCompositeType) {
 
   if ("production" !== process.env.NODE_ENV) {
     instance._isOwnerNecessary = false;
+    instance._warnedAboutRefsInRender = false;
   }
 
   // Internal instances should fully constructed at this point, so they should

package/lib/traverseAllChildren.js

@@ -17,6 +17,7 @@ var ReactInstanceHandles = require("./ReactInstanceHandles");
 
 var getIteratorFn = require("./getIteratorFn");
 var invariant = require("./invariant");
+var warning = require("./warning");
 
 var SEPARATOR = ReactInstanceHandles.SEPARATOR;
 var SUBSEPARATOR = ':';
@@ -34,6 +35,8 @@ var userProvidedKeyEscaperLookup = {
 
 var userProvidedKeyEscapeRegex = /[=.:]/g;
 
+var didWarnAboutMaps = false;
+
 function userProvidedKeyEscaper(match) {
   return userProvidedKeyEscaperLookup[match];
 }
@@ -158,6 +161,15 @@ function traverseAllChildrenImpl(
           );
         }
       } else {
+        if ("production" !== process.env.NODE_ENV) {
+          ("production" !== process.env.NODE_ENV ? warning(
+            didWarnAboutMaps,
+            'Using Maps as children is not yet fully supported. It is an ' +
+            'experimental feature that might be removed. Convert it to a ' +
+            'sequence / iterable of keyed ReactElements instead.'
+          ) : null);
+          didWarnAboutMaps = true;
+        }
         // Iterator will provide entry [k,v] tuples rather than values.
         while (!(step = iterator.next()).done) {
           var entry = step.value;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a JavaScript library for building user interfaces.",
-  "version": "0.13.0-beta.2",
+  "version": "0.13.1",
   "keywords": [
     "react"
   ],