Skip to content

Commit d1213c8

Browse files
author
Alex Terentiev
committed
fix of #1170
1 parent 0c4313c commit d1213c8

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/controls/treeView/TreeItem.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export default class TreeItem extends React.Component<ITreeItemProps, ITreeItemS
106106
let active = props.activeItems.filter(item => item.key === props.treeItem.key);
107107

108108
let expanded = props.defaultExpanded;
109-
if (!expanded && props.nodesToExpand.indexOf(props.treeItem.key) != -1) {
109+
if (!expanded && (props.nodesToExpand && props.nodesToExpand.indexOf(props.treeItem.key) !== -1)) {
110110
expanded = true;
111111
}
112112

@@ -149,15 +149,21 @@ export default class TreeItem extends React.Component<ITreeItemProps, ITreeItemS
149149
* @param nextContext
150150
*/
151151
public componentWillReceiveProps(nextProps: ITreeItemProps): void {
152+
const {
153+
selectionMode,
154+
nodesToExpand,
155+
treeItem
156+
} = this.props;
152157
// If selection is turned on, set the item as selected
153-
if (this.props.selectionMode != TreeViewSelectionMode.None) {
154-
let active = nextProps.activeItems.filter(item => item.key === this.props.treeItem.key);
158+
if (selectionMode != TreeViewSelectionMode.None) {
159+
160+
let active = nextProps.activeItems.filter(item => item.key === treeItem.key);
155161

156162
let _isExpanded:boolean=this.state.expanded;
157-
if(!_isExpanded && this.props.nodesToExpand.indexOf(this.props.treeItem.key) != -1) {
163+
if(!_isExpanded && nodesToExpand?.indexOf(this.props.treeItem.key) != -1) {
158164
_isExpanded = true;
159165
}
160-
if(_isExpanded && this.props.nodesToExpand.indexOf(this.props.treeItem.key) == -1){
166+
if(_isExpanded && nodesToExpand?.indexOf(this.props.treeItem.key) == -1){
161167
_isExpanded=false;
162168
}
163169

0 commit comments

Comments
 (0)