Preserve manual selection after filtering

Summary:
Before this diff filtering and manual expanding / collapsing could not be combined, this diff fixes that
{F236120000}

Reviewed By: jonathoma

Differential Revision: D21381515

fbshipit-source-id: b0662fcbad3b0dfcb0bfe846e3c05a3a78294dde
This commit is contained in:
Michel Weststrate
2020-05-05 07:56:57 -07:00
committed by Facebook GitHub Bot
parent b7775ef227
commit acc0e7c2e0
3 changed files with 34 additions and 17 deletions

View File

@@ -57,6 +57,8 @@ type ManagedDataInspectorProps = {
type ManagedDataInspectorState = {
expanded: DataInspectorExpanded;
filterExpanded: DataInspectorExpanded;
userExpanded: DataInspectorExpanded;
filter: string;
};
@@ -76,6 +78,8 @@ export default class ManagedDataInspector extends PureComponent<
super(props, context);
this.state = {
expanded: {},
userExpanded: {},
filterExpanded: {},
filter: '',
};
}
@@ -90,8 +94,9 @@ export default class ManagedDataInspector extends PureComponent<
if (!nextProps.filter) {
return {
filter: '',
filterExpanded: {},
// reset expanded when removing filter
expanded: currentState.filter ? {} : currentState.expanded,
expanded: currentState.userExpanded,
};
}
@@ -130,20 +135,30 @@ export default class ManagedDataInspector extends PureComponent<
if (filter.length >= 2) {
walk(nextProps.data, []);
}
const expanded: Record<string, boolean> = {};
const filterExpanded: Record<string, boolean> = {};
paths.forEach((path) => {
for (let i = 1; i < path.length; i++)
expanded[path.slice(0, i).join('.')] = true;
filterExpanded[path.slice(0, i).join('.')] = true;
});
return {
expanded,
filterExpanded,
expanded: {...currentState.userExpanded, ...filterExpanded},
filter,
};
}
onExpanded = (expanded: DataInspectorExpanded) => {
this.setState({expanded});
onExpanded = (path: string, isExpanded: boolean) => {
this.setState({
userExpanded: {
...this.state.userExpanded,
[path]: isExpanded,
},
expanded: {
...this.state.expanded,
[path]: isExpanded,
},
});
};
render() {