Skip to content

Commit

Permalink
(fix) Loader Semantic-Org#180
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Fedyashov committed Jul 8, 2016
1 parent 297bed8 commit 8590286
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/elements/Loader/Loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Loader.propTypes = {
/** Show that the Loader is inline. */
inline: PropTypes.oneOfType([
PropTypes.bool,
PropTypes.string,
PropTypes.oneOf(Loader._meta.props.inline),
]),

/** Size of the Loader. */
Expand All @@ -67,7 +67,7 @@ Loader.propTypes = {
/** Text content of the Loader. Mutually exclusive with the children prop. */
text: customPropTypes.all([
customPropTypes.mutuallyExclusive(['children']),
PropTypes.string,
PropTypes.node,
]),
}

Expand Down
1 change: 1 addition & 0 deletions test/specs/elements/Loader/Loader-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ describe('Loader', () => {
common.propKeyOrValueToClassName(Loader, 'inline')
common.propKeyOnlyToClassName(Loader, 'inverted')
common.propKeyOnlyToClassName(Loader, 'text')
common.propValueOnlyToClassName(Loader, 'size')
common.rendersChildren(Loader)

it('renders an div element', () => {
Expand Down

0 comments on commit 8590286

Please sign in to comment.