Web: Files: Thumbnails: fixed styles, refactoring
This commit is contained in:
parent
fe1a1e7e5c
commit
ed92a79f29
@ -126,7 +126,9 @@ export default function withContent(WrappedContent) {
|
||||
onClickUpdateItem = (e) => {
|
||||
console.log("here");
|
||||
const { fileActionType } = this.props;
|
||||
|
||||
console.log(fileActionType, FileAction.Create);
|
||||
|
||||
fileActionType === FileAction.Create
|
||||
? this.createItem(e)
|
||||
: this.updateItem(e);
|
||||
@ -266,7 +268,6 @@ export default function withContent(WrappedContent) {
|
||||
const titleWithoutExt = getTitleWithoutExst(item);
|
||||
|
||||
const isEdit = id === fileActionId && fileExst === fileActionExt;
|
||||
console.log(id, fileActionId, fileExst, fileActionExt);
|
||||
|
||||
const updatedDate = updated && this.getStatusByDate();
|
||||
|
||||
|
@ -146,7 +146,7 @@ export default function withFileActions(WrappedFileItem) {
|
||||
return;
|
||||
|
||||
if (isFolder && viewAs === "tile") {
|
||||
if (!isMouseDown) return;
|
||||
if (!isMouseDown || e.target.closest(".edit-button")) return;
|
||||
this.onFilesClick();
|
||||
} else {
|
||||
if (checked) {
|
||||
|
@ -218,14 +218,13 @@ class Tile extends React.PureComponent {
|
||||
};
|
||||
|
||||
const icon = this.getIconFile();
|
||||
|
||||
return (
|
||||
<StyledTile
|
||||
ref={this.tile}
|
||||
{...this.props}
|
||||
onContextMenu={onContextMenu}
|
||||
dragging={dragging && isFolder}
|
||||
isFolder={isFolder || (!fileExst && id === -1)}
|
||||
isFolder={(isFolder && !fileExst) || (!fileExst && id === -1)}
|
||||
isRecycleBin={isRecycleBin}
|
||||
>
|
||||
{isFolder || (!fileExst && id === -1) ? (
|
||||
@ -242,7 +241,11 @@ class Tile extends React.PureComponent {
|
||||
{renderElement && !(isFolder || (!fileExst && id === -1)) && (
|
||||
<StyledElement>{element}</StyledElement>
|
||||
)}
|
||||
<StyledContent isFolder={isFolder}>{children}</StyledContent>
|
||||
<StyledContent
|
||||
isFolder={(isFolder && !fileExst) || (!fileExst && id === -1)}
|
||||
>
|
||||
{children}
|
||||
</StyledContent>
|
||||
<StyledOptionButton spacerWidth={contextButtonSpacerWidth}>
|
||||
{renderContext ? (
|
||||
<ContextMenuButton
|
||||
@ -276,7 +279,12 @@ class Tile extends React.PureComponent {
|
||||
</StyledFileTileTop>
|
||||
<StyledFileTileBottom>
|
||||
<StyledElement>{element}</StyledElement>
|
||||
<StyledContent isFolder={isFolder}>{children}</StyledContent>
|
||||
<StyledContent
|
||||
className="styled-content"
|
||||
isFolder={(isFolder && !fileExst) || (!fileExst && id === -1)}
|
||||
>
|
||||
{children}
|
||||
</StyledContent>
|
||||
<StyledOptionButton spacerWidth={contextButtonSpacerWidth}>
|
||||
{renderContext ? (
|
||||
<ContextMenuButton
|
||||
|
@ -116,7 +116,6 @@ class TileContainer extends React.PureComponent {
|
||||
|
||||
React.Children.map(children, (item, index) => {
|
||||
const { isFolder, fileExst, id } = item.props.item;
|
||||
console.log(item.props.item);
|
||||
if ((isFolder || id === -1) && !fileExst) {
|
||||
Folders.push(
|
||||
<div
|
||||
|
Loading…
Reference in New Issue
Block a user