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

Web: Files: fixed Shared selection

Browse Source
This commit is contained in:
Nikita Gopienko 2022-09-28 16:18:02 +03:00
parent 56c664c9bb
commit af819055be
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/client/src/components/FolderTreeBody/TreeFolders.js
View File

@ -417,12 +417,14 @@ class TreeFolders extends React.Component {
}); });
}; };
onExpand = (expandedKeys, treeNode) => { onExpand = (expandedKeys, treeNode, isRoom = false) => {
this.expand = true; this.expand = true;
if (treeNode.node && !treeNode.node.children) { if (treeNode.node && !treeNode.node.children) {
if (treeNode.expanded) { if (treeNode.expanded) {
this.onLoadData(treeNode.node, true); this.onLoadData(treeNode.node, true);
} }
} else if (isRoom) {
this.props.onSelect([treeNode.node.children[0].id], treeNode);
} }
this.props.setExpandedPanelKeys(expandedKeys); this.props.setExpandedPanelKeys(expandedKeys);
@ -435,7 +437,8 @@ class TreeFolders extends React.Component {
newExpandedPanelKeys.push(folder[0]); newExpandedPanelKeys.push(folder[0]);
if (folder[0] == roomsFolderId) { if (folder[0] == roomsFolderId) {
this.onExpand(newExpandedPanelKeys, treeNode); this.onExpand(newExpandedPanelKeys, treeNode, true);
return; return;
} }
@ -553,7 +556,6 @@ export default inject(
setTreeFolders, setTreeFolders,
myFolderId, myFolderId,
commonFolderId, commonFolderId,
isPrivacyFolder,
setExpandedPanelKeys, setExpandedPanelKeys,
getSubfolders, getSubfolders,
setIsLoadingNodes, setIsLoadingNodes,
@ -569,7 +571,6 @@ export default inject(
currentId: id, currentId: id,
myId: myFolderId, myId: myFolderId,
commonId: commonFolderId, commonId: commonFolderId,
isPrivacy: isPrivacyFolder,
draggableItems: dragging ? selection : null, draggableItems: dragging ? selection : null,
treeFolders, treeFolders,
selectedKeys: useDefaultSelectedKeys selectedKeys: useDefaultSelectedKeys