This repository was archived by the owner on May 13, 2026. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -18,11 +18,12 @@ class Nav extends React.Component {
1818 classes [ tbsUtils . prefix ( this . props , 'justified' ) ] = this . props . justified ;
1919
2020
21- if ( this . props . navbar ) {
21+ if ( isNavbar ) {
2222 let bsClass = this . context . $bs_navbar_bsClass || 'navbar' ;
23+ const navbarRight = this . props . right != null ? this . props . right : this . props . pullRight ;
2324
2425 classes [ tbsUtils . prefix ( { bsClass } , 'nav' ) ] = true ;
25- classes [ tbsUtils . prefix ( { bsClass } , 'right' ) ] = isNavbar ;
26+ classes [ tbsUtils . prefix ( { bsClass } , 'right' ) ] = navbarRight ;
2627 } else {
2728 classes [ 'pull-right' ] = this . props . pullRight ;
2829 }
@@ -119,7 +120,7 @@ Nav.propTypes = {
119120 navbar : React . PropTypes . bool ,
120121 eventKey : React . PropTypes . any ,
121122 pullRight : React . PropTypes . bool ,
122- right : React . PropTypes . bool
123+ right : deprecated ( React . PropTypes . bool , 'Use the `pullRight` prop instead' )
123124} ;
124125
125126Nav . contextTypes = {
Original file line number Diff line number Diff line change @@ -186,7 +186,7 @@ describe('Navbar', () => {
186186 expect ( collapse . context . $bs_navbar_navExpanded ) . to . equal ( true ) ;
187187 } ) ;
188188
189- it . only ( 'Should wire the toggle to the collapse' , ( ) => {
189+ it ( 'Should wire the toggle to the collapse' , ( ) => {
190190 let instance = ReactTestUtils . renderIntoDocument (
191191 < Navbar >
192192 < Navbar . Header >
You can’t perform that action at this time.
0 commit comments