Web: Files: fix tile border radius
This commit is contained in:
parent
864b8268a5
commit
b95ba16e2d
@ -413,7 +413,16 @@ export default function withContent(WrappedContent) {
|
|||||||
isEdit,
|
isEdit,
|
||||||
titleWithoutExt,
|
titleWithoutExt,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
const { access, createdBy, fileExst, fileStatus, href, icon, id } = item;
|
const {
|
||||||
|
access,
|
||||||
|
createdBy,
|
||||||
|
fileExst,
|
||||||
|
fileStatus,
|
||||||
|
href,
|
||||||
|
icon,
|
||||||
|
id,
|
||||||
|
isFolder,
|
||||||
|
} = item;
|
||||||
|
|
||||||
const updatedDate = this.getStatusByDate(false);
|
const updatedDate = this.getStatusByDate(false);
|
||||||
const createdDate = this.getStatusByDate(true);
|
const createdDate = this.getStatusByDate(true);
|
||||||
@ -456,6 +465,7 @@ export default function withContent(WrappedContent) {
|
|||||||
cancelUpdateItem={this.cancelUpdateItem}
|
cancelUpdateItem={this.cancelUpdateItem}
|
||||||
isUpdatingRowItem={isUpdatingRowItem}
|
isUpdatingRowItem={isUpdatingRowItem}
|
||||||
passwordEntryProcess={passwordEntryProcess}
|
passwordEntryProcess={passwordEntryProcess}
|
||||||
|
isFolder={item.fileExst ? false : true}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<WrappedContent
|
<WrappedContent
|
||||||
|
@ -67,7 +67,7 @@ const EditingWrapper = styled.div`
|
|||||||
props.theme.filesEditingWrapper.tile.background};
|
props.theme.filesEditingWrapper.tile.background};
|
||||||
|
|
||||||
border: ${(props) => props.theme.filesEditingWrapper.border};
|
border: ${(props) => props.theme.filesEditingWrapper.border};
|
||||||
border-radius: 0 0 6px 6px;
|
border-radius: ${(props) => (props.isFolder ? "6px" : "0 0 6px 6px")};
|
||||||
|
|
||||||
height: 43px;
|
height: 43px;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
@ -188,8 +188,10 @@ const EditingWrapperComponent = (props) => {
|
|||||||
elementIcon,
|
elementIcon,
|
||||||
isUpdatingRowItem,
|
isUpdatingRowItem,
|
||||||
passwordEntryProcess,
|
passwordEntryProcess,
|
||||||
|
isFolder,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
|
console.log("isFolder", isFolder);
|
||||||
const isTable = viewAs === "table";
|
const isTable = viewAs === "table";
|
||||||
|
|
||||||
const [OkIconIsHovered, setIsHoveredOk] = useState(false);
|
const [OkIconIsHovered, setIsHoveredOk] = useState(false);
|
||||||
@ -233,6 +235,7 @@ const EditingWrapperComponent = (props) => {
|
|||||||
<EditingWrapper
|
<EditingWrapper
|
||||||
viewAs={viewAs}
|
viewAs={viewAs}
|
||||||
isUpdatingRowItem={isUpdatingRowItem && !isTable}
|
isUpdatingRowItem={isUpdatingRowItem && !isTable}
|
||||||
|
isFolder={isFolder}
|
||||||
>
|
>
|
||||||
{isTable && elementIcon}
|
{isTable && elementIcon}
|
||||||
{isUpdatingRowItem && !isTable ? (
|
{isUpdatingRowItem && !isTable ? (
|
||||||
|
Loading…
Reference in New Issue
Block a user