Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0

packages/client/src/components/GlobalEvents/RenameEvent.js

@@ -42,7 +42,6 @@ const RenameEvent = ({
   const onUpdate = React.useCallback((e, value) => {
     const originalTitle = getTitleWithoutExst(item);
 
-    setIsLoading(true);
     let timerId;
 
     const isSameTitle =
@@ -52,7 +51,6 @@ const RenameEvent = ({
 
     if (isSameTitle) {
       setStartValue(originalTitle);
-      setIsLoading(false);
 
       onClose();
 
@@ -83,7 +81,6 @@ const RenameEvent = ({
             timerId = null;
             clearActiveOperations([item.id]);
 
-            setIsLoading(false);
             onClose();
           })
       : renameFolder(item.id, value)
@@ -108,7 +105,6 @@ const RenameEvent = ({
             timerId = null;
             clearActiveOperations(null, [item.id]);
 
-            setIsLoading(false);
             onClose();
           });
   }, []);
@@ -124,7 +120,6 @@ const RenameEvent = ({
     <Dialog
       t={t}
       visible={eventDialogVisible}
-      title={t("Home:Rename")}
       title={t("Files:Rename")}
       startValue={startValue}
       onSave={onUpdate}

packages/common/components/Navigation/Navigation.js

@@ -44,6 +44,7 @@ const Navigation = ({
   withMenu,
   onPlusClick,
   isEmptyPage,
+  isDesktop: isDesktopClient,
   ...rest
 }) => {
   const [isOpen, setIsOpen] = React.useState(false);
@@ -153,6 +154,7 @@ const Navigation = ({
                 toggleInfoPanel={toggleInfoPanel}
                 isInfoPanelVisible={isInfoPanelVisible}
                 onClickAvailable={onClickAvailable}
+                isDesktopClient={isDesktopClient}
               />
             </>
           )}
@@ -164,6 +166,7 @@ const Navigation = ({
             isTabletView={isTabletView}
             isRecycleBinFolder={isRecycleBinFolder}
             isDesktop={isDesktop}
+            isDesktopClient={isDesktopClient}
             isInfoPanelVisible={isInfoPanelVisible}
           >
             <ArrowButton

packages/common/components/Navigation/StyledNavigation.js

@@ -24,6 +24,11 @@ const StyledContainer = styled.div`
     props.isRootFolder ? "auto 1fr" : "49px auto 1fr"};
 
   height: 100%;
+  ${(props) =>
+    props.isDesktopClient &&
+    css`
+      max-height: 32px;
+    `}
 
   .navigation-arrow-container {
     display: flex;

packages/common/components/Navigation/sub-components/drop-box.js

@@ -108,6 +108,7 @@ const DropBox = React.forwardRef(
       maxHeight,
       isOpen,
       isDesktop,
+      isDesktopClient,
     },
     ref
   ) => {
@@ -157,6 +158,7 @@ const DropBox = React.forwardRef(
             canCreate={canCreate}
             isDropBox={true}
             isInfoPanelVisible={isInfoPanelVisible}
+            isDesktopClient={isDesktopClient}
           >
             <ArrowButton
               isRootFolder={isRootFolder}

packages/components/context-menu-button/index.js

@@ -120,7 +120,8 @@ class ContextMenuButton extends React.Component {
     if (
       this.props.opened === nextProps.opened &&
       this.state.isOpen === nextState.isOpen &&
-      this.props.displayType === nextProps.displayType
+      this.props.displayType === nextProps.displayType &&
+      this.props.isDisabled === nextProps.isDisabled
     ) {
       return false;
     }