From 2a872fe33705a83e61017db60ab3ad45495e11ed Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Fri, 27 Aug 2021 17:10:26 +0300 Subject: [PATCH] Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. --- .../asc-web-components/heading/styled-heading.js | 4 +++- packages/asc-web-components/text/index.js | 3 +++ packages/asc-web-components/text/styled-text.js | 3 ++- .../src/components/dialogs/DeleteDialog/index.js | 8 +++++--- .../dialogs/DownloadDialog/DownloadContent.js | 10 ++++++++-- .../components/dialogs/DownloadDialog/index.js | 15 +++++++++++---- .../components/dialogs/ThirdPartyDialog/index.js | 5 ++++- .../Settings/Section/Body/ConnectedClouds.js | 1 + 8 files changed, 37 insertions(+), 12 deletions(-) diff --git a/packages/asc-web-components/heading/styled-heading.js b/packages/asc-web-components/heading/styled-heading.js index 8b6d4fab1a..278eea49d5 100644 --- a/packages/asc-web-components/heading/styled-heading.js +++ b/packages/asc-web-components/heading/styled-heading.js @@ -1,5 +1,5 @@ import styled, { css } from "styled-components"; - +import NoUserSelect from "@appserver/components/utils/commonStyles"; import commonTextStyles from "../text/common-text-styles"; import Base from "../themes/base"; @@ -20,6 +20,8 @@ const StyledHeading = styled.h1` ${styleCss}; ${commonTextStyles}; + + ${NoUserSelect}; `; StyledHeading.defaultProps = { theme: Base }; diff --git a/packages/asc-web-components/text/index.js b/packages/asc-web-components/text/index.js index 3a6d14d29f..f4a05ab08d 100644 --- a/packages/asc-web-components/text/index.js +++ b/packages/asc-web-components/text/index.js @@ -53,6 +53,8 @@ Text.propTypes = { isItalic: PropTypes.bool, /** Sets the 'display' property */ display: PropTypes.string, + /** Disable selection of text*/ + noSelect: PropTypes.bool, }; Text.defaultProps = { @@ -63,6 +65,7 @@ Text.defaultProps = { isBold: false, isInline: false, isItalic: false, + noSelect: false, }; export default Text; diff --git a/packages/asc-web-components/text/styled-text.js b/packages/asc-web-components/text/styled-text.js index 377e565ed7..d0eae90c6b 100644 --- a/packages/asc-web-components/text/styled-text.js +++ b/packages/asc-web-components/text/styled-text.js @@ -1,7 +1,7 @@ import styled, { css } from "styled-components"; import commonTextStyles from "./common-text-styles"; import Base from "../themes/base"; - +import NoUserSelect from "@appserver/components/utils/commonStyles"; const styleCss = css` font-size: ${(props) => props.fontSizeProp}; outline: 0 !important; @@ -37,6 +37,7 @@ const StyledText = styled.p` ${styleCss}; ${commonTextStyles}; + ${(props) => props.noSelect && NoUserSelect} `; StyledText.defaultProps = { theme: Base }; diff --git a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js index 161033f7a8..d492ec72eb 100644 --- a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js +++ b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js @@ -175,10 +175,12 @@ class DeleteDialogComponent extends React.Component { {title}
- {noteText} + + {noteText} + {foldersList.length > 0 && ( - + {t("Translations:Folders")}: )} @@ -195,7 +197,7 @@ class DeleteDialogComponent extends React.Component { ))} {filesList.length > 0 && ( - + {t("Translations:Files")}: )} diff --git a/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js b/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js index 89eaba3d15..3e7608f35c 100644 --- a/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js +++ b/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js @@ -297,12 +297,18 @@ const DownloadContent = (props) => { element={element} > - + {file.title} <> {file.checked && ( - + {t("ConvertInto")} )} diff --git a/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js b/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js index b75d16621f..0d9778db0f 100644 --- a/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js +++ b/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js @@ -434,7 +434,7 @@ class DownloadDialogComponent extends React.Component { > {t("Translations:DownloadAs")} - {t("ChooseFormatText")} + {t("ChooseFormatText")} {documents.length > 0 && ( - + {t("Other")} <> @@ -518,11 +524,12 @@ class DownloadDialogComponent extends React.Component { type="page" title={folder.title} fontSize="14px" + noSelect > {folder.title} <> - + {folder.fileExst && t("OriginalFormat")} @@ -534,7 +541,7 @@ class DownloadDialogComponent extends React.Component { )} {!isSingleFile && {t("ConvertToZip")}} - {t("ConvertMessage")} + {t("ConvertMessage")}