From 056fe260cdcabe17bea847903d281eca52947470 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 31 May 2022 09:37:06 +0300 Subject: [PATCH] Web: Files: Removed scroll sticking if you try to move the scroll slider. --- .../panels/SelectFileDialog/AsideView.js | 152 +++++++------ .../SelectionPanel/SelectionPanelBody.js | 204 +++++++++--------- 2 files changed, 170 insertions(+), 186 deletions(-) diff --git a/products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js b/products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js index 9f67e52d8b..f012c0ba16 100644 --- a/products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js +++ b/products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js @@ -33,92 +33,86 @@ const SelectFileDialogAsideView = ({ maxInputWidth, newFilter, }) => { - const onMouseEvent = (event) => { - event.stopPropagation(); - }; - return ( -
- - {dialogName} - - -
-
- - {t("Translations:FolderSelection")} - + + {dialogName} + + +
+
+ + {t("Translations:FolderSelection")} + - + - - {filesListTitle} - -
-
- + {filesListTitle} + +
+
+ +
+
+ {footer} +
+
-
- {footer} -
-
- - - -
+
+ + + ); }; export default SelectFileDialogAsideView; diff --git a/products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js b/products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js index 26a66a0b30..79859fbafc 100644 --- a/products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js +++ b/products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js @@ -47,119 +47,109 @@ const SelectionPanelBody = ({ isDisableButton, parentId, }) => { - const onMouseEvent = (event) => { - event.stopPropagation(); - }; - return ( -
- - {dialogName} - - -
-
- - {t("Common:Documents")} - + + {dialogName} + + +
+
+ + {t("Common:Documents")} + - {folderId && resultingFolderTree ? ( - + ) : ( + + )} +
+
+ <> +
+ {header} + + - ) : ( - - )} -
-
- <> -
- {header} - - - {folderSelection - ? t("FolderContents", { folderTitle }) - : filesListTitle} - -
- - - -
- -
-
{footer}
- -
-
+ + + +
+ +
+
{footer}
+ +
+
- - - -
+
+
+
+
); };