Skip to content

Commit

Permalink
Merge 447c9aa into 7ebb064
Browse files Browse the repository at this point in the history
  • Loading branch information
afc163 committed Jun 14, 2016
2 parents 7ebb064 + 447c9aa commit 0339e27
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/SelectTrigger.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const SelectTrigger = React.createClass({
dropdownAlign: PropTypes.object,
visible: PropTypes.bool,
multiple: PropTypes.bool,
combobox: PropTypes.bool,
inputValue: PropTypes.string,
filterOption: PropTypes.any,
options: PropTypes.any,
Expand Down Expand Up @@ -89,7 +90,7 @@ const SelectTrigger = React.createClass({
},
render() {
const { onPopupFocus, ...props } = this.props;
const { multiple, visible, inputValue, dropdownAlign } = props;
const { multiple, combobox, visible, inputValue, dropdownAlign } = props;
const dropdownPrefixCls = this.getDropdownPrefixCls();
const popupClassName = {
[props.dropdownClassName]: !!props.dropdownClassName,
Expand All @@ -104,7 +105,7 @@ const SelectTrigger = React.createClass({
});
return (<Trigger {...props}
showAction={props.disabled ? [] : ['click']}
hideAction={props.disabled ? [] : ['blur']}
hideAction={props.disabled ? [] : [combobox ? 'blur' : 'click']}
ref="trigger"
popupPlacement="bottomLeft"
builtinPlacements={BUILT_IN_PLACEMENTS}
Expand Down

0 comments on commit 0339e27

Please sign in to comment.