Skip to content

Commit

Permalink
Merge pull request #403 from jkruder/component-doc-desc-types
Browse files Browse the repository at this point in the history
Fixes warning displayed in doc/example about invalid prop type #401
  • Loading branch information
mmrtnz committed Mar 9, 2015
2 parents 73a9079 + d25425c commit bb80245
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion docs/src/app/components/component-doc.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ var ComponentDoc = React.createClass({

propTypes: {
code: React.PropTypes.string.isRequired,
desc: React.PropTypes.string,
desc: React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.element
]),
name: React.PropTypes.string.isRequired,
componentInfo: React.PropTypes.array.isRequired
},
Expand Down

0 comments on commit bb80245

Please sign in to comment.