From 3bc91ad33bb66e114797fc8467a4008ff9416b1b Mon Sep 17 00:00:00 2001 From: Akmal Isomadinov Date: Wed, 17 Jul 2024 15:11:49 +0500 Subject: [PATCH 01/11] Client: Fixed bug 69070 --- packages/client/src/components/EmptyContainer/index.js | 6 +++++- packages/client/src/pages/Home/Hooks/useFiles.js | 2 +- packages/client/src/store/ContextOptionsStore.js | 4 ++++ packages/shared/enums/index.ts | 9 +++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/EmptyContainer/index.js b/packages/client/src/components/EmptyContainer/index.js index b11d3a3994..956a768482 100644 --- a/packages/client/src/components/EmptyContainer/index.js +++ b/packages/client/src/components/EmptyContainer/index.js @@ -27,10 +27,11 @@ import { observer, inject } from "mobx-react"; //import { useLocation } from "react-router-dom"; +import { Events, FileExtensions } from "@docspace/shared/enums"; + import RootFolderContainer from "./RootFolderContainer"; import EmptyFilterContainer from "./EmptyFilterContainer"; import EmptyFolderContainer from "./EmptyFolderContainer"; -import { Events } from "@docspace/shared/enums"; import RoomNoAccessContainer from "./RoomNoAccessContainer"; const linkStyles = { @@ -65,9 +66,12 @@ const EmptyContainer = ({ const event = new Event(Events.CREATE); + const isPDF = format === FileExtensions.PDF; + const payload = { extension: format, id: -1, + edit: isPDF, }; event.payload = payload; diff --git a/packages/client/src/pages/Home/Hooks/useFiles.js b/packages/client/src/pages/Home/Hooks/useFiles.js index 7001aee8e0..defecd2b6c 100644 --- a/packages/client/src/pages/Home/Hooks/useFiles.js +++ b/packages/client/src/pages/Home/Hooks/useFiles.js @@ -314,7 +314,7 @@ const useFiles = ({ fromTemplate: true, title: gallerySelected.attributes.name_form, openEditor: !isFormRoom, - edit: true, + edit: !isFormRoom, }; event.payload = payload; diff --git a/packages/client/src/store/ContextOptionsStore.js b/packages/client/src/store/ContextOptionsStore.js index df1c37e226..f587cd9241 100644 --- a/packages/client/src/store/ContextOptionsStore.js +++ b/packages/client/src/store/ContextOptionsStore.js @@ -104,6 +104,7 @@ import { UrlActionType, EmployeeType, FilesSelectorFilterTypes, + FileExtensions, } from "@docspace/shared/enums"; import FilesFilter from "@docspace/shared/api/files/filter"; import { getFileLink, getFolderLink } from "@docspace/shared/api/files"; @@ -2123,9 +2124,12 @@ class ContextOptionsStore { onCreate = (format) => { const event = new Event(Events.CREATE); + const isPDf = format === FileExtensions.PDF; + const payload = { extension: format, id: -1, + edit: isPDf, }; event.payload = payload; diff --git a/packages/shared/enums/index.ts b/packages/shared/enums/index.ts index cd9fa471f5..efa095906a 100644 --- a/packages/shared/enums/index.ts +++ b/packages/shared/enums/index.ts @@ -583,3 +583,12 @@ export const enum LDAPCertificateProblem { CertUntrustedCa = -2146762478, CertUnrecognizedError = -2146762477, } + +export enum FileExtensions { + PDF = "pdf", + DOC = "doc", + DOCX = "docx", + DOCXF = "docxf", + XLSX = "xlsx", + PPTX = "pptx", +} From 3297bdf32f50ae892759f6b352eca59f9c8f14cf Mon Sep 17 00:00:00 2001 From: DmitrySychugov Date: Wed, 17 Jul 2024 15:37:48 +0500 Subject: [PATCH 02/11] Fix Bug 66422 - Client: corrected colors for badges, type user --- .../sub-components/ItemTitle/AccountsItemTitle.js | 6 ++++-- .../Body/sub-components/ItemTitle/GroupsItemTitle.js | 4 +++- .../src/pages/Home/Section/AccountsBody/Badges.js | 9 +++++---- .../PortalSettings/Layout/Section/Header/index.js | 5 +++-- .../categories/common/Branding/CommonWhiteLabel.js | 4 +++- .../categories/common/Branding/whitelabel.js | 3 ++- .../categories/common/Customization/dns-settings.js | 5 ++++- .../data-management/backup/auto-backup/index.js | 2 +- .../LDAP/sub-components/ToggleAutoSync.js | 2 +- .../integration/LDAP/sub-components/ToggleLDAP.js | 2 +- .../SingleSignOn/sub-components/ToggleSSO.js | 6 ++++-- .../integration/ThirdPartyServicesSettings/index.js | 2 +- .../security/sub-components/HistoryMainContent.js | 6 ++++-- .../categories/storage-management/Quotas.js | 4 +++- .../categories/storage-management/Statistics.js | 5 ++++- .../components/MobileCategoryWrapper.js | 6 ++++-- .../Body/sub-components/main-profile/index.js | 8 ++++---- .../components/drop-down-item/DropDownItem.tsx | 4 +++- packages/shared/themes/dark.ts | 12 ++++++------ 19 files changed, 60 insertions(+), 35 deletions(-) diff --git a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js index 8bebbf6b8d..890ecb92e8 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js @@ -26,6 +26,7 @@ import { useRef } from "react"; import { withTranslation } from "react-i18next"; +import { useTheme } from "styled-components"; import { Text } from "@docspace/shared/components/text"; import { Tooltip } from "@docspace/shared/components/tooltip"; @@ -48,6 +49,7 @@ const AccountsItemTitle = ({ return <>; } + const theme = useTheme(); const itemTitleRef = useRef(); const isPending = @@ -113,7 +115,7 @@ const AccountsItemTitle = ({ className="sso-badge" label={t("Common:SSO")} color={"#FFFFFF"} - backgroundColor="#22C386" + backgroundColor={theme.isBase ? "#22C386" : "#2E5E4C"} fontSize={"9px"} fontWeight={800} noHover @@ -132,7 +134,7 @@ const AccountsItemTitle = ({ className="ldap-badge" label={t("Common:LDAP")} color={"#FFFFFF"} - backgroundColor="#8570BD" + backgroundColor={theme.isBase ? "#8570BD" : "#544C6A"} fontSize={"9px"} fontWeight={800} noHover diff --git a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/GroupsItemTitle.js b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/GroupsItemTitle.js index fa5a128cc1..f9687dab8f 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/GroupsItemTitle.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/GroupsItemTitle.js @@ -26,6 +26,7 @@ import { useRef } from "react"; import { withTranslation } from "react-i18next"; +import { useTheme } from "styled-components"; import { Text } from "@docspace/shared/components/text"; import { ContextMenuButton } from "@docspace/shared/components/context-menu-button"; import { Avatar, AvatarSize } from "@docspace/shared/components/avatar"; @@ -43,6 +44,7 @@ const GroupsItemTitle = ({ getGroupContextOptions, }) => { const itemTitleRef = useRef(); + const theme = useTheme(); const getContextOptions = () => getGroupContextOptions(t, infoPanelSelection, true); @@ -88,7 +90,7 @@ const GroupsItemTitle = ({ className="ldap-badge" label={t("Common:LDAP")} color={"#FFFFFF"} - backgroundColor="#8570BD" + backgroundColor={theme.isBase ? "#8570BD" : "#544C6A"} fontSize={"9px"} fontWeight={800} noHover diff --git a/packages/client/src/pages/Home/Section/AccountsBody/Badges.js b/packages/client/src/pages/Home/Section/AccountsBody/Badges.js index 8fe51a53b6..e48f45b504 100644 --- a/packages/client/src/pages/Home/Section/AccountsBody/Badges.js +++ b/packages/client/src/pages/Home/Section/AccountsBody/Badges.js @@ -26,7 +26,7 @@ import React from "react"; import { inject, observer } from "mobx-react"; -import styled, { css } from "styled-components"; +import styled, { css, useTheme } from "styled-components"; import { withTranslation } from "react-i18next"; import { useNavigate, useLocation } from "react-router-dom"; @@ -97,6 +97,7 @@ const Badges = ({ }) => { const navigate = useNavigate(); const location = useLocation(); + const theme = useTheme(); const onClickPaid = () => { if (filter.payments === PaymentsType.Paid) return; @@ -130,7 +131,7 @@ const Badges = ({ className="accounts-badge" label={t("Common:LDAP")} color={"#FFFFFF"} - backgroundColor="#8570BD" + backgroundColor={theme.isBase ? "#8570BD" : "#544C6A"} fontSize={"9px"} fontWeight={800} noHover @@ -143,7 +144,7 @@ const Badges = ({ className="accounts-badge" label={t("SSO")} color={"#FFFFFF"} - backgroundColor="#22C386" + backgroundColor={theme.isBase ? "#22C386" : "#2E5E4C"} fontSize={"9px"} fontWeight={800} noHover @@ -155,7 +156,7 @@ const Badges = ({ { const navigate = useNavigate(); const location = useLocation(); + const theme = useTheme(); const [state, setState] = React.useState({ header: "", @@ -390,7 +391,7 @@ const SectionHeaderContent = (props) => { {isNeedPaidIcon ? ( { + const theme = useTheme(); const { t } = useTranslation(["Settings", "Profile", "Common"]); return ( @@ -66,7 +68,7 @@ const CommonWhiteLabel = ({ {!isSettingPaid && ( diff --git a/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js b/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js index 3478cb7284..b7e950b285 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js +++ b/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js @@ -73,6 +73,7 @@ const WhiteLabel = (props) => { resetIsInit, standalone, + theme, } = props; const navigate = useNavigate(); const location = useLocation(); @@ -278,7 +279,7 @@ const WhiteLabel = (props) => { diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js index e3d09aa775..63d53294d8 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js +++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js @@ -26,6 +26,7 @@ import CombinedShapeSvgUrl from "PUBLIC_DIR/images/combined.shape.svg?url"; import React, { useState, useEffect, useCallback } from "react"; +import { useTheme } from "styled-components"; import { withTranslation } from "react-i18next"; import { HelpButton } from "@docspace/shared/components/help-button"; import { FieldContainer } from "@docspace/shared/components/field-container"; @@ -96,6 +97,8 @@ const DNSSettings = (props) => { const [isError, setIsError] = useState(false); const [errorText, setErrorText] = useState(""); + const theme = useTheme(); + useEffect(() => { setDocumentTitle(t("DNSSettings")); @@ -287,7 +290,7 @@ const DNSSettings = (props) => { diff --git a/packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js b/packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js index eb52bf6c97..b5c929fce8 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js @@ -504,7 +504,7 @@ class AutomaticBackup extends React.PureComponent { {!isEnableAuto && ( {!isLdapAvailable && ( {!isLdapAvailable && ( { const { t } = useTranslation("SingleSignOn"); + + const theme = useTheme(); return ( { {!isSSOAvailable && ( { const isLoginHistoryPage = window.location.pathname.includes("login-history"); + const theme = useTheme(); + useEffect(() => { getSettings(); }, []); @@ -315,7 +317,7 @@ const HistoryMainContent = (props) => { diff --git a/packages/client/src/pages/PortalSettings/categories/storage-management/Quotas.js b/packages/client/src/pages/PortalSettings/categories/storage-management/Quotas.js index d7ee2a50fc..9f5e634b07 100644 --- a/packages/client/src/pages/PortalSettings/categories/storage-management/Quotas.js +++ b/packages/client/src/pages/PortalSettings/categories/storage-management/Quotas.js @@ -27,6 +27,7 @@ import { useTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import { Trans } from "react-i18next"; +import { useTheme } from "styled-components"; import { isMobile } from "@docspace/shared/utils"; import { Text } from "@docspace/shared/components/text"; @@ -54,6 +55,7 @@ const QuotaPerItemsComponent = ({ isStatisticsAvailable }) => { }; const QuotasComponent = (props) => { const { t } = useTranslation("Settings"); + const theme = useTheme(); const { isStatisticsAvailable } = props; @@ -66,7 +68,7 @@ const QuotasComponent = (props) => { {!isStatisticsAvailable && ( { const { t } = useTranslation("Settings"); + const theme = useTheme(); const { isStatisticsAvailable } = props; + const iconElement = ( id, icon, @@ -89,7 +92,7 @@ const StatisticsComponent = (props) => { {!isStatisticsAvailable && ( { badgeLabel, } = props; + const theme = useTheme(); + const onClickProp = isDisabled ? {} : { onClick: onClickLink }; const onHrefProp = isDisabled ? {} : { href: url }; @@ -107,7 +109,7 @@ const MobileCategoryWrapper = (props) => { {withPaidBadge && ( { className="sso-badge" label={t("Common:SSO")} color={"#FFFFFF"} - backgroundColor="#22C386" + backgroundColor={theme.isBase ? "#22C386" : "#2E5E4C"} fontSize={"9px"} fontWeight={800} noHover @@ -242,7 +242,7 @@ const MainProfile = (props) => { className="sso-badge" label={t("Common:LDAP")} color={"#FFFFFF"} - backgroundColor="#8570BD" + backgroundColor={theme.isBase ? "#8570BD" : "#544C6A"} fontSize={"9px"} fontWeight={800} noHover @@ -268,7 +268,7 @@ const MainProfile = (props) => { className="sso-badge" label={t("Common:SSO")} color={"#FFFFFF"} - backgroundColor="#22C386" + backgroundColor={theme.isBase ? "#22C386" : "#2E5E4C"} fontSize={"9px"} fontWeight={800} noHover @@ -287,7 +287,7 @@ const MainProfile = (props) => { className="ldap-badge" label={t("Common:LDAP")} color={"#FFFFFF"} - backgroundColor="#8570BD" + backgroundColor={theme.isBase ? "#8570BD" : "#544C6A"} fontSize={"9px"} fontWeight={800} noHover diff --git a/packages/shared/components/drop-down-item/DropDownItem.tsx b/packages/shared/components/drop-down-item/DropDownItem.tsx index 838af92eb9..75e208d6b5 100644 --- a/packages/shared/components/drop-down-item/DropDownItem.tsx +++ b/packages/shared/components/drop-down-item/DropDownItem.tsx @@ -27,6 +27,7 @@ import React from "react"; import { ReactSVG } from "react-svg"; import { useTranslation } from "react-i18next"; +import { useTheme } from "styled-components"; import RightArrowReactSvgUrl from "PUBLIC_DIR/images/right.arrow.react.svg?url"; import ArrowLeftReactUrl from "PUBLIC_DIR/images/arrow-left.react.svg?url"; @@ -69,6 +70,7 @@ const DropDownItem = (props: DropDownItemProps) => { } = props; const { t } = useTranslation(["Common"]); + const theme = useTheme(); const { withToggle, checked, onClick, onClickSelectedItem, label, ...rest } = props; @@ -168,7 +170,7 @@ const DropDownItem = (props: DropDownItemProps) => { fontSize="9px" isHovered={false} borderRadius="50px" - backgroundColor="#533ED1" + backgroundColor={theme.isBase ? "#533ED1" : "#5447A3"} label={t("Common:BetaLabel")} /> diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts index 7710b8403f..63d63c8b79 100644 --- a/packages/shared/themes/dark.ts +++ b/packages/shared/themes/dark.ts @@ -605,7 +605,7 @@ const Dark: TTheme = { padding: "1px", lineHeight: "0.8", overflow: "hidden", - color: black, + color: white, backgroundColor: "#F59931", disableBackgroundColor: "#858585", }, @@ -1113,21 +1113,21 @@ const Dark: TTheme = { }, administrator: { - fill: "#F59931", + fill: "#A15B1D", stroke: darkBlack, - color: black, + color: white, }, guest: { fill: "#575757", stroke: darkBlack, - color: black, + color: white, }, owner: { - fill: "#EDC409", + fill: "#A38A1A", stroke: darkBlack, - color: black, + color: white, }, editContainer: { From c7aa25e62b71ad4565aeff44cbcba38ca248087b Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Wed, 17 Jul 2024 13:45:44 +0300 Subject: [PATCH 03/11] Shared: ModalDialog: fix padding --- packages/shared/components/modal-dialog/ModalDialog.styled.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/components/modal-dialog/ModalDialog.styled.ts b/packages/shared/components/modal-dialog/ModalDialog.styled.ts index cd923ac106..8d02861821 100644 --- a/packages/shared/components/modal-dialog/ModalDialog.styled.ts +++ b/packages/shared/components/modal-dialog/ModalDialog.styled.ts @@ -178,7 +178,7 @@ const StyledBody = styled(Box)<{ withBodyScroll?: boolean; }>` position: relative; - padding: 0 16px; + padding: 16px; padding-bottom: ${(props) => props.currentDisplayType === "aside" || props.hasFooter ? "8px" : "16px"}; From 67ccf13720042cae72908b899661806ff2c27034 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Wed, 17 Jul 2024 13:51:18 +0300 Subject: [PATCH 04/11] Fix Bug 69242 Stretched logo on login --- .../components/color-theme/sub-components/LoginContainer.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/shared/components/color-theme/sub-components/LoginContainer.ts b/packages/shared/components/color-theme/sub-components/LoginContainer.ts index 849f5c6321..991120e440 100644 --- a/packages/shared/components/color-theme/sub-components/LoginContainer.ts +++ b/packages/shared/components/color-theme/sub-components/LoginContainer.ts @@ -270,6 +270,7 @@ const LoginContainer = styled.div<{ align-items: center; justify-content: center; width: 100%; + max-width: 386px; height: ${(props) => (props.type === "invitation" ? "26.56px" : "44px")}; padding-bottom: ${(props) => props.type === "invitation" ? "16px" : "40px"}; From 1965f8d4be3cbac73b9a6ece87c95f8ffe93a24f Mon Sep 17 00:00:00 2001 From: Akmal Isomadinov Date: Wed, 17 Jul 2024 15:56:05 +0500 Subject: [PATCH 05/11] Client: Fixed bug 69191 The "Save here" button is active on the "Save" panel in the PDF editor from the "Complete" folder. --- packages/doceditor/src/hooks/useSelectFolderDialog.ts | 4 +++- packages/shared/components/selector/sub-components/Footer.tsx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/doceditor/src/hooks/useSelectFolderDialog.ts b/packages/doceditor/src/hooks/useSelectFolderDialog.ts index 5a6fcccbfa..632f8a4fd6 100644 --- a/packages/doceditor/src/hooks/useSelectFolderDialog.ts +++ b/packages/doceditor/src/hooks/useSelectFolderDialog.ts @@ -119,6 +119,9 @@ const useSelectFolderDialog = ({}: UseSelectFolderDialogProps) => { if (!selectedItemSecurity) return false; + if ("Create" in selectedItemSecurity && !selectedItemSecurity.Create) + return true; + return "CopyTo" in selectedItemSecurity ? !selectedItemSecurity?.CopyTo : !selectedItemSecurity.Copy; @@ -136,4 +139,3 @@ const useSelectFolderDialog = ({}: UseSelectFolderDialogProps) => { }; export default useSelectFolderDialog; - diff --git a/packages/shared/components/selector/sub-components/Footer.tsx b/packages/shared/components/selector/sub-components/Footer.tsx index 2224f206c2..a92d43acb7 100644 --- a/packages/shared/components/selector/sub-components/Footer.tsx +++ b/packages/shared/components/selector/sub-components/Footer.tsx @@ -140,7 +140,7 @@ const Footer = React.memo( isDisabled={ !withFooterInput ? disableSubmitButton - : disableSubmitButton && !currentFooterInputValue.trim() + : disableSubmitButton || !currentFooterInputValue.trim() } onClick={onSubmit} /> From 1626d2b3b97d9e9f83bfa8fb55d68b05d0e86f1f Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Wed, 17 Jul 2024 13:26:33 +0200 Subject: [PATCH 06/11] Client: InvitePanel: Fix broken tabs in AddUsersPanel in RTL --- .../src/components/panels/InvitePanel/StyledInvitePanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js index 458ccec52a..68db8db36b 100644 --- a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js +++ b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js @@ -342,8 +342,8 @@ const StyledInviteInputContainer = styled.div` overflow-x: hidden; } .scroll-body > div { - justify-content: left; - padding-left: 16px; + justify-content: flex-start; + padding-inline-start: 16px; } } } From 0712c90cb525d9785100ff0f57bd7961b9faa21e Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Wed, 17 Jul 2024 14:29:21 +0300 Subject: [PATCH 07/11] Revert "Shared: ModalDialog: fix padding" This reverts commit c7aa25e62b71ad4565aeff44cbcba38ca248087b. --- packages/shared/components/modal-dialog/ModalDialog.styled.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/components/modal-dialog/ModalDialog.styled.ts b/packages/shared/components/modal-dialog/ModalDialog.styled.ts index 8d02861821..cd923ac106 100644 --- a/packages/shared/components/modal-dialog/ModalDialog.styled.ts +++ b/packages/shared/components/modal-dialog/ModalDialog.styled.ts @@ -178,7 +178,7 @@ const StyledBody = styled(Box)<{ withBodyScroll?: boolean; }>` position: relative; - padding: 16px; + padding: 0 16px; padding-bottom: ${(props) => props.currentDisplayType === "aside" || props.hasFooter ? "8px" : "16px"}; From 17788d7ac0f846d83b7382aa9620be5d8a7af74a Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Wed, 17 Jul 2024 14:35:41 +0300 Subject: [PATCH 08/11] Client: CreateEditRoomDialog: add margin --- .../dialogs/CreateEditRoomDialog/sub-components/RoomTypeList.js | 1 + .../dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeList.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeList.js index 549c876a0c..c46dcfe682 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeList.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeList.js @@ -34,6 +34,7 @@ import RoomTypeListLoader from "@docspace/shared/skeletons/create-edit-room/Room import { RoomsTypeValues } from "@docspace/shared/utils/common"; const StyledRoomTypeList = styled.div` + margin-top: 20px; width: 100%; display: flex; flex-direction: column; diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js index e1c91a1dcc..37e07b1655 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js @@ -54,6 +54,7 @@ const StyledSetRoomParams = styled.div` flex-direction: column; width: 100%; gap: 22px; + margin-top: 20px; .icon-editor_text { margin-bottom: 6px; From d5dd886dad87f75d5b2fe64a5f8d9fc04337faab Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Wed, 17 Jul 2024 14:36:00 +0300 Subject: [PATCH 09/11] Editor: ShareDialog: add margin --- packages/doceditor/src/components/ShareDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/doceditor/src/components/ShareDialog.tsx b/packages/doceditor/src/components/ShareDialog.tsx index d57e6be42a..932aa6ed3e 100644 --- a/packages/doceditor/src/components/ShareDialog.tsx +++ b/packages/doceditor/src/components/ShareDialog.tsx @@ -39,7 +39,7 @@ import { TFile } from "@docspace/shared/api/files/types"; const StyledWrapper = styled.div` ${NoUserSelect} - + margin-top: 16px; height: 100%; display: flex; flex-direction: column; From 55657c9c706b4ea372e8c4d218b1351a743be9c8 Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Wed, 17 Jul 2024 13:51:21 +0200 Subject: [PATCH 10/11] Client: InvitePanel: Fix not fullwidth rows in invite panel on mobile screen size --- .../src/components/panels/InvitePanel/StyledInvitePanel.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js index 68db8db36b..7a5cd4b468 100644 --- a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js +++ b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js @@ -118,12 +118,11 @@ const ScrollList = styled.div` ? "auto" : props.offsetTop && `calc(100% - ${props.offsetTop}px)`}; - ${!isMobile() && - css` - .row-item { + .row-item { + @media not ${mobile} { width: 448px !important; } - `} + } `; const StyledBlock = styled.div` From 3d9547c327cdbbf299a29c4333f95b242f44f6d5 Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Wed, 17 Jul 2024 13:57:45 +0200 Subject: [PATCH 11/11] Client: InvitePanel: Fix invite input in rtl --- .../panels/InvitePanel/StyledInvitePanel.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js index 7a5cd4b468..c47db34fb1 100644 --- a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js +++ b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js @@ -263,7 +263,7 @@ const StyledInviteInput = styled.div` .append { display: ${(props) => (props.isShowCross ? "flex" : "none")}; align-items: center; - padding-right: 8px; + padding-inline-end: 8px; cursor: default; } @@ -372,7 +372,7 @@ const StyledDropDown = styled(DropDown)` .email-list_add-button { display: flex; - margin-left: auto; + margin-inline-start: auto; align-items: center; gap: 4px; @@ -380,8 +380,13 @@ const StyledDropDown = styled(DropDown)` color: #4781d1; } - svg path { - fill: #4781d1; + svg { + ${({ theme }) => + theme.interfaceDirection === "rtl" && "transform: scaleX(-1);"}; + + path { + fill: #4781d1; + } } } }