{"commit":{"authorName":"cpojer","authorEmail":"christoph.pojer@gmail.com","revision":"b713c2c6968d7513305ea5285825698c2eab90c5","authoredAt":"2014-01-09T11:39:25-08:00","shortRevision":"b713c2c696","subject":"Add PropTypes.component to demand a single React component."},"files":[{"path":"src\/core\/ReactPropTypes.js","status":"M"},{"path":"src\/core\/__tests__\/ReactPropTypes-test.js","status":"M"}],"parents":["f47238be419160e9ec44890de4e7bd58a7ac99f3"],"body":"","patch":"diff --git a\/src\/core\/ReactPropTypes.js b\/src\/core\/ReactPropTypes.js\nindex 6f85c03a7f..230852a076 100644\n--- a\/src\/core\/ReactPropTypes.js\n+++ b\/src\/core\/ReactPropTypes.js\n@@ -86,7 +86,8 @@ var Props = {\n \n instanceOf: createInstanceTypeChecker,\n \n- renderable: createRenderableTypeChecker()\n+ renderable: createRenderableTypeChecker(),\n+ component: createComponentTypeChecker()\n \n };\n \n@@ -200,6 +201,25 @@ function createRenderableTypeChecker() {\n return createChainableTypeChecker(validateRenderableType);\n }\n \n+function createComponentTypeChecker() {\n+ function validateComponentType(\n+ shouldThrow, propValue, propName, componentName, location\n+ ) {\n+ var isValid = ReactComponent.isValidComponent(propValue);\n+ if (!shouldThrow) {\n+ return isValid;\n+ }\n+ invariant(\n+ isValid,\n+ 'Invalid %s `%s` supplied to `%s`, expected a React component.',\n+ ReactPropTypeLocationNames[location],\n+ propName,\n+ componentName\n+ );\n+ }\n+ return createChainableTypeChecker(validateComponentType);\n+}\n+\n function createChainableTypeChecker(validate) {\n function checkType(\n isRequired, shouldThrow, props, propName, componentName, location\ndiff --git a\/src\/core\/__tests__\/ReactPropTypes-test.js b\/src\/core\/__tests__\/ReactPropTypes-test.js\nindex 9eeb48f583..6157ed1dd8 100644\n--- a\/src\/core\/__tests__\/ReactPropTypes-test.js\n+++ b\/src\/core\/__tests__\/ReactPropTypes-test.js\n@@ -19,6 +19,8 @@\n \n \"use strict\";\n \n+var ReactTestUtils;\n+\n var Props = require('ReactPropTypes');\n var React = require('React');\n var ReactPropTypeLocations = require('ReactPropTypeLocations');\n@@ -46,6 +48,8 @@ var MyComponent = React.createClass({\n describe('Primitive Types', function() {\n beforeEach(function() {\n require('mock-modules').dumpCache();\n+\n+ ReactTestUtils = require('ReactTestUtils');\n });\n \n it(\"should throw for invalid strings\", function() {\n@@ -170,6 +174,56 @@ describe('Instance Types', function() {\n });\n });\n \n+describe('Component Type', function() {\n+ it('should support components', () => {\n+ expect(typeCheck(Props.component,

)).not.toThrow();\n+ });\n+\n+ it('should not support multiple components or scalar values', () => {\n+ [[

], 123, 'foo', false].forEach((value) => {\n+ expect(typeCheck(Props.component, value)).toThrow();\n+ });\n+ });\n+\n+ var Component = React.createClass({\n+ propTypes: {\n+ children: Props.component.isRequired\n+ },\n+\n+ render: function() {\n+ return

{this.props.children}<\/div>;\n+ }\n+ });\n+\n+ it('should be able to define a single child as children', () => {\n+ expect(() => {\n+ var instance =\n+ \n+

\n+ <\/Component>;\n+ ReactTestUtils.renderIntoDocument(instance);\n+ }).not.toThrow();\n+ });\n+\n+ it('should throw when passing more than one child', () => {\n+ expect(() => {\n+ var instance =\n+ \n+

\n+

\n+ <\/Component>;\n+ ReactTestUtils.renderIntoDocument(instance);\n+ }).toThrow();\n+ });\n+\n+ it('should throw when passing no children and isRequired is set', () => {\n+ expect(() => {\n+ var instance = ;\n+ ReactTestUtils.renderIntoDocument(instance);\n+ }).toThrow();\n+ });\n+});\n+\n describe('Union Types', function() {\n beforeEach(function() {\n require('mock-modules').dumpCache();\n"}

dillon1000/react

Files changed