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

web: components: Fixed getSelected undefined

Browse Source
This commit is contained in:
Alexey Safronov 2019-08-09 12:19:07 +03:00
parent f657b76631
commit 74cf0a3864
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,12 +53,12 @@ class ComboBox extends React.PureComponent {
this.ref = React.createRef();
const selectedItem = this.findSelected();
const selectedItem = this.getSelected();
this.state = {
isOpen: props.opened,
boxLabel: selectedItem.label,
boxIcon: selectedItem.icon,
boxLabel: selectedItem && selectedItem.label,
boxIcon: selectedItem && selectedItem.icon,
options: props.options
};
@ -100,13 +100,19 @@ class ComboBox extends React.PureComponent {
handleAnyClick(false, this.handleClick);
}
findSelected = () => {
getSelected = () => {
const selectedItem = this.props.options.find(x => x.key === this.props.selectedOption)
|| this.props.options[0];
return selectedItem;
}
getSelectedLabel = () => {
const selectedItem = this.getSelected();
return selectedItem ? selectedItem.label : "1-1";
}
componentDidUpdate(prevProps, prevState) {
if (this.props.opened !== prevProps.opened) {
this.toggle(this.props.opened);
@ -117,7 +123,7 @@ class ComboBox extends React.PureComponent {
}
if (this.props.options.length !== prevProps.options.length) { //TODO: Move options from state
const label = this.findSelected().label;
const label = this.getSelectedLabel();
this.setState({
options: this.props.options,
boxLabel: label
@ -125,7 +131,7 @@ class ComboBox extends React.PureComponent {
}
if (this.props.selectedOption !== prevProps.selectedOption) {
const label = this.findSelected().label;
const label = this.getSelectedLabel();
this.setState({ boxLabel: label });
}
}