Fixed Bug 52888 - Client.Files. Fixed share button size

This commit is contained in:
Nikita Gopienko 2021-10-01 15:19:14 +03:00
parent dd7a504e06
commit 1727201852
3 changed files with 27 additions and 13 deletions

View File

@ -226,6 +226,23 @@ class TableHeader extends React.Component {
const storageSize =
!resetColumnsSize && localStorage.getItem(columnStorageName);
const defaultSize = this.props.columns.find((col) => col.defaultSize)
?.defaultSize;
//TODO: Fixed columns size if something went wrong
if (storageSize) {
const splitStorage = storageSize.split(" ");
if (
defaultSize &&
splitStorage[splitStorage.length - 2] !== `${defaultSize}px`
) {
localStorage.removeItem(columnStorageName);
return this.onResize();
}
}
const tableContainer = storageSize
? storageSize.split(" ")
: container.style.gridTemplateColumns.split(" ");
@ -275,12 +292,11 @@ class TableHeader extends React.Component {
const newItemWidth = (containerWidth * percent) / 100 + "px";
gridTemplateColumns.push(newItemWidth);
} else {
const newItemWidth =
percent === 0
? defaultSize
? `${defaultSize}px`
: `${minColumnSize}px`
: (containerWidth * percent) / 100 + "px";
const newItemWidth = defaultSize
? `${defaultSize}px`
: percent === 0
? `${minColumnSize}px`
: (containerWidth * percent) / 100 + "px";
gridTemplateColumns.push(newItemWidth);
}
@ -295,9 +311,6 @@ class TableHeader extends React.Component {
str = gridTemplateColumns.join(" ");
} else {
const defaultSize = this.props.columns.find((col) => col.defaultSize)
?.defaultSize;
const column =
(newContainerWidth * (isSingleTable ? 60 : 100)) / 100 -
(defaultSize || 0) -

View File

@ -74,7 +74,7 @@ class FilesTableHeader extends React.Component {
key: "Share",
title: "",
enable: withContent,
defaultSize: 80,
defaultSize: 120,
resizable: false,
},
];
@ -188,12 +188,12 @@ class FilesTableHeader extends React.Component {
{cbMenuItems.map((key) => {
const label = getCheckboxItemLabel(t, key);
return (
<DropDownItem
<DropDownItem
key={key}
label={label}
data-key={key}
onClick={this.onSelect}
/>
onClick={this.onSelect}
/>
);
})}
</>

View File

@ -35,6 +35,7 @@ const StyledDragAndDrop = styled(DragAndDrop)`
const StyledShare = styled.div`
cursor: pointer;
margin: 0 auto;
.share-button {
padding: 4px;