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

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

@@ -353,6 +353,7 @@ DropDownContainer.propTypes = {
   isDefaultMode: PropTypes.bool,
   /** Needed to open correctly people and group selector when the section width is small */
   smallSectionWidth: PropTypes.bool,
+  /** It is necessary when we explicitly set the direction, disables check position */
   fixedDirection: PropTypes.bool,
 };
 

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

@@ -235,6 +235,7 @@ const MainButtonMobile = (props) => {
           directionY="top"
           directionX="right"
           isMobile={isMobile || isTablet}
+          fixedDirection={true}
           heightProp={height}
           sectionWidth={sectionWidth}
           isDefaultMode={false}

web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js

@@ -155,7 +155,6 @@ class ArticleBodyContent extends React.Component {
     const items = this.catalogItems();
     const { isLoadedPage } = this.props;
     const commonSettings = location.pathname.includes("common");
-    // TODO: styles fix
 
     const showLoader = commonSettings ? !isLoadedPage : false;
 

web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/loaderArticleBody.js

@@ -15,7 +15,6 @@ const StyledLoader = styled.div`
 
   @media (min-width: 1024px) {
     padding: 0px 20px 0px;
-    margin-top: -7px;
 
     .loader {
       width: 216px;

web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/StyledSettings.js

@@ -37,23 +37,11 @@ const StyledSettingsComponent = styled.div`
     font-weight: 400;
   }
 
-  .field-container-flex {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 8px;
-    margin-bottom: 12px;
-  }
-
   .toggle {
     position: inherit;
     grid-gap: inherit;
   }
 
-  .field-title {
-    font-weight: 600;
-    line-height: 20px;
-  }
-
   .errorText {
     position: absolute;
     font-size: 10px;

web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/language-and-time-zone.js

@@ -1,7 +1,6 @@
 import React from "react";
 import { withTranslation } from "react-i18next";
 import FieldContainer from "@appserver/components/field-container";
-import ToggleButton from "@appserver/components/toggle-button";
 import ComboBox from "@appserver/components/combobox";
 import toastr from "@appserver/components/toast/toastr";
 import HelpButton from "@appserver/components/help-button";
@@ -433,13 +432,6 @@ class LanguageAndTimeZone extends React.Component {
             className="dropdown-item-width"
           />
         </FieldContainer>
-        <div className="field-container-flex">
-          <div className="field-title">{`${t("Automatic time zone")}`}</div>
-          <ToggleButton
-            className="toggle"
-            onChange={() => toastr.info(<>Not implemented</>)}
-          />
-        </div>
         <FieldContainer
           id="fieldContainerTimezone"
           labelText={`${t("TimeZone")}:`}

web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/welcome-page-settings.js

@@ -60,7 +60,12 @@ class WelcomePageSettings extends React.Component {
   }
 
   componentDidMount() {
+    const { isLoaded, setIsLoadedWelcomePageSettings, tReady } = this.props;
     window.addEventListener("resize", this.checkInnerWidth);
+
+    const isLoadedSetting = isLoaded && tReady;
+
+    if (isLoadedSetting) setIsLoadedWelcomePageSettings(isLoadedSetting);
   }
 
   componentDidUpdate(prevProps, prevState) {
@@ -68,9 +73,13 @@ class WelcomePageSettings extends React.Component {
 
     const { hasScroll } = this.state;
 
-    const isLoadedSetting = isLoaded && tReady;
+    if (isLoaded !== prevProps.isLoaded || tReady !== prevProps.tReady) {
+      const isLoadedSetting = isLoaded && tReady;
 
-    if (isLoadedSetting) setIsLoadedWelcomePageSettings(isLoadedSetting);
+      if (isLoadedSetting) {
+        setIsLoadedWelcomePageSettings(isLoadedSetting);
+      }
+    }
 
     const checkScroll = checkScrollSettingsBlock();
 

web/ASC.Web.Client/src/components/pages/Settings/categories/common/sub-components/loaderCustomization.js

@@ -127,7 +127,6 @@ const LoaderCustomization = ({
       <Loaders.Rectangle height="32px" className="combo-box" />
       {lngTZSettings && (
         <>
-          <Loaders.Rectangle height="20px" className="field-container" />
           <Loaders.Rectangle height="20px" className="title-long" />
           <Loaders.Rectangle height="32px" className="combo-box" />
         </>