Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

packages/asc-web-common/components/FloatingButton/StyledFloatingButton.js

@@ -2,6 +2,8 @@ import Base from "@appserver/components/themes/base";
 import styled, { keyframes, css } from "styled-components";
 
 const StyledCircleWrap = styled.div`
+  position: relative;
+  z-index: 500;
   width: 48px;
   height: 48px;
   background: ${(props) =>

packages/asc-web-components/drop-down/index.js

@@ -62,7 +62,7 @@ class DropDown extends React.PureComponent {
   componentDidUpdate(prevProps) {
     if (this.props.open !== prevProps.open) {
       if (this.props.open) {
-        this.props.enableOnClickOutside();
+        !isMobile && this.props.enableOnClickOutside(); //fixed main-button-mobile click, remove !isMobile if have dd problem
         this.bindDocumentResizeListener();
         if (this.props.isDefaultMode) {
           return this.checkPositionPortal();

packages/asc-web-components/main-button-mobile/index.js

@@ -16,7 +16,7 @@ import IconButton from "../icon-button";
 import Button from "../button";
 import Text from "../text";
 import Scrollbar from "@appserver/components/scrollbar";
-import { isMobile, isTablet } from "react-device-detect";
+import { isMobile } from "react-device-detect";
 import Backdrop from "../backdrop";
 
 const ProgressBarMobile = ({
@@ -237,13 +237,13 @@ const MainButtonMobile = (props) => {
           manualWidth={manualWidth || "400px"}
           directionY="top"
           directionX="right"
-          isMobile={isMobile || isTablet}
+          isMobile={isMobile}
           fixedDirection={true}
           heightProp={height}
           sectionWidth={sectionWidth}
           isDefaultMode={false}
         >
-          {isMobile || isTablet ? (
+          {isMobile ? (
             <Scrollbar
               style={{ position: "absolute" }}
               scrollclass="section-scroll"

packages/asc-web-components/main-button-mobile/styled-main-button.js

@@ -12,6 +12,8 @@ const StyledFloatingButton = styled(FloatingButton)`
   z-index: 1010;
   background: ${(props) => props.theme.mainButtonMobile.buttonColor} !important;
 
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+
   .circle__mask + div {
     display: flex;
     align-items: center;

products/ASC.Files/Client/src/components/Badges.js

@@ -85,14 +85,6 @@ const Badges = ({
   const isForm = fileExst === ".oform";
   const isTile = viewAs === "tile";
 
-  const iconEdit = isForm
-    ? "/static/images/access.edit.form.react.svg"
-    : "/static/images/file.actions.convert.edit.doc.react.svg";
-
-  const iconForm = "/static/images/access.edit.form.react.svg";
-
-  const iconRefresh = "/static/images/refresh.react.svg";
-
   const countVersions = versionGroup > 999 ? "999+" : versionGroup;
 
   const contentNewItems = newItems > 999 ? "999+" : newItems;
@@ -108,6 +100,17 @@ const Badges = ({
 
   const fontSizeBadge = isTile || tabletViewBadge ? "11px" : "9px";
 
+  const iconForm =
+    sizeBadge === "medium"
+      ? "/static/images/access.edit.form.medium.react.svg"
+      : "/static/images/access.edit.form.react.svg";
+
+  const iconEdit = !isForm
+    ? "/static/images/file.actions.convert.edit.doc.react.svg"
+    : iconForm;
+
+  const iconRefresh = "/static/images/refresh.react.svg";
+
   const commonBadgeProps = {
     borderRadius: "11px",
     color: theme.filesBadges.color,

products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/styles/styles.js

@@ -3,7 +3,7 @@ import styled from "styled-components";
 import { Base } from "@appserver/components/themes";
 
 const StyledInfoRoomBody = styled.div`
-  padding: 0px 0px 0 16px;
+  padding-left: 20px;
   height: auto;
   background-color: ${(props) => props.theme.infoPanel.backgroundColor};
   color: ${(props) => props.theme.infoPanel.textColor};

public/images/access.edit.form.medium.react.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 1C0.447715 1 0 1.44772 0 2V6C0 6.55228 0.447715 7 1 7H15C15.5523 7 16 6.55228 16 6V2C16 1.44772 15.5523 1 15 1H1ZM1 9C0.447715 9 0 9.44771 0 10C0 10.5523 0.447715 11 1 11H15C15.5523 11 16 10.5523 16 10C16 9.44771 15.5523 9 15 9H1ZM6 14C6 13.4477 6.44772 13 7 13H15C15.5523 13 16 13.4477 16 14C16 14.5523 15.5523 15 15 15H7C6.44772 15 6 14.5523 6 14ZM2.5 3C2.22386 3 2 3.22386 2 3.5V4.5C2 4.77614 2.22386 5 2.5 5H13.5C13.7761 5 14 4.77614 14 4.5V3.5C14 3.22386 13.7761 3 13.5 3H2.5Z" fill="#657077"/>
+</svg>