Merge pull request #8594 from bvaughn/dont-warn-about-getInitialState…

…-on-class-if-state-set

Don't warn about class components using getInitialState if state is set
(cherry picked from commit 3c6d4ba)

src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee

@@ -319,6 +319,25 @@ describe 'ReactCoffeeScriptClass', ->
     )
     undefined
 
+  it 'does not warn about getInitialState() on class components
+      if state is also defined.', ->
+    spyOn console, 'error'
+    class Foo extends React.Component
+      constructor: (props) ->
+        super props
+        @state = bar: @props.initialValue
+
+      getInitialState: ->
+        {}
+
+      render: ->
+        span
+          className: 'foo'
+
+    test React.createElement(Foo), 'SPAN', 'foo'
+    expect(console.error.calls.count()).toBe 0
+    undefined
+
   it 'should warn when misspelling shouldComponentUpdate', ->
     spyOn console, 'error'
     class NamedComponent extends React.Component

src/isomorphic/modern/class/__tests__/ReactES6Class-test.js

@@ -354,6 +354,21 @@ describe('ReactES6Class', () => {
     );
   });
 
+  it('does not warn about getInitialState() on class components if state is also defined.', () => {
+    spyOn(console, 'error');
+    class Foo extends React.Component {
+      state = this.getInitialState();
+      getInitialState() {
+        return {};
+      }
+      render() {
+        return <span className="foo" />;
+      }
+    }
+    test(<Foo />, 'SPAN', 'foo');
+    expect(console.error.calls.count()).toBe(0);
+  });
+
   it('should warn when misspelling shouldComponentUpdate', () => {
     spyOn(console, 'error');
 

src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts

@@ -454,6 +454,24 @@ describe('ReactTypeScriptClass', function() {
     );
   });
 
+  it('does not warn about getInitialState() on class components ' +
+     'if state is also defined.', () => {
+    spyOn(console, 'error');
+
+    class Example extends React.Component {
+      state = {};
+      getInitialState() {
+        return {};
+      }
+      render() {
+        return React.createElement('span', {className: 'foo'});
+      }
+    }
+
+    test(React.createElement(Example), 'SPAN', 'foo');
+    expect((<any>console.error).calls.count()).toBe(0);
+  });
+
   it('should warn when misspelling shouldComponentUpdate', function() {
     spyOn(console, 'error');
 

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

@@ -270,7 +270,8 @@ var ReactCompositeComponent = {
       // catch them here, at initialization time, instead.
       warning(
         !inst.getInitialState ||
-        inst.getInitialState.isReactClassApproved,
+        inst.getInitialState.isReactClassApproved ||
+        inst.state,
         'getInitialState was defined on %s, a plain JavaScript class. ' +
         'This is only supported for classes created using React.createClass. ' +
         'Did you mean to define a state property instead?',