From f9adab1e99b50f25ff3e95d0241a90f09d816944 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 11 Jul 2024 17:38:06 +0300 Subject: [PATCH] Web: Components: LinkRow: fixed styles --- .../views/Members/sub-components/LinkRow.tsx | 5 +- .../shared/components/share/Share.styled.ts | 22 ++++++++- .../shared/components/share/Share.types.ts | 4 +- .../share/sub-components/LinkRow.tsx | 46 +++++++++++-------- packages/shared/themes/base.ts | 2 + packages/shared/themes/dark.ts | 2 + 6 files changed, 59 insertions(+), 22 deletions(-) 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 83364af54b..e166b12cbe 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 @@ -215,7 +215,9 @@ const LinkRow = (props: LinkRowProps) => { expirationDate: moment.Moment | null, ) => { const newLink = { ...link }; - newLink.sharedTo.expirationDate = moment(expirationDate); + newLink.sharedTo.expirationDate = expirationDate + ? moment(expirationDate) + : null; editExternalLinkAction(newLink); }; @@ -230,6 +232,7 @@ const LinkRow = (props: LinkRowProps) => { isPrimaryLink={isPrimaryLink} onAccessRightsSelect={onAccessRightsSelect} changeExpirationOption={changeExpirationOption} + isArchiveFolder={isArchiveFolder} /> ); }; diff --git a/packages/shared/components/share/Share.styled.ts b/packages/shared/components/share/Share.styled.ts index a9c8776483..9f80696536 100644 --- a/packages/shared/components/share/Share.styled.ts +++ b/packages/shared/components/share/Share.styled.ts @@ -50,12 +50,23 @@ const StyledLinks = styled.div` } `; -const StyledLinkRow = styled.div<{ isExpired?: boolean }>` +const StyledLinkRow = styled.div<{ isExpired?: boolean; isDisabled?: boolean }>` display: flex; gap: 8px; align-items: center; height: 68px; + opacity: ${({ isDisabled }) => (isDisabled ? 0.4 : 1)}; + + .avatar-wrapper, + .avatar-wrapper:hover { + svg { + path { + fill: ${({ theme }) => theme.infoPanel.avatarColor}; + } + } + } + .avatar_role-wrapper { svg { path:nth-child(3) { @@ -76,6 +87,7 @@ const StyledLinkRow = styled.div<{ isExpired?: boolean }>` display: flex; flex-direction: column; gap: 0; + overflow: hidden; } .internal-combobox { @@ -102,6 +114,14 @@ const StyledLinkRow = styled.div<{ isExpired?: boolean }>` .expired-options { padding: 0px; + .text { + color: ${({ theme }) => theme.infoPanel.links.color}; + :hover { + color: ${({ theme }) => theme.infoPanel.links.color}; + background: unset; + } + } + & > span > a { padding: 0px !important; } diff --git a/packages/shared/components/share/Share.types.ts b/packages/shared/components/share/Share.types.ts index 22192b5c24..0b9c27506c 100644 --- a/packages/shared/components/share/Share.types.ts +++ b/packages/shared/components/share/Share.types.ts @@ -58,6 +58,7 @@ export type LinkRowProps = loadingLinks: (string | number)[]; isRoomsLink?: undefined; isPrimaryLink?: undefined; + isArchiveFolder?: undefined; getData: () => undefined; onOpenContextMenu?: undefined; onCloseContextMenu?: undefined; @@ -75,7 +76,8 @@ export type LinkRowProps = availableExternalRights: TAvailableExternalRights; loadingLinks: (string | number)[]; isRoomsLink?: boolean; - isPrimaryLink?: boolean; + isPrimaryLink: boolean; + isArchiveFolder: boolean; getData: () => ContextMenuModel[]; onOpenContextMenu: (e: React.MouseEvent) => void; onCloseContextMenu: () => void; diff --git a/packages/shared/components/share/sub-components/LinkRow.tsx b/packages/shared/components/share/sub-components/LinkRow.tsx index 14fddf6abd..905181e503 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, isRoomsLink, isPrimaryLink, + isArchiveFolder, getData, onOpenContextMenu, onCloseContextMenu, @@ -124,6 +125,7 @@ const LinkRow = ({ {isLoaded ? ( @@ -137,7 +139,9 @@ const LinkRow = ({ )}
{isRoomsLink ? ( - {linkTitle} + + {linkTitle} + ) : !isExpiredLink ? ( )}
- onCopyLink(link)} - title={t("Common:CreateAndCopy")} - isDisabled={isExpiredLink || isLoaded} - /> + {!isArchiveFolder && ( + onCopyLink(link)} + title={t("Common:CreateAndCopy")} + isDisabled={isExpiredLink || isLoaded} + /> + )} {isRoomsLink ? ( <> - + {!isArchiveFolder && ( + + )} ) : ( { closeButtonBg: "transparent", nameColor: "#858585", + avatarColor: "#555F65", links: { + color: "#4781D1", iconColor: "#3B72A7", iconErrorColor: "#F24724", primaryColor: "#555F65", diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts index e59bd8d3ae..aed49d539b 100644 --- a/packages/shared/themes/dark.ts +++ b/packages/shared/themes/dark.ts @@ -2053,8 +2053,10 @@ const Dark: TTheme = { closeButtonBg: "#a2a2a2", nameColor: "#A3A9AE", + avatarColor: "#A3A9AE", links: { + color: "#4781D1", iconColor: "#858585", iconErrorColor: "#E06451", primaryColor: "#ADADAD",