{"commit":{"revision":"c885abbf21fb04ae286f45b0fa5cc433310f8d8c","authorName":"cpojer","authorEmail":"christoph.pojer@gmail.com","authoredAt":"2014-01-14T10:45:35-08:00","subject":"Allow null return values for functions to-be-merged.","shortRevision":"c885abbf21"},"body":"","files":[{"path":"src\/core\/ReactCompositeComponent.js","status":"M"},{"path":"src\/core\/__tests__\/ReactCompositeComponent-test.js","status":"M"}],"patch":"diff --git a\/src\/core\/ReactCompositeComponent.js b\/src\/core\/ReactCompositeComponent.js\nindex 40a94b8bed..fab9ffd78d 100644\n--- a\/src\/core\/ReactCompositeComponent.js\n+++ b\/src\/core\/ReactCompositeComponent.js\n@@ -547,10 +547,14 @@ function mergeObjectsWithNoDuplicateKeys(one, two) {\n *\/\n function createMergedResultFunction(one, two) {\n return function mergedResult() {\n- return mergeObjectsWithNoDuplicateKeys(\n- one.apply(this, arguments),\n- two.apply(this, arguments)\n- );\n+ var a = one.apply(this, arguments);\n+ var b = two.apply(this, arguments);\n+ if (a == null) {\n+ return b;\n+ } else if (b == null) {\n+ return a;\n+ }\n+ return mergeObjectsWithNoDuplicateKeys(a, b);\n };\n }\n \ndiff --git a\/src\/core\/__tests__\/ReactCompositeComponent-test.js b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\nindex ed75168de4..d7fa8feb80 100644\n--- a\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n@@ -477,30 +477,6 @@ describe('ReactCompositeComponent', function() {\n );\n });\n \n- it('should throw with bad getInitialState() return values', function() {\n- var Mixin = {\n- getInitialState: function() {\n- return null;\n- }\n- };\n- var Component = React.createClass({\n- mixins: [Mixin],\n- getInitialState: function() {\n- return {x: true};\n- },\n- render: function() {\n- return ;\n- }\n- });\n- var instance = ;\n- expect(function() {\n- ReactTestUtils.renderIntoDocument(instance);\n- }).toThrow(\n- 'Invariant Violation: mergeObjectsWithNoDuplicateKeys(): ' +\n- 'Cannot merge non-objects'\n- );\n- });\n-\n it('should work with object getInitialState() return values', function() {\n var Component = React.createClass({\n getInitialState: function() {\n@@ -546,7 +522,77 @@ describe('ReactCompositeComponent', function() {\n return ;\n }\n });\n- expect(() => ).not.toThrow();\n+ expect(\n+ () => ReactTestUtils.renderIntoDocument()\n+ ).not.toThrow();\n+ });\n+\n+ it('should work with a null getInitialState return value and a mixin', () => {\n+ var Component;\n+ var instance;\n+\n+ var Mixin = {\n+ getInitialState: function() {\n+ return {foo: 'bar'};\n+ }\n+ };\n+ Component = React.createClass({\n+ mixins: [Mixin],\n+ getInitialState: function() {\n+ return null;\n+ },\n+ render: function() {\n+ return ;\n+ }\n+ });\n+ expect(\n+ () => ReactTestUtils.renderIntoDocument()\n+ ).not.toThrow();\n+\n+ instance = ;\n+ ReactTestUtils.renderIntoDocument(instance);\n+ expect(instance.state).toEqual({foo: 'bar'});\n+\n+ \/\/ Also the other way round should work\n+ var Mixin2 = {\n+ getInitialState: function() {\n+ return null;\n+ }\n+ };\n+ Component = React.createClass({\n+ mixins: [Mixin2],\n+ getInitialState: function() {\n+ return {foo: 'bar'};\n+ },\n+ render: function() {\n+ return ;\n+ }\n+ });\n+ expect(\n+ () => ReactTestUtils.renderIntoDocument()\n+ ).not.toThrow();\n+\n+ instance = ;\n+ ReactTestUtils.renderIntoDocument(instance);\n+ expect(instance.state).toEqual({foo: 'bar'});\n+\n+ \/\/ Multiple mixins should be fine too\n+ Component = React.createClass({\n+ mixins: [Mixin, Mixin2],\n+ getInitialState: function() {\n+ return {x: true};\n+ },\n+ render: function() {\n+ return ;\n+ }\n+ });\n+ expect(\n+ () => ReactTestUtils.renderIntoDocument()\n+ ).not.toThrow();\n+\n+ instance = ;\n+ ReactTestUtils.renderIntoDocument(instance);\n+ expect(instance.state).toEqual({foo: 'bar', x: true});\n });\n \n it('should work with object getInitialState() return values', function() {\n","parents":["d9b959884bcd1fc0921a843b590325bcd5ab050e"]}

dillon1000/react

Files changed