Skip to content

Nav updates #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddywashere merged 2 commits into from
Jan 5, 2017
Merged

Nav updates #265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f979aae
feat(Nav): update navbar prop class value
eddywashere Jan 5, 2017
3ee55f1
feat(Navbar): rename dark prop to inverse, add toggleable size prop
eddywashere Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
feat(Navbar): rename dark prop to inverse, add toggleable size prop
  • Loading branch information
@eddywashere
eddywashere committed Jan 5, 2017
commit 3ee55f19792bd803d937837f4599ff0ee88974fb
3 changes: 2 additions & 1 deletion docs/lib/Components/NavbarPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ export default class NavsPage extends React.Component {
<PrismCode className="language-jsx">
{`Navbar.propTypes = {
light: PropTypes.bool,
dark: PropTypes.bool,
inverse: PropTypes.bool,
full: PropTypes.bool,
fixed: PropTypes.string,
color: PropTypes.string,
role: PropTypes.string,
toggleable: PropTypes.string,
tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string])
// pass in custom element to use
}`}
Expand Down
12 changes: 8 additions & 4 deletions src/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,30 @@ import { mapToCssModules } from './utils';

const propTypes = {
light: PropTypes.bool,
dark: PropTypes.bool,
inverse: PropTypes.bool,
full: PropTypes.bool,
fixed: PropTypes.string,
color: PropTypes.string,
role: PropTypes.string,
tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
className: PropTypes.string,
cssModule: PropTypes.object,
toggleable: PropTypes.string,
};

const defaultProps = {
tag: 'nav',
role: 'navigation'
role: 'navigation',
toggleable: '',
};

const Navbar = (props) => {
const {
toggleable,
className,
cssModule,
light,
dark,
inverse,
full,
fixed,
color,
Expand All @@ -35,9 +38,10 @@ const Navbar = (props) => {
const classes = mapToCssModules(classNames(
className,
'navbar',
toggleable === '' ? 'navbar-toggleable' : `navbar-toggleable-${toggleable}`,
{
'navbar-light': light,
'navbar-dark': dark,
'navbar-inverse': inverse,
[`bg-${color}`]: color,
'navbar-full': full,
[`navbar-fixed-${fixed}`]: fixed
Expand Down
17 changes: 14 additions & 3 deletions src/__tests__/Navbar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ describe('Navbar', () => {
it('should render .navbar markup', () => {
const wrapper = shallow(<Navbar />);

expect(wrapper.html()).toBe('<nav role="navigation" class="navbar"></nav>');
expect(wrapper.html()).toBe('<nav role="navigation" class="navbar navbar-toggleable"></nav>');
});

it('should render custom tag', () => {
const wrapper = shallow(<Navbar tag="div" />);

expect(wrapper.html()).toBe('<div role="navigation" class="navbar"></div>');
expect(wrapper.html()).toBe('<div role="navigation" class="navbar navbar-toggleable"></div>');
});

it('sholid render children', () => {
const wrapper = shallow(<Navbar>Children</Navbar>);

expect(wrapper.html()).toBe('<nav role="navigation" class="navbar">Children</nav>');
expect(wrapper.html()).toBe('<nav role="navigation" class="navbar navbar-toggleable">Children</nav>');
});

it('should pass additional classNames', () => {
Expand All @@ -27,4 +27,15 @@ describe('Navbar', () => {
expect(wrapper.hasClass('extra')).toBe(true);
expect(wrapper.hasClass('navbar')).toBe(true);
});

it('should render prop based classes', () => {
const wrapper = shallow(<Navbar light inverse toggleable="sm" color="success" full fixed="top" />);

expect(wrapper.hasClass('bg-success')).toBe(true);
expect(wrapper.hasClass('navbar')).toBe(true);
expect(wrapper.hasClass('navbar-toggleable-sm')).toBe(true);
expect(wrapper.hasClass('navbar-light')).toBe(true);
expect(wrapper.hasClass('navbar-inverse')).toBe(true);
expect(wrapper.hasClass('navbar-fixed-top')).toBe(true);
});
});