Web: Files: fixed dragging thirdparty folder
This commit is contained in:
parent
4f0edbe593
commit
4c454c7ad1
@ -60,7 +60,7 @@ export default function withFileActions(WrappedFileItem) {
|
|||||||
isActive,
|
isActive,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
const { id, isFolder } = item;
|
const { id, isFolder, isThirdPartyFolder } = item;
|
||||||
|
|
||||||
const notSelectable = e.target.classList.contains("not-selectable");
|
const notSelectable = e.target.classList.contains("not-selectable");
|
||||||
const isFileName = e.target.classList.contains("item-file-name");
|
const isFileName = e.target.classList.contains("item-file-name");
|
||||||
@ -72,7 +72,12 @@ export default function withFileActions(WrappedFileItem) {
|
|||||||
)
|
)
|
||||||
return e;
|
return e;
|
||||||
|
|
||||||
if (window.innerWidth < 1025 || notSelectable || isMobile) {
|
if (
|
||||||
|
window.innerWidth < 1025 ||
|
||||||
|
notSelectable ||
|
||||||
|
isMobile ||
|
||||||
|
isThirdPartyFolder
|
||||||
|
) {
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,10 @@ const StyledSimpleFilesRow = styled(Row)`
|
|||||||
${(props) => (props.checked || props.isActive) && checkedStyle};
|
${(props) => (props.checked || props.isActive) && checkedStyle};
|
||||||
${(props) => props.dragging && draggingStyle}
|
${(props) => props.dragging && draggingStyle}
|
||||||
position: unset;
|
position: unset;
|
||||||
cursor: ${(props) => props.checked && `url(images/cursor.palm.svg), auto`};
|
cursor: ${(props) =>
|
||||||
|
!props.isThirdPartyFolder &&
|
||||||
|
(props.checked || props.isActive) &&
|
||||||
|
"url(images/cursor.palm.svg), auto"};
|
||||||
margin-top: -2px;
|
margin-top: -2px;
|
||||||
|
|
||||||
${(props) =>
|
${(props) =>
|
||||||
@ -160,6 +163,7 @@ const SimpleFilesRow = (props) => {
|
|||||||
contextButtonSpacerWidth={displayShareButton}
|
contextButtonSpacerWidth={displayShareButton}
|
||||||
dragging={dragging && isDragging}
|
dragging={dragging && isDragging}
|
||||||
isActive={isActive}
|
isActive={isActive}
|
||||||
|
isThirdPartyFolder={item.isThirdPartyFolder}
|
||||||
>
|
>
|
||||||
<FilesRowContent
|
<FilesRowContent
|
||||||
item={item}
|
item={item}
|
||||||
|
@ -58,7 +58,9 @@ const StyledTableRow = styled(TableRow)`
|
|||||||
background: ${(props) =>
|
background: ${(props) =>
|
||||||
(props.checked || props.isActive) && "#F3F4F4 !important"};
|
(props.checked || props.isActive) && "#F3F4F4 !important"};
|
||||||
cursor: ${(props) =>
|
cursor: ${(props) =>
|
||||||
(props.checked || props.isActive) && "url(images/cursor.palm.svg), auto"};
|
!props.isThirdPartyFolder &&
|
||||||
|
(props.checked || props.isActive) &&
|
||||||
|
"url(images/cursor.palm.svg), auto"};
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
@ -238,6 +240,7 @@ const FilesTableRow = (props) => {
|
|||||||
checked={checkedProps}
|
checked={checkedProps}
|
||||||
isActive={isActive}
|
isActive={isActive}
|
||||||
onHideContextMenu={onHideContextMenu}
|
onHideContextMenu={onHideContextMenu}
|
||||||
|
isThirdPartyFolder={item.isThirdPartyFolder}
|
||||||
>
|
>
|
||||||
<TableCell {...dragStyles} {...selectionProp}>
|
<TableCell {...dragStyles} {...selectionProp}>
|
||||||
<FileNameCell {...props} />
|
<FileNameCell {...props} />
|
||||||
|
@ -428,8 +428,15 @@ class FilesActionStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
selectRowAction = (checked, file) => {
|
selectRowAction = (checked, file) => {
|
||||||
const { selected, setSelected, selectFile, deselectFile } = this.filesStore;
|
const {
|
||||||
|
selected,
|
||||||
|
setSelected,
|
||||||
|
selectFile,
|
||||||
|
deselectFile,
|
||||||
|
setBufferSelection,
|
||||||
|
} = this.filesStore;
|
||||||
//selected === "close" && setSelected("none");
|
//selected === "close" && setSelected("none");
|
||||||
|
setBufferSelection(null);
|
||||||
if (checked) {
|
if (checked) {
|
||||||
selectFile(file);
|
selectFile(file);
|
||||||
} else {
|
} else {
|
||||||
|
@ -98,6 +98,7 @@ class FilesStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
setStartDrag = (startDrag) => {
|
setStartDrag = (startDrag) => {
|
||||||
|
this.selection = this.selection.filter((x) => !x.isThirdPartyFolder); // removed root thirdparty folders
|
||||||
this.startDrag = startDrag;
|
this.startDrag = startDrag;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1130,6 +1131,7 @@ class FilesStore {
|
|||||||
)
|
)
|
||||||
: null;
|
: null;
|
||||||
const contextOptions = this.getFilesContextOptions(item, canOpenPlayer);
|
const contextOptions = this.getFilesContextOptions(item, canOpenPlayer);
|
||||||
|
const isThirdPartyFolder = providerKey && id === rootFolderId;
|
||||||
|
|
||||||
//const isCanWebEdit = canWebEdit(item.fileExst);
|
//const isCanWebEdit = canWebEdit(item.fileExst);
|
||||||
const icon =
|
const icon =
|
||||||
@ -1212,6 +1214,7 @@ class FilesStore {
|
|||||||
previewUrl,
|
previewUrl,
|
||||||
folderUrl,
|
folderUrl,
|
||||||
href,
|
href,
|
||||||
|
isThirdPartyFolder,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user