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

Web: Files: added expandedKeys prop

Browse Source
This commit is contained in:
Nikita Gopienko 2020-03-13 18:28:56 +03:00
parent 7b346ed102
commit 390f107572
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
View File

@ -160,13 +160,8 @@ class TreeFolders extends React.Component {
});
};
componentDidUpdate() {
const { expandedKeys } = this.props;
this.ref.current.setState({ expandedKeys });
}
render() {
const { selectedKeys, fakeNewDocuments } = this.props;
const { selectedKeys, fakeNewDocuments, expandedKeys } = this.props;
const { treeData } = this.state;
//console.log("TreeFolders render", this.props);
@ -185,6 +180,7 @@ class TreeFolders extends React.Component {
badgeLabel={fakeNewDocuments}
onBadgeClick={() => console.log("onBadgeClick")}
loadData={this.onLoadData}
expandedKeys={expandedKeys}
>
{this.getItems(treeData)}
</TreeMenu>

11
products/ASC.Files/Client/src/components/Article/Body/index.js
View File

@ -17,7 +17,7 @@ class ArticleBodyContent extends React.Component {
}
}
componentDidUpdate(prevProps) {
componentDidUpdate(prevProps, prevState) {
const { treeFolders } = this.props.filter;
if (!utils.array.isArrayEqual(treeFolders, this.state.expandedKeys)) {
@ -81,11 +81,11 @@ class ArticleBodyContent extends React.Component {
return true;
}
if (fakeNewDocuments !== nextProps.fakeNewDocuments) {
if (currentModule[0] !== nextProps.currentModule[0]) {
return true;
}
if (currentModule !== nextProps.currentModule) {
if (fakeNewDocuments !== nextProps.fakeNewDocuments) {
return true;
}
@ -94,6 +94,9 @@ class ArticleBodyContent extends React.Component {
) {
return true;
}
if (nextState.expandedKeys.length !== this.state.expandedKeys.length) {
return true;
}
return false;
}*/
@ -108,7 +111,7 @@ class ArticleBodyContent extends React.Component {
setFilter
} = this.props;
//console.log("TreeFolders render", this.props);
//console.log("Article Body render", this.props, this.state.expandedKeys);
return (
<TreeFolders
selectedKeys={selectedKeys}