IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: components: Fix update options in Combobox

Browse Source
This commit is contained in:
Alexey Safronov 2019-08-09 11:18:51 +03:00
parent bb810be053
commit bf78784af2
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/ASC.Web.Components/src/components/combobox/index.js
View File

@ -53,8 +53,7 @@ class ComboBox extends React.PureComponent {
this.ref = React.createRef();
const selectedItem = this.props.options.find(x => x.key === this.props.selectedOption)
|| this.props.options[0];
const selectedItem = this.findSelected();
this.state = {
isOpen: props.opened,
@ -101,6 +100,13 @@ class ComboBox extends React.PureComponent {
handleAnyClick(false, this.handleClick);
}
findSelected = () => {
const selectedItem = this.props.options.find(x => x.key === this.props.selectedOption)
|| this.props.options[0];
return selectedItem;
}
componentDidUpdate(prevProps, prevState) {
if (this.props.opened !== prevProps.opened) {
this.toggle(this.props.opened);
@ -110,8 +116,16 @@ class ComboBox extends React.PureComponent {
handleAnyClick(this.state.isOpen, this.handleClick);
}
if (this.props.options.length !== prevProps.options.length) { //TODO: Move options from state
const label = this.findSelected().label;
this.setState({
options: this.props.options,
boxLabel: label
});
}
if (this.props.selectedOption !== prevProps.selectedOption) {
const label = this.props.options.find(x => x.key === this.props.selectedOption).label;
const label = this.findSelected().label;
this.setState({ boxLabel: label });
}
}