{"commit":{"subject":"Fix bug in cloneWithProps()","shortRevision":"1e980a146f","authoredAt":"2014-01-06T18:20:54-08:00","authorName":"Pete Hunt","revision":"1e980a146f2e500c4beaac2240b0a072eedb70d5","authorEmail":"pete@instagram.com"},"files":[{"path":"src\/core\/ReactCompositeComponent.js","status":"M"},{"path":"src\/utils\/__tests__\/cloneWithProps-test.js","status":"M"}],"body":"","parents":["57f208e4025837bcbb96a6299c68586f0ce174a0"],"patch":"diff --git a\/src\/core\/ReactCompositeComponent.js b\/src\/core\/ReactCompositeComponent.js\nindex 82d99539ec..914d3846e1 100644\n--- a\/src\/core\/ReactCompositeComponent.js\n+++ b\/src\/core\/ReactCompositeComponent.js\n@@ -1231,6 +1231,7 @@ var ReactCompositeComponent = {\n return instance;\n };\n ConvenienceConstructor.componentConstructor = Constructor;\n+ Constructor.ConvenienceConstructor = ConvenienceConstructor;\n ConvenienceConstructor.originalSpec = spec;\n \n mixSpecIntoComponent(ConvenienceConstructor, spec);\ndiff --git a\/src\/utils\/__tests__\/cloneWithProps-test.js b\/src\/utils\/__tests__\/cloneWithProps-test.js\nindex 2e96bdcdda..ecccbc2796 100644\n--- a\/src\/utils\/__tests__\/cloneWithProps-test.js\n+++ b\/src\/utils\/__tests__\/cloneWithProps-test.js\n@@ -38,7 +38,7 @@ describe('cloneWithProps', function() {\n onlyChild = require('onlyChild');\n });\n \n- it('should clone an object with new props', function() {\n+ it('should clone a DOM component with new props', function() {\n var Grandparent = React.createClass({\n render: function() {\n return

<\/Parent>;\n@@ -58,6 +58,33 @@ describe('cloneWithProps', function() {\n .toBe('child xyz');\n });\n \n+ it('should clone a composite component with new props', function() {\n+\n+ var Child = React.createClass({\n+ render: function() {\n+ return

;\n+ }\n+ });\n+\n+ var Grandparent = React.createClass({\n+ render: function() {\n+ return <\/Parent>;\n+ }\n+ });\n+ var Parent = React.createClass({\n+ render: function() {\n+ return (\n+

\n+ {cloneWithProps(onlyChild(this.props.children), {className: 'xyz'})}\n+ <\/div>\n+ );\n+ }\n+ });\n+ var component = ReactTestUtils.renderIntoDocument();\n+ expect(component.getDOMNode().childNodes[0].className)\n+ .toBe('child xyz');\n+ });\n+\n it('should warn when cloning with refs', function() {\n var Grandparent = React.createClass({\n render: function() {\n"}

dillon1000/react

Files changed