Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ var Dropdown = function (_Component) {
}, {
key: 'parseValue',
value: function parseValue(value, options) {
var option = undefined;
var option = void 0;

if (typeof value === 'string') {
for (var i = 0, num = options.length; i < num; i++) {
Expand All @@ -123,8 +123,7 @@ var Dropdown = function (_Component) {
var newState = {
selected: {
value: value,
label: label
},
label: label },
isOpen: false
};
this.fireChangeEvent(newState);
Expand All @@ -147,8 +146,9 @@ var Dropdown = function (_Component) {
value = option.label || option;
}
var label = option.label || option.value || option;
var isSelected = value === this.state.selected.value || value === this.state.selected;

var classes = (_classes = {}, _defineProperty(_classes, this.props.baseClassName + '-option', true), _defineProperty(_classes, option.className, !!option.className), _defineProperty(_classes, 'is-selected', value === this.state.selected.value || value === this.state.selected), _classes);
var classes = (_classes = {}, _defineProperty(_classes, this.props.baseClassName + '-option', true), _defineProperty(_classes, option.className, !!option.className), _defineProperty(_classes, 'is-selected', isSelected), _classes);

var optionClass = (0, _classnames2.default)(classes);

Expand All @@ -158,7 +158,9 @@ var Dropdown = function (_Component) {
key: value,
className: optionClass,
onMouseDown: this.setValue.bind(this, value, label),
onClick: this.setValue.bind(this, value, label) },
onClick: this.setValue.bind(this, value, label),
role: 'option',
'aria-selected': isSelected ? 'true' : 'false' },
label
);
}
Expand All @@ -184,7 +186,7 @@ var Dropdown = function (_Component) {

return _react2.default.createElement(
'div',
{ className: baseClassName + '-group', key: option.name },
{ className: baseClassName + '-group', key: option.name, role: 'listbox', tabIndex: '-1' },
groupTitle,
_options
);
Expand Down Expand Up @@ -247,7 +249,7 @@ var Dropdown = function (_Component) {
);
var menu = this.state.isOpen ? _react2.default.createElement(
'div',
{ className: menuClass },
{ className: menuClass, 'aria-expanded': 'true' },
this.buildMenu()
) : null;

Expand All @@ -256,7 +258,7 @@ var Dropdown = function (_Component) {
{ className: dropdownClass },
_react2.default.createElement(
'div',
{ className: controlClass, onMouseDown: this.handleMouseDown.bind(this), onTouchEnd: this.handleMouseDown.bind(this) },
{ className: controlClass, onMouseDown: this.handleMouseDown.bind(this), onTouchEnd: this.handleMouseDown.bind(this), 'aria-haspopup': 'listbox' },
value,
_react2.default.createElement(
'div',
Expand Down
Loading