From 723c7f44ce4238ea87f68b7dbbb73a7f4fa50b13 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 11 Jul 2024 12:17:40 +0300 Subject: [PATCH] Web: Components: LinkRow: fixed styles --- .../InfoPanel/Body/views/Members/index.js | 1 + .../views/Members/sub-components/LinkRow.tsx | 5 ++- .../shared/components/share/Share.styled.ts | 2 +- .../share/sub-components/LinkRow.tsx | 39 +++++++------------ 4 files changed, 18 insertions(+), 29 deletions(-) diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js index ce42e7a44e..1f444c33a3 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js @@ -183,6 +183,7 @@ const Members = ({ link={primaryLink} setIsScrollLocked={setIsScrollLocked} isShareLink + isPrimaryLink />, ); } diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.tsx b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.tsx index 0c5725c25f..e7be665cff 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.tsx +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.tsx @@ -64,6 +64,7 @@ type LinkRowProps = { setIsScrollLocked: (isScrollLocked: boolean) => void; isPublicRoomType: boolean; isFormRoom: boolean; + isPrimaryLink: boolean; }; const LinkRow = (props: LinkRowProps) => { @@ -79,6 +80,7 @@ const LinkRow = (props: LinkRowProps) => { setIsScrollLocked, isPublicRoomType, isFormRoom, + isPrimaryLink, editExternalLink, setExternalLink, } = props; @@ -185,8 +187,6 @@ const LinkRow = (props: LinkRowProps) => { const editExternalLinkAction = (newLink: TFileLink) => { setLoadingLinks([newLink.sharedTo.id]); - console.log("newLink", newLink); - editExternalLink(roomId, newLink) .then((linkData: TFileLink) => { setExternalLink(linkData); @@ -227,6 +227,7 @@ const LinkRow = (props: LinkRowProps) => { onOpenContextMenu={onOpenContextMenu} onCloseContextMenu={onCloseContextMenu} isRoom + isPrimaryLink={isPrimaryLink} linkTitle={title} onAccessRightsSelect={onAccessRightsSelect} changeExpirationOption={changeExpirationOption} diff --git a/packages/shared/components/share/Share.styled.ts b/packages/shared/components/share/Share.styled.ts index 08e32389eb..54d6740bf2 100644 --- a/packages/shared/components/share/Share.styled.ts +++ b/packages/shared/components/share/Share.styled.ts @@ -50,10 +50,10 @@ const StyledLinks = styled.div` `; const StyledLinkRow = styled.div<{ isExpired?: boolean }>` - padding: 8px 0; display: flex; gap: 8px; align-items: center; + height: 68px; .avatar_role-wrapper { /* svg { diff --git a/packages/shared/components/share/sub-components/LinkRow.tsx b/packages/shared/components/share/sub-components/LinkRow.tsx index 9b718d6c25..5f75c9d0b9 100644 --- a/packages/shared/components/share/sub-components/LinkRow.tsx +++ b/packages/shared/components/share/sub-components/LinkRow.tsx @@ -66,6 +66,7 @@ const LinkRow = ({ loadingLinks, isRoom, + isPrimaryLink, linkTitle, getData, onOpenContextMenu, @@ -133,14 +134,6 @@ const LinkRow = ({ role={AvatarRole.user} source={avatar} roleIcon={isLocked ? : undefined} - - // roleIcon={ - // expiryDate ? ( - //
- // - //
- // ) : null - // } /> )}
@@ -164,11 +157,13 @@ const LinkRow = ({ ) : ( {shareOption?.label} )} - + {!isPrimaryLink && ( + + )}
) : (