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

Client: CreateEditRoomDialog: Fixed styles because of an aside header component.

Browse Source
This commit is contained in:
Tatiana Lopaeva 2024-08-22 17:38:14 +03:00
parent 05131a7b40
commit 23ae780278
3 changed files with 2 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
View File

@ -28,7 +28,6 @@ import React, { useState, useEffect, useRef, useCallback } from "react";
import TagHandler from "./handlers/TagHandler";
import SetRoomParams from "./sub-components/SetRoomParams";
import DialogHeader from "./sub-components/DialogHeader";
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { Button } from "@docspace/shared/components/button";
@ -132,9 +131,7 @@ const EditRoomDialog = ({
isScrollLocked={isScrollLocked}
withFooterBorder
>
<ModalDialog.Header>
<DialogHeader isEdit />
</ModalDialog.Header>
<ModalDialog.Header>{t("RoomEditing")}</ModalDialog.Header>
<ModalDialog.Body>
<SetRoomParams

67
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/DialogHeader.js
View File

@ -1,67 +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 ArrowPathReactSvgUrl from "PUBLIC_DIR/images/arrow.path.react.svg?url";
import React from "react";
import { withTranslation } from "react-i18next";
import withLoader from "@docspace/client/src/HOCs/withLoader";
import { IconButton } from "@docspace/shared/components/icon-button";
import CreateEditRoomDilogHeaderLoader from "@docspace/shared/skeletons/create-edit-room/DilogHeader";
const DialogHeader = ({
t,
isEdit,
isChooseRoomType,
onArrowClick,
disabledIcon,
}) => {
return (
<>
{isEdit ? (
<span>{t("RoomEditing")}</span>
) : isChooseRoomType ? (
<span>{t("ChooseRoomType")}</span>
) : (
<div className="header-with-button">
{!disabledIcon && (
<IconButton
size={17}
iconName={ArrowPathReactSvgUrl}
className="sharing_panel-arrow"
onClick={onArrowClick}
/>
)}
<div>{t("Files:CreateRoom")}</div>
</div>
)}
</>
);
};
export default withTranslation(["CreateEditRoomDialog", "Files"])(
withLoader(DialogHeader)(<CreateEditRoomDilogHeaderLoader />),
);

1
packages/shared/components/aside/Aside.styled.tsx
View File

@ -118,6 +118,7 @@ const StyledHeaderContainer = styled.div`
justify-content: space-between;
margin: 0 16px;
height: 53px;
min-height: 53px;
position: relative;
.additional-icons-container {