From 0268d807c268d8357d1846a83ef0b00d56b7a6e5 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Wed, 29 Jun 2022 17:22:57 +0300 Subject: [PATCH 1/3] Fix Bug 57863: errors in console when press enter repeatedly --- products/ASC.Files/Client/src/store/HotkeyStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/store/HotkeyStore.js b/products/ASC.Files/Client/src/store/HotkeyStore.js index 50fd7e324b..06f81193ca 100644 --- a/products/ASC.Files/Client/src/store/HotkeyStore.js +++ b/products/ASC.Files/Client/src/store/HotkeyStore.js @@ -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]) { From 46acfbca6d615e2d7218582e9b042bee915ff40c Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Wed, 29 Jun 2022 17:47:10 +0300 Subject: [PATCH 2/3] Fixed Bug 57769 - Docs: fixed banner selection --- .../asc-web-common/components/Section/index.js | 3 +++ .../asc-web-components/campaigns-banner/index.js | 16 +++++++++++++--- .../campaigns-banner/styled-campaigns-banner.js | 5 +++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/asc-web-common/components/Section/index.js b/packages/asc-web-common/components/Section/index.js index f5f55b56cd..1839cebec8 100644 --- a/packages/asc-web-common/components/Section/index.js +++ b/packages/asc-web-common/components/Section/index.js @@ -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); diff --git a/packages/asc-web-components/campaigns-banner/index.js b/packages/asc-web-components/campaigns-banner/index.js index 3daae5e938..6ed8cf1cee 100644 --- a/packages/asc-web-components/campaigns-banner/index.js +++ b/packages/asc-web-components/campaigns-banner/index.js @@ -25,13 +25,23 @@ const CampaignsBanner = (props) => { return ( - + {headerLabel} - + {subHeaderLabel} - + {!imageLoad && } diff --git a/packages/asc-web-components/campaigns-banner/styled-campaigns-banner.js b/packages/asc-web-components/campaigns-banner/styled-campaigns-banner.js index 0bb5d51442..5bf1e72c00 100644 --- a/packages/asc-web-components/campaigns-banner/styled-campaigns-banner.js +++ b/packages/asc-web-components/campaigns-banner/styled-campaigns-banner.js @@ -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}; From bbf70655324393c11e7e5f6876bf709bba54bbc9 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Wed, 29 Jun 2022 18:05:53 +0300 Subject: [PATCH 3/3] Fixed Bug 53879 - Client: Check box. Fixed file selection reset after adding new icons --- .../pages/Home/Section/Body/TilesView/sub-components/Tile.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js index 8ecf9e9509..4ccb74ec48 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js @@ -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([]); }