Merge branch 'master' of github.com:facebook/react

Author: jimfb

docs/docs/10.4-test-utils.md

@@ -73,7 +73,7 @@ Returns true if `instance` is a composite component (created with `React.createC
 boolean isCompositeComponentWithType(ReactComponent instance, function componentClass)
 ```
 
-The combination of `isComponentOfType()` and `isCompositeComponent()`.
+Returns true if `instance` is a composite component (created with `React.createClass()`) whose type is of a React `componentClass`.
 
 ### isTextComponent
 

src/browser/ui/ReactDOMComponent.js

@@ -290,7 +290,7 @@ ReactDOMComponent.Mixin = {
       // superfluous reconcile. It's possible for state to be mutable but such
       // change should trigger an update of the owner which would recreate
       // the element. We explicitly check for the existence of an owner since
-      // it's possible for a element created outside a composite to be
+      // it's possible for an element created outside a composite to be
       // deeply mutated and reused.
       return;
     }

src/browser/ui/ReactMount.js

@@ -369,7 +369,7 @@ var ReactMount = {
         typeof nextElement === 'function' ?
           ' Instead of passing a component class, make sure to instantiate ' +
           'it by passing it to React.createElement.' :
-        // Check if it quacks like a element
+        // Check if it quacks like an element
         typeof nextElement.props !== "undefined" ?
           ' This may be caused by unintentionally loading two independent ' +
           'copies of React.' :

src/browser/ui/__tests__/ReactDOMComponent-test.js

@@ -175,8 +175,10 @@ describe('ReactDOMComponent', function() {
 
     it("should transition from innerHTML to string content", function() {
       var container = document.createElement('div');
-      React.render(<div dangerouslySetInnerHTML={{__html: 'bonjour'}} />
-      , container);
+      React.render(
+        <div dangerouslySetInnerHTML={{__html: 'bonjour'}} />,
+        container
+      );
 
       expect(container.firstChild.innerHTML).toEqual('bonjour');
       React.render(<div>adieu</div>, container);

src/browser/ui/dom/CSSProperty.js

@@ -16,7 +16,6 @@
  */
 var isUnitlessNumber = {
   columnCount: true,
-  fillOpacity: true,
   flex: true,
   flexGrow: true,
   flexShrink: true,
@@ -28,7 +27,11 @@ var isUnitlessNumber = {
   orphans: true,
   widows: true,
   zIndex: true,
-  zoom: true
+  zoom: true,
+
+  // SVG-related properties
+  fillOpacity: true,
+  strokeOpacity: true
 };
 
 /**

src/core/ReactComponent.js

@@ -187,7 +187,7 @@ var ReactComponent = {
         '`render` method to pass the correct value as props to the component ' +
         'where it is created.'
       );
-      // This is a deoptimized path. We optimize for always having a element.
+      // This is a deoptimized path. We optimize for always having an element.
       // This creates an extra internal element.
       this._pendingElement = ReactElement.cloneAndReplaceProps(
         this._pendingElement || this._currentElement,
@@ -205,7 +205,7 @@ var ReactComponent = {
      * @internal
      */
     _setPropsInternal: function(partialProps, callback) {
-      // This is a deoptimized path. We optimize for always having a element.
+      // This is a deoptimized path. We optimize for always having an element.
       // This creates an extra internal element.
       var element = this._pendingElement || this._currentElement;
       this._pendingElement = ReactElement.cloneAndReplaceProps(

src/core/__tests__/ReactTextComponent-test.js

@@ -18,12 +18,28 @@ describe('ReactTextComponent', function() {
     React = require('React');
   });
 
-  it('should escape the rootID', function(){
+  it('should escape the rootID', function() {
     var ThisThingShouldBeEscaped = '">>> LULZ <<<"';
     var ThisThingWasBeEscaped = '&quot;&gt;&gt;&gt; LULZ &lt;&lt;&lt;&quot;';
     var thing = <div><span key={ThisThingShouldBeEscaped}>LULZ</span></div>;
     var html = React.renderToString(thing);
     expect(html).not.toContain(ThisThingShouldBeEscaped);
     expect(html).toContain(ThisThingWasBeEscaped);
-  })
+  });
+
+  it('updates a mounted text component in place', function() {
+    var el = document.createElement('div');
+    var inst = React.render(<div>{'foo'}{'bar'}</div>, el);
+
+    var foo = inst.getDOMNode().children[0];
+    var bar = inst.getDOMNode().children[1];
+    expect(foo.tagName).toBe('SPAN');
+    expect(bar.tagName).toBe('SPAN');
+
+    var inst = React.render(<div>{'baz'}{'qux'}</div>, el);
+    // After the update, the spans should have stayed in place (as opposed to
+    // getting unmounted and remounted)
+    expect(inst.getDOMNode().children[0]).toBe(foo);
+    expect(inst.getDOMNode().children[1]).toBe(bar);
+  });
 });

src/utils/OrderedMap.js

@@ -175,7 +175,7 @@ var OrderedMapMethods = {
 
   /**
    * Returns the object for a given key, or `undefined` if not present. To
-   * distinguish a undefined entry vs not being in the set, use `has()`.
+   * distinguish an undefined entry vs not being in the set, use `has()`.
    *
    * @param {string} key String key to lookup the value for.
    * @return {Object?} Object at key `key`, or undefined if not in map.