Merge branch 'master' of github.com:emortlock/tailwind-react

Author: emortlock

src/header/NavBrand.jsx

@@ -5,13 +5,14 @@ import { withTheme } from '../theme'
 import { BaseComponent } from '../tailwind'
 import { filterProps } from '../utils'
 
-const NavBrand = ({ theme, is, children, ...rest }) => (
+const NavBrand = ({ theme, header: { style }, is, children, ...rest }) => (
   <BaseComponent
     flex={[true, 'no-shrink']}
     items="center"
     h={12}
     is={is}
     m={{ r: theme.spacing.lg }}
+    text={style.text}
     {...filterProps(rest, ['header'])}
   >
     {children}
@@ -22,11 +23,15 @@ NavBrand.propTypes = {
   theme: PropTypes.shape({}).isRequired,
   is: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.object]),
   children: PropTypes.node,
+  header: PropTypes.shape({
+    style: PropTypes.object.isRequired,
+  }),
 }
 
 NavBrand.defaultProps = {
   is: 'div',
   children: undefined,
+  header: {},
 }
 
 export { NavBrand as component }

src/header/__tests__/NavBrand.jsx

@@ -5,7 +5,10 @@ import { component as NavBrand } from '../NavBrand'
 import { defaultTheme } from '../../theme'
 
 const setup = (testProps = {}) => {
-  const props = Object.assign({ theme: defaultTheme }, testProps)
+  const props = Object.assign(
+    { theme: defaultTheme, header: { style: { text: 'white' } } },
+    testProps,
+  )
 
   const wrapper = shallow(<NavBrand {...props}>Tailwind React</NavBrand>)
 

src/header/__tests__/__snapshots__/NavBrand.jsx.snap

@@ -16,6 +16,7 @@ exports[`NavBrand renders matching snapshot 1`] = `
       "r": 8,
     }
   }
+  text="white"
 >
   Tailwind React
 </BaseComponent>