From 4f93505de9454fdb0993a215808d3f73776e3411 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 24 Jun 2022 17:54:33 +0300 Subject: [PATCH 1/4] Fix Bug 57777 - Docs: Hotkey Ctrl+A makes pagination block smaller by height --- products/ASC.Files/Client/src/store/HotkeyStore.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/products/ASC.Files/Client/src/store/HotkeyStore.js b/products/ASC.Files/Client/src/store/HotkeyStore.js index 11481e22f0..bea6fb484a 100644 --- a/products/ASC.Files/Client/src/store/HotkeyStore.js +++ b/products/ASC.Files/Client/src/store/HotkeyStore.js @@ -85,8 +85,8 @@ class HotkeyStore { } else { if (scroll) scroll.style.overflowX = "hidden"; //hack to fix react-custom-scrollbar bug with horizontal scroll el.scrollIntoView({ block: "center" }); - if (scroll) scroll.style.overflowX = null; - //console.log("element is not visible"); + if (scroll) scroll.style.overflowX = "scroll"; + console.log("element is not visible"); } } }; From 84ff84faa25e75c33fc01715a9563b94f848e8c5 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 24 Jun 2022 18:07:17 +0300 Subject: [PATCH 2/4] Fix Bug 57800 - Docs: Application crash after going to a folder and calling the menu with the "+" button in Desktop/Tablet mode --- packages/asc-web-components/drop-down/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/asc-web-components/drop-down/index.js b/packages/asc-web-components/drop-down/index.js index 4662add70a..9035e4356b 100644 --- a/packages/asc-web-components/drop-down/index.js +++ b/packages/asc-web-components/drop-down/index.js @@ -163,7 +163,7 @@ class DropDown extends React.PureComponent { const rects = parent.current.getBoundingClientRect(); - let dropDownHeight = this.dropDownRef.current.offsetParent + let dropDownHeight = this.dropDownRef.current?.offsetParent ? this.dropDownRef.current.offsetHeight : DomHelpers.getHiddenElementOuterHeight(this.dropDownRef.current); From f0f4e13633f6de79a99638d0e5391cdfcc1d67cb Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 24 Jun 2022 18:39:33 +0300 Subject: [PATCH 3/4] Fix Bug 57771 - The text color of the hotkeys on the Hotkeys page is not adapted to the dark theme --- packages/asc-web-components/themes/base.js | 6 ++++++ packages/asc-web-components/themes/dark.js | 6 ++++++ .../src/components/panels/HotkeysPanel/index.js | 14 +++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/packages/asc-web-components/themes/base.js b/packages/asc-web-components/themes/base.js index 68d3014603..b62dbcd48f 100644 --- a/packages/asc-web-components/themes/base.js +++ b/packages/asc-web-components/themes/base.js @@ -2706,6 +2706,12 @@ const Base = { textColor: "#316DAA", bottomLineColor: "#316DAA", }, + + hotkeys: { + key: { + color: grayMain, + }, + }, }; export default Base; diff --git a/packages/asc-web-components/themes/dark.js b/packages/asc-web-components/themes/dark.js index 08345f2369..0e57774d2e 100644 --- a/packages/asc-web-components/themes/dark.js +++ b/packages/asc-web-components/themes/dark.js @@ -2716,6 +2716,12 @@ const Dark = { textColor: "#E06A1B", bottomLineColor: "#E06A1B", }, + + hotkeys: { + key: { + color: "#C4C4C4", + }, + }, }; export default Dark; diff --git a/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js b/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js index 9668d3669e..51fbdc9e5a 100644 --- a/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js +++ b/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js @@ -14,8 +14,9 @@ import NavigationBlock from "./NavigationBlock"; import CreationBlock from "./CreationBlock"; import UploadBlock from "./UploadBlock"; import { isMacOs } from "react-device-detect"; +import Base from "@appserver/components/themes/base"; -const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => { +const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, theme, tReady }) => { const scrollRef = useRef(null); const onClose = () => setHotkeyPanelVisible(false); @@ -27,7 +28,7 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => { }; const keyTextStyles = { ...textStyles, - ...{ color: "#657077", className: "hotkeys-key" }, + ...{ color: theme.hotkeys.key.color, className: "hotkeys-key" }, }; const CtrlKey = isMacOs ? "⌘" : "Ctrl"; @@ -131,12 +132,19 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => { ); }; +HotkeyPanel.defaultProps = { theme: Base }; + export default inject(({ auth }) => { - const { hotkeyPanelVisible, setHotkeyPanelVisible } = auth.settingsStore; + const { + hotkeyPanelVisible, + setHotkeyPanelVisible, + theme, + } = auth.settingsStore; return { visible: hotkeyPanelVisible, setHotkeyPanelVisible, + theme, }; })( withTranslation(["HotkeysPanel", "Article", "Common"])(observer(HotkeyPanel)) From 80addf5d866c67aacf195c3991b49c14c39e03f6 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Fri, 24 Jun 2022 20:41:11 +0300 Subject: [PATCH 4/4] fixed Bug 57463 --- .../WCFService/FileOperations/FileMarkAsReadOperation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs index b1a83d2034..503c39fe94 100644 --- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs +++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs @@ -133,7 +133,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations var newrootfolder = new List(); - foreach (var r in rootIds) + foreach (var r in rootIds.Where(id => id != 0)) { var item = new KeyValuePair(r, await fileMarker.GetRootFoldersIdMarkedAsNewAsync(r)); newrootfolder.Add($"new_{{\"key\"? \"{item.Key}\", \"value\"? \"{item.Value}\"}}");