diff --git a/web/ASC.Web.Components/src/components/combobox/index.js b/web/ASC.Web.Components/src/components/combobox/index.js index 1cf6e74fc7..64a17b7573 100644 --- a/web/ASC.Web.Components/src/components/combobox/index.js +++ b/web/ASC.Web.Components/src/components/combobox/index.js @@ -98,10 +98,11 @@ class ComboBox extends React.PureComponent { {this.state.options.map((option, index) => { - option.onClick && option.onClick(e); + onClick={() => { + option.onClick && option.onClick(); this.toggle(!this.state.isOpen); this.setState({ boxLabel: option.label }); + this.props.onSelect && this.props.onSelect(option); }} /> )} @@ -116,7 +117,8 @@ ComboBox.propTypes = { isDisabled: PropTypes.bool, withBorder: PropTypes.bool, selectedIndex: PropTypes.number, - options: PropTypes.array + options: PropTypes.array, + onSelect: PropTypes.func } ComboBox.defaultProps = { diff --git a/web/ASC.Web.Components/src/components/paging/index.js b/web/ASC.Web.Components/src/components/paging/index.js index e23c811597..f9a8b3bed0 100644 --- a/web/ASC.Web.Components/src/components/paging/index.js +++ b/web/ASC.Web.Components/src/components/paging/index.js @@ -39,13 +39,13 @@ const Paging = props => {