Merge pull request #1418 from ONLYOFFICE/feature/bug-hotfix

Correct toolbar title

apps/documenteditor/mobile/src/controller/Toolbar.jsx

@@ -7,7 +7,6 @@ import ToolbarView from "../view/Toolbar";
 const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'storeFocusObjects', 'storeToolbarSettings','storeDocumentInfo')(observer(props => {
     const {t} = useTranslation();
     const _t = t("Toolbar", { returnObjects: true });
-
     const appOptions = props.storeAppOptions;
     const isDisconnected = props.users.isDisconnected;
     const displayMode = props.storeReview.displayMode;
@@ -23,8 +22,10 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
 
     const showEditDocument = !appOptions.isEdit && appOptions.canEdit && appOptions.canRequestEditRights;
 
+    const docInfo = props.storeDocumentInfo;
+    const docTitle = docInfo.dataDoc ? docInfo.dataDoc.title : '';
+
     useEffect(() => {
-        Common.Notifications.on('setdoctitle', setDocTitle);
         Common.Gateway.on('init', loadConfig);
         Common.Notifications.on('toolbar:activatecontrols', activateControls);
         Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls);
@@ -37,19 +38,12 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
         }
 
         return () => {
-            // Common.Notifications.off('setdoctitle', setDocTitle);
             Common.Notifications.off('toolbar:activatecontrols', activateControls);
             Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls);
             Common.Notifications.off('goback', goBack);
         }
     });
 
-    const docInfo = props.storeDocumentInfo;
-    const [docTitle, resetDocTitle] = useState(docInfo.dataDoc ? docInfo.dataDoc.title : '');
-    const setDocTitle = (title) => {
-        resetDocTitle(title);
-    }
-
     // Back button
     const [isShowBack, setShowBack] = useState(appOptions.canBackToFolder);
     const loadConfig = (data) => {

apps/presentationeditor/mobile/src/controller/Toolbar.jsx

@@ -21,8 +21,10 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeFocusObjects'
     const isCanRedo = storeToolbarSettings.isCanRedo;
     const disabledPreview = storeToolbarSettings.countPages <= 0;
 
+    const docInfo = props.storePresentationInfo;
+    const docTitle = docInfo.dataDoc ? docInfo.dataDoc.title : '';
+
     useEffect(() => {
-        Common.Notifications.on('setdoctitle', setDocTitle);
         Common.Gateway.on('init', loadConfig);
         Common.Notifications.on('toolbar:activatecontrols', activateControls);
         Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls);
@@ -35,19 +37,12 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeFocusObjects'
         }
 
         return () => {
-            Common.Notifications.off('setdoctitle', setDocTitle);
             Common.Notifications.off('toolbar:activatecontrols', activateControls);
             Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls);
             Common.Notifications.off('goback', goBack);
         }
     });
 
-    const docInfo = props.storePresentationInfo;
-    const [docTitle, resetDocTitle] = useState(docInfo.dataDoc ? docInfo.dataDoc.title : '');
-    const setDocTitle = (title) => {
-        resetDocTitle(title);
-    }
-
     // Back button
     const [isShowBack, setShowBack] = useState(appOptions.canBackToFolder);
     const loadConfig = (data) => {

apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx

@@ -24,10 +24,12 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn
     const storeToolbarSettings = props.storeToolbarSettings;
     const isCanUndo = storeToolbarSettings.isCanUndo;
     const isCanRedo = storeToolbarSettings.isCanRedo;
+    const disabledControls = storeToolbarSettings.disabledControls;
+    const disabledEditControls = storeToolbarSettings.disabledEditControls;
+    const disabledSettings = storeToolbarSettings.disabledSettings;
 
     useEffect(() => {
         Common.Gateway.on('init', loadConfig);
-
         Common.Notifications.on('toolbar:activatecontrols', activateControls);
         Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls);
         Common.Notifications.on('goback', goBack);
@@ -109,26 +111,26 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn
         }
     }
 
-    const [disabledEditControls, setDisabledEditControls] = useState(false);
+    // const [disabledEditControls, setDisabledEditControls] = useState(false);
 
     const onApiActiveSheetChanged = (index) => {
         Common.Notifications.trigger('comments:filterchange', ['doc', 'sheet' + Common.EditorApi.get().asc_getWorksheetId(index)], false );
     };
 
-    const [disabledSettings, setDisabledSettings] = useState(false);
+    // const [disabledSettings, setDisabledSettings] = useState(false);
     const deactivateEditControls = (enableDownload) => {
-        setDisabledEditControls(true);
+        storeToolbarSettings.setDisabledEditControls(true);
         if (enableDownload) {
             //DE.getController('Settings').setMode({isDisconnected: true, enableDownload: enableDownload});
         } else {
-            setDisabledSettings(true);
+            storeToolbarSettings.setDisabledSettings(true);
         }
     };
-
-
-    const [disabledControls, setDisabledControls] = useState(/*true*/false);
+    
+    // const [disabledControls, setDisabledControls] = useState(/*true*/false);
     const activateControls = () => {
-        setDisabledControls(false);
+        // setDisabledControls(false);
+        storeToolbarSettings.setDisabledControls(false);
     };
 
     const onEditDocument = () => {

apps/spreadsheeteditor/mobile/src/store/toolbar.js

@@ -6,10 +6,34 @@ export class storeToolbarSettings {
             isCanUndo: observable,
             setCanUndo: action,
             isCanRedo: observable,
-            setCanRedo: action
+            setCanRedo: action,
+            disabledControls: observable,
+            setDisabledControls: action,
+            disabledEditControls: observable,
+            setDisabledEditControls: action,
+            disabledSettings: observable, 
+            setDisabledSettings: action
         })
     }
 
+    disabledControls = true;
+
+    setDisabledControls(value) {
+        this.disabledControls = value;
+    }
+
+    disabledEditControls = false;
+
+    setDisabledEditControls(value) {
+        this.disabledEditControls = value;
+    }
+
+    disabledSettings = false;
+
+    setDisabledSettings(value) {
+        this.disabledSettings = value;
+    }
+
     isCanUndo = false;
 
     setCanUndo(can) {