Merge branch 'feature/thumbnails' of https://github.com/ONLYOFFICE/AppServer into feature/thumbnails

This commit is contained in:
Nikita Gopienko 2021-04-20 14:21:32 +03:00
commit b40ffc781c
2 changed files with 5 additions and 1 deletions

View File

@ -278,6 +278,7 @@ const FileItem = createSelectable((props) => {
thumbnailClick={onFilesClick}
onDoubleClick={onFilesClick}
onMouseUp={onMouseUpHandler}
isRecycleBin={isRecycleBin}
>
<FilesContent
item={item}

View File

@ -27,7 +27,8 @@ const FolderStyles = css`
`;
const StyledTile = styled.div`
cursor: ${(props) => (props.isFolder ? "pointer" : "default")};
cursor: ${(props) =>
props.isFolder && !props.isRecycleBin ? "pointer" : "default"};
min-height: 55px;
width: 100%;
@ -193,6 +194,7 @@ class Tile extends React.PureComponent {
isFolder,
tileContextClick,
dragging,
isRecycleBin,
} = this.props;
const renderCheckbox = Object.prototype.hasOwnProperty.call(
@ -230,6 +232,7 @@ class Tile extends React.PureComponent {
onContextMenu={onContextMenu}
dragging={dragging && isFolder}
isFolder={isFolder}
isRecycleBin={isRecycleBin}
>
{isFolder ? (
<>