diff --git a/packages/asc-web-components/table-container/TableHeader.js b/packages/asc-web-components/table-container/TableHeader.js index 28f7fd1e00..bb31042995 100644 --- a/packages/asc-web-components/table-container/TableHeader.js +++ b/packages/asc-web-components/table-container/TableHeader.js @@ -345,12 +345,7 @@ class TableHeader extends React.Component { }; resetColumns = (resetToDefault = false) => { - const { - containerRef, - checkboxSize, - columnStorageName, - columns, - } = this.props; + const { containerRef, columnStorageName, columns } = this.props; const defaultSize = this.props.columns.find((col) => col.defaultSize) ?.defaultSize; @@ -373,7 +368,7 @@ class TableHeader extends React.Component { (containerWidth * firstColumnPercent) / 100 + "px"; const otherColumns = (containerWidth * percent) / 100 + "px"; - str = `${checkboxSize} ${firstColumnSize} `; + str = `${firstColumnSize} `; for (let col of columns) { if (!col.default) str += col.enable @@ -385,13 +380,10 @@ class TableHeader extends React.Component { } else { const percent = 100 / enableColumns.length; const newContainerWidth = - containerWidth - - this.getSubstring(checkboxSize) - - containerMargin - - (defaultSize || 0); + containerWidth - containerMargin - (defaultSize || 0); const otherColumns = (newContainerWidth * percent) / 100 + "px"; - str = `${checkboxSize} `; + str = ""; for (let col of this.props.columns) { str += col.enable ? /* col.minWidth @@ -439,53 +431,40 @@ class TableHeader extends React.Component { return ( <> - {isHeaderVisible ? ( - - ) : ( - - - {columns.map((column, index) => { - const nextColumn = this.getNextColumn(columns, index); - const resizable = nextColumn ? nextColumn.resizable : false; + + + {columns.map((column, index) => { + const nextColumn = this.getNextColumn(columns, index); + const resizable = nextColumn ? nextColumn.resizable : false; - return ( - - ); - })} + return ( + + ); + })} + +
+ +
+
+
-
- -
-
-
- )} ); diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js index 513f57dad5..c66bf2cab3 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js @@ -68,8 +68,8 @@ const StyledTableRow = styled(TableRow)` } .table-container_row-checkbox { - padding-left: 4px; - width: 26px; + padding-left: 12px; + width: 16px; } &:hover {