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

Merge branch 'release/v2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.5.0

Browse Source
This commit is contained in:
Vlada Gazizova 2024-04-03 13:40:00 +03:00
commit 02c4bc00a4
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
View File

@ -119,6 +119,7 @@ const StyledPeopleRow = styled(TableRow)`
opacity: ${(props) => (props.hideColumns ? 0 : 1)};
& > div {
width: auto;
max-width: fit-content;
}
}
@ -373,7 +374,7 @@ const InsideGroupTableRow = (props) => {
plusBadgeValue={groups.length - 1}
onSelect={onOpenGroup}
options={groupItems}
scaled
scaled={false}
directionY="both"
size="content"
modernView
@ -413,7 +414,7 @@ const InsideGroupTableRow = (props) => {
}
options={typesOptions}
onSelect={onTypeChange}
scaled
scaled={false}
directionY="both"
size="content"
displaySelectedOption
@ -461,6 +462,7 @@ const InsideGroupTableRow = (props) => {
e.target.closest(".checkbox") ||
e.target.closest(".table-container_row-checkbox") ||
e.target.closest(".type-combobox") ||
e.target.closest(".groups-combobox") ||
e.target.closest(".paid-badge") ||
e.target.closest(".pending-badge") ||
e.target.closest(".disabled-badge") ||
@ -533,10 +535,7 @@ const InsideGroupTableRow = (props) => {
)}
{groupAccountsInsideGroupColumnIsEnabled ? (
<TableCell
className={"table-cell_groups"}
onClick={(e) => e.stopPropagation()}
>
<TableCell className={"table-cell_groups"}>
{renderGroupsCell()}
</TableCell>
) : (

11
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
View File

@ -127,6 +127,7 @@ const StyledPeopleRow = styled(TableRow)`
opacity: ${(props) => (props.hideColumns ? 0 : 1)};
& > div {
width: auto;
max-width: fit-content;
}
}
@ -382,7 +383,7 @@ const PeopleTableRow = (props) => {
plusBadgeValue={groups.length - 1}
onSelect={onOpenGroup}
options={groupItems}
scaled
scaled={false}
directionY="both"
size="content"
modernView
@ -421,7 +422,7 @@ const PeopleTableRow = (props) => {
}
options={typesOptions}
onSelect={onTypeChange}
scaled
scaled={false}
directionY="both"
size="content"
displaySelectedOption
@ -469,6 +470,7 @@ const PeopleTableRow = (props) => {
e.target.closest(".checkbox") ||
e.target.closest(".table-container_row-checkbox") ||
e.target.closest(".type-combobox") ||
e.target.closest(".groups-combobox") ||
e.target.closest(".paid-badge") ||
e.target.closest(".pending-badge") ||
e.target.closest(".disabled-badge") ||
@ -541,10 +543,7 @@ const PeopleTableRow = (props) => {
)}
{groupAccountsColumnIsEnabled ? (
<TableCell
className={"table-cell_groups"}
onClick={(e) => e.stopPropagation()}
>
<TableCell className={"table-cell_groups"}>
{renderGroupsCell()}
</TableCell>
) : (

8
packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
View File

@ -179,7 +179,7 @@ const StyledTableRow = styled(TableRow)`
.table-container_element-wrapper,
.table-container_row-loader {
min-width: ${(props) => (props.isRoom ? "40px" : "36px")};
min-width: 40px;
border-bottom: unset;
${(props) =>
props.theme.interfaceDirection === "rtl"
@ -194,7 +194,7 @@ const StyledTableRow = styled(TableRow)`
}
.table-container_element-container {
width: 32px;
width: 36px;
height: 32px;
display: flex;
@ -207,10 +207,10 @@ const StyledTableRow = styled(TableRow)`
${(props) =>
props.theme.interfaceDirection === "rtl"
? css`
margin-right: 4px;
margin-right: 8px;
`
: css`
margin-left: 4px;
margin-left: 8px;
`}
}
}