Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0

products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js

@@ -116,6 +116,7 @@ const EditingWrapperComponent = (props) => {
         onClick={cancelUpdateItem}
         icon={cancelIcon}
         data-itemid={itemId}
+        data-action="cancel"
         onMouseEnter={setIsHoveredCancelHandler}
         onMouseLeave={setIsHoveredCancelHandler}
         isHovered={CancelIconIsHovered}

products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js

@@ -134,7 +134,10 @@ class FilesRowContent extends React.PureComponent {
   }
 
   completeAction = (id) => {
-    this.props.editCompleteAction(id, this.props.item);
+    const isCancel =
+      (id.currentTarget && id.currentTarget.dataset.action === "cancel") ||
+      id.keyCode === 27;
+    this.props.editCompleteAction(id, this.props.item, isCancel);
   };
 
   updateItem = () => {
@@ -144,17 +147,20 @@ class FilesRowContent extends React.PureComponent {
       item,
       setIsLoading,
       fileActionId,
+      editCompleteAction,
     } = this.props;
 
     const { itemTitle } = this.state;
     const originalTitle = getTitleWithoutExst(item);
 
     setIsLoading(true);
-    if (originalTitle === itemTitle || itemTitle.trim() === "") {
+    const isSameTitle =
+      originalTitle.trim() === itemTitle.trim() || itemTitle.trim() === "";
+    if (isSameTitle) {
       this.setState({
         itemTitle: originalTitle,
       });
-      return this.completeAction(fileActionId);
+      return editCompleteAction(fileActionId, item, isSameTitle);
     }
 
     item.fileExst

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

@@ -225,7 +225,7 @@ class FilesActionStore {
       });
   };
 
-  editCompleteAction = (id, selectedItem) => {
+  editCompleteAction = async (id, selectedItem, isCancelled = false) => {
     const {
       filter,
       folders,
@@ -241,8 +241,9 @@ class FilesActionStore {
     const item = items.find((o) => o.id === id && !o.fileExst); //TODO: maybe need files find and folders find, not at one function?
     if (type === FileAction.Create || type === FileAction.Rename) {
       setIsLoading(true);
-      fetchFiles(this.selectedFolderStore.id, filter)
-        .then((data) => {
+
+      if (!isCancelled) {
+        const data = await fetchFiles(this.selectedFolderStore.id, filter);
         const newItem = (item && item.id) === -1 ? null : item; //TODO: not add new folders?
         if (!selectedItem.fileExst) {
           const path = data.selectedFolder.pathParts;
@@ -251,12 +252,10 @@ class FilesActionStore {
           loopTreeFolders(path, newTreeFolders, folders, null, newItem);
           setTreeFolders(newTreeFolders);
         }
-        })
-        .finally(() => {
+      }
       setAction({ type: null, id: null, extension: null });
       setIsLoading(false);
       type === FileAction.Rename && this.onSelectItem(selectedItem);
-        });
     }
   };
 

web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js

@@ -16,6 +16,7 @@ import EmailInput from "@appserver/components/email-input";
 import PageLayout from "@appserver/common/components/PageLayout";
 import { combineUrl, createPasswordHash } from "@appserver/common/utils";
 import { AppServerConfig } from "@appserver/common/constants";
+import { isMobile } from "react-device-detect";
 
 const inputWidth = "400px";
 
@@ -31,6 +32,7 @@ const ConfirmContainer = styled.div`
 
   .start-basis {
     align-items: flex-start;
+    ${isMobile && `margin-top: 56px;`}
   }
 
   .margin-left {