diff --git a/src/components/Nav/Nav.js b/src/components/Nav/Nav.js index 1a562d4..4a9708f 100644 --- a/src/components/Nav/Nav.js +++ b/src/components/Nav/Nav.js @@ -1,9 +1,9 @@ import React from 'react' import PropTypes from 'prop-types' +import NavBrand from './NavBrand' +import NavItem from './NavItem' import NavLeft from './NavLeft' -import NavCenter from './NavCenter' import NavRight from './NavRight' -import NavItem from './NavItem' import NavToggle from './NavToggle' import classNames from 'classnames' @@ -16,7 +16,7 @@ const Nav = ({ className, ...props }) => { - const classes = classNames('nav', { + const classes = classNames('navbar', { 'has-shadow': hasShadow }, className) @@ -35,8 +35,8 @@ Nav.defaultProps = { as: 'nav' } +Nav.Brand = NavBrand Nav.Left = NavLeft -Nav.Center = NavCenter Nav.Right = NavRight Nav.Item = NavItem Nav.Toggle = NavToggle diff --git a/src/components/Nav/NavBrand.js b/src/components/Nav/NavBrand.js new file mode 100644 index 0000000..519910d --- /dev/null +++ b/src/components/Nav/NavBrand.js @@ -0,0 +1,26 @@ +import React from 'react' +import PropTypes from 'prop-types' +import classNames from 'classnames' + +const NavBrand = ({ + as: Div, + className, + ...props +}) => { + const classes = classNames('navbar-brand', className) + + return
+} + +NavBrand.displayName = 'Nav.Brand' + +NavBrand.propTypes = { + as: PropTypes.node, + className: PropTypes.string +} + +NavBrand.defaultProps = { + as: 'div' +} + +export default NavBrand diff --git a/src/components/Nav/NavCenter.js b/src/components/Nav/NavCenter.js deleted file mode 100644 index 704792b..0000000 --- a/src/components/Nav/NavCenter.js +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react' -import PropTypes from 'prop-types' -import classNames from 'classnames' - -const NavCenter = ({ - menu, - className, - ...props -}) => { - const classes = classNames('nav-center', { - 'nav-menu': menu - }, className) - - return -} - -NavCenter.displayName = 'Nav.Center' - -NavCenter.propTypes = { - menu: PropTypes.bool, - className: PropTypes.string -} - -export default NavCenter diff --git a/src/components/Nav/NavItem.js b/src/components/Nav/NavItem.js index d3efaa3..008b8d6 100644 --- a/src/components/Nav/NavItem.js +++ b/src/components/Nav/NavItem.js @@ -6,16 +6,18 @@ const NavItem = ({ as: Item, active, tab, + hasDropdown, hiddenTablet, hiddenMobile, className, ...props }) => { - const classes = classNames('nav-item', { + const classes = classNames('navbar-item', { + 'has-dropdown': hasDropdown, 'is-active': active, - 'is-tab': tab, + 'is-hidden-mobile': hiddenMobile, 'is-hidden-tablet': hiddenTablet, - 'is-hidden-mobile': hiddenMobile + 'is-tab': tab }, className) return