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

This commit is contained in:
Timofey Boyko 2024-04-05 13:25:13 +03:00
commit c72b4968b2
5 changed files with 10 additions and 9 deletions

View File

@ -62,8 +62,8 @@ export default function withContent(WrappedContent) {
) => {
if (isContextClick) {
checked
? setBufferSelection(user, addToSelection)
: setBufferSelection(null);
? setBufferSelection(null)
: setBufferSelection(user, addToSelection);
return;
}

View File

@ -109,7 +109,6 @@ const StyledAccountsItemTitle = styled.div`
}
.context-button {
padding-top: 24px;
${(props) =>
props.theme.interfaceDirection === "rtl"
? css`

View File

@ -79,7 +79,7 @@ const AccountsItemTitle = ({
<Avatar
className="avatar"
role={infoPanelSelection.role ? infoPanelSelection.role : "user"}
size={AvatarSize.max}
size={AvatarSize.big}
source={userAvatar}
/>
<div className="info-panel__info-text">

View File

@ -56,7 +56,7 @@ const GroupsItemTitle = ({
<StyledAccountsItemTitle ref={itemTitleRef}>
<Avatar
className="avatar"
size={AvatarSize.max}
size={AvatarSize.big}
userName={infoPanelSelection.name}
isGroup={true}
/>

View File

@ -23,7 +23,7 @@
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import styled from "styled-components";
import { Avatar } from "@docspace/shared/components/avatar";
import { ContextMenu } from "@docspace/shared/components/context-menu";
import { useState, useRef } from "react";
@ -31,6 +31,10 @@ import { ContextMenuButton } from "@docspace/shared/components/context-menu-butt
import { inject } from "mobx-react";
import { useTranslation } from "react-i18next";
const StyledContextMenu = styled(ContextMenu)`
min-width: auto !important;
`;
const GroupMember = ({
userId,
groupMember,
@ -108,14 +112,12 @@ const GroupMember = ({
onClick={onClick}
getData={() => model}
/>
<ContextMenu
<StyledContextMenu
model={model}
containerRef={iconRef}
ref={buttonMenuRef}
onHide={onHide}
scaled={false}
leftOffset={-8}
topOffset={8}
/>
</div>
</div>