Commit ab97d856 by Ari Rizzitano

fix up classes

parent 30dafa9a
...@@ -62,13 +62,13 @@ class Dropdown extends React.Component { ...@@ -62,13 +62,13 @@ class Dropdown extends React.Component {
handleMenuKeyDown(e) { handleMenuKeyDown(e) {
e.preventDefault(); e.preventDefault();
if (this.isTriggerKey('CLOSE_MENU', e.key)) { if (Dropdown.isTriggerKey('CLOSE_MENU', e.key)) {
this.toggle(); this.toggle();
} else if (this.isTriggerKey('NAVIGATE_DOWN', e.key)) { } else if (Dropdown.isTriggerKey('NAVIGATE_DOWN', e.key)) {
this.setState({ this.setState({
focusIndex: (this.state.focusIndex + 1) % this.props.menuItems.length, focusIndex: (this.state.focusIndex + 1) % this.props.menuItems.length,
}); });
} else if (this.isTriggerKey('NAVIGATE_UP', e.key)) { } else if (Dropdown.isTriggerKey('NAVIGATE_UP', e.key)) {
this.setState({ this.setState({
focusIndex: ((this.state.focusIndex - 1) + this.props.menuItems.length) % focusIndex: ((this.state.focusIndex - 1) + this.props.menuItems.length) %
this.props.menuItems.length, this.props.menuItems.length,
...@@ -77,9 +77,9 @@ class Dropdown extends React.Component { ...@@ -77,9 +77,9 @@ class Dropdown extends React.Component {
} }
handleToggleKeyDown(e) { handleToggleKeyDown(e) {
if (!this.state.open && this.isTriggerKey('OPEN_MENU', e.key)) { if (!this.state.open && Dropdown.isTriggerKey('OPEN_MENU', e.key)) {
this.toggle(); this.toggle();
} else if (this.state.open && this.isTriggerKey('CLOSE_MENU', e.key)) { } else if (this.state.open && Dropdown.isTriggerKey('CLOSE_MENU', e.key)) {
this.toggle(); this.toggle();
this.toggleElem.focus(); this.toggleElem.focus();
} }
...@@ -155,18 +155,20 @@ Dropdown.propTypes = { ...@@ -155,18 +155,20 @@ Dropdown.propTypes = {
label: PropTypes.string, label: PropTypes.string,
href: PropTypes.string, href: PropTypes.string,
})).isRequired, })).isRequired,
classes: PropTypes.shape().optional, classes: PropTypes.shape,
}; };
Dropdown.defaultProps = { Dropdown.defaultProps = {
classes: { classes: {
dropdown: 'dropdown', dropdown: 'dropdown',
active: 'active', active: 'active',
toggle: 'btn dropdown-toggle', toggle: 'btn btn-secondary dropdown-toggle',
screenreader: 'sr-only', screenreader: 'sr-only',
show: 'show', show: 'show',
menu: 'dropdown-menu', menu: 'dropdown-menu',
menuActive: null,
menuItem: 'dropdown-item', menuItem: 'dropdown-item',
menuWrapper: null,
}, },
}; };
......
...@@ -113,7 +113,7 @@ storiesOf('Dropdown', module) ...@@ -113,7 +113,7 @@ storiesOf('Dropdown', module)
classes={{ classes={{
dropdown: 'dropdown', dropdown: 'dropdown',
active: 'active', active: 'active',
toggle: 'btn dropdown-toggle', toggle: 'btn btn-secondary border-0 dropdown-toggle',
screenreader: 'sr-only', screenreader: 'sr-only',
show: 'show', show: 'show',
menu: 'dropdown-menu', menu: 'dropdown-menu',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment