From 6eea58d59142ee142934dbc6ae073772c4f2967f Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Thu, 22 Aug 2024 19:27:56 +0300 Subject: [PATCH] Refactoring. --- .../panels/InvitePanel/StyledInvitePanel.js | 24 +----- .../components/panels/InvitePanel/index.js | 1 - .../shared/components/aside/Aside.styled.tsx | 2 +- .../sub-components/CloseButton.tsx | 74 ------------------- .../selectors/Groups/GroupsSelector.types.ts | 1 - packages/shared/selectors/Groups/index.tsx | 2 +- .../selectors/People/PeopleSelector.types.ts | 1 - packages/shared/selectors/People/index.tsx | 1 - .../selectors/Room/RoomSelector.types.ts | 1 - packages/shared/selectors/Room/index.tsx | 2 - 10 files changed, 5 insertions(+), 104 deletions(-) delete mode 100644 packages/shared/components/modal-dialog/sub-components/CloseButton.tsx diff --git a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js index adac49f4de..52e7edf8e5 100644 --- a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js +++ b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js @@ -125,17 +125,7 @@ const ScrollList = styled.div` const StyledBlock = styled.div` border-bottom: ${(props) => props.theme.filesPanels.sharing.borderBottom}; - - ${(props) => - props.theme.interfaceDirection === "rtl" - ? css` - padding-right: 16px; - padding-left: 37px; - ` - : css` - padding-left: 16px; - padding-right: 37px; - `} + padding-inline: 16px 37px; `; StyledBlock.defaultProps = { theme: Base }; @@ -525,16 +515,8 @@ const StyledControlContainer = styled.div` z-index: 450; @media ${mobile} { - ${(props) => - props.theme.interfaceDirection === "rtl" - ? css` - left: 13px; - top: 17px; - ` - : css` - right: 13px; - top: 17px; - `} + top: 17px; + inset-inline-end: 16px; } `; const StyledInviteLanguage = styled.div` diff --git a/packages/client/src/components/panels/InvitePanel/index.js b/packages/client/src/components/panels/InvitePanel/index.js index 83f626ff1d..b8f3410589 100644 --- a/packages/client/src/components/panels/InvitePanel/index.js +++ b/packages/client/src/components/panels/InvitePanel/index.js @@ -50,7 +50,6 @@ import { StyledInvitePanel, StyledButtons, StyledControlContainer, - StyledCrossIconMobile, } from "./StyledInvitePanel"; import ItemsList from "./sub-components/ItemsList"; diff --git a/packages/shared/components/aside/Aside.styled.tsx b/packages/shared/components/aside/Aside.styled.tsx index 58ee4c9f44..ece81484dc 100644 --- a/packages/shared/components/aside/Aside.styled.tsx +++ b/packages/shared/components/aside/Aside.styled.tsx @@ -151,7 +151,7 @@ const StyledHeaderContainer = styled.div` border-bottom: 1px solid rgb(236, 238, 241); width: calc(100% + 32px); position: absolute; - left: -16px; + inset-inline-end: -16px; bottom: 0; } `; diff --git a/packages/shared/components/modal-dialog/sub-components/CloseButton.tsx b/packages/shared/components/modal-dialog/sub-components/CloseButton.tsx deleted file mode 100644 index 5b34ee03e9..0000000000 --- a/packages/shared/components/modal-dialog/sub-components/CloseButton.tsx +++ /dev/null @@ -1,74 +0,0 @@ -// (c) Copyright Ascensio System SIA 2009-2024 -// -// This program is a free software product. -// You can redistribute it and/or modify it under the terms -// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software -// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended -// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of -// any third-party rights. -// -// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see -// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html -// -// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021. -// -// The interactive user interfaces in modified source and object code versions of the Program must -// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3. -// -// Pursuant to Section 7(b) of the License you must retain the original Product logo when -// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under -// trademark law for use of our trademarks. -// -// 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 React from "react"; -import styled from "styled-components"; - -import CrossIconReactSvgUrl from "PUBLIC_DIR/images/icons/17/cross.react.svg?url"; - -import { IconButton } from "../../icon-button"; -import { Base } from "../../../themes"; - -import { ModalDialogCloseButtonProps } from "../ModalDialog.types"; -import { ModalDialogType } from "../ModalDialog.enums"; - -const StyledCloseButtonWrapper = styled.div<{ - currentDisplayType: ModalDialogType; -}>` - width: 17px; - height: 17px; - - margin-left: auto; - padding-left: 2px; - - svg { - cursor: pointer; - } -`; - -StyledCloseButtonWrapper.defaultProps = { theme: Base }; - -const CloseButton = ({ - currentDisplayType, - - onClick, -}: ModalDialogCloseButtonProps) => { - return ( - - - - ); -}; - -export { CloseButton }; diff --git a/packages/shared/selectors/Groups/GroupsSelector.types.ts b/packages/shared/selectors/Groups/GroupsSelector.types.ts index a322ef19a6..f1f5ad93dc 100644 --- a/packages/shared/selectors/Groups/GroupsSelector.types.ts +++ b/packages/shared/selectors/Groups/GroupsSelector.types.ts @@ -33,7 +33,6 @@ import { TSelectorItem } from "../../components/selector"; export type GroupsSelectorProps = TSelectorHeader & { id?: string; className?: string; - onClose?: () => void; onSubmit: ( selectedItems: TSelectorItem[], access?: TAccessRight | null, diff --git a/packages/shared/selectors/Groups/index.tsx b/packages/shared/selectors/Groups/index.tsx index 03d537ac6e..d0795434e9 100644 --- a/packages/shared/selectors/Groups/index.tsx +++ b/packages/shared/selectors/Groups/index.tsx @@ -43,7 +43,7 @@ const GroupsSelector = (props: GroupsSelectorProps) => { className, headerProps, - onClose, + onSubmit, } = props; diff --git a/packages/shared/selectors/People/PeopleSelector.types.ts b/packages/shared/selectors/People/PeopleSelector.types.ts index 75dd5b2af5..3e283eaea8 100644 --- a/packages/shared/selectors/People/PeopleSelector.types.ts +++ b/packages/shared/selectors/People/PeopleSelector.types.ts @@ -64,5 +64,4 @@ export type PeopleSelectorProps = TSelectorHeader & emptyScreenHeader?: string; emptyScreenDescription?: string; - onClose?: () => void; }; diff --git a/packages/shared/selectors/People/index.tsx b/packages/shared/selectors/People/index.tsx index b677c39bf7..bda1660d16 100644 --- a/packages/shared/selectors/People/index.tsx +++ b/packages/shared/selectors/People/index.tsx @@ -142,7 +142,6 @@ const PeopleSelector = ({ emptyScreenHeader, emptyScreenDescription, - onClose, }: PeopleSelectorProps) => { const { t }: { t: TTranslation } = useTranslation(["Common"]); diff --git a/packages/shared/selectors/Room/RoomSelector.types.ts b/packages/shared/selectors/Room/RoomSelector.types.ts index 0f3ca64cf7..bfa38caf8f 100644 --- a/packages/shared/selectors/Room/RoomSelector.types.ts +++ b/packages/shared/selectors/Room/RoomSelector.types.ts @@ -48,5 +48,4 @@ export type RoomSelectorProps = TSelectorHeader & withSearch?: boolean; disableThirdParty?: boolean; - onClose?: () => void; }; diff --git a/packages/shared/selectors/Room/index.tsx b/packages/shared/selectors/Room/index.tsx index 7cba6b9921..aa73fc615c 100644 --- a/packages/shared/selectors/Room/index.tsx +++ b/packages/shared/selectors/Room/index.tsx @@ -73,8 +73,6 @@ const RoomSelector = ({ roomType, disableThirdParty, - - onClose, }: RoomSelectorProps) => { const { t }: { t: TTranslation } = useTranslation(["Common"]);