Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

This commit is contained in:
Vlada Gazizova 2022-06-29 18:07:25 +03:00
commit 517eefe3ab
5 changed files with 25 additions and 5 deletions

View File

@ -9,6 +9,7 @@ import {
isMobile as isMobileUtils,
isTablet as isTabletUtils,
} from "@appserver/components/utils/device";
import NoUserSelect from "@appserver/components/utils/commonStyles";
import { Provider } from "@appserver/components/utils/context";
import { isMobile, isFirefox, isMobileOnly } from "react-device-detect";
@ -39,6 +40,8 @@ const StyledSelectoWrapper = styled.div`
const StyledMainBar = styled.div`
box-sizing: border-box;
${NoUserSelect}
margin-left: -20px;
width: calc(100% + 20px);

View File

@ -25,13 +25,23 @@ const CampaignsBanner = (props) => {
return (
<BannerWrapper>
<a href={link} target="_blank" rel="noreferrer">
<Text fontWeight="700" fontSize="13px">
<Text noSelect fontWeight="700" fontSize="13px">
{headerLabel}
</Text>
<Text className="banner-sub-header" fontWeight="500" fontSize="12px">
<Text
noSelect
className="banner-sub-header"
fontWeight="500"
fontSize="12px"
>
{subHeaderLabel}
</Text>
<img src={img} onMouseDown={onMouseDown} onLoad={handleImageLoaded} />
<img
className="banner-img"
src={img}
onMouseDown={onMouseDown}
onLoad={handleImageLoaded}
/>
{!imageLoad && <Loaders.Rectangle height="140px" borderRadius="5px" />}
</a>

View File

@ -1,5 +1,6 @@
import styled from "styled-components";
import Base from "../themes/base";
import NoUserSelect from "../utils/commonStyles";
const BannerWrapper = styled.div`
max-width: 185px;
@ -32,6 +33,10 @@ const BannerWrapper = styled.div`
line-height: 1.5;
}
.banner-img {
${NoUserSelect}
}
.banner-btn {
width: 100%;
color: ${(props) => props.theme.campaignsBanner.btnColor};

View File

@ -383,7 +383,9 @@ class Tile extends React.PureComponent {
if (
e.target.nodeName !== "IMG" &&
e.target.nodeName !== "INPUT" &&
e.target.nodeName !== "rect"
e.target.nodeName !== "rect" &&
e.target.nodeName !== "path" &&
e.target.nodeName !== "svg"
) {
setSelection && setSelection([]);
}

View File

@ -69,7 +69,7 @@ class HotkeyStore {
);
if (viewAs === "table") {
item = item && item[0].getElementsByClassName("table-container_cell");
item = item && item[0]?.getElementsByClassName("table-container_cell");
}
if (item && item[0]) {