Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2

packages/asc-web-components/context-menu/index.js

@@ -83,10 +83,12 @@ class ContextMenu extends Component {
 
   hide = (e) => {
     this.currentEvent = e;
-    this.setState({ visible: false, reshow: false, changeView: false }, () => {
-      if (this.props.onHide) {
-        this.props.onHide(this.currentEvent);
-      }
+
+    this.props.onHide && this.props.onHide(e);
+    this.setState({
+      visible: false,
+      reshow: false,
+      changeView: false,
     });
   };
 

products/ASC.Files/Client/src/HOCs/withFileActions.js

@@ -30,6 +30,7 @@ export default function withFileActions(WrappedFileItem) {
 
     onHideContextMenu = () => {
       this.props.setBufferSelection(null);
+      this.props.setEnabledHotkeys(true);
     };
 
     onDropZoneUpload = (files, uploadToFolder) => {
@@ -253,6 +254,7 @@ export default function withFileActions(WrappedFileItem) {
         hotkeyCaret,
         activeFiles,
         activeFolders,
+        setEnabledHotkeys,
       } = filesStore;
 
       const { startUpload } = uploadDataStore;
@@ -323,6 +325,7 @@ export default function withFileActions(WrappedFileItem) {
         getModel: contextOptionsStore.getModel,
         showHotkeyBorder,
         openFileAction,
+        setEnabledHotkeys,
       };
     }
   )(observer(WithFileActions));

products/ASC.Files/Client/src/HOCs/withHotkeys.js

@@ -39,6 +39,7 @@ const withHotkeys = (Component) => {
 
       uploadFile,
       someDialogIsOpen,
+      enabledHotkeys,
     } = props;
 
     const hotkeysFilter = {
@@ -46,7 +47,7 @@ const withHotkeys = (Component) => {
         ev.target?.type === "checkbox" || ev.target?.tagName !== "INPUT",
       filterPreventDefault: false,
       enableOnTags: ["INPUT"],
-      enabled: !someDialogIsOpen,
+      enabled: !someDialogIsOpen && enabledHotkeys,
     };
 
     const onKeyDown = (e) => activateHotkeys(e);
@@ -219,7 +220,13 @@ const withHotkeys = (Component) => {
       filesActionsStore,
       hotkeyStore,
     }) => {
-      const { setSelected, viewAs, setViewAs, fileActionStore } = filesStore;
+      const {
+        setSelected,
+        viewAs,
+        setViewAs,
+        fileActionStore,
+        enabledHotkeys,
+      } = filesStore;
       const { setAction } = fileActionStore;
 
       const {
@@ -287,6 +294,7 @@ const withHotkeys = (Component) => {
 
         uploadFile,
         someDialogIsOpen,
+        enabledHotkeys,
       };
     }
   )(observer(WithHotkeys));

products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js

@@ -38,6 +38,7 @@ const FileTile = (props) => {
     badgesComponent,
     t,
     getContextModel,
+    onHideContextMenu,
   } = props;
 
   const temporaryExtension =
@@ -88,6 +89,7 @@ const FileTile = (props) => {
           inProgress={inProgress}
           isEdit={isEdit}
           getContextModel={getContextModel}
+          hideContextMenu={onHideContextMenu}
           t={t}
           title={
             item.isFolder

products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js

@@ -378,6 +378,7 @@ class Tile extends React.PureComponent {
       title,
       getContextModel,
       showHotkeyBorder,
+      hideContextMenu,
     } = this.props;
     const { isFolder, id, fileExst } = item;
 
@@ -479,6 +480,7 @@ class Tile extends React.PureComponent {
                 <div className="expandButton" />
               )}
               <ContextMenu
+                onHide={hideContextMenu}
                 getContextModel={getContextModel}
                 ref={this.cm}
                 header={contextMenuHeader}
@@ -552,6 +554,7 @@ class Tile extends React.PureComponent {
                   ref={this.cm}
                   header={contextMenuHeader}
                   withBackdrop={true}
+                  onHide={hideContextMenu}
                 />
               </StyledOptionButton>
             </StyledFileTileBottom>

products/ASC.Files/Client/src/store/FilesActionsStore.js

@@ -410,6 +410,7 @@ class FilesActionStore {
       setSelection,
       setHotkeyCaretStart,
       setHotkeyCaret,
+      setEnabledHotkeys,
       filesList,
     } = this.filesStore;
     /* selected === "close" &&  */ setSelected("none");
@@ -421,8 +422,10 @@ class FilesActionStore {
     );
 
     if (item) {
-      if (isBuffer) setBufferSelection(item);
-      else {
+      if (isBuffer) {
+        setBufferSelection(item);
+        setEnabledHotkeys(false);
+      } else {
         setSelection([item]);
         setHotkeyCaret(null);
         setHotkeyCaretStart(null);

products/ASC.Files/Client/src/store/FilesStore.js

@@ -63,6 +63,7 @@ class FilesStore {
   headerBorder = false;
 
   isPrevSettingsModule = false;
+  enabledHotkeys = true;
 
   constructor(
     authStore,
@@ -1940,6 +1941,10 @@ class FilesStore {
   setPasswordEntryProcess = (process) => {
     this.passwordEntryProcess = process;
   };
+
+  setEnabledHotkeys = (enabledHotkeys) => {
+    this.enabledHotkeys = enabledHotkeys;
+  };
 }
 
 export default FilesStore;