IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
Timofey Boyko 2022-04-27 14:20:13 +03:00
commit b83d85b787
6 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/asc-web-components/table-container/StyledTableContainer.js
View File

@ -40,12 +40,17 @@ const StyledTableContainer = styled.div`
border-image-source: ${(props) =>
props.theme.tableContainer.header.borderImageSource};
border-top: 0;
}
.lengthen-header {
border-bottom: ${(props) =>
props.theme.tableContainer.header.borderBottom};
border-image-source: none;
}
.lengthen-header {
border-bottom: ${(props) => props.theme.tableContainer.header.borderBottom};
border-image-source: none;
}
.hotkeys-lengthen-header {
border-bottom: ${(props) =>
props.theme.tableContainer.header.hotkeyBorderBottom};
border-image-source: none;
}
.content-container {

1
packages/asc-web-components/themes/base.js
View File

@ -2078,6 +2078,7 @@ const Base = {
hoverIconColor: grayMain,
borderImageSource: `linear-gradient(to right,${white} 21px,${grayLightMid} 21px,${grayLightMid} calc(100% - 20px),${white} calc(100% - 20px))`,
hotkeyBorderBottom: `1px solid ${globalColors.blueMain}`,
},
tableCell: {

1
packages/asc-web-components/themes/dark.js
View File

@ -2081,6 +2081,7 @@ const Dark = {
hoverIconColor: grayMaxLight,
borderImageSource: `linear-gradient(to right,${black} 21px,#474747 21px,#474747 calc(100% - 20px),${black} calc(100% - 20px))`,
hotkeyBorderBottom: `1px solid ${globalColors.blueMain}`,
},
tableCell: {

4
products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
View File

@ -32,10 +32,6 @@ const StyledTableContainer = styled(TableContainer)`
.table-row {
.table-container_file-name-cell,
.table-container_row-context-menu-wrapper {
margin-top: -1px;
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
border-bottom: ${(props) =>
`1px solid ${props.theme.filesSection.tableView.row.borderColor}`};
}

16
products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
View File

@ -107,22 +107,26 @@ class FilesTableHeader extends React.Component {
}
onBeginScroll = () => {
const { firstElemChecked, headerBorder } = this.props;
const { firstElemChecked } = this.props;
const currentScrollPosition = this.customScrollElm.scrollTop;
const elem = document.getElementById("table-container_caption-header");
if (elem && headerBorder) elem.style.borderColor = "#2da7db";
if (currentScrollPosition === 0) {
this.isBeginScrolling = false;
this.props.firstElemChecked &&
this.props.headerBorder &&
elem?.classList?.add("hotkeys-lengthen-header");
!firstElemChecked && elem?.classList?.remove("lengthen-header");
return;
}
if (elem) elem.style.borderColor = "#ECEEF1";
!this.isBeginScrolling && elem?.classList?.add("lengthen-header");
if (!this.isBeginScrolling) {
elem?.classList?.remove("hotkeys-lengthen-header");
elem?.classList?.add("lengthen-header");
}
this.isBeginScrolling = true;
};
@ -138,7 +142,7 @@ class FilesTableHeader extends React.Component {
if (this.props.firstElemChecked && this.props.headerBorder) {
const elem = document.getElementById("table-container_caption-header");
if (elem) elem.style.borderColor = "#2da7db";
elem?.classList?.add("hotkeys-lengthen-header");
}
}

4
products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
View File

@ -265,7 +265,7 @@ const FilesTableRow = (props) => {
React.useEffect(() => {
if (index === 0) {
if (checkedProps || isActive) {
if (checkedProps || isActive || showHotkeyBorder) {
setFirsElemChecked(true);
} else {
setFirsElemChecked(false);
@ -273,8 +273,6 @@ const FilesTableRow = (props) => {
if (showHotkeyBorder) {
setHeaderBorder(true);
} else {
const elem = document.getElementById("table-container_caption-header");
if (elem) elem.style.borderColor = "#ECEEF1";
setHeaderBorder(false);
}
}