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

Web: Files: fixed dragging

Browse Source
This commit is contained in:
Nikita Gopienko 2021-06-29 13:36:04 +03:00
parent 73cdaad3fb
commit 9870859fe1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Client/src/HOCs/withFileActions.js
View File

@ -209,7 +209,7 @@ export default function withFileActions(WrappedFileItem) {
render() {
const {
item,
isRecycleBin,
isTrashFolder,
draggable,
canShare,
isPrivacy,
@ -227,7 +227,7 @@ export default function withFileActions(WrappedFileItem) {
const isEdit =
!!actionType && actionId === id && fileExst === actionExtension;
const isDragging = isFolder && access < 2 && !isRecycleBin;
const isDragging = isFolder && access < 2 && !isTrashFolder && !isPrivacy;
let className = isDragging ? " droppable" : "";
if (draggable) className += " draggable not-selectable";

5
products/ASC.Files/Client/src/pages/Home/index.js
View File

@ -226,6 +226,7 @@ class PureHome extends React.Component {
fileActionId,
firstLoad,
isHeaderVisible,
isPrivacyFolder,
isRecycleBinFolder,
primaryProgressDataVisible,
@ -251,7 +252,7 @@ class PureHome extends React.Component {
withBodyScroll
withBodyAutoFocus={!isMobile}
uploadFiles
onDrop={isRecycleBinFolder ? null : this.onDrop}
onDrop={isRecycleBinFolder || isPrivacyFolder ? null : this.onDrop}
setSelections={this.props.setSelections}
onMouseMove={this.onMouseMove}
showPrimaryProgressBar={primaryProgressDataVisible}
@ -330,6 +331,7 @@ export default inject(
const { id } = fileActionStore;
const {
isRecycleBinFolder,
isPrivacyFolder,
expandedKeys,
setExpandedKeys,
} = treeFoldersStore;
@ -372,6 +374,7 @@ export default inject(
uploaded,
converted,
isRecycleBinFolder,
isPrivacyFolder,
isVisitor: auth.userStore.user.isVisitor,
expandedKeys,