fix(Header): Fix image prop (#545)

* fix(Header): Fix `image` prop * fix(Header): Fix lint * Merge branch 'master' of https://github.com/TechnologyAdvice/stardust into fix/header-prop Conflicts: test/specs/elements/Header/Header-test.js
Semantic-Org · Sep 25, 2016 · 94de48f · 94de48f
1 parent 147a70d
commit 94de48f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/src/elements/Header/Header.js b/src/elements/Header/Header.js
@@ -29,14 +29,15 @@ function Header(props) {
     'ui',
     size,
     color,
-    useKeyOnly(icon === true, 'icon'),
-    useKeyOnly(sub, 'sub'),
-    useKeyOnly(dividing, 'dividing'),
-    useKeyOnly(block, 'block'),
     useKeyOrValueAndKey(attached, 'attached'),
+    useKeyOnly(block, 'block'),
+    useKeyOnly(disabled, 'disabled'),
+    useKeyOnly(dividing, 'dividing'),
     useValueAndKey(floated, 'floated'),
+    useKeyOnly(icon === true, 'icon'),
+    useKeyOnly(image === true, 'image'),
     useKeyOnly(inverted, 'inverted'),
-    useKeyOnly(disabled, 'disabled'),
+    useKeyOnly(sub, 'sub'),
     useTextAlignProp(textAlign),
     className,
     'header',
@@ -53,7 +54,7 @@ function Header(props) {
     )
   }
 
-  if (image || icon && typeof icon !== 'boolean') {
+  if ((image && typeof image !== 'boolean') || (icon && typeof icon !== 'boolean')) {
     return (
       <ElementType {...rest} className={classes}>
         {createIcon(icon) || createImage(image)}
@@ -125,12 +126,15 @@ Header.propTypes = {
 
   /** Add an image by img src or pass an <Image />. */
   image: customPropTypes.every([
-    customPropTypes.disallow(['children', 'icon']),
-    PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.element,
-      PropTypes.object,
-    ]),
+    customPropTypes.disallow(['icon']),
+    customPropTypes.givenProps(
+      { children: PropTypes.node.isRequired },
+      PropTypes.bool,
+    ),
+    customPropTypes.givenProps(
+      { image: PropTypes.oneOfType([PropTypes.string, PropTypes.element, PropTypes.object]) },
+      customPropTypes.disallow(['children']),
+    ),
   ]),
 
   /** Color of the header. */

diff --git a/test/specs/elements/Header/Header-test.js b/test/specs/elements/Header/Header-test.js
@@ -43,6 +43,17 @@ describe('Header', () => {
     })
   })
 
+  describe('image', () => {
+    it('adds an image class when true', () => {
+      shallow(<Header image />)
+        .should.have.className('image')
+    })
+    it('does not add an Image when true', () => {
+      shallow(<Header image />)
+        .should.not.have.descendants('Image')
+    })
+  })
+
   describe('content', () => {
     it('adds child text', () => {
       shallow(<Header content='foo' />)