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

Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button.

Browse Source
This commit is contained in:
Tatiana Lopaeva 2021-08-27 17:10:26 +03:00
parent 71e2fad599
commit 2a872fe337
8 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/asc-web-components/heading/styled-heading.js
View File

@ -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 };

3
packages/asc-web-components/text/index.js
View File

@ -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;

3
packages/asc-web-components/text/styled-text.js
View File

@ -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 };

8
products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
View File

@ -175,10 +175,12 @@ class DeleteDialogComponent extends React.Component {
<ModalDialog.Header>{title}</ModalDialog.Header>
<ModalDialog.Body>
<div className="modal-dialog-content">
<Text className="delete_dialog-header-text">{noteText}</Text>
<Text className="delete_dialog-header-text" noSelect>
{noteText}
</Text>
<Scrollbar style={{ height, maxHeight: 330 }} stype="mediumBlack">
{foldersList.length > 0 && (
<Text isBold className="delete_dialog-text">
<Text isBold className="delete_dialog-text" noSelect>
{t("Translations:Folders")}:
</Text>
)}
@ -195,7 +197,7 @@ class DeleteDialogComponent extends React.Component {
))}
{filesList.length > 0 && (
<Text isBold className="delete_dialog-text">
<Text isBold className="delete_dialog-text" noSelect>
{t("Translations:Files")}:
</Text>
)}

10
products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
View File

@ -297,12 +297,18 @@ const DownloadContent = (props) => {
element={element}
>
<RowContent convertSideInfo={false}>
<Text truncate type="page" title={file.title} fontSize="14px">
<Text
truncate
type="page"
title={file.title}
fontSize="14px"
noSelect
>
{file.title}
</Text>
<></>
{file.checked && (
<Text fontSize="12px" containerWidth="auto">
<Text fontSize="12px" containerWidth="auto" noSelect>
{t("ConvertInto")}
</Text>
)}

15
products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
View File

@ -434,7 +434,7 @@ class DownloadDialogComponent extends React.Component {
>
<ModalDialog.Header>{t("Translations:DownloadAs")}</ModalDialog.Header>
<ModalDialog.Body>
<Text>{t("ChooseFormatText")}</Text>
<Text noSelect>{t("ChooseFormatText")}</Text>
{documents.length > 0 && (
<DownloadContent
t={t}
@ -490,7 +490,13 @@ class DownloadDialogComponent extends React.Component {
indeterminate={indeterminateOtherTitle}
>
<RowContent>
<Text truncate type="page" title={"Other"} fontSize="14px">
<Text
truncate
type="page"
title={"Other"}
fontSize="14px"
noSelect
>
{t("Other")}
</Text>
<></>
@ -518,11 +524,12 @@ class DownloadDialogComponent extends React.Component {
type="page"
title={folder.title}
fontSize="14px"
noSelect
>
{folder.title}
</Text>
<></>
<Text fontSize="12px" containerWidth="auto">
<Text fontSize="12px" containerWidth="auto" noSelect>
{folder.fileExst && t("OriginalFormat")}
</Text>
</RowContent>
@ -534,7 +541,7 @@ class DownloadDialogComponent extends React.Component {
)}
{!isSingleFile && <Text>{t("ConvertToZip")}</Text>}
<Text>{t("ConvertMessage")}</Text>
<Text noSelect>{t("ConvertMessage")}</Text>
</ModalDialog.Body>
<ModalDialog.Footer>
<Button

5
products/ASC.Files/Client/src/components/dialogs/ThirdPartyDialog/index.js
View File

@ -7,6 +7,7 @@ import ModalDialog from "@appserver/components/modal-dialog";
import Text from "@appserver/components/text";
import Link from "@appserver/components/link";
import { connectedCloudsTitleTranslation } from "../../../helpers/utils";
import NoUserSelect from "@appserver/components/utils/commonStyles";
const StyledServicesBlock = styled.div`
display: grid;
@ -28,6 +29,7 @@ const StyledServicesBlock = styled.div`
}
img {
${NoUserSelect}
border: 1px solid #d1d1d1;
width: 158px;
height: 40px;
@ -134,7 +136,7 @@ const ThirdPartyDialog = (props) => {
{t("Translations:ConnectingAccount")}
</ModalDialog.Header>
<ModalDialog.Body>
<Text as="div">
<Text as="div" noSelect>
{t("ConnectDescription")}
{isAdmin && (
<Trans t={t} i18nKey="ConnectAdminDescription" ns="Settings">
@ -230,6 +232,7 @@ const ThirdPartyDialog = (props) => {
className="service-item service-text"
data-title={webDavConnectItem[0]}
data-key={webDavConnectItem[0]}
noSelect
>
{t("ConnextOtherAccount")}
</Text>

1
products/ASC.Files/Client/src/pages/Settings/Section/Body/ConnectedClouds.js
View File

@ -239,6 +239,7 @@ class ConnectClouds extends React.Component {
fontWeight="600"
fontSize="15px"
color="#333"
noSelect
>
{tReady ? (
typeTitle