Merge branch 'develop' into feature/bar-quotas
This commit is contained in:
commit
25e7101b6b
@ -38,14 +38,15 @@ const InfoPanelBodyContent = ({
|
||||
const isAccounts = getIsAccounts();
|
||||
const isGallery = getIsGallery();
|
||||
|
||||
const isSeveralItems = props.selectedItems.length > 1;
|
||||
|
||||
const isNoItem =
|
||||
(isGallery && !gallerySelected) ||
|
||||
(!selection?.title && !isSeveralItems) ||
|
||||
((isRootFolder || isAccounts) &&
|
||||
selection?.isSelectedFolder &&
|
||||
!selection?.wasContextMenuSelection);
|
||||
|
||||
const isSeveralItems = props.selectedItems.length > 1;
|
||||
|
||||
const viewHelper = new ViewHelper({
|
||||
defaultProps: {
|
||||
selection,
|
||||
|
@ -50,6 +50,10 @@ const StyledTitle = styled.div`
|
||||
}
|
||||
`}
|
||||
|
||||
.item-icon {
|
||||
height: 32px;
|
||||
width: 32px;
|
||||
}
|
||||
img {
|
||||
&.icon {
|
||||
display: flex;
|
||||
|
@ -24,7 +24,9 @@ const FilesItemTitle = ({
|
||||
if (isSeveralItems)
|
||||
return (
|
||||
<StyledTitle>
|
||||
<ReactSVG className="icon" src={getIcon(32, ".file")} />
|
||||
<div className="item-icon">
|
||||
<ReactSVG className="icon" src={getIcon(32, ".file")} />
|
||||
</div>
|
||||
<Text className="text">
|
||||
{`${t("InfoPanel:ItemsSelected")}: ${severalItemsLength}`}
|
||||
</Text>
|
||||
@ -35,11 +37,13 @@ const FilesItemTitle = ({
|
||||
|
||||
return (
|
||||
<StyledTitle ref={itemTitleRef}>
|
||||
<img
|
||||
className={`icon ${selection.isRoom && "is-room"}`}
|
||||
src={selection.icon}
|
||||
alt="thumbnail-icon"
|
||||
/>
|
||||
<div className="item-icon">
|
||||
<img
|
||||
className={`icon ${selection.isRoom && "is-room"}`}
|
||||
src={selection.icon}
|
||||
alt="thumbnail-icon"
|
||||
/>
|
||||
</div>
|
||||
<Text className="text">{selection.title}</Text>
|
||||
{selection && (
|
||||
<ItemContextOptions
|
||||
|
Loading…
Reference in New Issue
Block a user