Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-searchbar

# Conflicts:
#	apps/common/mobile/lib/view/Search.jsx
#	apps/common/mobile/resources/less/common-material.less

apps/common/Analytics.js

@@ -30,8 +30,8 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
 */
-if (Common === undefined)
+if (window.Common === undefined)
-    var Common = {};
+    window.Common = {};
 
 Common.component = Common.component || {};
 

apps/common/mobile/lib/controller/ContextMenu.jsx

@@ -109,15 +109,17 @@ class ContextMenuController extends Component {
                 extraItems: this.initExtraItems()
             });
 
-            this.$targetEl.css({left: `${x}px`, top: `${y}px`});
+            if ( this.state.items.length > 0 ) {
-            const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement);
+                this.$targetEl.css({left: `${x}px`, top: `${y}px`});
+                const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement);
 
-            if ( Device.android )
+                if (Device.android)
-                this.offsetPopoverTop(popover);
+                    this.offsetPopoverTop(popover);
 
-            this.setState(state => {
+                this.setState(state => {
-                return {opened: true}
+                    return {opened: true}
-            });
+                });
+            }
         }
     }
 

apps/common/mobile/lib/view/About.jsx

@@ -120,6 +120,7 @@ const PageAbout = props => {
 
 const About = inject("storeAppOptions")(observer(PageAbout));
 About.appVersion = () => (__PRODUCT_VERSION__);
+About.compareVersions = () => /d$/.test(__PRODUCT_VERSION__);
 
 
 export default About;

apps/common/mobile/lib/view/Search.jsx

@@ -274,14 +274,14 @@ class SearchView extends Component {
                 <div className="searchbar-inner">
                     <div className="searchbar-inner__left">
                         <div className="searchbar-input-wrap">
-                            <input placeholder={_t.textSearch} type="search" value={searchQuery} 
+                            <input placeholder={_t.textSearch} type="search" maxLength="255" value={searchQuery} 
                                 onChange={e => {this.changeSearchQuery(e.target.value)}} />
                             {isIos ? <i className="searchbar-icon" /> : null}
                             <span className="input-clear-button" />
                         </div>
                         {usereplace || isReplaceAll ? (
                             <div className="searchbar-input-wrap">
-                                <input placeholder={_t.textReplace} type="search" id="idx-replace-val" value={replaceQuery} 
+                                <input placeholder={_t.textReplace} type="search" maxLength="255" id="idx-replace-val" value={replaceQuery} 
                                     onChange={e => {this.changeReplaceQuery(e.target.value)}} />
                                 {isIos ? <i className="searchbar-icon" /> : null}
                                 <span className="input-clear-button" />

apps/common/mobile/lib/view/collaboration/Collaboration.jsx

@@ -87,6 +87,7 @@ const routes = [
 const PageCollaboration = inject('storeAppOptions')(observer(props => {
     const { t } = useTranslation();
     const _t = t('Common.Collaboration', {returnObjects: true});
+    const appOptions = props.storeAppOptions;
     return (
         <View style={props.style} stackPages={true} routes={routes} url={props.page && `/${props.page}/`}>
             <Page name="collab__main">
@@ -103,12 +104,12 @@ const PageCollaboration = inject('storeAppOptions')(observer(props => {
                     <ListItem link={'/users/'} title={_t.textUsers}>
                         <Icon slot="media" icon="icon-users"></Icon>
                     </ListItem>
-                    {props.storeAppOptions.canViewComments &&
+                    {appOptions.canViewComments &&
                         <ListItem link='/comments/' title={_t.textComments}>
                             <Icon slot="media" icon="icon-insert-comment"></Icon>
                         </ListItem>
                     }
-                    {window.editorType === 'de' &&
+                    {window.editorType === 'de' && (appOptions.canReview || appOptions.canViewReview) &&
                         <ListItem link={'/review/'} title={_t.textReview}>
                             <Icon slot="media" icon="icon-review"></Icon>
                         </ListItem>

apps/common/mobile/resources/less/common-material.less

@@ -7,6 +7,17 @@
     @darkGrey: #757575;
 
     --f7-navbar-shadow-image: none;
+
+    --f7-navbar-bg-color: @themeColor;
+    --f7-navbar-link-color: @navBarIconColor;
+    --f7-navbar-text-color: @navBarIconColor;
+    --f7-navbar-height: 56px;
+
+    --f7-subnavbar-bg-color: @themeColor;
+    --f7-subnavbar-link-color: @navBarIconColor;
+    --f7-subnavbar-text-color: @navBarIconColor;
+    --f7-subnavbar-height: 56px;
+
     --f7-radio-active-color: @themeColor;
     --f7-toggle-active-color: @themeColor;
     --f7-range-bar-active-bg-color: @themeColor;
@@ -69,6 +80,12 @@
         }
     }
 
+    .page.page-with-subnavbar.page-with-logo {
+        .page-content {
+            --f7-page-navbar-offset: var(--f7-navbar-height);
+        }
+    }
+
     // Buttons
 
     .segmented {

apps/common/mobile/resources/less/common.less

@@ -9,7 +9,10 @@
 @autoColor: @black;
 
 .navbar.main-navbar {
-    height: 26px;
+    height: 0;
+    &.navbar-with-logo {
+        height: 26px;
+    }
     .navbar-inner {
         display: flex;
         justify-content: center;
@@ -22,8 +25,19 @@
     }
 }
 
-.page.page-with-subnavbar .page-content {
+.subnavbar {
-    --f7-page-subnavbar-offset: 26px;
+    .subnavbar-inner {
+        padding: 0;
+    }
+}
+
+.page.page-with-subnavbar {
+    .page-content {
+        --f7-page-subnavbar-offset: 0px;
+    }
+    &.page-with-logo .page-content {
+        --f7-page-subnavbar-offset: 26px;
+    }
 }
 
 .popup, .popover, .sheet-modal {
@@ -102,6 +116,12 @@
     }
 }
 
+.dialog {
+    .content-block {
+        padding: 0;
+    }
+}
+
 .about {
     .content-block {
         margin: 0 auto 15px;
@@ -210,6 +230,7 @@
         height: 38px;
         margin-top: 14px;
         background-image: url(../img/themes/themes.png);
+        display: block;
     }
     .item-theme.active:before {
         content: '';
@@ -713,6 +734,24 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 
+.picker-3d { 
+    .picker-item {
+        padding: 0;
+        text-align: left;
+        font-size: 16px;
+        span {
+            padding: 0;
+        }
+    }
+}
+
+.picker-center-highlight {
+    width: 100%;
+    left: 0;
+    right: 0;
+}
+
+
 
 
 

apps/common/mobile/utils/IrregularStack.js

@@ -0,0 +1,50 @@
+
+export default class IrregularStack {
+    constructor (config) {
+        this._stack = [];
+
+        const _config = config || {};
+        this._strongCompare = _config.strongCompare || this._compare;
+        this._weakCompare = _config.weakCompare || this._compare;
+    }
+
+    _compare (obj1, obj2) {
+        if (typeof obj1 === 'object' && typeof obj2 === 'object' && window.JSON)
+            return window.JSON.stringify(obj1) === window.JSON.stringify(obj2);
+        return obj1 === obj2;
+    };
+
+    _indexOf (obj, compare) {
+        for (let i = this._stack.length - 1; i >= 0; i--) {
+            if (compare(this._stack[i], obj))
+                return i;
+        }
+        return -1;
+    }
+
+    push (obj) {
+        this._stack.push(obj);
+    }
+
+    pop (obj) {
+        const index = this._indexOf(obj, this._strongCompare);
+        if (index !== -1) {
+            const removed = this._stack.splice(index, 1);
+            return removed[0];
+        }
+        return undefined;
+    }
+
+    get (obj) {
+        const index = this._indexOf(obj, this._weakCompare);
+        if (index !== -1) {
+            return this._stack[index];
+        }
+        return undefined;
+    }
+
+    exist (obj) {
+        return !(this._indexOf(obj, this._strongCompare) < 0);
+    }
+
+}

apps/documenteditor/mobile/locale/en.json

@@ -44,7 +44,93 @@
     "textNoLicenseTitle": "License limit reached",
     "textPaidFeature": "Paid feature",
     "textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader. Please contact our Sales Department to get a quote.",
-    "textClose": "Close"
+    "textClose": "Close",
+
+    "errorProcessSaveResult": "Saving is failed.",
+    "criticalErrorTitle": "Error",
+    "warnProcessRightsChange": "You have been denied the right to edit the file.",
+    "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
+
+    "errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
+    "titleUpdateVersion": "Version changed",
+    "textHasMacros": "The file contains automatic macros.<br>Do you want to run macros?",
+    "textRemember": "Remember my choice",
+    "textYes": "Yes",
+    "textNo": "No"
+  },
+  "Error": {
+    "criticalErrorTitle": "Error",
+    "unknownErrorText": "Unknown error.",
+    "convertationTimeoutText": "Convertation timeout exceeded.",
+    "openErrorText": "An error has occurred while opening the file",
+    "saveErrorText": "An error has occurred while saving the file",
+    "downloadErrorText": "Download failed.",
+    "uploadImageSizeMessage": "Maximium image size limit exceeded.",
+    "uploadImageExtMessage": "Unknown image format.",
+    "uploadImageFileCountMessage": "No images uploaded.",
+    "splitMaxRowsErrorText": "The number of rows must be less than %1",
+    "splitMaxColsErrorText": "The number of columns must be less than %1",
+    "splitDividerErrorText": "The number of rows must be a divisor of %1",
+    "errorKeyEncrypt": "Unknown key descriptor",
+    "errorKeyExpire": "Key descriptor expired",
+    "errorUsersExceed": "Count of users was exceed",
+    "errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored and page is reloaded.",
+    "errorFilePassProtect": "The file is password protected and could not be opened.",
+    "errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
+    "errorDataRange": "Incorrect data range.",
+    "errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
+    "errorUserDrop": "The file cannot be accessed right now.",
+    "errorMailMergeLoadFile": "Loading failed",
+    "errorMailMergeSaveFile": "Merge failed.",
+    "errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
+    "errorBadImageUrl": "Image url is incorrect",
+    "errorSessionAbsolute": "The document editing session has expired. Please reload the page.",
+    "errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
+    "errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
+    "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
+    "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
+    "errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
+    "errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
+    "errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
+    "errorDefaultMessage": "Error code: %1",
+    "criticalErrorExtText": "Press 'OK' to back to document list.",
+    "notcriticalErrorTitle": "Warning",
+    "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page."
+  },
+  "LongActions": {
+    "openTitleText": "Opening Document",
+    "openTextText": "Opening document...",
+    "saveTitleText": "Saving Document",
+    "saveTextText": "Saving document...",
+    "loadFontsTitleText": "Loading Data",
+    "loadFontsTextText": "Loading data...",
+    "loadImagesTitleText": "Loading Images",
+    "loadImagesTextText": "Loading images...",
+    "loadFontTitleText": "Loading Data",
+    "loadFontTextText": "Loading data...",
+    "loadImageTitleText": "Loading Image",
+    "loadImageTextText": "Loading image...",
+    "downloadTitleText": "Downloading Document",
+    "downloadTextText": "Downloading document...",
+    "printTitleText": "Printing Document",
+    "printTextText": "Printing document...",
+    "uploadImageTitleText": "Uploading Image",
+    "uploadImageTextText": "Uploading image...",
+    "applyChangesTitleText": "Loading Data",
+    "applyChangesTextText": "Loading data...",
+    "savePreparingText": "Preparing to save",
+    "savePreparingTitle": "Preparing to save. Please wait...",
+    "mailMergeLoadFileText": "Loading Data Source...",
+    "mailMergeLoadFileTitle": "Loading Data Source",
+    "downloadMergeTitle": "Downloading",
+    "downloadMergeText": "Downloading...",
+    "sendMergeTitle": "Sending Merge",
+    "sendMergeText": "Sending Merge...",
+    "waitText": "Please, wait...",
+    "txtEditingMode": "Set editing mode...",
+    "loadingDocumentTitleText": "Loading document",
+    "loadingDocumentTextText": "Loading document...",
+    "textLoadingDocument": "Loading document"
   },
   "Toolbar": {
     "dlgLeaveTitleText": "You leave the application",

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

@@ -7,6 +7,7 @@ import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
 import ContextMenuController from '../../../../common/mobile/lib/controller/ContextMenu';
 import { idContextMenuElement } from '../../../../common/mobile/lib/view/ContextMenu';
 import { Device } from '../../../../common/mobile/utils/device';
+import EditorUIController from '../lib/patch';
 
 @inject ( stores => ({
     isEdit: stores.storeAppOptions.isEdit,
@@ -64,29 +65,36 @@ class ContextMenu extends ContextMenuController {
     onMenuItemClick(action) {
         super.onMenuItemClick(action);
 
+        if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) )
+            return;
+
         const api = Common.EditorApi.get();
         switch (action) {
             case 'cut':
-                if (!api.Cut() && !LocalStorage.getBool("de-hide-copy-cut-paste-warning")) {
+                if ( !LocalStorage.getBool("de-hide-copy-cut-paste-warning") )
                     this.showCopyCutPasteModal();
-                }
                 break;
             case 'copy':
-                if (!api.Copy() && !LocalStorage.getBool("de-hide-copy-cut-paste-warning")) {
+                if (!api.Copy() && !LocalStorage.getBool("de-hide-copy-cut-paste-warning") )
                     this.showCopyCutPasteModal();
-                }
                 break;
             case 'paste':
-                if (!api.Paste() && !LocalStorage.getBool("de-hide-copy-cut-paste-warning")) {
+                if ( !LocalStorage.getBool("de-hide-copy-cut-paste-warning") )
                     this.showCopyCutPasteModal();
-                }
-                break;
-            case 'addcomment':
-                Common.Notifications.trigger('addcomment');
                 break;
             case 'viewcomment':
                 Common.Notifications.trigger('viewcomment');
                 break;
+            case 'openlink':
+                const stack = api.getSelectedElements();
+                let value;
+                stack.forEach((item) => {
+                    if (item.get_ObjectType() == Asc.c_oAscTypeSelectElement.Hyperlink) {
+                        value = item.get_ObjectValue().get_Value();
+                    }
+                });
+                value && this.openLink(value);
+                break;
             case 'review':
                 setTimeout(() => {
                     this.props.openOptions('coauth', 'cm-review');
@@ -97,38 +105,6 @@ class ContextMenu extends ContextMenuController {
                     this.props.openOptions('coauth', 'cm-review-change');
                 }, 400);
                 break;
-            case 'merge':
-                api.MergeCells();
-                break;
-            case 'split':
-                this.showSplitModal();
-                break;
-            case 'delete':
-                api.asc_Remove();
-                break;
-            case 'deletetable':
-                api.remTable();
-                break;
-            case 'edit':
-                setTimeout(() => {
-                    this.props.openOptions('edit');
-                }, 0);
-                break;
-            case 'addlink':
-                setTimeout(() => {
-                    this.props.openOptions('add', 'link');
-                }, 400)
-                break;
-            case 'openlink':
-                const stack = Common.EditorApi.get().getSelectedElements();
-                let value;
-                stack.forEach((item) => {
-                    if (item.get_ObjectType() == Asc.c_oAscTypeSelectElement.Hyperlink) {
-                        value = item.get_ObjectValue().get_Value();
-                    }
-                });
-                value && this.openLink(value);
-                break;
         }
 
         console.log("click context menu item: " + action);
@@ -164,14 +140,13 @@ class ContextMenu extends ContextMenuController {
         const dialog = f7.dialog.create({
             title: _t.menuSplit,
             text: '',
-            content:
+            content: `<div class="content-block">
-                '<div class="content-block">' +
+                        <div class="row">
-                '<div class="row">' +
+                            <div class="col-50">${_t.textColumns}</div>
-                '<div class="col-50">' + _t.textColumns + '</div>' +
+                            <div class="col-50">${_t.textRows}</div>
-                '<div class="col-50">' + _t.textRows + '</div>' +
+                        </div>
-                '</div>' +
+                        <div id="picker-split-size"></div>
-                '<div id="picker-split-size"></div>' +
+                    </div>`,
-                '</div>',
             buttons: [
                 {
                     text: _t.menuCancel
@@ -228,197 +203,53 @@ class ContextMenu extends ContextMenuController {
 
     initMenuItems() {
         if ( !Common.EditorApi ) return [];
+        const { isEdit } = this.props;
 
-        const { t } = this.props;
+        if (isEdit && EditorUIController.ContextMenu) {
-        const _t = t("ContextMenu", { returnObjects: true });
+            return EditorUIController.ContextMenu.mapMenuItems(this);
+        } else {
+            const { t } = this.props;
+            const _t = t("ContextMenu", {returnObjects: true});
+            const { canViewComments } = this.props;
 
-        const { isEdit, canViewComments, canReview, isDisconnected } = this.props;
+            const api = Common.EditorApi.get();
+            const stack = api.getSelectedElements();
+            const canCopy = api.can_CopyCut();
 
-        const api = Common.EditorApi.get();
+            let itemsIcon = [],
-        const stack = api.getSelectedElements();
+                itemsText = [];
-        const canCopy = api.can_CopyCut();
 
-        let itemsIcon = [],
+            if ( canCopy ) {
-            itemsText = [];
+                itemsIcon.push({
-
+                    event: 'copy',
-        if ( canCopy ) {
+                    icon: 'icon-copy'
-            itemsIcon.push({
+                });
-                event: 'copy',
-                icon: 'icon-copy'
-            });
-        }
-
-        if ( canViewComments && this.isComments && !isEdit ) {
-            itemsText.push({
-                caption: _t.menuViewComment,
-                event: 'viewcomment'
-            });
-        }
-
-        let isText = false,
-            isTable = false,
-            isImage = false,
-            isChart = false,
-            isShape = false,
-            isLink = false,
-            lockedText = false,
-            lockedTable = false,
-            lockedImage = false,
-            lockedHeader = false;
-
-        stack.forEach(item => {
-            const objectType = item.get_ObjectType(),
-                    objectValue = item.get_ObjectValue();
-
-            if ( objectType == Asc.c_oAscTypeSelectElement.Header ) {
-                lockedHeader = objectValue.get_Locked();
-            } else
-            if ( objectType == Asc.c_oAscTypeSelectElement.Paragraph ) {
-                lockedText = objectValue.get_Locked();
-                isText = true;
-            } else
-            if ( objectType == Asc.c_oAscTypeSelectElement.Image ) {
-                lockedImage = objectValue.get_Locked();
-                if ( objectValue && objectValue.get_ChartProperties() ) {
-                    isChart = true;
-                } else
-                if ( objectValue && objectValue.get_ShapeProperties() ) {
-                    isShape = true;
-                } else {
-                    isImage = true;
-                }
-            } else
-            if ( objectType == Asc.c_oAscTypeSelectElement.Table ) {
-                lockedTable = objectValue.get_Locked();
-                isTable = true;
-            } else
-            if ( objectType == Asc.c_oAscTypeSelectElement.Hyperlink ) {
-                isLink = true;
             }
-        });
 
-        if ( stack.length > 0 ) {
+            if ( canViewComments && this.isComments ) {
-            const swapItems = function(items, indexBefore, indexAfter) {
+                itemsText.push({
-                items[indexAfter] = items.splice(indexBefore, 1, items[indexAfter])[0];
+                    caption: _t.menuViewComment,
-            };
+                    event: 'viewcomment'
-
+                });
-            if ( isEdit && !isDisconnected ) {
-                if ( !lockedText && !lockedTable && !lockedImage && !lockedHeader && canCopy ) {
-                    itemsIcon.push({
-                        event: 'cut',
-                        icon: 'icon-cut'
-                    });
-
-                    // Swap 'Copy' and 'Cut'
-                    swapItems(itemsIcon, 0, 1);
-                }
-
-                if ( !lockedText && !lockedTable && !lockedImage && !lockedHeader ) {
-                    itemsIcon.push({
-                        event: 'paste',
-                        icon: 'icon-paste'
-                    });
-                }
-
-                if ( isTable && api.CheckBeforeMergeCells() && !lockedTable && !lockedHeader) {
-                    itemsText.push({
-                        caption: _t.menuMerge,
-                        event: 'merge'
-                    });
-                }
-
-                if ( isTable && api.CheckBeforeSplitCells() && !lockedTable && !lockedHeader ) {
-                    itemsText.push({
-                        caption: _t.menuSplit,
-                        event: 'split'
-                    });
-                }
-
-                if ( !lockedText && !lockedTable && !lockedImage && !lockedHeader ) {
-                    itemsText.push({
-                        caption: _t.menuDelete,
-                        event: 'delete'
-                    });
-                }
-
-                if ( isTable && !lockedTable && !lockedText && !lockedHeader ) {
-                    itemsText.push({
-                        caption: _t.menuDeleteTable,
-                        event: 'deletetable'
-                    });
-                }
-
-                if ( !lockedText && !lockedTable && !lockedImage && !lockedHeader ){
-                    itemsText.push({
-                        caption: _t.menuEdit,
-                        event: 'edit'
-                    });
-                }
-
-                if ( !!api.can_AddHyperlink() && !lockedHeader) {
-                    itemsText.push({
-                        caption: _t.menuAddLink,
-                        event: 'addlink'
-                    });
-                }
-
-                if ( canReview ) {
-                    if (this.inRevisionChange) {
-                        itemsText.push({
-                            caption: _t.menuReviewChange,
-                            event: 'reviewchange'
-                        });
-                    } else {
-                        itemsText.push({
-                            caption: _t.menuReview,
-                            event: 'review'
-                        });
-                    }
-                }
-
-                if ( this.isComments && canViewComments ) {
-                    itemsText.push({
-                        caption: _t.menuViewComment,
-                        event: 'viewcomment'
-                    });
-                }
-
-                const isObject = isShape || isChart || isImage || isTable;
-                const hideAddComment = !canViewComments || api.can_AddQuotedComment() === false || lockedText || lockedTable || lockedImage || lockedHeader || (!isText && isObject);
-                if ( !hideAddComment ) {
-                    itemsText.push({
-                        caption: _t.menuAddComment,
-                        event: 'addcomment'
-                    });
-                }
             }
-        }
 
-        if ( isLink ) {
+            let isLink = false;
-            itemsText.push({
+            stack.forEach(item => {
-                caption: _t.menuOpenLink,
+                const objectType = item.get_ObjectType();
-                event: 'openlink'
+                if ( objectType === Asc.c_oAscTypeSelectElement.Hyperlink ) {
+                    isLink = true;
+                }
             });
-        }
 
-        if ( Device.phone && itemsText.length > 2 ) {
+            if ( isLink ) {
-            this.extraItems = itemsText.splice(2,itemsText.length, {
+                itemsText.push({
-                caption: _t.menuMore,
+                    caption: _t.menuOpenLink,
-                event: 'showActionSheet'
+                    event: 'openlink'
-            });
+                });
-        }
+            }
 
-        return itemsIcon.concat(itemsText);
+            return itemsIcon.concat(itemsText);
-        // return [{
+        }
-        //         caption: 'Edit',
-        //         event: 'edit'
-        //     }, {
-        //         caption: 'View',
-        //         event: 'view'
-        //     }, {
-        //         icon: 'icon-paste',
-        //         event: 'review'
-        //     }];
     }
 
     initExtraItems () {

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

@@ -0,0 +1,228 @@
+import React, { useEffect } from 'react';
+import { inject } from 'mobx-react';
+import { f7 } from 'framework7-react';
+import { useTranslation } from 'react-i18next';
+
+const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => {
+    const {t} = useTranslation();
+    const _t = t("Error", { returnObjects: true });
+
+    useEffect(() => {
+        Common.Notifications.on('engineCreated', (api) => {
+            api.asc_registerCallback('asc_onError', onError);
+        });
+        return () => {
+            const api = Common.EditorApi.get();
+            api.asc_unregisterCallback('asc_onError', onError);
+        }
+    });
+
+    const onError = (id, level, errData) => {
+        if (id === Asc.c_oAscError.ID.LoadingScriptError) {
+            f7.notification.create({
+                title: _t.criticalErrorTitle,
+                text: _t.scriptLoadError,
+                closeButton: true
+            }).open();
+            return;
+        }
+
+        Common.Notifications.trigger('preloader:close');
+        Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
+
+        const api = Common.EditorApi.get();
+
+        const config = {
+            closable: false
+        };
+
+        switch (id)
+        {
+            case Asc.c_oAscError.ID.Unknown:
+                config.msg = _t.unknownErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationTimeout:
+                config.msg = _t.convertationTimeoutText;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationOpenError:
+                config.msg = _t.openErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationSaveError:
+                config.msg = _t.saveErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.DownloadError:
+                config.msg = _t.downloadErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageSize:
+                config.msg = _t.uploadImageSizeMessage;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageExt:
+                config.msg = _t.uploadImageExtMessage;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageFileCount:
+                config.msg = _t.uploadImageFileCountMessage;
+                break;
+
+            case Asc.c_oAscError.ID.SplitCellMaxRows:
+                config.msg = _t.splitMaxRowsErrorText.replace('%1', errData.get_Value());
+                break;
+
+            case Asc.c_oAscError.ID.SplitCellMaxCols:
+                config.msg = _t.splitMaxColsErrorText.replace('%1', errData.get_Value());
+                break;
+
+            case Asc.c_oAscError.ID.SplitCellRowsDivider:
+                config.msg = _t.splitDividerErrorText.replace('%1', errData.get_Value());
+                break;
+
+            case Asc.c_oAscError.ID.VKeyEncrypt:
+                config.msg = _t.errorKeyEncrypt;
+                break;
+
+            case Asc.c_oAscError.ID.KeyExpire:
+                config.msg = _t.errorKeyExpire;
+                break;
+
+            case Asc.c_oAscError.ID.UserCountExceed:
+                config.msg = _t.errorUsersExceed;
+                break;
+
+            case Asc.c_oAscError.ID.CoAuthoringDisconnect:
+                config.msg = _t.errorViewerDisconnect;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationPassword:
+                config.msg = _t.errorFilePassProtect;
+                break;
+
+            case Asc.c_oAscError.ID.StockChartError:
+                config.msg = _t.errorStockChart;
+                break;
+
+            case Asc.c_oAscError.ID.DataRangeError:
+                config.msg = _t.errorDataRange;
+                break;
+
+            case Asc.c_oAscError.ID.Database:
+                config.msg = _t.errorDatabaseConnection;
+                break;
+
+            case Asc.c_oAscError.ID.UserDrop:
+                const lostEditingRights = storeAppOptions.lostEditingRights;
+                if (lostEditingRights) {
+                    storeAppOptions.changeEditingRights(false);
+                    return;
+                }
+                storeAppOptions.changeEditingRights(true);
+                config.msg = _t.errorUserDrop;
+                break;
+
+            case Asc.c_oAscError.ID.MailMergeLoadFile:
+                config.msg = _t.errorMailMergeLoadFile;
+                break;
+
+            case Asc.c_oAscError.ID.MailMergeSaveFile:
+                config.msg = _t.errorMailMergeSaveFile;
+                break;
+
+            case Asc.c_oAscError.ID.Warning:
+                config.msg = _t.errorConnectToServer;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageUrl:
+                config.msg = _t.errorBadImageUrl;
+                break;
+
+            case Asc.c_oAscError.ID.SessionAbsolute:
+                config.msg = _t.errorSessionAbsolute;
+                break;
+
+            case Asc.c_oAscError.ID.SessionIdle:
+                config.msg = _t.errorSessionIdle;
+                break;
+
+            case Asc.c_oAscError.ID.SessionToken:
+                config.msg = _t.errorSessionToken;
+                break;
+
+            case Asc.c_oAscError.ID.DataEncrypted:
+                config.msg = _t.errorDataEncrypted;
+                break;
+
+            case Asc.c_oAscError.ID.AccessDeny:
+                config.msg = _t.errorAccessDeny;
+                break;
+
+            case Asc.c_oAscError.ID.EditingError:
+                config.msg = _t.errorEditingDownloadas;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+                config.msg = _t.errorFileSizeExceed;
+                break;
+
+            case Asc.c_oAscError.ID.UpdateVersion:
+                config.msg = _t.errorUpdateVersionOnDisconnect;
+                break;
+
+            default:
+                config.msg = _t.errorDefaultMessage.replace('%1', id);
+                break;
+        }
+
+        if (level === Asc.c_oAscError.Level.Critical) {
+
+            // report only critical errors
+            Common.Gateway.reportError(id, config.msg);
+
+            config.title = _t.criticalErrorTitle;
+
+            if (storeAppOptions.canBackToFolder && !storeAppOptions.isDesktopApp) {
+                config.msg += '</br></br>' + _t.criticalErrorExtText;
+                config.callback = function() {
+                    Common.Notifications.trigger('goback', true);
+                }
+            }
+            if (id === Asc.c_oAscError.ID.DataEncrypted) {
+                api.asc_coAuthoringDisconnect();
+                Common.Notifications.trigger('api:disconnect');
+            }
+        }
+        else {
+            Common.Gateway.reportWarning(id, config.msg);
+
+            config.title    = _t.notcriticalErrorTitle;
+            config.callback = (btn) => {
+                if (id === Asc.c_oAscError.ID.Warning && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) {
+                    api.asc_DownloadOrigin();
+                }
+                storeAppOptions.changeEditingRights(false);
+            };
+        }
+
+        f7.dialog.create({
+            cssClass: 'error-dialog',
+            title   : config.title,
+            text    : config.msg,
+            buttons: [
+                {
+                    text: 'OK',
+                    onClick: config.callback
+                }
+            ]
+        }).open();
+
+        Common.component.Analytics.trackEvent('Internal Error', id.toString());
+    };
+
+    return null
+});
+
+export default ErrorController;

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

@@ -0,0 +1,207 @@
+import React, { Component } from 'react';
+import { inject } from 'mobx-react';
+import { f7 } from 'framework7-react';
+import { withTranslation } from 'react-i18next';
+import IrregularStack from "../../../../common/mobile/utils/IrregularStack";
+
+class LongActions extends Component {
+    constructor(props) {
+        super(props);
+
+        this.stackLongActions = new IrregularStack({
+            strongCompare   : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;},
+            weakCompare     : function(obj1, obj2){return obj1.type === obj2.type;}
+        });
+
+        this.onLongActionBegin = this.onLongActionBegin.bind(this);
+        this.onLongActionEnd = this.onLongActionEnd.bind(this);
+        this.onOpenDocument = this.onOpenDocument.bind(this);
+        this.closePreloader = this.closePreloader.bind(this);
+    }
+
+    closePreloader() {
+        if (this.loadMask && this.loadMask.el) {
+            f7.dialog.close(this.loadMask.el);
+        }
+    }
+
+    componentDidMount() {
+        Common.Notifications.on('engineCreated', (api) => {
+            api.asc_registerCallback('asc_onStartAction', this.onLongActionBegin);
+            api.asc_registerCallback('asc_onEndAction', this.onLongActionEnd);
+            api.asc_registerCallback('asc_onOpenDocumentProgress', this.onOpenDocument);
+        });
+        Common.Notifications.on('preloader:endAction', this.onLongActionEnd);
+        Common.Notifications.on('preloader:beginAction', this.onLongActionBegin);
+        Common.Notifications.on('preloader:close', this.closePreloader);
+    }
+
+    componentWillUnmount() {
+        const api = Common.EditorApi.get();
+        api.asc_unregisterCallback('asc_onStartAction', this.onLongActionBegin);
+        api.asc_unregisterCallback('asc_onEndAction', this.onLongActionEnd);
+        api.asc_unregisterCallback('asc_onOpenDocumentProgress', this.onOpenDocument);
+
+        Common.Notifications.off('preloader:endAction', this.onLongActionEnd);
+        Common.Notifications.off('preloader:beginAction', this.onLongActionBegin);
+        Common.Notifications.off('preloader:close', this.closePreloader);
+    }
+
+    onLongActionBegin (type, id) {
+        const action = {id: id, type: type};
+        this.stackLongActions.push(action);
+        this.setLongActionView(action);
+    }
+
+    onLongActionEnd (type, id) {
+        let action = {id: id, type: type};
+        this.stackLongActions.pop(action);
+
+        //this.updateWindowTitle(true);
+
+        action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
+
+        if (action) {
+            this.setLongActionView(action)
+        }
+
+        action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
+
+        if (action) {
+            this.setLongActionView(action)
+        } else {
+            this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in') && f7.dialog.close(this.loadMask.el);
+        }
+    }
+
+    setLongActionView (action) {
+        const { t } = this.props;
+        const _t = t("LongActions", { returnObjects: true });
+        let title = '';
+        let text = '';
+        switch (action.id) {
+            case Asc.c_oAscAsyncAction['Open']:
+                title   = _t.openTitleText;
+                text    = _t.openTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['Save']:
+                title   = _t.saveTitleText;
+                text    = _t.saveTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadDocumentFonts']:
+                title   = _t.loadFontsTitleText;
+                text    = _t.loadFontsTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadDocumentImages']:
+                title   = _t.loadImagesTitleText;
+                text    = _t.loadImagesTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadFont']:
+                title   = _t.loadFontTitleText;
+                text    = _t.loadFontTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadImage']:
+                title   = _t.loadImageTitleText;
+                text    = _t.loadImageTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['DownloadAs']:
+                title   = _t.downloadTitleText;
+                text    = _t.downloadTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['Print']:
+                title   = _t.printTitleText;
+                text    = _t.printTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['UploadImage']:
+                title   = _t.uploadImageTitleText;
+                text    = _t.uploadImageTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['ApplyChanges']:
+                title   = _t.applyChangesTitleText;
+                text    = _t.applyChangesTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['PrepareToSave']:
+                title   = _t.savePreparingText;
+                text    = _t.savePreparingTitle;
+                break;
+
+            case Asc.c_oAscAsyncAction['MailMergeLoadFile']:
+                title   = _t.mailMergeLoadFileText;
+                text    = _t.mailMergeLoadFileTitle;
+                break;
+
+            case Asc.c_oAscAsyncAction['DownloadMerge']:
+                title   = _t.downloadMergeTitle;
+                text    = _t.downloadMergeText;
+                break;
+
+            case Asc.c_oAscAsyncAction['SendMailMerge']:
+                title   = _t.sendMergeTitle;
+                text    = _t.sendMergeText;
+                break;
+
+            case Asc.c_oAscAsyncAction['Waiting']:
+                title   = _t.waitText;
+                text    = _t.waitText;
+                break;
+
+            case ApplyEditRights:
+                title   = _t.txtEditingMode;
+                text    = _t.txtEditingMode;
+                break;
+
+            case LoadingDocument:
+                title   = _t.loadingDocumentTitleText;
+                text    = _t.loadingDocumentTextText;
+                break;
+            default:
+                if (typeof action.id == 'string'){
+                    title   = action.id;
+                    text    = action.id;
+                }
+                break;
+        }
+
+        if (action.type === Asc.c_oAscAsyncActionType['BlockInteraction']) {
+            if (action.id === Asc.c_oAscAsyncAction['ApplyChanges']) {
+                return;
+            }
+
+            if (this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in')) {
+                this.loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
+            } else {
+                this.loadMask = f7.dialog.preloader(title);
+            }
+        }
+
+    }
+
+    onOpenDocument (progress) {
+        if (this.loadMask && this.loadMask.el) {
+            const $title = this.loadMask.el.getElementsByClassName('dialog-title')[0];
+            const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
+
+            const { t } = this.props;
+            const _t = t("LongActions", { returnObjects: true });
+            $title.innerHTML = `${_t.textLoadingDocument}: ${Math.min(Math.round(proc * 100), 100)}%`;
+        }
+    }
+
+    render() {
+        return null;
+    }
+}
+
+const LongActionsController = withTranslation()(LongActions);
+
+export default LongActionsController;

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

@@ -9,12 +9,12 @@ import {InitReviewController as ReviewController} from '../../../../common/mobil
 import { onAdvancedOptions } from './settings/Download.jsx';
 import {
     CommentsController,
-    AddCommentController,
-    EditCommentController,
     ViewCommentsController
 } from "../../../../common/mobile/lib/controller/collaboration/Comments";
 import About from '../../../../common/mobile/lib/view/About';
 import EditorUIController from '../lib/patch';
+import ErrorController from "./Error";
+import LongActionsController from "./LongActions";
 
 @inject(
     "storeAppOptions",
@@ -24,17 +24,24 @@ import EditorUIController from '../lib/patch';
     "storeParagraphSettings",
     "storeTableSettings",
     "storeDocumentInfo",
-    "storeChartSettings"
+    "storeChartSettings",
+    "storeApplicationSettings"
     )
 class MainController extends Component {
     constructor(props) {
         super(props);
         window.editorType = 'de';
 
+        this.LoadingDocument = -256;
+
         this._state = {
-            licenseType: false
+            licenseType: false,
+            isFromGatewayDownloadAs: false,
+            isDocModified: false
         };
 
+        this.defaultTitleText = __APP_TITLE_TEXT__;
+
         const { t } = this.props;
         this._t = t('Main', {returnObjects:true});
     }
@@ -75,6 +82,15 @@ class MainController extends Component {
 
                 this.editorConfig.lang && this.api.asc_setLocale(this.editorConfig.lang);
 
+                let value = LocalStorage.getItem("de-mobile-macros-mode");
+                if (value === null) {
+                    value = this.editorConfig.customization ? this.editorConfig.customization.macrosMode : 'warn';
+                    value = (value === 'enable') ? 1 : (value === 'disable' ? 2 : 0);
+                } else {
+                    value = parseInt(value);
+                }
+                this.props.storeApplicationSettings.changeMacrosSettings(value);
+
                 Common.Notifications.trigger('configOptionsFill');
             };
 
@@ -106,21 +122,21 @@ class MainController extends Component {
                     docInfo.put_Permissions(_permissions);
                     docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
 
-                    // var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false);
+                    let enable = !this.editorConfig.customization || (this.editorConfig.customization.macros !== false);
-                    // docInfo.asc_putIsEnabledMacroses(!!enable);
+                    docInfo.asc_putIsEnabledMacroses(!!enable);
-                    // enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false);
+                    enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins !== false);
-                    // docInfo.asc_putIsEnabledPlugins(!!enable);
+                    docInfo.asc_putIsEnabledPlugins(!!enable);
 
-                    // let type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType);
+                    const type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType);
-                    // if (type && typeof type[1] === 'string') {
+                    if (type && typeof type[1] === 'string') {
-                    //     this.permissions.edit = this.permissions.review = false;
+                        this.permissions.edit = this.permissions.review = false;
-                    // }
+                    }
                 }
 
                 this.api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);
                 this.api.asc_registerCallback('asc_onDocumentContentReady', onDocumentContentReady);
                 this.api.asc_registerCallback('asc_onLicenseChanged', this.onLicenseChanged.bind(this));
-                // this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this));
+                this.api.asc_registerCallback('asc_onRunAutostartMacroses', this.onRunAutostartMacroses.bind(this));
                 this.api.asc_setDocInfo(docInfo);
                 this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId);
 
@@ -173,14 +189,62 @@ class MainController extends Component {
             };
 
             const onDocumentContentReady = () => {
-                this.applyLicense();
+                if (this._isDocReady)
+                    return;
+
+                const appOptions = this.props.storeAppOptions;
+                const appSettings = this.props.storeApplicationSettings;
 
-                Common.Gateway.documentReady();
                 f7.emit('resize');
 
-                Common.Notifications.trigger('document:ready');
-
                 this._isDocReady = true;
+
+                this.api.SetDrawingFreeze(false);
+
+                Common.Notifications.trigger('preloader:close');
+                Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+
+                let value = LocalStorage.getItem("de-settings-zoom");
+                const zf = (value !== null) ? parseInt(value) : (appOptions.customization && appOptions.customization.zoom ? parseInt(appOptions.customization.zoom) : 100);
+                (zf === -1) ? this.api.zoomFitToPage() : ((zf === -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100));
+
+                value = LocalStorage.getBool("de-mobile-spellcheck", !(appOptions.customization && appOptions.customization.spellcheck === false));
+                appSettings.changeSpellCheck(value);
+                this.api.asc_setSpellCheck(value);
+
+                this.updateWindowTitle(true);
+
+                this.api.SetTextBoxInputMode(LocalStorage.getBool("de-settings-inputmode"));
+
+                value = LocalStorage.getBool("de-mobile-no-characters");
+                appSettings.changeNoCharacters(value);
+                this.api.put_ShowParaMarks(value);
+
+                value = LocalStorage.getBool("de-mobile-hidden-borders");
+                appSettings.changeShowTableEmptyLine(value);
+                this.api.put_ShowTableEmptyLine(value);
+
+                if (appOptions.isEdit && this.needToUpdateVersion) {
+                    Common.Notifications.trigger('api:disconnect');
+                }
+
+                Common.Gateway.on('processsaveresult', this.onProcessSaveResult.bind(this));
+                Common.Gateway.on('processrightschange', this.onProcessRightsChange.bind(this));
+                Common.Gateway.on('downloadas', this.onDownloadAs.bind(this));
+                Common.Gateway.on('requestclose', this.onRequestClose.bind(this));
+
+                Common.Gateway.sendInfo({
+                    mode: appOptions.isEdit ? 'edit' : 'view'
+                });
+
+                this.api.Resize();
+                this.api.zoomFitToWidth();
+                this.api.asc_GetDefaultTableStyles && setTimeout(() => {this.api.asc_GetDefaultTableStyles()}, 1);
+
+                this.applyLicense();
+
+                Common.Notifications.trigger('document:ready');
+                Common.Gateway.documentReady();
             };
 
             const _process_array = (array, fn) => {
@@ -205,16 +269,42 @@ class MainController extends Component {
                         'translate': t('Main.SDK', {returnObjects:true})
                     });
 
+                    Common.Notifications.trigger('engineCreated', this.api);
+                    Common.EditorApi = {get: () => this.api};
+
+                    // Set font rendering mode
+                    let value = LocalStorage.getItem("de-settings-fontrender");
+                    if (value === null) {
+                        value = window.devicePixelRatio > 1 ? '1' : '0';
+                    }
+                    switch (value) {
+                        case '0': this.api.SetFontRenderingMode(3); break;
+                        case '1': this.api.SetFontRenderingMode(1); break;
+                        case '2': this.api.SetFontRenderingMode(2); break;
+                    }
+
+                    Common.Utils.Metric.setCurrentMetric(1); //pt
+
                     this.appOptions   = {};
                     this.bindEvents();
 
                     Common.Gateway.on('init',           loadConfig);
-                    // Common.Gateway.on('showmessage',    _.bind(me.onExternalMessage, me));
+                    Common.Gateway.on('showmessage',    this.onExternalMessage.bind(this));
                     Common.Gateway.on('opendocument',   loadDocument);
                     Common.Gateway.appReady();
 
-                    Common.Notifications.trigger('engineCreated', this.api);
+                    Common.Gateway.on('internalcommand', function(data) {
-                    Common.EditorApi = {get: () => this.api};
+                        if (data.command === 'hardBack') {
+                            if ($$('.modal-in').length > 0) {
+                                if ( !($$('.error-dialog.modal-in').length > 0) ) {
+                                    f7.dialog.close();
+                                }
+                                Common.Gateway.internalMessage('hardBack', false);
+                            } else
+                                Common.Gateway.internalMessage('hardBack', true);
+                        }
+                    });
+                    Common.Gateway.internalMessage('listenHardBack');
                 }, error => {
                     console.log('promise failed ' + error);
                 });
@@ -240,8 +330,8 @@ class MainController extends Component {
         Common.Utils.Metric.setCurrentMetric(value);
         this.api.asc_SetDocumentUnits((value === Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value===Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
 
-        //me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
+        this.api.asc_registerCallback('asc_onDocumentModifiedChanged', this.onDocumentModifiedChanged.bind(this));
-        //me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));
+        this.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  this.onDocumentCanSaveChanged.bind(this));
 
         //if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
         //    me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights);
@@ -255,6 +345,19 @@ class MainController extends Component {
         window.onunload = this.onUnload.bind(this);
     }
 
+    onDocumentModifiedChanged () {
+        const isModified = this.api.asc_isDocumentCanSave();
+        if (this._state.isDocModified !== isModified) {
+            this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
+        }
+
+        this.updateWindowTitle();
+    }
+
+    onDocumentCanSaveChanged (isCanSave) {
+        //
+    }
+
     onBeforeUnload () {
         LocalStorage.save();
 
@@ -286,6 +389,12 @@ class MainController extends Component {
 
     applyLicense () {
         const _t = this._t;
+        const warnNoLicense  = _t.warnNoLicense.replace(/%1/g, __COMPANY_NAME__);
+        const warnNoLicenseUsers = _t.warnNoLicenseUsers.replace(/%1/g, __COMPANY_NAME__);
+        const textNoLicenseTitle = _t.textNoLicenseTitle.replace(/%1/g, __COMPANY_NAME__);
+        const warnLicenseExceeded = _t.warnLicenseExceeded.replace(/%1/g, __COMPANY_NAME__);
+        const warnLicenseUsersExceeded = _t.warnLicenseUsersExceeded.replace(/%1/g, __COMPANY_NAME__);
+
         const appOptions = this.props.storeAppOptions;
         if (appOptions.config.mode !== 'view' && !EditorUIController.isSupportEditFeature()) {
             let value = LocalStorage.getItem("de-opensource-warning");
@@ -313,9 +422,9 @@ class MainController extends Component {
             ) {
                 license = (license === Asc.c_oLicenseResult.ExpiredLimited) ? _t.warnLicenseLimitedNoAccess : _t.warnLicenseLimitedRenewed;
             } else if (license === Asc.c_oLicenseResult.Connections || license === Asc.c_oLicenseResult.UsersCount) {
-                license = (license===Asc.c_oLicenseResult.Connections) ? _t.warnLicenseExceeded : _t.warnLicenseUsersExceeded;
+                license = (license===Asc.c_oLicenseResult.Connections) ? warnLicenseExceeded : warnLicenseUsersExceeded;
             } else {
-                license = (license === Asc.c_oLicenseResult.ConnectionsOS) ? _t.warnNoLicense : _t.warnNoLicenseUsers;
+                license = (license === Asc.c_oLicenseResult.ConnectionsOS) ? warnNoLicense : warnNoLicenseUsers;
                 buttons = [{
                     text: _t.textBuyNow,
                     bold: true,
@@ -345,7 +454,7 @@ class MainController extends Component {
             if (now - value > 86400000) {
                 LocalStorage.setItem("de-license-warning", now);
                 f7.dialog.create({
-                    title: _t.textNoLicenseTitle,
+                    title: textNoLicenseTitle,
                     text : license,
                     buttons: buttons
                 }).open();
@@ -374,7 +483,7 @@ class MainController extends Component {
         if (this.changeServerVersion) return true;
         const _t = this._t;
 
-        if (About.appVersion() !== buildVersion && !window.compareVersions) {
+        if (About.appVersion() !== buildVersion && !About.compareVersions()) {
             this.changeServerVersion = true;
             f7.dialog.alert(
                 _t.errorServerVersion,
@@ -388,9 +497,15 @@ class MainController extends Component {
     }
 
     bindEvents() {
-        this.api.asc_registerCallback('asc_onSendThemeColors', (colors, standart_colors) => {
+        this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this));
-            Common.Utils.ThemeColor.setColors(colors, standart_colors);
+        this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this));
-        });
+        this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this));
+        this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this));
+        this.api.asc_registerCallback('asc_onPrint', this.onPrint.bind(this));
+
+        EditorUIController.initThemeColors && EditorUIController.initThemeColors();
+
+        this.api.asc_registerCallback('asc_onDownloadUrl', this.onDownloadUrl.bind(this));
 
         const storeDocumentSettings = this.props.storeDocumentSettings;
         this.api.asc_registerCallback('asc_onPageOrient', isPortrait => {
@@ -399,34 +514,12 @@ class MainController extends Component {
         this.api.asc_registerCallback('asc_onDocSize', (w, h) => {
             storeDocumentSettings.changeDocSize(w, h);
         });
-        const storeFocusObjects = this.props.storeFocusObjects;
-        this.api.asc_registerCallback('asc_onFocusObject', objects => {
-            storeFocusObjects.resetFocusObjects(objects);
-        });
 
         //text settings
         const storeTextSettings = this.props.storeTextSettings;
-        this.api.asc_registerCallback('asc_onInitEditorFonts', (fonts, select) => {
+        EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings);
-            storeTextSettings.initEditorFonts(fonts, select);
+        EditorUIController.initFocusObjects && EditorUIController.initFocusObjects(this.props.storeFocusObjects);
-        });
+
-        this.api.asc_registerCallback('asc_onFontFamily', (font) => {
-            storeTextSettings.resetFontName(font);
-        });
-        this.api.asc_registerCallback('asc_onFontSize', (size) => {
-            storeTextSettings.resetFontSize(size);
-        });
-        this.api.asc_registerCallback('asc_onBold', (isBold) => {
-            storeTextSettings.resetIsBold(isBold);
-        });
-        this.api.asc_registerCallback('asc_onItalic', (isItalic) => {
-            storeTextSettings.resetIsItalic(isItalic);
-        });
-        this.api.asc_registerCallback('asc_onUnderline', (isUnderline) => {
-            storeTextSettings.resetIsUnderline(isUnderline);
-        });
-        this.api.asc_registerCallback('asc_onStrikeout', (isStrikeout) => {
-            storeTextSettings.resetIsStrikeout(isStrikeout);
-        });
         this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => {
             storeTextSettings.resetTypeBaseline(typeBaseline);
         });
@@ -437,10 +530,15 @@ class MainController extends Component {
             switch (type) {
                 case 0:
                     storeTextSettings.resetBullets(subtype);
+                    storeTextSettings.resetNumbers(-1);
                     break;
                 case 1:
                     storeTextSettings.resetNumbers(subtype);
+                    storeTextSettings.resetBullets(-1);
                     break;
+                default: 
+                    storeTextSettings.resetBullets(-1);
+                    storeTextSettings.resetNumbers(-1);
             }
         });
         this.api.asc_registerCallback('asc_onPrAlign', (align) => {
@@ -458,28 +556,13 @@ class MainController extends Component {
         });
 
         //paragraph settings
-        this.api.asc_setParagraphStylesSizes(330, 38);
+        EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeParagraphSettings);
-        const storeParagraphSettings = this.props.storeParagraphSettings;
-        this.api.asc_registerCallback('asc_onInitEditorStyles', (styles) => {
-            storeParagraphSettings.initEditorStyles(styles);
-        });
-        this.api.asc_registerCallback('asc_onParaStyleName', (name) => {
-            storeParagraphSettings.changeParaStyleName(name);
-        });
 
         //table settings
-        const storeTableSettings = this.props.storeTableSettings;
+        EditorUIController.initTableTemplates && EditorUIController.initTableTemplates(this.props.storeTableSettings);
-        this.api.asc_registerCallback('asc_onInitTableTemplates', (templates) => {
-            storeTableSettings.initTableTemplates(templates);
-        });
 
         //chart settings
-        const storeChartSettings = this.props.storeChartSettings;
+        EditorUIController.updateChartStyles && EditorUIController.updateChartStyles(this.props.storeChartSettings, this.props.storeFocusObjects);
-        this.api.asc_registerCallback('asc_onUpdateChartStyles', () => {
-            if (storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties()) {
-                storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.get_ChartProperties().getType()));
-            }
-        });
 
         // Document Info
 
@@ -501,10 +584,6 @@ class MainController extends Component {
           storeDocumentInfo.switchIsLoaded(true);
         });
 
-        this.api.asc_registerCallback('asc_onDocumentName', (name) => {
-            // console.log(name);
-        });
-
         // Color Schemes
 
         this.api.asc_registerCallback('asc_onSendThemeColorSchemes', (arr) => {
@@ -519,14 +598,206 @@ class MainController extends Component {
         });
     }
 
+    onProcessSaveResult (data) {
+        this.api.asc_OnSaveEnd(data.result);
+
+        if (data && data.result === false) {
+            const _t = this._t;
+            f7.dialog.alert(
+                (!data.message) ? _t.errorProcessSaveResult : data.message,
+                _t.criticalErrorTitle
+            );
+        }
+    }
+
+    onProcessRightsChange (data) {
+        if (data && data.enabled === false) {
+            const appOptions = this.props.storeAppOptions;
+            const old_rights = appOptions.lostEditingRights;
+            appOptions.changeEditingRights(!old_rights);
+            this.api.asc_coAuthoringDisconnect();
+            Common.Notifications.trigger('api:disconnect');
+
+            if (!old_rights) {
+                const _t = this._t;
+                f7.dialog.alert(
+                    (!data.message) ? _t.warnProcessRightsChange : data.message,
+                    _t.notcriticalErrorTitle,
+                    () => { appOptions.changeEditingRights(false); }
+                );
+            }
+        }
+    }
+
+    onDownloadAs () {
+        const appOptions = this.props.storeAppOptions;
+        if ( !appOptions.canDownload && !appOptions.canDownloadOrigin) {
+            Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this._t.errorAccessDeny);
+            return;
+        }
+
+        this._state.isFromGatewayDownloadAs = true;
+        const type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType);
+
+        if (type && typeof type[1] === 'string') {
+            this.api.asc_DownloadOrigin(true);
+        } else {
+            this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true));
+        }
+    }
+
+    onDownloadUrl () {
+        if (this._state.isFromGatewayDownloadAs) {
+            Common.Gateway.downloadAs(url);
+        }
+
+        this._state.isFromGatewayDownloadAs = false;
+    }
+
+    onRequestClose () {
+        Common.Gateway.requestClose();
+    }
+
+    onUpdateVersion (callback) {
+        const _t = this._t;
+
+        this.needToUpdateVersion = true;
+        Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+
+        f7.dialog.alert(
+            _t.errorUpdateVersion,
+            _t.titleUpdateVersion,
+            () => {
+                Common.Gateway.updateVersion();
+                if (callback) {
+                    callback.call(this);
+                }
+                Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+            });
+    }
+
+    onDocumentName () {
+        this.updateWindowTitle(true);
+    }
+
+    updateWindowTitle (force) {
+        const isModified = this.api.isDocumentModified();
+        if (this._state.isDocModified !== isModified || force) {
+            const title = this.defaultTitleText;
+
+            if (window.document.title != title) {
+                window.document.title = title;
+            }
+
+            this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
+            this._state.isDocModified = isModified;
+        }
+    }
+
+    onPrint () {
+        if (!this.props.storeAppOptions.canPrint) return;
+
+        if (this.api)
+            this.api.asc_Print();
+        Common.component.Analytics.trackEvent('Print');
+    }
+
+    onPrintUrl (url) {
+        if (this.iframePrint) {
+            this.iframePrint.parentNode.removeChild(this.iframePrint);
+            this.iframePrint = null;
+        }
+
+        if (!this.iframePrint) {
+            this.iframePrint = document.createElement("iframe");
+            this.iframePrint.id = "id-print-frame";
+            this.iframePrint.style.display = 'none';
+            this.iframePrint.style.visibility = "hidden";
+            this.iframePrint.style.position = "fixed";
+            this.iframePrint.style.right = "0";
+            this.iframePrint.style.bottom = "0";
+            document.body.appendChild(this.iframePrint);
+            this.iframePrint.onload = function() {
+                this.iframePrint.contentWindow.focus();
+                this.iframePrint.contentWindow.print();
+                this.iframePrint.contentWindow.blur();
+                window.focus();
+            };
+        }
+
+        if (url) {
+            this.iframePrint.src = url;
+        }
+    }
+
+    onExternalMessage (msg) {
+        if (msg && msg.msg) {
+            msg.msg = (msg.msg).toString();
+            f7.notification.create({
+                //title: uiApp.params.modalTitle,
+                text: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)],
+                closeButton: true
+            }).open();
+
+            Common.component.Analytics.trackEvent('External Error');
+        }
+    }
+
+    onRunAutostartMacroses () {
+        const config = this.props.storeAppOptions.config;
+        const enable = !config.customization || (config.customization.macros !== false);
+        if (enable) {
+            const value = this.props.storeApplicationSettings.macrosMode;
+            if (value === 1) {
+                this.api.asc_runAutostartMacroses();
+            } else if (value === 0) {
+                const _t = this._t;
+                f7.dialog.create({
+                    title: _t.notcriticalErrorTitle,
+                    text: _t.textHasMacros,
+                    content: `<div class="checkbox-in-modal">
+                      <label class="checkbox">
+                        <input type="checkbox" name="checkbox-show-macros" />
+                        <i class="icon-checkbox"></i>
+                      </label>
+                      <span class="right-text">${_t.textRemember}</span>
+                      </div>`,
+                    buttons: [{
+                        text: _t.textYes,
+                        onClick: () => {
+                            const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked');
+                            if (dontshow) {
+                                this.props.storeApplicationSettings.changeMacrosSettings(1);
+                                LocalStorage.setItem("de-mobile-macros-mode", 1);
+                            }
+                            setTimeout(() => {
+                                this.api.asc_runAutostartMacroses();
+                            }, 1);
+                        }},
+                        {
+                            text: _t.textNo,
+                            onClick: () => {
+                                const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked');
+                                if (dontshow) {
+                                    this.props.storeApplicationSettings.changeMacrosSettings(2);
+                                    LocalStorage.setItem("de-mobile-macros-mode", 2);
+                                }
+                            }
+                        }]
+                }).open();
+            }
+        }
+    }
+
     render() {
         return (
             <Fragment>
+                <LongActionsController />
+                <ErrorController LoadingDocument={this.LoadingDocument}/>
                 <CollaborationController />
                 <ReviewController />
                 <CommentsController />
-                <AddCommentController />
+                {EditorUIController.getEditCommentControllers && EditorUIController.getEditCommentControllers()}
-                <EditCommentController />
                 <ViewCommentsController />
             </Fragment>
             )

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

@@ -13,6 +13,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop
     const displayMode = props.storeReview.displayMode;
     const stateDisplayMode = displayMode == "final" || displayMode == "original" ? true : false;
     const displayCollaboration = props.users.hasEditUsers || appOptions.canViewComments || appOptions.canReview || appOptions.canViewReview;
+    const readerMode = appOptions.readerMode;
 
     useEffect(() => {
         const onDocumentReady = () => {
@@ -24,6 +25,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop
             Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect);
             Common.Notifications.on('toolbar:activatecontrols', activateControls);
             Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls);
+            Common.Notifications.on('goback', goBack);
         };
         if ( !Common.EditorApi ) {
             Common.Notifications.on('document:ready', onDocumentReady);
@@ -39,6 +41,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop
             Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect);
             Common.Notifications.off('toolbar:activatecontrols', activateControls);
             Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls);
+            Common.Notifications.off('goback', goBack);
 
             const api = Common.EditorApi.get();
             api.asc_unregisterCallback('asc_onCanUndo', onApiCanUndo);
@@ -174,6 +177,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop
 
     return (
         <ToolbarView openOptions={props.openOptions}
+                     isEdit={appOptions.isEdit}
                      docTitle={docTitle}
                      isShowBack={isShowBack}
                      onBack={onBack}
@@ -187,6 +191,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop
                      disabledEditControls={disabledEditControls}
                      disabledSettings={disabledSettings}
                      displayCollaboration={displayCollaboration}
+                     readerMode={readerMode}
         />
     )
 });

apps/documenteditor/mobile/src/controller/edit/EditText.jsx

@@ -18,7 +18,7 @@ class EditTextController extends Component {
             if (isDecrement) {
                 typeof size === 'undefined' ? api.FontSizeOut() : size = Math.max(1, --size);
             } else {
-                typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(100, ++size);
+                typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(300, ++size);
             }
             if (typeof size !== 'undefined') {
                 api.put_TextPrFontSize(size);

apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx

@@ -18,20 +18,17 @@ class ApplicationSettingsController extends Component {
     }
 
     switchSpellCheck(value) {
-        const api = Common.EditorApi.get();
+        LocalStorage.setBool("de-mobile-spellcheck", value);
-        // let state = value === '1' ? true : false;
+        Common.EditorApi.get().asc_setSpellCheck(value);
-        // Common.localStorage.setItem("de-mobile-spellcheck", value ? 1 : 0);
-        api.asc_setSpellCheck(value);
     }
 
     switchNoCharacters(value) {
-        LocalStorage.setItem("de-mobile-no-characters", value);
+        LocalStorage.setBool("de-mobile-no-characters", value);
-
         Common.EditorApi.get().put_ShowParaMarks(value);
     }
 
     switchShowTableEmptyLine(value) {
-        LocalStorage.setItem("de-mobile-hidden-borders", value);
+        LocalStorage.setBool("de-mobile-hidden-borders", value);
         Common.EditorApi.get().put_ShowTableEmptyLine(value);
     }
 
@@ -57,8 +54,7 @@ class ApplicationSettingsController extends Component {
     }
 
     setMacrosSettings(value) {
-        // Common.Utils.InternalSettings.set("de-mobile-macros-mode", +value);
+        LocalStorage.setItem("de-mobile-macros-mode", value);
-        // Common.localStorage.setItem("de-mobile-macros-mode", +value);
     }
 
     render() {

apps/documenteditor/mobile/src/controller/settings/Download.jsx

@@ -55,6 +55,8 @@ class DownloadController extends Component {
 const DownloadWithTranslation = withTranslation()(DownloadController);
 
 const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequestClose) => {
+    if ($$('.dlg-adv-options.modal-in').length > 0) return;
+
     const api = Common.EditorApi.get();
     if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
         let picker;
@@ -97,7 +99,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest
                 '</div>' +
                 '<div id="txt-encoding"></div>' +
                 '</div>',
-            buttons: buttons
+            buttons: buttons,
+            cssClass: 'dlg-adv-options'
         }).open();
         dialog.on('opened', () => {
             picker = f7.picker.create({
@@ -122,7 +125,7 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest
                 const password = document.getElementById('modal-password').value;
                 api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
                 //if (!me._isDocReady) {
-                    //me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
+                    //Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
                 //}
             }
         }];
@@ -138,7 +141,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest
             text: _t.txtProtected,
             content:
                 '<div class="input-field"><input type="password" name="modal-password" placeholder="' + _t.advDRMPassword + '" id="modal-password"></div>',
-            buttons: buttons
+            buttons: buttons,
+            cssClass: 'dlg-adv-options'
         }).open();
     }
 };

apps/documenteditor/mobile/src/controller/settings/Settings.jsx

@@ -0,0 +1,77 @@
+import React, {useEffect} from 'react';
+import { useTranslation } from 'react-i18next';
+import {f7} from 'framework7-react';
+import { observer, inject } from "mobx-react";
+import {Device} from '../../../../../common/mobile/utils/device';
+
+import SettingsView from "../../view/settings/Settings";
+
+const Settings = props => {
+    useEffect(() => {
+        if ( Device.phone ) {
+            f7.popup.open('.settings-popup');
+        } else {
+            f7.popover.open('#settings-popover', '#btn-settings');
+        }
+
+        return () => {
+            // component will unmount
+        }
+    });
+
+    const onviewclosed = () => {
+        if ( props.onclosed )
+            props.onclosed();
+    };
+
+    const closeModal = () => {
+        if (Device.phone) {
+            f7.sheet.close('.settings-popup');
+        } else {
+            f7.popover.close('#settings-popover');
+        }
+    };
+
+    const onReaderMode = () => {
+        const appOptions = props.storeAppOptions;
+        appOptions.changeReaderMode();
+
+        Common.EditorApi.get().ChangeReaderMode();
+
+        if (Device.phone) {
+            setTimeout(() => {
+                closeModal();
+            }, 1);
+        }
+    };
+
+    const onPrint = () => {
+        setTimeout(() => {
+            Common.EditorApi.get().asc_Print();
+        }, 1);
+        closeModal();
+    };
+
+    const showHelp = () => {
+        let url = __HELP_URL__;
+        // let url = 'https://helpcenter.onlyoffice.com';
+
+        if (url.charAt(url.length-1) !== '/') {
+            url += '/';
+        }
+
+        if (Device.sailfish || Device.android) {
+            url+='mobile-applications/documents/mobile-web-editors/android/index.aspx';
+        }
+        else {
+            url+='mobile-applications/documents/mobile-web-editors/ios/index.aspx';
+        }
+
+        closeModal();
+        window.open(url, "_blank");
+    };
+
+    return <SettingsView usePopover={!Device.phone} onclosed={onviewclosed} onReaderMode={onReaderMode} onPrint={onPrint} showHelp={showHelp}/>
+};
+
+export default inject("storeAppOptions")(observer(Settings));

apps/documenteditor/mobile/src/less/app-material.less

@@ -5,14 +5,6 @@
 
 
 .device-android {
-    --f7-navbar-bg-color: @themeColor;
-    --f7-navbar-link-color: @navBarIconColor;
-    --f7-navbar-text-color: @navBarIconColor;
-
-    --f7-subnavbar-bg-color: @themeColor;
-    --f7-subnavbar-link-color: @navBarIconColor;
-    --f7-subnavbar-text-color: @navBarIconColor;
-
     // Main Toolbar
     #editor-navbar.navbar .right {
         padding-right: 4px;

apps/documenteditor/mobile/src/lib/patch.jsx

@@ -11,4 +11,13 @@ EditorUIController.getToolbarOptions = () => {
     return null
 };
 
+EditorUIController.initFonts = () => null;
+EditorUIController.initEditorStyles = () => null;
+EditorUIController.initFocusObjects = () => null;
+EditorUIController.initTableTemplates = () => null;
+EditorUIController.ContextMenu = {
+    mapMenuItems: () => [],
+    handleMenuItemClick: () => true,
+};
+
 export default EditorUIController;

apps/documenteditor/mobile/src/page/main.jsx

@@ -2,18 +2,18 @@
 import React, { Component } from 'react';
 import { f7 } from 'framework7-react';
 import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react';
-import { inject } from "mobx-react";
+import { observer, inject } from "mobx-react";
 
 import EditOptions from '../view/edit/Edit';
 import AddOptions from '../view/add/Add';
-import Settings from '../view/settings/Settings';
+import Settings from '../controller/settings/Settings';
 import Collaboration from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'
 import { Device } from '../../../../common/mobile/utils/device'
 import { Search, SearchSettings } from '../controller/Search';
 import ContextMenu from '../controller/ContextMenu';
 import { Toolbar } from "../controller/Toolbar";
 
-export default class MainPage extends Component {
+class MainPage extends Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -62,14 +62,17 @@ export default class MainPage extends Component {
     };
 
   render() {
+      const appOptions = this.props.storeAppOptions;
+      const config = appOptions.config;
+      const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo)));
       return (
-          <Page name="home">
+          <Page name="home" className={showLogo && 'page-with-logo'}>
               {/* Top Navbar */}
-              <Navbar id='editor-navbar' className='main-navbar'>
+              <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
-                  <div className="main-logo"><Icon icon="icon-logo"></Icon></div>
+                  {showLogo && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
                   <Subnavbar>
-                    <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
+                      <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
-                    <Search useSuspense={false} />
+                      <Search useSuspense={false}/>
                   </Subnavbar>
               </Navbar>
               {/* Page content */}
@@ -100,4 +103,6 @@ export default class MainPage extends Component {
           </Page>
       )
   }
-};
+}
+
+export default inject("storeAppOptions")(observer(MainPage));

apps/documenteditor/mobile/src/store/appOptions.js

@@ -8,13 +8,36 @@ export class storeAppOptions {
             canReview: observable,
             setConfigOptions: action,
             setPermissionOptions: action,
-            setCanViewReview: action
+
+            canViewReview: observable,
+            setCanViewReview: action,
+
+            lostEditingRights: observable,
+            changeEditingRights: action,
+
+            readerMode: observable,
+            changeReaderMode: action,
+
+            canBrandingExt: observable
         });
     }
 
     isEdit = false;
     canViewComments = false;
     canReview = false;
+    canViewReview = false;
+
+    lostEditingRights = false;
+    changeEditingRights (value) {
+        this.lostEditingRights = value;
+    }
+
+    readerMode = false;
+    changeReaderMode () {
+        this.readerMode = !this.readerMode;
+    }
+
+    canBrandingExt = false;
 
     config = {};
     setConfigOptions (config) {

apps/documenteditor/mobile/src/store/focusObjects.js

@@ -1,4 +1,5 @@
 import {action, observable, computed, makeObservable} from 'mobx';
+import EditorUIController from '../lib/patch'
 
 export class storeFocusObjects {
     constructor() {
@@ -23,34 +24,10 @@ export class storeFocusObjects {
     _headerType = 1;
 
     resetFocusObjects (objects) {
-        this._focusObjects = objects;
     }
 
     get settings() {
-        const _settings = [];
+        return !!this.intf ? this.intf.filterFocusObjects() : null;
-        for (let object of this._focusObjects) {
-            let type = object.get_ObjectType();
-            if (Asc.c_oAscTypeSelectElement.Paragraph === type) {
-                _settings.push('text', 'paragraph');
-            } else if (Asc.c_oAscTypeSelectElement.Table === type) {
-                _settings.push('table');
-            } else if (Asc.c_oAscTypeSelectElement.Image === type) {
-                if (object.get_ObjectValue().get_ChartProperties()) {
-                    // Exclude shapes if chart exist
-                    let si = _settings.indexOf('shape');
-                    si < 0 ? _settings.push('chart') : _settings.splice(si,1,'chart');
-                } else if (object.get_ObjectValue().get_ShapeProperties() && !_settings.includes('chart')) {
-                    _settings.push('shape');
-                } else {
-                    _settings.push('image');
-                }
-            } else if (Asc.c_oAscTypeSelectElement.Hyperlink === type) {
-                _settings.push('hyperlink');
-            } else if (Asc.c_oAscTypeSelectElement.Header === type) {
-                _settings.push('header');
-            }
-        }
-        return _settings.filter((value, index, self) => self.indexOf(value) === index);
     }
 
     get headerType() {
@@ -64,83 +41,23 @@ export class storeFocusObjects {
     }
 
     get headerObject() {
-        const headers = [];
+        return !!this.intf ? this.intf.getHeaderObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Header) {
-                headers.push(object);
-            }
-        }
-        if (headers.length > 0) {
-            const object = headers[headers.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get paragraphObject() {
-        const paragraphs = [];
+        return !!this.intf ? this.intf.getParagraphObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Paragraph) {
-                paragraphs.push(object);
-            }
-        }
-        if (paragraphs.length > 0) {
-            const object = paragraphs[paragraphs.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get shapeObject() {
-        const shapes = [];
+        return !!this.intf ? this.intf.getShapeObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Image) {
-                if (object.get_ObjectValue() && object.get_ObjectValue().get_ShapeProperties()) {
-                    shapes.push(object);
-                }
-            }
-        }
-        if (shapes.length > 0) {
-            const object = shapes[shapes.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get imageObject() {
-        const images = [];
+        return !!this.intf ? this.intf.getImageObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Image) {
-                const imageObject = object.get_ObjectValue();
-                if (imageObject && imageObject.get_ShapeProperties() === null && imageObject.get_ChartProperties() === null) {
-                    images.push(object);
-                }
-            }
-        }
-        if (images.length > 0) {
-            const object = images[images.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get tableObject() {
-        const tables = [];
+        return !!this.intf ? this.intf.getTableObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Table) {
-                tables.push(object);
-            }
-        }
-        if (tables.length > 0) {
-            const object = tables[tables.length - 1]; // get top table
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get isTableInStack() {
@@ -153,32 +70,10 @@ export class storeFocusObjects {
     }
 
     get chartObject() {
-        const charts = [];
+        return !!this.intf ? this.intf.getChartObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectValue() && object.get_ObjectValue().get_ChartProperties()) {
-                charts.push(object);
-            }
-        }
-        if (charts.length > 0) {
-            const object = charts[charts.length - 1]; // get top table
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
     
     get linkObject() {
-        const links = [];
+        return !!this.intf ? this.intf.getLinkObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Hyperlink) {
-                links.push(object);
-            }
-        }
-        if (links.length > 0) {
-            const object = links[links.length - 1]; // get top
-            return  object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 }

apps/documenteditor/mobile/src/store/paragraphSettings.js

@@ -20,11 +20,6 @@ export class storeParagraphSettings {
     styleName = undefined;
 
     initEditorStyles (styles) {
-        this.styles = styles.get_MergedStyles();
-        this.styleThumbSize = {
-            width   : styles.STYLE_THUMBNAIL_WIDTH,
-            height  : styles.STYLE_THUMBNAIL_HEIGHT
-        };
     }
 
     get paragraphStyles () {
@@ -39,7 +34,6 @@ export class storeParagraphSettings {
     }
 
     changeParaStyleName (name) {
-        this.styleName = name;
     }
 
     backColor = undefined;

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

@@ -9,19 +9,21 @@ const ToolbarView = props => {
         <Fragment>
             <NavLeft>
                 {props.isShowBack && <Link className={`btn-doc-back${props.disabledControls && ' disabled'}`} icon='icon-back' onClick={props.onBack}></Link>}
-                <Link icon='icon-undo' className={!props.isCanUndo && 'disabled'} onClick={props.onUndo}></Link>
+                {props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({
-                <Link icon='icon-redo' className={!props.isCanRedo && 'disabled'} onClick={props.onRedo}></Link>
+                    disabledUndo: !props.isCanUndo,
+                    disabledRedo: !props.isCanRedo,
+                    onUndoClick: props.onUndo,
+                    onRedoClick: props.onRedo
+                })}
             </NavLeft>
             {!Device.phone && <NavTitle>{props.docTitle}</NavTitle>}
             <NavRight>
-                {
+                {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({
-                    EditorUIController.getToolbarOptions({
                         disabled: disableEditBtn || props.disabledControls,
                         onEditClick: e => props.openOptions('edit'),
-                        onAddClick: e => props.openOptions('add'),
+                        onAddClick: e => props.openOptions('add')
-                    })
+                })}
-                }
+                { Device.phone ? null : <Link className={(props.disabledControls || props.readerMode) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> }
-                { Device.phone ? null : <Link className={props.disabledControls && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> }
                 {props.displayCollaboration && <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={e => props.openOptions('coauth')}></Link>}
                 <Link className={(props.disabledSettings || props.disabledControls) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={e => props.openOptions('settings')}></Link>
             </NavRight>

apps/documenteditor/mobile/src/view/app.jsx

@@ -3,6 +3,8 @@ import React from 'react';
 import {App,Panel,Views,View,Popup,Page,Navbar,Toolbar,NavRight,Link,Block,BlockTitle,List,ListItem,ListInput,ListButton,BlockFooter} from 'framework7-react';
 import { f7, f7ready } from 'framework7-react';
 
+import '../../../../common/Analytics.js';
+
 import '../../../../common/Gateway.js';
 import '../../../../common/main/lib/util/utils.js';
 

apps/documenteditor/mobile/src/view/edit/EditImage.jsx

@@ -76,10 +76,10 @@ const PageWrap = props => {
             }
             <List>
                 <ListItem title={_t.textMoveWithText} className={'inline' === wrapType ? 'disabled' : ''}>
-                    <Toggle checked={moveText} onToggleChange={() => {props.onMoveText(!moveText)}}/>
+                    <Toggle checked={moveText} onChange={() => {props.onMoveText(!moveText)}}/>
                 </ListItem>
                 <ListItem title={_t.textAllowOverlap}>
-                    <Toggle checked={overlap} onToggleChange={() => {props.onOverlap(!overlap)}}/>
+                    <Toggle checked={overlap} onChange={() => {props.onOverlap(!overlap)}}/>
                 </ListItem>
             </List>
             {

apps/documenteditor/mobile/src/view/edit/EditTable.jsx

@@ -70,10 +70,10 @@ const PageWrap = props => {
         <Page>
             <Navbar title={_t.textWrap} backLink={_t.textBack} />
             <List>
-                <ListItem title={_t.textInline} radio checked={wrapType === 'inline'} onClick={() => {props.onWrapType(c_tableWrap.TABLE_WRAP_NONE)}}>
+                <ListItem title={_t.textInline} radio checked={wrapType === 'inline'} onChange={() => {props.onWrapType(c_tableWrap.TABLE_WRAP_NONE)}}>
                     {!isAndroid && <Icon slot="media" icon="icon-wrap-table-inline"></Icon>}
                 </ListItem>
-                <ListItem title={_t.textFlow} radio checked={wrapType === 'flow'} onClick={() => {props.onWrapType(c_tableWrap.TABLE_WRAP_PARALLEL)}}>
+                <ListItem title={_t.textFlow} radio checked={wrapType === 'flow'} onChange={() => {props.onWrapType(c_tableWrap.TABLE_WRAP_PARALLEL)}}>
                     {!isAndroid && <Icon slot="media" icon="icon-wrap-table-flow"></Icon>}
                 </ListItem>
             </List>

apps/documenteditor/mobile/src/view/edit/EditText.jsx

@@ -131,6 +131,7 @@ const PageBullets = props => {
     ];
     const storeTextSettings = props.storeTextSettings;
     const typeBullets = storeTextSettings.typeBullets;
+    
     return(
         <Page className='bullets dataview'>
             <Navbar title={t('Edit.textBullets')} backLink={t('Edit.textBack')} />

apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx

@@ -106,7 +106,7 @@ const PageMacrosSettings = props => {
 
     const changeMacros = value => {
         store.changeMacrosSettings(value);
-        // props.setMacrosSettings(value);
+        props.setMacrosSettings(value);
     };
 
     return (

apps/documenteditor/mobile/src/view/settings/Settings.jsx

@@ -1,6 +1,6 @@
 import React, {Component, useEffect} from 'react';
-import {View,Page,Navbar,NavRight,Link,Popup,Popover,Icon,ListItem,List} from 'framework7-react';
+import {View, Page, Navbar, NavRight, Link, Popup, Popover, Icon,ListItem, List, Toggle} from 'framework7-react';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 import {f7} from 'framework7-react';
 import { observer, inject } from "mobx-react";
 import {Device} from '../../../../../common/mobile/utils/device';
@@ -57,8 +57,8 @@ const routes = [
 ];
 
 
-const SettingsList = inject("storeAppOptions")( observer( withTranslation()( props => {
+const SettingsList = inject("storeAppOptions")(observer(props => {
-    const {t} = props;
+    const { t } = useTranslation();
     const _t = t('Settings', {returnObjects: true});
     const navbar = <Navbar title={_t.textSettings}>
                     {!props.inPopover  && <NavRight><Link popupClose=".settings-popup">{_t.textDone}</Link></NavRight>}
@@ -113,14 +113,14 @@ const SettingsList = inject("storeAppOptions")( observer( withTranslation()( pro
                 {navbar}
                 <List>
                     {!props.inPopover &&
-                        <ListItem title={!_isEdit ? _t.textFind : _t.textFindAndReplace} link="#" searchbarEnable='.searchbar' onClick={closeModal}>
+                        <ListItem title={!_isEdit ? _t.textFind : _t.textFindAndReplace} link='#' searchbarEnable='.searchbar' onClick={closeModal} className='no-indicator'>
                             <Icon slot="media" icon="icon-search"></Icon>
                         </ListItem>
                     }
                     {_canReader &&
                         <ListItem title={_t.textReaderMode}> {/*ToDo*/}
                             <Icon slot="media" icon="icon-reader"></Icon>
-                            <Toggle checked={false} onToggleChange={() => {}}/>
+                            <Toggle checked={appOptions.readerMode} onChange={() => {props.onReaderMode()}}/>
                         </ListItem>
                     }
                     {/*ToDo: settings-orthography*/}
@@ -143,7 +143,7 @@ const SettingsList = inject("storeAppOptions")( observer( withTranslation()( pro
                     </ListItem>
                     }
                     {_canPrint &&
-                        <ListItem title={_t.textPrint}>
+                        <ListItem title={_t.textPrint} onClick={props.onPrint} link='#' className='no-indicator'>
                             <Icon slot="media" icon="icon-print"></Icon>
                         </ListItem>
                     }
@@ -151,7 +151,7 @@ const SettingsList = inject("storeAppOptions")( observer( withTranslation()( pro
                         <Icon slot="media" icon="icon-info"></Icon>
                     </ListItem>
                     {_canHelp &&
-                        <ListItem title={_t.textHelp} link="#">
+                        <ListItem title={_t.textHelp} link="#" onClick={props.showHelp}>
                             <Icon slot="media" icon="icon-help"></Icon>
                         </ListItem>
                     }
@@ -164,7 +164,7 @@ const SettingsList = inject("storeAppOptions")( observer( withTranslation()( pro
             </Page>
         </View>
     )
-})));
+}));
 
 class SettingsView extends Component {
     constructor(props) {
@@ -182,37 +182,13 @@ class SettingsView extends Component {
         return (
             show_popover ?
                 <Popover id="settings-popover" className="popover__titled" onPopoverClosed={() => this.props.onclosed()}>
-                    <SettingsList inPopover={true} onOptionClick={this.onoptionclick} style={{height: '410px'}} />
+                    <SettingsList inPopover={true} onOptionClick={this.onoptionclick} style={{height: '410px'}} onReaderMode={this.props.onReaderMode} onPrint={this.props.onPrint} showHelp={this.props.showHelp}/>
                 </Popover> :
                 <Popup className="settings-popup" onPopupClosed={() => this.props.onclosed()}>
-                    <SettingsList onOptionClick={this.onoptionclick} />
+                    <SettingsList onOptionClick={this.onoptionclick} onReaderMode={this.props.onReaderMode} onPrint={this.props.onPrint} showHelp={this.props.showHelp}/>
                 </Popup>
         )
     }
 }
 
-const Settings = props => {
+export default SettingsView;
-    useEffect(() => {
-        if ( Device.phone )
-            f7.popup.open('.settings-popup');
-        else f7.popover.open('#settings-popover', '#btn-settings');
-
-        return () => {
-            // component will unmount
-        }
-    });
-
-
-    const onviewclosed = () => {
-        if ( props.onclosed )
-            props.onclosed();
-    };
-
-    // if ( Device.phone ) {
-    //     return <SettingsPopup onclosed={onviewclosed} />
-    // }
-
-    return <SettingsView usePopover={!Device.phone} onclosed={onviewclosed} />
-};
-
-export default Settings;

apps/presentationeditor/mobile/locale/en.json

@@ -21,9 +21,110 @@
         "Slide subtitle": "Slide subtitle",
         "Table": "Table",
         "Slide title": "Slide title"
-      }
+      },
+      "closeButtonText": "Close File",
+      "advDRMOptions": "Protected File",
+      "advDRMPassword": "Password",
+
+      "leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
+      "titleLicenseExp": "License expired",
+      "warnLicenseExp": "Your license has expired. Please update your license and refresh the page.",
+      "errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+      "titleServerVersion": "Editor updated",
+      "notcriticalErrorTitle": "Warning",
+      "errorOpensource": "Using the free Community version you can open documents for viewing only. To access mobile web editors, a commercial license is required.",
+      "warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please contact your administrator.",
+      "warnLicenseLimitedRenewed": "License needs to be renewed. You have a limited access to document editing functionality.<br>Please contact your administrator to get full access",
+      "warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact your administrator to learn more.",
+      "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
+      "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
+      "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
+      "textBuyNow": "Visit website",
+      "textContactUs": "Contact sales",
+      "textNoLicenseTitle": "License limit reached",
+      "textPaidFeature": "Paid feature",
+      "textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader. Please contact our Sales Department to get a quote.",
+      "textClose": "Close",
+
+      "errorProcessSaveResult": "Saving is failed.",
+      "criticalErrorTitle": "Error",
+      "warnProcessRightsChange": "You have been denied the right to edit the file.",
+      "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
+
+      "errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
+      "titleUpdateVersion": "Version changed",
+      "textHasMacros": "The file contains automatic macros.<br>Do you want to run macros?",
+      "textRemember": "Remember my choice",
+      "textYes": "Yes",
+      "textNo": "No"
     }
   },
+  "Error": {
+    "criticalErrorTitle": "Error",
+    "unknownErrorText": "Unknown error.",
+    "convertationTimeoutText": "Convertation timeout exceeded.",
+    "openErrorText": "An error has occurred while opening the file",
+    "saveErrorText": "An error has occurred while saving the file",
+    "downloadErrorText": "Download failed.",
+    "uploadImageSizeMessage": "Maximium image size limit exceeded.",
+    "uploadImageExtMessage": "Unknown image format.",
+    "uploadImageFileCountMessage": "No images uploaded.",
+    "splitMaxRowsErrorText": "The number of rows must be less than %1",
+    "splitMaxColsErrorText": "The number of columns must be less than %1",
+    "splitDividerErrorText": "The number of rows must be a divisor of %1",
+    "errorKeyEncrypt": "Unknown key descriptor",
+    "errorKeyExpire": "Key descriptor expired",
+    "errorUsersExceed": "Count of users was exceed",
+    "errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored and page is reloaded.",
+    "errorFilePassProtect": "The file is password protected and could not be opened.",
+    "errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
+    "errorDataRange": "Incorrect data range.",
+    "errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
+    "errorUserDrop": "The file cannot be accessed right now.",
+    "errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
+    "errorBadImageUrl": "Image url is incorrect",
+    "errorSessionAbsolute": "The document editing session has expired. Please reload the page.",
+    "errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
+    "errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
+    "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
+    "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
+    "errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
+    "errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
+    "errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
+    "errorDefaultMessage": "Error code: %1",
+    "criticalErrorExtText": "Press 'OK' to back to document list.",
+    "notcriticalErrorTitle": "Warning",
+    "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page."
+  },
+  "LongActions": {
+    "openTitleText": "Opening Document",
+    "openTextText": "Opening document...",
+    "saveTitleText": "Saving Document",
+    "saveTextText": "Saving document...",
+    "loadFontsTitleText": "Loading Data",
+    "loadFontsTextText": "Loading data...",
+    "loadImagesTitleText": "Loading Images",
+    "loadImagesTextText": "Loading images...",
+    "loadFontTitleText": "Loading Data",
+    "loadFontTextText": "Loading data...",
+    "loadImageTitleText": "Loading Image",
+    "loadImageTextText": "Loading image...",
+    "downloadTitleText": "Downloading Document",
+    "downloadTextText": "Downloading document...",
+    "printTitleText": "Printing Document",
+    "printTextText": "Printing document...",
+    "uploadImageTitleText": "Uploading Image",
+    "uploadImageTextText": "Uploading image...",
+    "applyChangesTitleText": "Loading Data",
+    "applyChangesTextText": "Loading data...",
+    "savePreparingText": "Preparing to save",
+    "savePreparingTitle": "Preparing to save. Please wait...",
+    "waitText": "Please, wait...",
+    "txtEditingMode": "Set editing mode...",
+    "loadingDocumentTitleText": "Loading document",
+    "loadingDocumentTextText": "Loading document...",
+    "textLoadingDocument": "Loading document"
+  },
   "ContextMenu": {
     "menuViewComment": "View Comment",
     "menuAddComment": "Add Comment",
@@ -37,6 +138,12 @@
     "errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.",
     "textDoNotShowAgain": "Don't show again"
   },
+  "Toolbar": {
+    "dlgLeaveTitleText": "You leave the application",
+    "dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.",
+    "leaveButtonText": "Leave this Page",
+    "stayButtonText": "Stay on this Page"
+  },
   "View": {
     "Settings": {
       "textDone": "Done",
@@ -274,7 +381,9 @@
       "textSearch": "Search",
       "textCaseSensitive": "Case Sensitive",
       "textHighlight": "Highlight Results",
-      "textNoTextFound": "Text not Found"
+      "textNoTextFound": "Text not Found",
+      "textSelectObjectToEdit": "Select object to edit",
+      "textFinalMessage": "The end of slide preview. Click to exit."
     }
   },
   "Common": {

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

@@ -7,6 +7,7 @@ import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
 import ContextMenuController from '../../../../common/mobile/lib/controller/ContextMenu';
 import { idContextMenuElement } from '../../../../common/mobile/lib/view/ContextMenu';
 import { Device } from '../../../../common/mobile/utils/device';
+import EditorUIController from '../lib/patch';
 
 @inject ( stores => ({
     isEdit: stores.storeAppOptions.isEdit,
@@ -57,10 +58,13 @@ class ContextMenu extends ContextMenuController {
     onMenuItemClick(action) {
         super.onMenuItemClick(action);
 
+        if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) )
+            return;
+
         const api = Common.EditorApi.get();
         switch (action) {
             case 'cut':
-                if (!api.Cut() && !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) {
+                if ( !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) {
                     this.showCopyCutPasteModal();
                 }
                 break;
@@ -70,29 +74,13 @@ class ContextMenu extends ContextMenuController {
                 }
                 break;
             case 'paste':
-                if (!api.Paste() && !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) {
+                if ( !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) {
                     this.showCopyCutPasteModal();
                 }
                 break;
-            case 'addcomment':
-                Common.Notifications.trigger('addcomment');
-                break;
             case 'viewcomment':
                 Common.Notifications.trigger('viewcomment');
                 break;
-            case 'delete':
-                api.asc_Remove();
-                break;
-            case 'edit':
-                setTimeout(() => {
-                    this.props.openOptions('edit');
-                }, 0);
-                break;
-            case 'addlink':
-                setTimeout(() => {
-                    this.props.openOptions('add', 'link');
-                }, 400)
-                break;
             case 'openlink':
                 const stack = Common.EditorApi.get().getSelectedElements();
                 let value;
@@ -104,8 +92,6 @@ class ContextMenu extends ContextMenuController {
                 value && this.openLink(value);
                 break;
         }
-
-        console.log("click context menu item: " + action);
     }
 
     showCopyCutPasteModal() {
@@ -154,152 +140,77 @@ class ContextMenu extends ContextMenuController {
     initMenuItems() {
         if ( !Common.EditorApi ) return [];
 
-        const { t } = this.props;
+        const { isEdit } = this.props;
-        const _t = t("ContextMenu", { returnObjects: true });
 
-        const { isEdit, canViewComments, isDisconnected } = this.props;
+        if (isEdit && EditorUIController.ContextMenu) {
+            return EditorUIController.ContextMenu.mapMenuItems(this);
+        } else {
+            const { t } = this.props;
+            const _t = t("ContextMenu", { returnObjects: true });
 
-        const api = Common.EditorApi.get();
+            const { canViewComments, isDisconnected } = this.props;
-        const stack = api.getSelectedElements();
-        const canCopy = api.can_CopyCut();
 
-        let itemsIcon = [],
+            const api = Common.EditorApi.get();
-            itemsText = [];
+            const stack = api.getSelectedElements();
+            const canCopy = api.can_CopyCut();
 
-        let isText = false,
+            let itemsIcon = [],
-            isTable = false,
+                itemsText = [];
-            isImage = false,
-            isChart = false,
-            isShape = false,
-            isLink = false,
-            isSlide = false,
-            isObject = false;
 
-        stack.forEach(item => {
+            let isText = false,
-            const objectType = item.get_ObjectType(),
+                isTable = false,
-                objectValue = item.get_ObjectValue();
+                isImage = false,
+                isChart = false,
+                isShape = false,
+                isLink = false,
+                isSlide = false,
+                isObject = false;
 
-            if (objectType == Asc.c_oAscTypeSelectElement.Paragraph) {
+            stack.forEach(item => {
-                isText = true;
+                const objectType = item.get_ObjectType(),
-            } else if (objectType == Asc.c_oAscTypeSelectElement.Image) {
+                    objectValue = item.get_ObjectValue();
-                isImage = true;
-            } else if (objectType == Asc.c_oAscTypeSelectElement.Chart) {
-                isChart = true;
-            } else if (objectType == Asc.c_oAscTypeSelectElement.Shape) {
-                isShape = true;
-            } else if (objectType == Asc.c_oAscTypeSelectElement.Table) {
-                isTable = true;
-            } else if (objectType == Asc.c_oAscTypeSelectElement.Hyperlink) {
-                isLink = true;
-            } else if (objectType == Asc.c_oAscTypeSelectElement.Slide) {
-                isSlide = true;
-            }
-        });
 
-        isObject = isText || isImage || isChart || isShape || isTable;
+                if (objectType == Asc.c_oAscTypeSelectElement.Paragraph) {
-
+                    isText = true;
-        if (canCopy && isObject) {
+                } else if (objectType == Asc.c_oAscTypeSelectElement.Image) {
-            itemsIcon.push({
+                    isImage = true;
-                event: 'copy',
+                } else if (objectType == Asc.c_oAscTypeSelectElement.Chart) {
-                icon: 'icon-copy'
+                    isChart = true;
-            });
+                } else if (objectType == Asc.c_oAscTypeSelectElement.Shape) {
-        }
+                    isShape = true;
-        if (canViewComments && this.isComments && !isEdit) {
+                } else if (objectType == Asc.c_oAscTypeSelectElement.Table) {
-            itemsText.push({
+                    isTable = true;
-                caption: _t.menuViewComment,
+                } else if (objectType == Asc.c_oAscTypeSelectElement.Hyperlink) {
-                event: 'viewcomment'
+                    isLink = true;
-            });
+                } else if (objectType == Asc.c_oAscTypeSelectElement.Slide) {
-        }
+                    isSlide = true;
-
-        if ( stack.length > 0 ) {
-            let topObject = stack[stack.length - 1],
-                topObjectType = topObject.get_ObjectType(),
-                topObjectValue = topObject.get_ObjectValue(),
-                objectLocked = typeof topObjectValue.get_Locked === 'function' ? topObjectValue.get_Locked() : false;
-
-            !objectLocked && (objectLocked = typeof topObjectValue.get_LockDelete === 'function' ? topObjectValue.get_LockDelete() : false);
-
-            const swapItems = function(items, indexBefore, indexAfter) {
-                items[indexAfter] = items.splice(indexBefore, 1, items[indexAfter])[0];
-            };
-
-            if (!objectLocked && isEdit && !isDisconnected) {
-                if (canCopy && isObject) {
-                    itemsIcon.push({
-                        event: 'cut',
-                        icon: 'icon-cut'
-                    });
-
-                    // Swap 'Copy' and 'Cut'
-                    swapItems(itemsIcon, 0, 1);
                 }
+            });
 
+            isObject = isText || isImage || isChart || isShape || isTable;
+
+            if (canCopy && isObject) {
                 itemsIcon.push({
-                    event: 'paste',
+                    event: 'copy',
-                    icon: 'icon-paste'
+                    icon: 'icon-copy'
                 });
-
-                if (isObject)
-                    itemsText.push({
-                        caption: _t.menuDelete,
-                        event: 'delete'
-                    });
-
-                itemsText.push({
-                    caption: _t.menuEdit,
-                    event: 'edit'
-                });
-
-                if (!isLink && api.can_AddHyperlink() !== false) {
-                    itemsText.push({
-                        caption: _t.menuAddLink,
-                        event: 'addlink'
-                    });
-                }
-
-                if (this.isComments && canViewComments) {
-                    itemsText.push({
-                        caption: _t.menuViewComment,
-                        event: 'viewcomment'
-                    });
-                }
-
-                const hideAddComment = (isText && isChart) || api.can_AddQuotedComment() === false || !canViewComments;
-                if (!hideAddComment) {
-                    itemsText.push({
-                        caption: _t.menuAddComment,
-                        event: 'addcomment'
-                    });
-                }
             }
+            if (canViewComments && this.isComments && !isEdit) {
+                itemsText.push({
+                    caption: _t.menuViewComment,
+                    event: 'viewcomment'
+                });
+            }
+
+            if (isLink) {
+                itemsText.push({
+                    caption: _t.menuOpenLink,
+                    event: 'openlink'
+                });
+            }
+
+            return itemsIcon.concat(itemsText);
         }
-
-        if (isLink) {
-            itemsText.push({
-                caption: _t.menuOpenLink,
-                event: 'openlink'
-            });
-        }
-
-
-        if ( Device.phone && itemsText.length > 2 ) {
-            this.extraItems = itemsText.splice(2,itemsText.length, {
-                caption: _t.menuMore,
-                event: 'showActionSheet'
-            });
-        }
-
-        return itemsIcon.concat(itemsText);
-        // return [{
-        //         caption: 'Edit',
-        //         event: 'edit'
-        //     }, {
-        //         caption: 'View',
-        //         event: 'view'
-        //     }, {
-        //         icon: 'icon-paste',
-        //         event: 'review'
-        //     }];
     }
 
     initExtraItems () {

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

@@ -0,0 +1,222 @@
+import React, { useEffect } from 'react';
+import { inject } from 'mobx-react';
+import { f7 } from 'framework7-react';
+import { useTranslation } from 'react-i18next';
+
+const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => {
+    const {t} = useTranslation();
+    const _t = t("Error", { returnObjects: true });
+
+    useEffect(() => {
+        Common.Notifications.on('engineCreated', (api) => {
+            api.asc_registerCallback('asc_onError', onError);
+        });
+        return () => {
+            const api = Common.EditorApi.get();
+            api.asc_unregisterCallback('asc_onError', onError);
+        }
+    });
+
+    const onError = (id, level, errData) => {
+        if (id === -82) return; // format error
+
+        if (id === Asc.c_oAscError.ID.LoadingScriptError) {
+            f7.notification.create({
+                title: _t.criticalErrorTitle,
+                text: _t.scriptLoadError,
+                closeButton: true
+            }).open();
+            return;
+        }
+
+        Common.Notifications.trigger('preloader:close');
+        Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
+
+        const api = Common.EditorApi.get();
+
+        const config = {
+            closable: false
+        };
+
+        switch (id)
+        {
+            case Asc.c_oAscError.ID.Unknown:
+                config.msg = _t.unknownErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationTimeout:
+                config.msg = _t.convertationTimeoutText;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationOpenError:
+                config.msg = _t.openErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationSaveError:
+                config.msg = _t.saveErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.DownloadError:
+                config.msg = _t.downloadErrorText;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageSize:
+                config.msg = _t.uploadImageSizeMessage;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageExt:
+                config.msg = _t.uploadImageExtMessage;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageFileCount:
+                config.msg = _t.uploadImageFileCountMessage;
+                break;
+
+            case Asc.c_oAscError.ID.SplitCellMaxRows:
+                config.msg = _t.splitMaxRowsErrorText.replace('%1', errData.get_Value());
+                break;
+
+            case Asc.c_oAscError.ID.SplitCellMaxCols:
+                config.msg = _t.splitMaxColsErrorText.replace('%1', errData.get_Value());
+                break;
+
+            case Asc.c_oAscError.ID.SplitCellRowsDivider:
+                config.msg = _t.splitDividerErrorText.replace('%1', errData.get_Value());
+                break;
+
+            case Asc.c_oAscError.ID.VKeyEncrypt:
+                config.msg = _t.errorKeyEncrypt;
+                break;
+
+            case Asc.c_oAscError.ID.KeyExpire:
+                config.msg = _t.errorKeyExpire;
+                break;
+
+            case Asc.c_oAscError.ID.UserCountExceed:
+                config.msg = _t.errorUsersExceed;
+                break;
+
+            case Asc.c_oAscError.ID.CoAuthoringDisconnect:
+                config.msg = _t.errorViewerDisconnect;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationPassword:
+                config.msg = _t.errorFilePassProtect;
+                break;
+
+            case Asc.c_oAscError.ID.StockChartError:
+                config.msg = _t.errorStockChart;
+                break;
+
+            case Asc.c_oAscError.ID.DataRangeError:
+                config.msg = _t.errorDataRange;
+                break;
+
+            case Asc.c_oAscError.ID.Database:
+                config.msg = _t.errorDatabaseConnection;
+                break;
+
+            case Asc.c_oAscError.ID.UserDrop:
+                const lostEditingRights = storeAppOptions.lostEditingRights;
+                if (lostEditingRights) {
+                    storeAppOptions.changeEditingRights(false);
+                    return;
+                }
+                storeAppOptions.changeEditingRights(true);
+                config.msg = _t.errorUserDrop;
+                break;
+
+            case Asc.c_oAscError.ID.Warning:
+                config.msg = _t.errorConnectToServer;
+                break;
+
+            case Asc.c_oAscError.ID.UplImageUrl:
+                config.msg = _t.errorBadImageUrl;
+                break;
+
+            case Asc.c_oAscError.ID.SessionAbsolute:
+                config.msg = _t.errorSessionAbsolute;
+                break;
+
+            case Asc.c_oAscError.ID.SessionIdle:
+                config.msg = _t.errorSessionIdle;
+                break;
+
+            case Asc.c_oAscError.ID.SessionToken:
+                config.msg = _t.errorSessionToken;
+                break;
+
+            case Asc.c_oAscError.ID.DataEncrypted:
+                config.msg = _t.errorDataEncrypted;
+                break;
+
+            case Asc.c_oAscError.ID.AccessDeny:
+                config.msg = _t.errorAccessDeny;
+                break;
+
+            case Asc.c_oAscError.ID.EditingError:
+                config.msg = _t.errorEditingDownloadas;
+                break;
+
+            case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+                config.msg = _t.errorFileSizeExceed;
+                break;
+
+            case Asc.c_oAscError.ID.UpdateVersion:
+                config.msg = _t.errorUpdateVersionOnDisconnect;
+                break;
+
+            default:
+                config.msg = _t.errorDefaultMessage.replace('%1', id);
+                break;
+        }
+
+        if (level === Asc.c_oAscError.Level.Critical) {
+
+            // report only critical errors
+            Common.Gateway.reportError(id, config.msg);
+
+            config.title = _t.criticalErrorTitle;
+
+            if (storeAppOptions.canBackToFolder && !storeAppOptions.isDesktopApp) {
+                config.msg += '</br></br>' + _t.criticalErrorExtText;
+                config.callback = function() {
+                    Common.Notifications.trigger('goback', true);
+                }
+            }
+            if (id === Asc.c_oAscError.ID.DataEncrypted) {
+                api.asc_coAuthoringDisconnect();
+                Common.Notifications.trigger('api:disconnect');
+            }
+        }
+        else {
+            Common.Gateway.reportWarning(id, config.msg);
+
+            config.title    = _t.notcriticalErrorTitle;
+            config.callback = (btn) => {
+                if (id === Asc.c_oAscError.ID.Warning && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) {
+                    api.asc_DownloadOrigin();
+                }
+                storeAppOptions.changeEditingRights(false);
+            };
+        }
+
+        f7.dialog.create({
+            cssClass: 'error-dialog',
+            title   : config.title,
+            text    : config.msg,
+            buttons: [
+                {
+                    text: 'OK',
+                    onClick: config.callback
+                }
+            ]
+        }).open();
+
+        Common.component.Analytics.trackEvent('Internal Error', id.toString());
+    };
+
+    return null
+});
+
+export default ErrorController;

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

@@ -0,0 +1,192 @@
+import React, { Component } from 'react';
+import { inject } from 'mobx-react';
+import { f7 } from 'framework7-react';
+import { withTranslation } from 'react-i18next';
+import IrregularStack from "../../../../common/mobile/utils/IrregularStack";
+
+class LongActions extends Component {
+    constructor(props) {
+        super(props);
+
+        this.stackLongActions = new IrregularStack({
+            strongCompare   : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;},
+            weakCompare     : function(obj1, obj2){return obj1.type === obj2.type;}
+        });
+
+        this.onLongActionBegin = this.onLongActionBegin.bind(this);
+        this.onLongActionEnd = this.onLongActionEnd.bind(this);
+        this.onOpenDocument = this.onOpenDocument.bind(this);
+        this.closePreloader = this.closePreloader.bind(this);
+    }
+
+    closePreloader() {
+        if (this.loadMask && this.loadMask.el) {
+            f7.dialog.close(this.loadMask.el);
+        }
+    }
+
+    componentDidMount() {
+        Common.Notifications.on('engineCreated', (api) => {
+            api.asc_registerCallback('asc_onStartAction', this.onLongActionBegin);
+            api.asc_registerCallback('asc_onEndAction', this.onLongActionEnd);
+            api.asc_registerCallback('asc_onOpenDocumentProgress', this.onOpenDocument);
+        });
+        Common.Notifications.on('preloader:endAction', this.onLongActionEnd);
+        Common.Notifications.on('preloader:beginAction', this.onLongActionBegin);
+        Common.Notifications.on('preloader:close', this.closePreloader);
+    }
+
+    componentWillUnmount() {
+        const api = Common.EditorApi.get();
+        api.asc_unregisterCallback('asc_onStartAction', this.onLongActionBegin);
+        api.asc_unregisterCallback('asc_onEndAction', this.onLongActionEnd);
+        api.asc_unregisterCallback('asc_onOpenDocumentProgress', this.onOpenDocument);
+
+        Common.Notifications.off('preloader:endAction', this.onLongActionEnd);
+        Common.Notifications.off('preloader:beginAction', this.onLongActionBegin);
+        Common.Notifications.off('preloader:close', this.closePreloader);
+    }
+
+    onLongActionBegin (type, id) {
+        const action = {id: id, type: type};
+        this.stackLongActions.push(action);
+        this.setLongActionView(action);
+    }
+
+    onLongActionEnd (type, id) {
+        let action = {id: id, type: type};
+        this.stackLongActions.pop(action);
+
+        //this.updateWindowTitle(true);
+
+        action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
+
+        if (action) {
+            this.setLongActionView(action)
+        }
+
+        action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
+
+        if (action) {
+            this.setLongActionView(action)
+        } else {
+            this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in') && f7.dialog.close(this.loadMask.el);
+        }
+    }
+
+    setLongActionView (action) {
+        const { t } = this.props;
+        const _t = t("LongActions", { returnObjects: true });
+        let title = '';
+        let text = '';
+        switch (action.id) {
+            case Asc.c_oAscAsyncAction['Open']:
+                title   = _t.openTitleText;
+                text    = _t.openTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['Save']:
+                title   = _t.saveTitleText;
+                text    = _t.saveTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadDocumentFonts']:
+                title   = _t.loadFontsTitleText;
+                text    = _t.loadFontsTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadDocumentImages']:
+                title   = _t.loadImagesTitleText;
+                text    = _t.loadImagesTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadFont']:
+                title   = _t.loadFontTitleText;
+                text    = _t.loadFontTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['LoadImage']:
+                title   = _t.loadImageTitleText;
+                text    = _t.loadImageTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['DownloadAs']:
+                title   = _t.downloadTitleText;
+                text    = _t.downloadTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['Print']:
+                title   = _t.printTitleText;
+                text    = _t.printTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['UploadImage']:
+                title   = _t.uploadImageTitleText;
+                text    = _t.uploadImageTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['ApplyChanges']:
+                title   = _t.applyChangesTitleText;
+                text    = _t.applyChangesTextText;
+                break;
+
+            case Asc.c_oAscAsyncAction['PrepareToSave']:
+                title   = _t.savePreparingText;
+                text    = _t.savePreparingTitle;
+                break;
+
+            case Asc.c_oAscAsyncAction['Waiting']:
+                title   = _t.waitText;
+                text    = _t.waitText;
+                break;
+
+            case ApplyEditRights:
+                title   = _t.txtEditingMode;
+                text    = _t.txtEditingMode;
+                break;
+
+            case LoadingDocument:
+                title   = _t.loadingDocumentTitleText;
+                text    = _t.loadingDocumentTextText;
+                break;
+            default:
+                if (typeof action.id == 'string'){
+                    title   = action.id;
+                    text    = action.id;
+                }
+                break;
+        }
+
+        if (action.type === Asc.c_oAscAsyncActionType['BlockInteraction']) {
+            if (action.id === Asc.c_oAscAsyncAction['ApplyChanges']) {
+                return;
+            }
+
+            if (this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in')) {
+                this.loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
+            } else {
+                this.loadMask = f7.dialog.preloader(title);
+            }
+        }
+
+    }
+
+    onOpenDocument (progress) {
+        if (this.loadMask && this.loadMask.el) {
+            const $title = this.loadMask.el.getElementsByClassName('dialog-title')[0];
+            const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
+
+            const { t } = this.props;
+            const _t = t("LongActions", { returnObjects: true });
+            $title.innerHTML = `${_t.textLoadingDocument}: ${Math.min(Math.round(proc * 100), 100)}%`;
+        }
+    }
+
+    render() {
+        return null;
+    }
+}
+
+const LongActionsController = withTranslation()(LongActions);
+
+export default LongActionsController;

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

@@ -4,21 +4,47 @@ import { inject } from "mobx-react";
 import { f7 } from "framework7-react";
 import { withTranslation } from 'react-i18next';
 import CollaborationController from '../../../../common/mobile/lib/controller/collaboration/Collaboration.jsx';
+import EditorUIController from '../lib/patch';
 import {
     CommentsController,
-    AddCommentController,
-    EditCommentController,
     ViewCommentsController
 } from "../../../../common/mobile/lib/controller/collaboration/Comments";
+import ErrorController from "./Error";
+import LongActionsController from "./LongActions";
+import {LocalStorage} from "../../../../common/mobile/utils/LocalStorage";
+import About from '../../../../common/mobile/lib/view/About';
 
-@inject("storeFocusObjects", "storeAppOptions", "storePresentationInfo", "storePresentationSettings", "storeSlideSettings", "storeTextSettings", "storeTableSettings", "storeChartSettings", "storeLinkSettings")
+@inject(
+    "storeFocusObjects",
+    "storeAppOptions",
+    "storePresentationInfo",
+    "storePresentationSettings",
+    "storeSlideSettings",
+    "storeTextSettings",
+    "storeTableSettings",
+    "storeChartSettings",
+    "storeLinkSettings",
+    "storeApplicationSettings"
+    )
 class MainController extends Component {
-    constructor(props) {
+    constructor (props) {
         super(props)
         window.editorType = 'pe';
+
+        this.LoadingDocument = -256;
+
+        this._state = {
+            licenseType: false,
+            isDocModified: false
+        };
+
+        this.defaultTitleText = __APP_TITLE_TEXT__;
+
+        const { t } = this.props;
+        this._t = t('Controller.Main', {returnObjects:true});
     }
 
-    initSdk() {
+    initSdk () {
         const script = document.createElement("script");
         script.src = "../../../../sdkjs/develop/sdkjs/slide/scripts.js";
         script.async = true;
@@ -44,6 +70,8 @@ class MainController extends Component {
             };
 
             const loadConfig = data => {
+                EditorUIController.isSupportEditFeature();
+
                 console.log('load config');
 
                 this.editorConfig = Object.assign({}, this.editorConfig, data.config);
@@ -51,7 +79,15 @@ class MainController extends Component {
                 this.props.storeAppOptions.setConfigOptions(this.editorConfig);
 
                 this.editorConfig.lang && this.api.asc_setLocale(this.editorConfig.lang);
-                // console.log(this.editorConfig);
+
+                let value = LocalStorage.getItem("pe-mobile-macros-mode");
+                if (value === null) {
+                    value = this.editorConfig.customization ? this.editorConfig.customization.macrosMode : 'warn';
+                    value = (value === 'enable') ? 1 : (value === 'disable' ? 2 : 0);
+                } else {
+                    value = parseInt(value);
+                }
+                this.props.storeApplicationSettings.changeMacrosSettings(value);
             };
 
             const loadDocument = data => {
@@ -82,15 +118,15 @@ class MainController extends Component {
                     docInfo.put_Permissions(_permissions);
                     docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
 
-                    // var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false);
+                    let enable = !this.editorConfig.customization || (this.editorConfig.customization.macros !== false);
-                    // docInfo.asc_putIsEnabledMacroses(!!enable);
+                    docInfo.asc_putIsEnabledMacroses(!!enable);
-                    // enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false);
+                    enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins !== false);
-                    // docInfo.asc_putIsEnabledPlugins(!!enable);
+                    docInfo.asc_putIsEnabledPlugins(!!enable);
                 }
 
                 this.api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);
-                // this.api.asc_registerCallback('asc_onLicenseChanged',       _.bind(this.onLicenseChanged, this));
+                this.api.asc_registerCallback('asc_onLicenseChanged', this.onLicenseChanged.bind(this));
-                // this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this));
+                this.api.asc_registerCallback('asc_onRunAutostartMacroses', this.onRunAutostartMacroses.bind(this));
                 this.api.asc_setDocInfo(docInfo);
                 this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId);
 
@@ -102,26 +138,22 @@ class MainController extends Component {
 
                 // Common.SharedSettings.set('document', data.doc);
 
-                // if (data.doc) {
+                if (data.doc) {
-                //     DE.getController('Toolbar').setDocumentTitle(data.doc.title);
+                    Common.Notifications.trigger('setdoctitle', data.doc.title);
-                //     if (data.doc.info) {
+                }
-                //         data.doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead.");
-                //         data.doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead.");
-                //     }
-                // }
             };
 
             const onEditorPermissions = params => {
-                let me = this;
                 const licType = params.asc_getLicenseType();
 
-                me.appOptions.canLicense      = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
+                this.appOptions.canLicense      = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
 
-                this.props.storeAppOptions.setPermissionOptions(this.document, licType, params, this.permissions);
+                const storeAppOptions = this.props.storeAppOptions;
+                storeAppOptions.setPermissionOptions(this.document, licType, params, this.permissions);
+                this.applyMode(storeAppOptions);
 
-                // me.api.asc_setViewMode(!me.appOptions.isEdit);
+                this.api.asc_LoadDocument();
-                me.api.asc_setViewMode(false);
+                this.api.Resize();
-                me.api.asc_LoadDocument();
             };
 
             const _process_array = (array, fn) => {
@@ -145,23 +177,36 @@ class MainController extends Component {
                         'translate': t('Controller.Main.SDK', {returnObjects:true})
                     });
 
+                    Common.Notifications.trigger('engineCreated', this.api);
+                    Common.EditorApi = {get: () => this.api};
+
                     this.appOptions   = {};
                     this.bindEvents();
 
-                    let value = null /*Common.localStorage.getItem("pe-settings-fontrender")*/;
+                    let value = LocalStorage.getItem("pe-settings-fontrender");
                     if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3';
                     this.api.SetFontRenderingMode(parseInt(value));
                     this.api.SetDrawingFreeze(true);
                     this.api.SetThemesPath("../../../../sdkjs/slide/themes/");
-                    // Common.Utils.Metric.setCurrentMetric(1); //pt
+                    Common.Utils.Metric.setCurrentMetric(1); //pt
 
                     Common.Gateway.on('init',           loadConfig);
-                    // Common.Gateway.on('showmessage',    _.bind(me.onExternalMessage, me));
+                    Common.Gateway.on('showmessage',    this.onExternalMessage.bind(this));
                     Common.Gateway.on('opendocument',   loadDocument);
                     Common.Gateway.appReady();
 
-                    Common.Notifications.trigger('engineCreated', this.api);
+                    Common.Gateway.on('internalcommand', function(data) {
-                    Common.EditorApi = {get: () => this.api};
+                        if (data.command === 'hardBack') {
+                            if ($$('.modal-in').length > 0) {
+                                if ( !($$('.error-dialog.modal-in').length > 0) ) {
+                                    f7.dialog.close();
+                                }
+                                Common.Gateway.internalMessage('hardBack', false);
+                            } else
+                                Common.Gateway.internalMessage('hardBack', true);
+                        }
+                    });
+                    Common.Gateway.internalMessage('listenHardBack');
                 }, error => {
                     console.log('promise failed ' + error);
                 });
@@ -174,90 +219,98 @@ class MainController extends Component {
         document.body.appendChild(script);
     }
 
-    bindEvents() {
+    applyMode(appOptions) {
-        const me = this;
+        this.api.asc_enableKeyEvents(appOptions.isEdit);
-       
+        this.api.asc_setViewMode(!appOptions.isEdit && !appOptions.isRestrictedEdit);
-        // me.api.asc_registerCallback('asc_onError',                      _.bind(me.onError, me));
+        (appOptions.isRestrictedEdit && appOptions.canComments) && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments);
-        me.api.asc_registerCallback('asc_onDocumentContentReady',       me._onDocumentContentReady.bind(me));
+
-        me.api.asc_registerCallback('asc_onOpenDocumentProgress',       me._onOpenDocumentProgress.bind(me));
+        let value = LocalStorage.getItem('pe-mobile-settings-unit');
+        value = (value !== null) ?
+            parseInt(value) :
+            (appOptions.customization && appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric());
+        (value === undefined) && (value = Common.Utils.Metric.getDefaultMetric());
+        Common.Utils.Metric.setCurrentMetric(value);
+        this.api.asc_SetDocumentUnits((value === Common.Utils.Metric.c_MetricUnits.inch) ?
+            Asc.c_oAscDocumentUnits.Inch :
+            ((value === Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
+
+        this.api.asc_registerCallback('asc_onDocumentModifiedChanged', this.onDocumentModifiedChanged.bind(this));
+        this.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  this.onDocumentCanSaveChanged.bind(this));
+
+        //if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
+        //    me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights);
+        //} else if (!this._isDocReady) {
+        //    me.hidePreloader();
+        //    me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
+        //}
+
+        // Message on window close
+        window.onbeforeunload = this.onBeforeUnload.bind(this);
+        window.onunload = this.onUnload.bind(this);
+    }
+
+    onDocumentModifiedChanged () {
+        const isModified = this.api.asc_isDocumentCanSave();
+        if (this._state.isDocModified !== isModified) {
+            this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
+        }
+
+        this.updateWindowTitle();
+    }
+
+    onDocumentCanSaveChanged (isCanSave) {
+        //
+    }
+
+    onBeforeUnload () {
+        LocalStorage.save();
+
+        if (this.api.isDocumentModified()) {
+            this.api.asc_stopSaving();
+            this.continueSavingTimer = window.setTimeout(() => {
+                this.api.asc_continueSaving();
+            }, 500);
+
+            return this._t.leavePageText;
+        }
+    }
+
+    onUnload () {
+        if (this.continueSavingTimer)
+            clearTimeout(this.continueSavingTimer);
+    }
+
+    bindEvents () {
+        this.api.asc_registerCallback('asc_onDocumentContentReady', this.onDocumentContentReady.bind(this));
+        this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this));
+        this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this));
+        this.api.asc_registerCallback('asc_onAdvancedOptions', this.onAdvancedOptions.bind(this));
+        this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this));
+        this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this));
+        this.api.asc_registerCallback('asc_onPrint', this.onPrint.bind(this));
+        this.api.asc_registerCallback('asc_onMeta', this.onMeta.bind(this));
+
+        EditorUIController.initThemeColors && EditorUIController.initThemeColors();
 
         const storePresentationSettings = this.props.storePresentationSettings;
 
-        me.api.asc_registerCallback('asc_onPresentationSize', (width, height) => {
+        this.api.asc_registerCallback('asc_onPresentationSize', (width, height) => {
             storePresentationSettings.changeSizeIndex(width, height);
         });
 
-        me.api.asc_registerCallback('asc_onSendThemeColorSchemes', (arr) => {
+        this.api.asc_registerCallback('asc_onSendThemeColorSchemes', (arr) => {
             storePresentationSettings.addSchemes(arr);
         });
 
-        // api.asc_registerCallback('asc_onSendThemeColorSchemes', _.bind(this.onSendThemeColorSchemes, this));
+        EditorUIController.initFocusObjects && EditorUIController.initFocusObjects(this.props.storeFocusObjects);
-        // me.api.asc_registerCallback('asc_onDocumentUpdateVersion',      _.bind(me.onUpdateVersion, me));
-        // me.api.asc_registerCallback('asc_onServerVersion',              _.bind(me.onServerVersion, me));
-        // me.api.asc_registerCallback('asc_onAdvancedOptions',            _.bind(me.onAdvancedOptions, me));
-        // me.api.asc_registerCallback('asc_onDocumentName',               _.bind(me.onDocumentName, me));
-        // me.api.asc_registerCallback('asc_onPrintUrl',                   _.bind(me.onPrintUrl, me));
-        // me.api.asc_registerCallback('asc_onThumbnailsShow',             _.bind(me.onThumbnailsShow, me));
-        // me.api.asc_registerCallback('asc_onMeta',                       _.bind(me.onMeta, me));
 
-        const storeFocusObjects = this.props.storeFocusObjects;
+        EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeSlideSettings);
-        const storeSlideSettings = this.props.storeSlideSettings;
-        
-        this.api.asc_registerCallback('asc_onFocusObject', objects => {
-            // console.log(objects);
-            storeFocusObjects.resetFocusObjects(objects);
-        });
-
-        this.api.asc_registerCallback('asc_onInitEditorStyles', themes => {
-            // console.log(themes);
-            storeSlideSettings.addArrayThemes(themes);
-        });
-
-        this.api.asc_registerCallback('asc_onUpdateThemeIndex',  themeId => {
-            // console.log(themeId);
-            storeSlideSettings.changeSlideThemeIndex(themeId);
-        });
-
-        this.api.asc_registerCallback('asc_onUpdateLayout', layouts => {
-            // console.log(layouts);
-            storeSlideSettings.addArrayLayouts(layouts);
-        });
-
-        this.api.asc_registerCallback('asc_onSendThemeColors', (colors, standart_colors) => {
-            Common.Utils.ThemeColor.setColors(colors, standart_colors);
-        });
 
         // Text settings 
 
         const storeTextSettings = this.props.storeTextSettings;
 
-        this.api.asc_registerCallback('asc_onInitEditorFonts', (fonts, select) => {
+        EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings);
-            storeTextSettings.initEditorFonts(fonts, select);
-        });
-
-        this.api.asc_registerCallback('asc_onFontFamily', (font) => {
-            storeTextSettings.resetFontName(font);
-        });
-
-        this.api.asc_registerCallback('asc_onFontSize', (size) => {
-            storeTextSettings.resetFontSize(size);
-        });
-
-        this.api.asc_registerCallback('asc_onBold', (isBold) => {
-            storeTextSettings.resetIsBold(isBold);
-        });
-
-        this.api.asc_registerCallback('asc_onItalic', (isItalic) => {
-            storeTextSettings.resetIsItalic(isItalic);
-        });
-
-        this.api.asc_registerCallback('asc_onUnderline', (isUnderline) => {
-            storeTextSettings.resetIsUnderline(isUnderline);
-        });
-
-        this.api.asc_registerCallback('asc_onStrikeout', (isStrikeout) => {
-            storeTextSettings.resetIsStrikeout(isStrikeout);
-        });
 
         this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => {
             storeTextSettings.resetTypeBaseline(typeBaseline);
@@ -272,9 +325,11 @@ class MainController extends Component {
             switch (type) {
                 case 0:
                     storeTextSettings.resetBullets(subtype);
+                    storeTextSettings.resetNumbers(-1);
                     break;
                 case 1:
                     storeTextSettings.resetNumbers(subtype);
+                    storeTextSettings.resetBullets(-1);
                     break;
                 default: 
                     storeTextSettings.resetBullets(-1);
@@ -314,30 +369,57 @@ class MainController extends Component {
 
         // Table settings
 
-        const storeTableSettings = this.props.storeTableSettings;
+        EditorUIController.initTableTemplates && EditorUIController.initTableTemplates(this.props.storeTableSettings);
-        
-        this.api.asc_registerCallback('asc_onInitTableTemplates', (templates) => {
-            storeTableSettings.initTableTemplates(templates);
-        });
 
         // Chart settings
 
-        const storeChartSettings = this.props.storeChartSettings;
+        EditorUIController.updateChartStyles && EditorUIController.updateChartStyles(this.props.storeChartSettings, this.props.storeFocusObjects);
-
-        this.api.asc_registerCallback('asc_onUpdateChartStyles', () => {
-            if (storeFocusObjects.chartObject) {
-                storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.getType()));
-            }
-        });
     }
 
-    _onDocumentContentReady() {
+    onDocumentContentReady () {
-        const me = this;
+        if (this._isDocReady)
-        me.api.SetDrawingFreeze(false);
+            return;
 
-        me.api.Resize();
+        this._isDocReady = true;
-        me.api.zoomFitToPage();
+
-        // me.api.asc_GetDefaultTableStyles && _.defer(function () {me.api.asc_GetDefaultTableStyles()});
+        const appOptions = this.props.storeAppOptions;
+        const appSettings = this.props.storeApplicationSettings;
+
+        this.api.SetDrawingFreeze(false);
+
+        Common.Notifications.trigger('preloader:close');
+        Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+
+        let value = LocalStorage.getItem("pe-settings-zoom");
+        const zf = (value!==null) ? parseInt(value) : (appOptions.customization && appOptions.customization.zoom ? parseInt(appOptions.customization.zoom) : -1);
+        (zf === -1) ? this.api.zoomFitToPage() : ((zf === -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100));
+
+        value = LocalStorage.getBool("pe-mobile-spellcheck", !(appOptions.customization && appOptions.customization.spellcheck===false));
+        appSettings.changeSpellCheck(value);
+        this.api.asc_setSpellCheck(value);
+
+        this.updateWindowTitle(true);
+
+        this.api.SetTextBoxInputMode(LocalStorage.getBool("pe-settings-inputmode"));
+
+        if (appOptions.isEdit && this.needToUpdateVersion) {
+            Common.Notifications.trigger('api:disconnect');
+        }
+
+        Common.Gateway.on('processsaveresult', this.onProcessSaveResult.bind(this));
+        Common.Gateway.on('processrightschange', this.onProcessRightsChange.bind(this));
+        Common.Gateway.on('downloadas', this.onDownloadAs.bind(this));
+        Common.Gateway.on('requestclose', this.onRequestClose.bind(this));
+
+        Common.Gateway.sendInfo({
+            mode: appOptions.isEdit ? 'edit' : 'view'
+        });
+
+        this.api.Resize();
+        this.api.zoomFitToPage();
+        this.api.asc_GetDefaultTableStyles && setTimeout(() => {this.api.asc_GetDefaultTableStyles()}, 1);
+
+        this.applyLicense();
 
         Common.Gateway.documentReady();
         f7.emit('resize');
@@ -345,28 +427,363 @@ class MainController extends Component {
         Common.Notifications.trigger('document:ready');
     }
 
-    _onOpenDocumentProgress(progress) {
+    onLicenseChanged (params) {
-        // if (this.loadMask) {
+        const appOptions = this.props.storeAppOptions;
-        //     var $title = $$(this.loadMask).find('.modal-title'),
+        const licType = params.asc_getLicenseType();
-        //         const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
+        if (licType !== undefined && appOptions.canEdit && appOptions.config.mode !== 'view' &&
-
+            (licType === Asc.c_oLicenseResult.Connections || licType === Asc.c_oLicenseResult.UsersCount || licType === Asc.c_oLicenseResult.ConnectionsOS || licType === Asc.c_oLicenseResult.UsersCountOS
-            // $title.text(this.textLoadingDocument + ': ' + Math.min(Math.round(proc * 100), 100) + '%');
+                || licType === Asc.c_oLicenseResult.SuccessLimit && (appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0))
-        // }
+            this._state.licenseType = licType;
+        if (this._isDocReady && this._state.licenseType)
+            this.applyLicense();
     }
 
-    render() {
+    applyLicense () {
+        const _t = this._t;
+        const warnNoLicense  = _t.warnNoLicense.replace(/%1/g, __COMPANY_NAME__);
+        const warnNoLicenseUsers = _t.warnNoLicenseUsers.replace(/%1/g, __COMPANY_NAME__);
+        const textNoLicenseTitle = _t.textNoLicenseTitle.replace(/%1/g, __COMPANY_NAME__);
+        const warnLicenseExceeded = _t.warnLicenseExceeded.replace(/%1/g, __COMPANY_NAME__);
+        const warnLicenseUsersExceeded = _t.warnLicenseUsersExceeded.replace(/%1/g, __COMPANY_NAME__);
+
+        const appOptions = this.props.storeAppOptions;
+        if (appOptions.config.mode !== 'view' && !EditorUIController.isSupportEditFeature()) {
+            let value = LocalStorage.getItem("pe-opensource-warning");
+            value = (value !== null) ? parseInt(value) : 0;
+            const now = (new Date).getTime();
+            if (now - value > 86400000) {
+                LocalStorage.setItem("pe-opensource-warning", now);
+                f7.dialog.create({
+                    title: _t.notcriticalErrorTitle,
+                    text : _t.errorOpensource,
+                    buttons: [{text: 'OK'}]
+                }).open();
+            }
+            Common.Notifications.trigger('toolbar:activatecontrols');
+            return;
+        }
+
+        if (this._state.licenseType) {
+            let license = this._state.licenseType;
+            let buttons = [{text: 'OK'}];
+            if ((appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0 &&
+                (license === Asc.c_oLicenseResult.SuccessLimit ||
+                    license === Asc.c_oLicenseResult.ExpiredLimited ||
+                    appOptions.permissionsLicense === Asc.c_oLicenseResult.SuccessLimit)
+            ) {
+                license = (license === Asc.c_oLicenseResult.ExpiredLimited) ? _t.warnLicenseLimitedNoAccess : _t.warnLicenseLimitedRenewed;
+            } else if (license === Asc.c_oLicenseResult.Connections || license === Asc.c_oLicenseResult.UsersCount) {
+                license = (license===Asc.c_oLicenseResult.Connections) ? warnLicenseExceeded : warnLicenseUsersExceeded;
+            } else {
+                license = (license === Asc.c_oLicenseResult.ConnectionsOS) ? warnNoLicense : warnNoLicenseUsers;
+                buttons = [{
+                    text: _t.textBuyNow,
+                    bold: true,
+                    onClick: function() {
+                        window.open(`${__PUBLISHER_URL__}`, "_blank");
+                    }
+                },
+                    {
+                        text: _t.textContactUs,
+                        onClick: function() {
+                            window.open(`mailto:${__SALES_EMAIL__}`, "_blank");
+                        }
+                    }];
+            }
+            if (this._state.licenseType === Asc.c_oLicenseResult.SuccessLimit) {
+                Common.Notifications.trigger('toolbar:activatecontrols');
+            } else {
+                Common.Notifications.trigger('toolbar:activatecontrols');
+                Common.Notifications.trigger('toolbar:deactivateeditcontrols');
+                Common.Notifications.trigger('api:disconnect');
+            }
+
+            let value = LocalStorage.getItem("pe-license-warning");
+            value = (value !== null) ? parseInt(value) : 0;
+            const now = (new Date).getTime();
+
+            if (now - value > 86400000) {
+                LocalStorage.setItem("pe-license-warning", now);
+                f7.dialog.create({
+                    title: textNoLicenseTitle,
+                    text : license,
+                    buttons: buttons
+                }).open();
+            }
+        } else {
+            if (!appOptions.isDesktopApp && !appOptions.canBrandingExt &&
+                appOptions.config && appOptions.config.customization && (appOptions.config.customization.loaderName || appOptions.config.customization.loaderLogo)) {
+                f7.dialog.create({
+                    title: _t.textPaidFeature,
+                    text  : _t.textCustomLoader,
+                    buttons: [{
+                        text: _t.textContactUs,
+                        bold: true,
+                        onClick: () => {
+                            window.open(`mailto:${__SALES_EMAIL__}`, "_blank");
+                        }
+                    },
+                        { text: _t.textClose }]
+                }).open();
+            }
+            Common.Notifications.trigger('toolbar:activatecontrols');
+        }
+    }
+
+    onUpdateVersion (callback) {
+        const _t = this._t;
+
+        this.needToUpdateVersion = true;
+        Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+
+        f7.dialog.alert(
+            _t.errorUpdateVersion,
+            _t.titleUpdateVersion,
+            () => {
+                Common.Gateway.updateVersion();
+                if (callback) {
+                    callback.call(this);
+                }
+                Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+            });
+    }
+
+    onServerVersion (buildVersion) {
+        if (this.changeServerVersion) return true;
+        const _t = this._t;
+
+        if (About.appVersion() !== buildVersion && !window.compareVersions) {
+            this.changeServerVersion = true;
+            f7.dialog.alert(
+                _t.errorServerVersion,
+                _t.titleServerVersion,
+                () => {
+                    setTimeout(() => {Common.Gateway.updateVersion()}, 0);
+                });
+            return true;
+        }
+        return false;
+    }
+
+    onAdvancedOptions (type, advOptions) {
+        if ($$('.dlg-adv-options.modal-in').length > 0) return;
+
+        const _t = this._t;
+
+        if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
+            Common.Notifications.trigger('preloader:close');
+            Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+
+            const buttons = [{
+                text: 'OK',
+                bold: true,
+                close: false,
+                onClick: () => {
+                    const password = document.getElementById('modal-password').value;
+                    this.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
+
+                    if (!this._isDocReady) {
+                        Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
+                    }
+                }
+            }];
+            if (this.props.storeAppOptions.canRequestClose)
+                buttons.push({
+                    text: _t.closeButtonText,
+                    onClick: () => {
+                        Common.Gateway.requestClose();
+                    }
+                });
+
+            f7.dialog.create({
+                title: _t.advDRMOptions,
+                text: (typeof advOptions === 'string' ? advOptions : _t.txtProtected),
+                content:
+                    `<div class="input-field">
+                        <input type="password" name="modal-password" placeholder="${ _t.advDRMPassword }" class="modal-text-input">
+                    </div>`,
+                buttons: buttons,
+                cssClass: 'dlg-adv-options'
+            }).open();
+        }
+    }
+
+    onDocumentName () {
+        this.updateWindowTitle(true);
+    }
+
+    updateWindowTitle (force) {
+        const isModified = this.api.isDocumentModified();
+        if (this._state.isDocModified !== isModified || force) {
+            const title = this.defaultTitleText;
+
+            if (window.document.title !== title) {
+                window.document.title = title;
+            }
+
+            this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
+            this._state.isDocModified = isModified;
+        }
+    }
+
+    onPrint () {
+        if (!this.props.storeAppOptions.canPrint) return;
+
+        if (this.api)
+            this.api.asc_Print();
+        Common.component.Analytics.trackEvent('Print');
+    }
+
+    onPrintUrl (url) {
+        if (this.iframePrint) {
+            this.iframePrint.parentNode.removeChild(this.iframePrint);
+            this.iframePrint = null;
+        }
+
+        if (!this.iframePrint) {
+            this.iframePrint = document.createElement("iframe");
+            this.iframePrint.id = "id-print-frame";
+            this.iframePrint.style.display = 'none';
+            this.iframePrint.style.visibility = "hidden";
+            this.iframePrint.style.position = "fixed";
+            this.iframePrint.style.right = "0";
+            this.iframePrint.style.bottom = "0";
+            document.body.appendChild(this.iframePrint);
+            this.iframePrint.onload = function() {
+                this.iframePrint.contentWindow.focus();
+                this.iframePrint.contentWindow.print();
+                this.iframePrint.contentWindow.blur();
+                window.focus();
+            };
+        }
+
+        if (url) {
+            this.iframePrint.src = url;
+        }
+    }
+
+    onMeta (meta) {
+        this.updateWindowTitle(true);
+        Common.Gateway.metaChange(meta);
+    }
+
+    onExternalMessage (msg) {
+        if (msg && msg.msg) {
+            msg.msg = (msg.msg).toString();
+            f7.notification.create({
+                //title: uiApp.params.modalTitle,
+                text: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)],
+                closeButton: true
+            }).open();
+
+            Common.component.Analytics.trackEvent('External Error');
+        }
+    }
+
+    onRunAutostartMacroses () {
+        const config = this.props.storeAppOptions.config;
+        const enable = !config.customization || (config.customization.macros !== false);
+        if (enable) {
+            const value = this.props.storeApplicationSettings.macrosMode;
+            if (value === 1) {
+                this.api.asc_runAutostartMacroses();
+            } else if (value === 0) {
+                const _t = this._t;
+                f7.dialog.create({
+                    title: _t.notcriticalErrorTitle,
+                    text: _t.textHasMacros,
+                    content: `<div class="checkbox-in-modal">
+                      <label class="checkbox">
+                        <input type="checkbox" name="checkbox-show-macros" />
+                        <i class="icon-checkbox"></i>
+                      </label>
+                      <span class="right-text">${_t.textRemember}</span>
+                      </div>`,
+                    buttons: [{
+                        text: _t.textYes,
+                        onClick: () => {
+                            const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked');
+                            if (dontshow) {
+                                this.props.storeApplicationSettings.changeMacrosSettings(1);
+                                LocalStorage.setItem("pe-mobile-macros-mode", 1);
+                            }
+                            setTimeout(() => {
+                                this.api.asc_runAutostartMacroses();
+                            }, 1);
+                        }},
+                        {
+                            text: _t.textNo,
+                            onClick: () => {
+                                const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked');
+                                if (dontshow) {
+                                    this.props.storeApplicationSettings.changeMacrosSettings(2);
+                                    LocalStorage.setItem("pe-mobile-macros-mode", 2);
+                                }
+                            }
+                        }]
+                }).open();
+            }
+        }
+    }
+
+    onProcessSaveResult (data) {
+        this.api.asc_OnSaveEnd(data.result);
+
+        if (data && data.result === false) {
+            const _t = this._t;
+            f7.dialog.alert(
+                (!data.message) ? _t.errorProcessSaveResult : data.message,
+                _t.criticalErrorTitle
+            );
+        }
+    }
+
+    onProcessRightsChange (data) {
+        if (data && data.enabled === false) {
+            const appOptions = this.props.storeAppOptions;
+            const old_rights = appOptions.lostEditingRights;
+            appOptions.changeEditingRights(!old_rights);
+            this.api.asc_coAuthoringDisconnect();
+            Common.Notifications.trigger('api:disconnect');
+
+            if (!old_rights) {
+                const _t = this._t;
+                f7.dialog.alert(
+                    (!data.message) ? _t.warnProcessRightsChange : data.message,
+                    _t.notcriticalErrorTitle,
+                    () => { appOptions.changeEditingRights(false); }
+                );
+            }
+        }
+    }
+
+    onDownloadAs () {
+        if ( !this.props.storeAppOptions.canDownload) {
+            Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this.errorAccessDeny);
+            return;
+        }
+        this._state.isFromGatewayDownloadAs = true;
+        this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PPTX, true));
+    }
+
+    onRequestClose () {
+        Common.Gateway.requestClose();
+    }
+
+    render () {
         return (
             <Fragment>
+                <LongActionsController />
+                <ErrorController LoadingDocument={this.LoadingDocument}/>
                 <CollaborationController />
                 <CommentsController />
-                <AddCommentController />
+                {EditorUIController.getEditCommentControllers && EditorUIController.getEditCommentControllers()}
-                <EditCommentController />
                 <ViewCommentsController />
             </Fragment>
             )
     }
 
-    componentDidMount() {
+    componentDidMount () {
         this.initSdk();
     }
 }

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

@@ -0,0 +1,106 @@
+import React, { useEffect, useState } from 'react';
+import { inject } from 'mobx-react';
+import { f7 } from 'framework7-react';
+import { useTranslation } from 'react-i18next';
+import Preview from "../view/Preview";
+
+const PreviewController = props => {
+    const { t } = useTranslation();
+    const _t = t('View.Edit', {returnObjects: true})
+
+    let _view, _touches, _touchStart, _touchEnd;
+
+    _view = $$('#pe-preview');
+
+    useEffect(() => {
+        const onDocumentReady = () => {
+            const api = Common.EditorApi.get();
+
+            api.asc_registerCallback('asc_onEndDemonstration', onEndDemonstration);
+            api.DemonstrationEndShowMessage(_t.textFinalMessage);
+        };
+
+        show();
+        onDocumentReady();
+
+        _view.on('touchstart', onTouchStart);
+        _view.on('touchmove', onTouchMove);
+        _view.on('touchend', onTouchEnd);
+        _view.on('click', onClick);
+
+        return () => {
+            const api = Common.EditorApi.get();
+
+            api.asc_unregisterCallback('asc_onEndDemonstration', onEndDemonstration);
+        
+            _view.off('touchstart', onTouchStart);
+            _view.off('touchmove', onTouchMove);
+            _view.off('touchend', onTouchEnd);
+            _view.off('click', onClick);
+        };
+    }, []);
+
+    const show = () => {
+        const api = Common.EditorApi.get();
+        api.StartDemonstration('presentation-preview', api.getCurrentPage());
+    };
+
+    const onTouchStart = e => {
+        e.preventDefault();
+
+        _touches = [];
+
+        for (let i = 0; i < e.touches.length; i++) {
+            _touches.push([e.touches[i].pageX, e.touches[i].pageY]);
+        }
+        _touchEnd = _touchStart = [e.touches[0].pageX, e.touches[0].pageY];
+    };
+
+    const onTouchMove = e => {
+        e.preventDefault();
+
+        const api = Common.EditorApi.get();
+
+        _touchEnd = [e.touches[0].pageX, e.touches[0].pageY];
+
+        if (e.touches.length < 2 ) return;
+
+        for (let i = 0; i < e.touches.length; i++) {
+            if (Math.abs(e.touches[i].pageX - _touches[i][0]) > 20 || Math.abs(e.touches[i].pageY - _touches[i][1]) > 20 ) {
+                api.EndDemonstration();
+                break;
+            }
+        }
+    };
+
+    const onTouchEnd = e => {
+        e.preventDefault();
+
+        const api = Common.EditorApi.get();
+
+        if (_touchEnd[0] - _touchStart[0] > 20)
+            api.DemonstrationPrevSlide();
+        else if (_touchStart[0] - _touchEnd[0] > 20)
+            api.DemonstrationNextSlide();
+    };
+
+    const onClick = e => {
+        const api = Common.EditorApi.get();
+        api.DemonstrationNextSlide();
+    };
+
+    // API Handlers
+
+    const onEndDemonstration = () => {
+        props.onclosed();
+    };
+
+    return (
+        <Preview />
+    )
+};
+
+export {PreviewController as Preview};
+
+
+

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

@@ -0,0 +1,209 @@
+import React, { useEffect, useState } from 'react';
+import { inject } from 'mobx-react';
+import { f7 } from 'framework7-react';
+import { useTranslation } from 'react-i18next';
+import ToolbarView from "../view/Toolbar";
+
+const ToolbarController = inject('storeAppOptions', 'users')(props => {
+    const {t} = useTranslation();
+    const _t = t("Toolbar", { returnObjects: true });
+
+    const appOptions = props.storeAppOptions;
+    const isDisconnected = props.users.isDisconnected;
+    const displayCollaboration = props.users.hasEditUsers || appOptions.canViewComments;
+
+    useEffect(() => {
+        const onDocumentReady = () => {
+            const api = Common.EditorApi.get();
+            api.asc_registerCallback('asc_onCanUndo', onApiCanUndo);
+            api.asc_registerCallback('asc_onCanRedo', onApiCanRedo);
+            api.asc_registerCallback('asc_onFocusObject', onApiFocusObject);
+            api.asc_registerCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect);
+            api.asc_registerCallback('asc_onCountPages', onApiCountPages);
+            Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect);
+            Common.Notifications.on('toolbar:activatecontrols', activateControls);
+            Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls);
+            Common.Notifications.on('goback', goBack);
+        };
+        if ( !Common.EditorApi ) {
+            Common.Notifications.on('document:ready', onDocumentReady);
+            Common.Notifications.on('setdoctitle', setDocTitle);
+            Common.Gateway.on('init', loadConfig);
+        } else {
+            onDocumentReady();
+        }
+
+        return () => {
+            Common.Notifications.off('document:ready', onDocumentReady);
+            Common.Notifications.off('setdoctitle', setDocTitle);
+            Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect);
+            Common.Notifications.off('toolbar:activatecontrols', activateControls);
+            Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls);
+            Common.Notifications.off('goback', goBack);
+
+            const api = Common.EditorApi.get();
+            api.asc_unregisterCallback('asc_onCanUndo', onApiCanUndo);
+            api.asc_unregisterCallback('asc_onCanRedo', onApiCanRedo);
+            api.asc_unregisterCallback('asc_onFocusObject', onApiFocusObject);
+            api.asc_unregisterCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect);
+            api.asc_unregisterCallback('asc_onCountPages', onApiCountPages);
+        }
+    });
+
+    const [docTitle, resetDocTitle] = useState('');
+    const setDocTitle = (title) => {
+        resetDocTitle(title);
+    }
+
+    // Back button
+    const [isShowBack, setShowBack] = useState(false);
+    const loadConfig = (data) => {
+        if (data && data.config && data.config.canBackToFolder !== false &&
+            data.config.customization && data.config.customization.goback &&
+            (data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose)) {
+            setShowBack(true);
+        }
+    };
+    const onBack = () => {
+        const api = Common.EditorApi.get();
+        if (api.isDocumentModified()) {
+            f7.dialog.create({
+                title   : _t.dlgLeaveTitleText,
+                text    : _t.dlgLeaveMsgText,
+                verticalButtons: true,
+                buttons : [
+                    {
+                        text: _t.leaveButtonText,
+                        onClick: function() {
+                            goBack();
+                        }
+                    },
+                    {
+                        text: _t.stayButtonText,
+                        bold: true
+                    }
+                ]
+            }).open();
+        } else {
+            goBack();
+        }
+    };
+    const goBack = (current) => {
+        //if ( !Common.Controllers.Desktop.process('goback') ) {
+            if (appOptions.customization.goback.requestClose && appOptions.canRequestClose) {
+                Common.Gateway.requestClose();
+            } else {
+                const href = appOptions.customization.goback.url;
+                if (!current && appOptions.customization.goback.blank !== false) {
+                    window.open(href, "_blank");
+                } else {
+                    parent.location.href = href;
+                }
+            }
+        //}
+    }
+
+    // Undo and Redo
+    const [isCanUndo, setCanUndo] = useState(true);
+    const [isCanRedo, setCanRedo] = useState(true);
+    const onApiCanUndo = (can) => {
+        if (isDisconnected) return;
+        setCanUndo(can);
+    };
+    const onApiCanRedo = (can) => {
+        if (isDisconnected) return;
+        setCanRedo(can);
+    };
+    const onUndo = () => {
+        const api = Common.EditorApi.get();
+        if (api) {
+            api.Undo();
+        }
+    };
+    const onRedo = () => {
+        const api = Common.EditorApi.get();
+        if (api) {
+            api.Redo();
+        }
+    }
+
+    const [disabledAdd, setDisabledAdd] = useState(false);
+    const [disabledEdit, setDisabledEdit] = useState(false);
+    const onApiFocusObject = (objects) => {
+        if (isDisconnected) return;
+
+        if (objects.length > 0) {
+            let slide_deleted = false,
+                slide_lock = false,
+                no_object = true,
+                objectLocked = false;
+            objects.forEach((object) => {
+                const type = object.get_ObjectType();
+                const objectValue = object.get_ObjectValue();
+                if (type === Asc.c_oAscTypeSelectElement.Slide) {
+                    slide_deleted = objectValue.get_LockDelete();
+                    slide_lock = objectValue.get_LockLayout() || objectValue.get_LockBackground() || objectValue.get_LockTransition() || objectValue.get_LockTiming();
+                } else if (objectValue && typeof objectValue.get_Locked === 'function') {
+                    no_object = false;
+                    objectLocked = objectLocked || objectValue.get_Locked();
+                }
+            });
+
+            setDisabledAdd(slide_deleted);
+            setDisabledEdit(slide_deleted || (objectLocked || no_object) && slide_lock);
+        }
+    };
+
+    const [disabledPreview, setDisabledPreview] = useState(false);
+    const onApiCountPages = (count) => {
+        setDisabledPreview(count <= 0);
+    };
+
+    const [disabledEditControls, setDisabledEditControls] = useState(false);
+    const [disabledSettings, setDisabledSettings] = useState(false);
+    const deactivateEditControls = (enableDownload) => {
+        setDisabledEditControls(true);
+        if (enableDownload) {
+            //DE.getController('Settings').setMode({isDisconnected: true, enableDownload: enableDownload});
+        } else {
+            setDisabledSettings(true);
+        }
+    };
+
+
+    const [disabledControls, setDisabledControls] = useState(true);
+    const activateControls = () => {
+        setDisabledControls(false);
+    };
+
+    const onCoAuthoringDisconnect = (enableDownload) => {
+        deactivateEditControls(enableDownload);
+        setCanUndo(false);
+        setCanRedo(false);
+        f7.popover.close();
+        f7.sheet.close();
+        f7.popup.close();
+    };
+
+    return (
+        <ToolbarView openOptions={props.openOptions}
+                     isEdit={appOptions.isEdit}
+                     docTitle={docTitle}
+                     isShowBack={isShowBack}
+                     onBack={onBack}
+                     isCanUndo={isCanUndo}
+                     isCanRedo={isCanRedo}
+                     onUndo={onUndo}
+                     onRedo={onRedo}
+                     disabledAdd={disabledAdd}
+                     disabledEdit={disabledEdit}
+                     disabledPreview={disabledPreview}
+                     disabledControls={disabledControls}
+                     disabledEditControls={disabledEditControls}
+                     disabledSettings={disabledSettings}
+                     displayCollaboration={displayCollaboration}
+        />
+    )
+});
+
+export {ToolbarController as Toolbar};

apps/presentationeditor/mobile/src/controller/edit/EditText.jsx

@@ -132,7 +132,7 @@ class EditTextController extends Component {
         if (isDecrement) {
             typeof size === 'undefined' ? api.FontSizeOut() : size = Math.max(1, --size);
         } else {
-            typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(100, ++size);
+            typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(300, ++size);
         }
         if (typeof size !== 'undefined') {
             api.put_TextPrFontSize(size);

apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx

@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import { ApplicationSettings } from "../../view/settings/ApplicationSettings";
+import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
 
 class ApplicationSettingsController extends Component {
     constructor(props) {
@@ -8,23 +9,19 @@ class ApplicationSettingsController extends Component {
 
     setUnitMeasurement(value) {
         const api = Common.EditorApi.get();
-        value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
+        value = (value !== null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
         Common.Utils.Metric.setCurrentMetric(value);
-        // Common.localStorage.setItem("pe-mobile-settings-unit", value);
+        LocalStorage.setItem("pe-mobile-settings-unit", value);
-        api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
+        api.asc_SetDocumentUnits((value === Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value === Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
     }
 
     switchSpellCheck(value) {
-        const api = Common.EditorApi.get();
+        LocalStorage.setBool("pe-mobile-spellcheck", value);
-        // let state = value === '1' ? true : false;
+        Common.EditorApi.get().asc_setSpellCheck(value);
-        // Common.localStorage.setItem("pe-mobile-spellcheck", state ? 1 : 0);
-        // Common.Utils.InternalSettings.set("pe-mobile-spellcheck", state);
-        api.asc_setSpellCheck(value);
     }
 
     setMacrosSettings(value) {
-        Common.Utils.InternalSettings.set("pe-mobile-macros-mode", value);
+        LocalStorage.setItem("pe-mobile-macros-mode", value);
-        // Common.localStorage.setItem("pe-mobile-macros-mode", value);
     }
 
 

apps/presentationeditor/mobile/src/lib/patch.jsx

@@ -0,0 +1,6 @@
+
+const EditorUIController = () => null;
+
+EditorUIController.isSupportEditFeature = () => false;
+
+export default EditorUIController;

apps/presentationeditor/mobile/src/page/app.jsx

@@ -3,6 +3,8 @@ import React from 'react';
 import {App,Panel,Views,View,Popup,Page,Navbar,Toolbar,NavRight,Link,Block,BlockTitle,List,ListItem,ListInput,ListButton,BlockFooter} from 'framework7-react';
 import { f7ready } from 'framework7-react';
 
+import '../../../../common/Analytics.js';
+
 import '../../../../common/Gateway.js';
 import '../../../../common/main/lib/util/utils.js';
 

apps/presentationeditor/mobile/src/page/main.jsx

@@ -1,15 +1,16 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
-import { Page, View, Navbar, NavLeft, NavRight, Link, Icon } from 'framework7-react';
+import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react';
+import { observer, inject } from "mobx-react";
 
 import EditOptions from '../view/edit/Edit';
 import AddOptions from '../view/add/Add';
 import Settings from '../view/settings/Settings';
 import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx';
-import { Device } from '../../../../common/mobile/utils/device';
+import { Preview } from "../controller/Preview";
 import { Search, SearchSettings } from '../controller/Search';
 import ContextMenu from '../controller/ContextMenu';
-
+import { Toolbar } from "../controller/Toolbar";
-export default class MainPage extends Component {
+class MainPage extends Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -17,9 +18,14 @@ export default class MainPage extends Component {
             addOptionsVisible: false,
             settingsVisible: false,
             collaborationVisible: false,
+            previewVisible: false
         };
     }
 
+    onClosePreview = () => {
+        this.setState({previewVisible: false});
+    }
+
     handleClickToOpenOptions = (opts, showOpts) => {
         ContextMenu.closeContextMenu();
 
@@ -34,7 +40,9 @@ export default class MainPage extends Component {
             else if ( opts == 'settings' )
                 return {settingsVisible: true};
             else if ( opts == 'coauth' )
-                return {collaborationVisible: true}
+                return {collaborationVisible: true};
+            else if ( opts == 'preview' )
+                return {previewVisible: true};
         });
     };
 
@@ -49,52 +57,55 @@ export default class MainPage extends Component {
                     return {settingsVisible: false};
                 else if ( opts == 'coauth' )
                     return {collaborationVisible: false}
+                else if ( opts == 'preview' )
+                    return {previewVisible: false};
             })
         })();
     };
 
-  render() {
+    render() {
-    return (
+        const appOptions = this.props.storeAppOptions;
-        <Page name="home">
+        const config = appOptions.config;
-            {/* Top Navbar */}
+        const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo)));
-            <Navbar id='editor-navbar'>
-                {/*<div slot="before-inner" className="main-logo"><Icon icon="icon-logo"></Icon></div>*/}
-                <NavLeft>
-                    <Link icon='icon-undo'></Link>
-                    <Link icon='icon-redo'></Link>
-                </NavLeft>
-                <NavRight>
-                    <Link id='btn-edit' icon='icon-edit-settings' href={false} onClick={e => this.handleClickToOpenOptions('edit')}></Link>
-                    <Link id='btn-add' icon='icon-plus' href={false} onClick={e => this.handleClickToOpenOptions('add')}></Link>
-                    { Device.phone ? null : <Link icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> }
-                    <Link id='btn-coauth' href={false} icon='icon-collaboration' onClick={e => this.handleClickToOpenOptions('coauth')}></Link>
-                    <Link id='btn-settings' icon='icon-settings' href={false} onClick={e => this.handleClickToOpenOptions('settings')}></Link>
-                </NavRight>
-                <Search useSuspense={false} />
-            </Navbar>
-            {/* Page content */}
-            <View id="editor_sdk" />
 
-            <SearchSettings useSuspense={false} />
+        return (
+            <Fragment>
+                {!this.state.previewVisible ? null : <Preview onclosed={this.handleOptionsViewClosed.bind(this, 'preview')} />}
+                <Page name="home" className={showLogo && 'page-with-logo'}>
+                    {/* Top Navbar */}
+                    <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
+                        {showLogo && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
+                        <Subnavbar>
+                            <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
+                            <Search useSuspense={false}/>
+                        </Subnavbar>
+                    </Navbar>
+                    {/* Page content */}
+                    <View id="editor_sdk" />
 
-            {
+                    <SearchSettings useSuspense={false} />
-                !this.state.editOptionsVisible ? null :
+
-                    <EditOptions onclosed={this.handleOptionsViewClosed.bind(this, 'edit')} />
+                    {
-            }
+                        !this.state.editOptionsVisible ? null :
-            {
+                            <EditOptions onclosed={this.handleOptionsViewClosed.bind(this, 'edit')} />
-                !this.state.addOptionsVisible ? null :
+                    }
-                    <AddOptions onclosed={this.handleOptionsViewClosed.bind(this, 'add')} showOptions={this.state.addShowOptions} />
+                    {
-            }
+                        !this.state.addOptionsVisible ? null :
-            {
+                            <AddOptions onclosed={this.handleOptionsViewClosed.bind(this, 'add')} showOptions={this.state.addShowOptions} />
-                !this.state.settingsVisible ? null :
+                    }
-                    <Settings onclosed={this.handleOptionsViewClosed.bind(this, 'settings')} />
+                    {
-            }
+                        !this.state.settingsVisible ? null :
-            {
+                            <Settings onclosed={this.handleOptionsViewClosed.bind(this, 'settings')} />
-                !this.state.collaborationVisible ? null :
+                    }
-                    <CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
+                    {
-            }
+                        !this.state.collaborationVisible ? null :
-            <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />
+                            <CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
-        </Page>
+                    }
-    )
+                    <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />
-  }
+                </Page>
-};
+            </Fragment>
+        )
+    }
+}
+
+export default inject("storeAppOptions")(observer(MainPage));

apps/presentationeditor/mobile/src/store/focusObjects.js

@@ -25,79 +25,15 @@ export class storeFocusObjects {
     }
 
     get settings() {
-        const _settings = [];
+        return !!this.intf ? this.intf.filterFocusObjects() : null;
-        let no_text = true;
-        for (let object of this._focusObjects) {
-            const type = object.get_ObjectType(),
-                objectValue = object.get_ObjectValue();
-            if (Asc.c_oAscTypeSelectElement.Paragraph == type) {
-                if ( !objectValue.get_Locked() )
-                    no_text = false;
-            } else if (Asc.c_oAscTypeSelectElement.Table == type) {
-                if ( !objectValue.get_Locked() ) {
-                    _settings.push('table');
-                    no_text = false;
-                }
-            } else if (Asc.c_oAscTypeSelectElement.Slide == type) {
-                if ( !(objectValue.get_LockLayout() || objectValue.get_LockBackground() || objectValue.get_LockTransition() || objectValue.get_LockTiming() ))
-                    _settings.push('slide');
-            } else if (Asc.c_oAscTypeSelectElement.Image == type) {
-                if ( !objectValue.get_Locked() )
-                    _settings.push('image');
-            } else if (Asc.c_oAscTypeSelectElement.Chart == type) {
-                if ( !objectValue.get_Locked() )
-                    _settings.push('chart');
-            } else if (Asc.c_oAscTypeSelectElement.Shape == type && !objectValue.get_FromChart()) {
-                if ( !objectValue.get_Locked() ) {
-                    _settings.push('shape');
-                    no_text = false;
-                }
-            } else if (Asc.c_oAscTypeSelectElement.Hyperlink == type) {
-                _settings.push('hyperlink');
-            }
-        }
-        if (!no_text && _settings.indexOf('image') < 0)
-            _settings.unshift('text');
-        const resultArr = _settings.filter((value, index, self) => self.indexOf(value) === index); //get uniq array
-        // Exclude hyperlink if text is locked
-        if (resultArr.indexOf('hyperlink') > -1 && resultArr.indexOf('text') < 0) {
-            resultArr.splice(resultArr.indexOf('hyperlink'), 1);
-        }
-        // Exclude shapes if chart exist
-        if (resultArr.indexOf('chart') > -1 && resultArr.indexOf('shape') > -1) {
-            resultArr.splice(resultArr.indexOf('shape'), 1);
-        }
-        return resultArr;
     }
 
     get slideObject() {
-        const slides = [];
+        return !!this.intf ? this.intf.getSlideObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Slide) {
-                slides.push(object);
-            }
-        }
-        if (slides.length > 0) {
-            const object = slides[slides.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get paragraphObject() {
-        const paragraphs = [];
+        return !!this.intf ? this.intf.getParagraphObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Paragraph) {
-                paragraphs.push(object);
-            }
-        }
-        if (paragraphs.length > 0) {
-            const object = paragraphs[paragraphs.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get paragraphLocked() {
@@ -111,48 +47,15 @@ export class storeFocusObjects {
     }
 
     get shapeObject() {
-        const shapes = [];
+        return !!this.intf ? this.intf.getShapeObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Shape) {
-                shapes.push(object);
-            }
-        }
-        if (shapes.length > 0) {
-            const object = shapes[shapes.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get imageObject() {
-        const images = [];
+        return !!this.intf ? this.intf.getImageObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Image && object.get_ObjectValue()) {
-                images.push(object);
-            }
-        }
-        if (images.length > 0) {
-            const object = images[images.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get tableObject() {
-        const tables = [];
+        return !!this.intf ? this.intf.getTableObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Table) {
-                tables.push(object);
-            }
-        }
-        if (tables.length > 0) {
-            const object = tables[tables.length - 1]; // get top table
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get isTableInStack() {
@@ -165,34 +68,10 @@ export class storeFocusObjects {
     }
 
     get chartObject() {
-        const charts = [];
+        return !!this.intf ? this.intf.getChartObject() : null;
-        
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Chart) {
-                charts.push(object);
-            }
-        }
-
-        if (charts.length > 0) {
-            const object = charts[charts.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get linkObject() {
-        const links = [];
+        return !!this.intf ? this.intf.getLinkObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Hyperlink) {
-                links.push(object);
-            }
-        }
-        if (links.length > 0) {
-            const object = links[links.length - 1]; // get top
-            return  object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 }

apps/presentationeditor/mobile/src/view/Preview.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+
+const Preview = () => {
+    return (
+        <div id="pe-preview" style={{position: 'absolute', left: 0, top: 0, width: '100%', height: '100%', zIndex: 1000}}>
+            <div id="presentation-preview" style={{width: '100%', height: '100%'}}></div>
+        </div>
+    )
+};
+
+export default Preview;

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

@@ -0,0 +1,35 @@
+import React, {Fragment} from 'react';
+import {NavLeft, NavRight, NavTitle, Link, Icon} from 'framework7-react';
+import { Device } from '../../../../common/mobile/utils/device';
+import EditorUIController from '../lib/patch'
+
+const ToolbarView = props => {
+    return (
+        <Fragment>
+            <NavLeft>
+                {props.isShowBack && <Link className={`btn-doc-back${props.disabledControls && ' disabled'}`} icon='icon-back' onClick={props.onBack}></Link>}
+                {props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({
+                    disabledUndo: !props.isCanUndo,
+                    disabledRedo: !props.isCanRedo,
+                    onUndoClick: props.onUndo,
+                    onRedoClick: props.onRedo
+                })}
+            </NavLeft>
+            {!Device.phone && <NavTitle>{props.docTitle}</NavTitle>}
+            <NavRight>
+                <Link className={(props.disabledControls || props.disabledPreview) && 'disabled'} icon='icon-play' href={false} onClick={() => {props.openOptions('preview')}}></Link>
+                {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({
+                    disabledAdd: props.disabledAdd || props.disabledControls,
+                    disabledEdit: props.disabledEdit || props.disabledControls,
+                    onEditClick: () => props.openOptions('edit'),
+                    onAddClick: () => props.openOptions('add')
+                })}
+                { Device.phone ? null : <Link className={props.disabledControls && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> }
+                {props.displayCollaboration && <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link>}
+                <Link className={(props.disabledSettings || props.disabledControls) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
+            </NavRight>
+        </Fragment>
+    )
+};
+
+export default ToolbarView;

apps/presentationeditor/mobile/src/view/add/Add.jsx

@@ -73,9 +73,11 @@ const AddLayoutContent = ({ tabs }) => {
 const AddTabs = props => {
     const { t } = useTranslation();
     const _t = t('View.Add', {returnObjects: true});
+    const api = Common.EditorApi.get();
+    const countPages = api.getCountPages();
     const showPanels = props.showPanels;
     const tabs = [];
-    if (!showPanels) {
+    if (!showPanels && countPages) {
         tabs.push({
             caption: _t.textSlide,
             id: 'add-slide',
@@ -101,6 +103,14 @@ const AddTabs = props => {
             component: <AddOtherController/>
         });
     }
+    if(!showPanels && !countPages) {
+        tabs.push({
+            caption: _t.textSlide,
+            id: 'add-slide',
+            icon: 'icon-add-slide',
+            component: <AddSlideController />
+        });
+    }
     if (showPanels && showPanels === 'link') {
         tabs.push({
             caption: _t.textAddLink,

apps/presentationeditor/mobile/src/view/edit/EditTable.jsx

@@ -60,24 +60,24 @@ const PageStyleOptions = props => {
             <Navbar title={_t.textOptions} backLink={_t.textBack}/>
             <List>
                 <ListItem title={_t.textHeaderRow}>
-                    <Toggle checked={isFirstRow} onToggleChange={() => {props.onCheckTemplateChange(tableLook, 0, !isFirstRow)}}/>
+                    <Toggle checked={isFirstRow} onChange={() => {props.onCheckTemplateChange(tableLook, 0, !isFirstRow)}}/>
                 </ListItem>
                 <ListItem title={_t.textTotalRow}>
-                    <Toggle checked={isLastRow} onToggleChange={() => {props.onCheckTemplateChange(tableLook, 1, !isLastRow)}}/>
+                    <Toggle checked={isLastRow} onChange={() => {props.onCheckTemplateChange(tableLook, 1, !isLastRow)}}/>
                 </ListItem>
                 <ListItem title={_t.textBandedRow}>
-                    <Toggle checked={isBandHor} onToggleChange={() => {props.onCheckTemplateChange(tableLook, 2, !isBandHor)}}/>
+                    <Toggle checked={isBandHor} onChange={() => {props.onCheckTemplateChange(tableLook, 2, !isBandHor)}}/>
                 </ListItem>
             </List>
             <List>
                 <ListItem title={_t.textFirstColumn}>
-                    <Toggle checked={isFirstCol} onToggleChange={() => {props.onCheckTemplateChange(tableLook, 3, !isFirstCol)}}/>
+                    <Toggle checked={isFirstCol} onChange={() => {props.onCheckTemplateChange(tableLook, 3, !isFirstCol)}}/>
                 </ListItem>
                 <ListItem title={_t.textLastColumn}>
-                    <Toggle checked={isLastCol} onToggleChange={() => {props.onCheckTemplateChange(tableLook, 4, !isLastCol)}}/>
+                    <Toggle checked={isLastCol} onChange={() => {props.onCheckTemplateChange(tableLook, 4, !isLastCol)}}/>
                 </ListItem>
                 <ListItem title={_t.textBandedColumn}>
-                    <Toggle checked={isBandVer} onToggleChange={() => {props.onCheckTemplateChange(tableLook, 5, !isBandVer)}}/>
+                    <Toggle checked={isBandVer} onChange={() => {props.onCheckTemplateChange(tableLook, 5, !isBandVer)}}/>
                 </ListItem>
             </List>
         </Page>

apps/presentationeditor/mobile/src/view/settings/Settings.jsx

@@ -84,7 +84,8 @@ const SettingsList = withTranslation()(props => {
 
     const showHelp = () => {
         // let url = '{{HELP_URL}}';
-        let url = 'https://helpcenter.onlyoffice.com';
+        let url = __HELP_URL__;
+        // let url = 'https://helpcenter.onlyoffice.com';
 
         if (url.charAt(url.length-1) !== '/') {
             url += '/';

apps/spreadsheeteditor/mobile/locale/en.json

@@ -29,6 +29,12 @@
         "menuEdit": "Edit",
         "menuDelete": "Delete"
     },
+    "Toolbar": {
+        "dlgLeaveTitleText": "You leave the application",
+        "dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.",
+        "leaveButtonText": "Leave this Page",
+        "stayButtonText": "Stay on this Page"
+    },
     "View" : {
         "Add" : {
             "textChart": "Chart",

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

@@ -7,6 +7,7 @@ import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
 import ContextMenuController from '../../../../common/mobile/lib/controller/ContextMenu';
 import { idContextMenuElement } from '../../../../common/mobile/lib/view/ContextMenu';
 import { Device } from '../../../../common/mobile/utils/device';
+import EditorUIController from '../lib/patch';
 
 @inject ( stores => ({
     isEdit: stores.storeAppOptions.isEdit,
@@ -61,11 +62,14 @@ class ContextMenu extends ContextMenuController {
 
         super.onMenuItemClick(action);
 
+        if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) )
+            return;
+
         const api = Common.EditorApi.get();
         const info = api.asc_getCellInfo();
         switch (action) {
             case 'cut':
-                if (!api.asc_Cut() && !LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) {
+                if (!LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) {
                     this.showCopyCutPasteModal();
                 }
                 break;
@@ -75,55 +79,13 @@ class ContextMenu extends ContextMenuController {
                 }
                 break;
             case 'paste':
-                if (!api.asc_Paste() && !LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) {
+                if (!LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) {
                     this.showCopyCutPasteModal();
                 }
                 break;
-            case 'addcomment':
-                Common.Notifications.trigger('addcomment');
-                break;
             case 'viewcomment':
                 Common.Notifications.trigger('viewcomment');
                 break;
-            case 'del':
-                api.asc_emptyCells(Asc.c_oAscCleanOptions.All);
-                break;
-            case 'wrap':
-                api.asc_setCellTextWrap(true);
-                break;
-            case 'unwrap':
-                api.asc_setCellTextWrap(false);
-                break;
-            case 'edit':
-                setTimeout(() => {
-                    this.props.openOptions('edit');
-                }, 0);
-                break;
-            case 'merge':
-                if (api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) {
-                    setTimeout(() => {
-                        f7.dialog.confirm(_t.warnMergeLostData, _t.notcriticalErrorTitle, () => {
-                            api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
-                        });
-                    }, 0);
-                } else {
-                    api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
-                }
-                break;
-            case 'unmerge':
-                api.asc_mergeCells(Asc.c_oAscMergeOptions.None);
-                break;
-            case 'hide':
-                api[info.asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns']();
-                break;
-            case 'show':
-                api[info.asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_showRows' : 'asc_showColumns']();
-                break;
-            case 'addlink':
-                setTimeout(() => {
-                    this.props.openOptions('add', 'link');
-                }, 400)
-                break;
             case 'openlink':
                 const linkinfo = info.asc_getHyperlink();
                 if ( linkinfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink ) {
@@ -145,12 +107,22 @@ class ContextMenu extends ContextMenuController {
                     api.asc_getUrlType(url) > 0 && this.openLink(url);
                 }
                 break;
-            case 'freezePanes':
-                api.asc_freezePane();
-                break;
         }
+    }
 
-        console.log("click context menu item: " + action);
+    onMergeCells() {
+        const { t } = this.props;
+        const _t = t("ContextMenu", { returnObjects: true });
+        const api = Common.EditorApi.get();
+        if (api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) {
+            setTimeout(() => {
+                f7.dialog.confirm(_t.warnMergeLostData, _t.notcriticalErrorTitle, () => {
+                    api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
+                });
+            }, 0);
+        } else {
+            api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
+        }
     }
 
     showCopyCutPasteModal() {
@@ -198,33 +170,35 @@ class ContextMenu extends ContextMenuController {
         const { t } = this.props;
         const _t = t("ContextMenu", { returnObjects: true });
 
-        const { isEdit, canViewComments, isDisconnected } = this.props;
+        const { isEdit } = this.props;
 
-        const api = Common.EditorApi.get();
+        if (isEdit && EditorUIController.ContextMenu) {
-        const cellinfo = api.asc_getCellInfo();
+            return EditorUIController.ContextMenu.mapMenuItems(this);
+        } else {
+            const {canViewComments } = this.props;
 
-        const itemsIcon = [];
+            const api = Common.EditorApi.get();
-        const itemsText = [];
+            const cellinfo = api.asc_getCellInfo();
 
-        let iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu;
+            const itemsIcon = [];
-        let iscelllocked = cellinfo.asc_getLocked();
+            const itemsText = [];
-        const seltype = cellinfo.asc_getSelectionType();
-        const xfs = cellinfo.asc_getXfs();
-        const isComments = cellinfo.asc_getComments().length > 0; //prohibit adding multiple comments in one cell;
 
-        switch (seltype) {
+            let iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu;
-            case Asc.c_oAscSelectionType.RangeCells:     iscellmenu  = true;     break;
+            const seltype = cellinfo.asc_getSelectionType();
-            case Asc.c_oAscSelectionType.RangeRow:       isrowmenu   = true;     break;
+            const isComments = cellinfo.asc_getComments().length > 0; //prohibit adding multiple comments in one cell;
-            case Asc.c_oAscSelectionType.RangeCol:       iscolmenu   = true;     break;
+
-            case Asc.c_oAscSelectionType.RangeMax:       isallmenu   = true;     break;
+            switch (seltype) {
-            case Asc.c_oAscSelectionType.RangeImage:     isimagemenu = true;     break;
+                case Asc.c_oAscSelectionType.RangeCells:     iscellmenu  = true;     break;
-            case Asc.c_oAscSelectionType.RangeShape:     isshapemenu = true;     break;
+                case Asc.c_oAscSelectionType.RangeRow:       isrowmenu   = true;     break;
-            case Asc.c_oAscSelectionType.RangeChart:     ischartmenu = true;     break;
+                case Asc.c_oAscSelectionType.RangeCol:       iscolmenu   = true;     break;
-            case Asc.c_oAscSelectionType.RangeChartText: istextchartmenu = true; break;
+                case Asc.c_oAscSelectionType.RangeMax:       isallmenu   = true;     break;
-            case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break;
+                case Asc.c_oAscSelectionType.RangeImage:     isimagemenu = true;     break;
-        }
+                case Asc.c_oAscSelectionType.RangeShape:     isshapemenu = true;     break;
+                case Asc.c_oAscSelectionType.RangeChart:     ischartmenu = true;     break;
+                case Asc.c_oAscSelectionType.RangeChartText: istextchartmenu = true; break;
+                case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break;
+            }
 
-        if (!isEdit) {
             if (iscellmenu || istextchartmenu || istextshapemenu) {
                 itemsIcon.push({
                     event: 'copy',
@@ -243,136 +217,9 @@ class ContextMenu extends ContextMenuController {
                     event: 'viewcomment'
                 });
             }
-        } else {
 
-            if (!iscelllocked && (isimagemenu || isshapemenu || ischartmenu || istextshapemenu || istextchartmenu)) {
+            return itemsIcon.concat(itemsText);
-                api.asc_getGraphicObjectProps().every((object) => {
-                    if (object.asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
-                        iscelllocked = object.asc_getObjectValue().asc_getLocked();
-                    }
-                    return !iscelllocked;
-                });
-            }
-
-            if (iscelllocked || api.isCellEdited) {
-                itemsIcon.push({
-                    event: 'copy',
-                    icon: 'icon-copy'
-                });
-
-            } else {
-                itemsIcon.push({
-                    event: 'cut',
-                    icon: 'icon-cut'
-                });
-                itemsIcon.push({
-                    event: 'copy',
-                    icon: 'icon-copy'
-                });
-                itemsIcon.push({
-                    event: 'paste',
-                    icon: 'icon-paste'
-                });
-                itemsText.push({
-                    caption: _t.menuDelete,
-                    event: 'del'
-                });
-
-                if (isimagemenu || isshapemenu || ischartmenu ||
-                    istextshapemenu || istextchartmenu) {
-                    itemsText.push({
-                        caption: _t.menuEdit,
-                        event: 'edit'
-                    });
-                } else {
-                    if (iscolmenu || isrowmenu) {
-                        itemsText.push({
-                            caption: _t.menuHide,
-                            event: 'hide'
-                        });
-                        itemsText.push({
-                            caption: _t.menuShow,
-                            event: 'show'
-                        });
-                    } else if (iscellmenu) {
-                        if (!iscelllocked) {
-                            itemsText.push({
-                                caption: _t.menuCell,
-                                event: 'edit'
-                            });
-                        }
-
-                        if (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.None) {
-                            itemsText.push({
-                                caption: _t.menuMerge,
-                                event: 'merge'
-                            });
-                        }
-
-                        if (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.Merge) {
-                            itemsText.push({
-                                caption: _t.menuUnmerge,
-                                event: 'unmerge'
-                            });
-                        }
-
-                        itemsText.push(
-                            xfs.asc_getWrapText() ?
-                                {
-                                    caption: _t.menuUnwrap,
-                                    event: 'unwrap'
-                                } :
-                                {
-                                    caption: _t.menuWrap,
-                                    event: 'wrap'
-                                });
-
-                        if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect()) {
-                            itemsText.push({
-                                caption: _t.menuOpenLink,
-                                event: 'openlink'
-                            });
-                        } else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() &&
-                            !cellinfo.asc_getLockText() && !!cellinfo.asc_getText()) {
-                            itemsText.push({
-                                caption: _t.menuAddLink,
-                                event: 'addlink'
-                            });
-                        }
-                    }
-
-                    itemsText.push({
-                        caption: api.asc_getSheetViewSettings().asc_getIsFreezePane() ? _t.menuUnfreezePanes : _t.menuFreezePanes,
-                        event: 'freezePanes'
-                    });
-
-                }
-
-                if (canViewComments) {
-                    if (isComments) {
-                        itemsText.push({
-                            caption: _t.menuViewComment,
-                            event: 'viewcomment'
-                        });
-                    } else if (iscellmenu) {
-                        itemsText.push({
-                            caption: _t.menuAddComment,
-                            event: 'addcomment'
-                        });
-                    }
-                }
-            }
         }
-
-
-        if ( Device.phone && itemsText.length > 2 ) {
-            this.extraItems = itemsText.splice(2,itemsText.length, {
-                caption: _t.menuMore,
-                event: 'showActionSheet'
-            });
-        }
-
-        return itemsIcon.concat(itemsText);
     }
 
     initExtraItems () {

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

@@ -5,6 +5,7 @@ import { f7 } from 'framework7-react';
 import { withTranslation } from 'react-i18next';
 import CollaborationController from '../../../../common/mobile/lib/controller/collaboration/Collaboration.jsx'
 import { onAdvancedOptions } from './settings/Download.jsx';
+import EditorUIController from '../lib/patch';
 import {
     AddCommentController,
     CommentsController,
@@ -51,6 +52,8 @@ class MainController extends Component {
             };
 
             const loadConfig = data => {
+                EditorUIController.isSupportEditFeature();
+
                 let me = this;
 
                 me.editorConfig = Object.assign({}, this.editorConfig, data.config);
@@ -184,6 +187,8 @@ class MainController extends Component {
                         // 'translate': translate
                     });
 
+                    Common.EditorApi = {get: () => this.api};
+
                     this.appOptions = {};
                     this.bindEvents();
 
@@ -199,7 +204,6 @@ class MainController extends Component {
                     Common.Gateway.appReady();
 
                     Common.Notifications.trigger('engineCreated', this.api);
-                    Common.EditorApi = {get: () => this.api};
                 }, error => {
                     console.log('promise failed ' + error);
                 });
@@ -224,58 +228,21 @@ class MainController extends Component {
         // me.api.asc_registerCallback('asc_onDocumentName',               _.bind(me.onDocumentName, me));
         me.api.asc_registerCallback('asc_onEndAction',                  me._onLongActionEnd.bind(me));
 
-        const storeSpreadsheetSettings = this.props.storeSpreadsheetSettings;
+        EditorUIController.initThemeColors && EditorUIController.initThemeColors();
-        const storeFocusObjects = this.props.storeFocusObjects;
-        const storeCellSettings = this.props.storeCellSettings;
-        const storeTextSettings = this.props.storeTextSettings;
-        const storeChartSettings = this.props.storeChartSettings;
-        const styleSize = storeCellSettings.styleSize;
-       
-        this.api.asc_registerCallback('asc_onSelectionChanged', cellInfo => {
-            console.log(cellInfo);
-            
-            storeFocusObjects.resetCellInfo(cellInfo);
-            storeCellSettings.initCellSettings(cellInfo);
-            storeTextSettings.initTextSettings(cellInfo);
 
-            let selectedObjects = Common.EditorApi.get().asc_getGraphicObjectProps();
+        EditorUIController.initCellInfo && EditorUIController.initCellInfo(this.props);
 
-            if(selectedObjects.length) {
+        EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeCellSettings);
-                storeFocusObjects.resetFocusObjects(selectedObjects);
 
-                // Chart Settings
+        EditorUIController.initFonts && EditorUIController.initFonts(this.props);
-
-                if (storeFocusObjects.chartObject) { 
-                    storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.get_ChartProperties().getType()));
-                }
-            }
-        });
 
+        const styleSize = this.props.storeCellSettings.styleSize;
         this.api.asc_setThumbnailStylesSizes(styleSize.width, styleSize.height);
 
-        this.api.asc_registerCallback('asc_onInitEditorFonts', (fonts, select) => {
-            storeCellSettings.initEditorFonts(fonts, select);
-            storeTextSettings.initEditorFonts(fonts, select);
-        });
-
-        this.api.asc_registerCallback('asc_onEditorSelectionChanged', fontObj => {
-            console.log(fontObj)
-            storeCellSettings.initFontInfo(fontObj);
-            storeTextSettings.initFontInfo(fontObj);
-        });
-
-        this.api.asc_registerCallback('asc_onInitEditorStyles', styles => {
-            storeCellSettings.initCellStyles(styles);
-        });
-
-        this.api.asc_registerCallback('asc_onSendThemeColors', (colors, standart_colors) => {
-            Common.Utils.ThemeColor.setColors(colors, standart_colors);
-        });
-
         // Spreadsheet Settings
 
         this.api.asc_registerCallback('asc_onSendThemeColorSchemes', schemes => {
-            storeSpreadsheetSettings.addSchemes(schemes);
+            this.props.storeSpreadsheetSettings.addSchemes(schemes);
         });
 
         // Downloaded Advanced Options
@@ -311,6 +278,8 @@ class MainController extends Component {
         me.api.asc_getWorksheetsCount();
         me.api.asc_showWorksheet(me.api.asc_getActiveWorksheetIndex());
 
+        this.applyLicense();
+
         Common.Gateway.documentReady();
         f7.emit('resize');
     }
@@ -324,6 +293,10 @@ class MainController extends Component {
         // }
     }
 
+    applyLicense () {
+        Common.Notifications.trigger('toolbar:activatecontrols');
+    }
+
     render() {
         return (
             <Fragment>

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

@@ -10,7 +10,6 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
     const {sheets, storeAppOptions, users} = props;
     const {t} = useTranslation();
     const _t = t('Statusbar', {returnObjects: true});
-    // console.log(props);
 
     let isEdit = storeAppOptions.isEdit;
     let isDisconnected = users.isDisconnected;
@@ -18,7 +17,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
     useEffect(() => {
         const onDocumentReady = () => {
             const api = Common.EditorApi.get();
-            api.asc_registerCallback('asc_onUpdateTabColor', onApiUpdateTabColor);
+            // api.asc_registerCallback('asc_onUpdateTabColor', onApiUpdateTabColor);
             api.asc_registerCallback('asc_onWorkbookLocked', onWorkbookLocked);
             api.asc_registerCallback('asc_onWorksheetLocked', onWorksheetLocked);
             api.asc_registerCallback('asc_onSheetsChanged', onApiSheetsChanged);
@@ -44,7 +43,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
             Common.Notifications.off('document:ready', onApiSheetsChanged);
 
             const api = Common.EditorApi.get();
-            api.asc_unregisterCallback('asc_onUpdateTabColor', onApiUpdateTabColor);
+            // api.asc_unregisterCallback('asc_onUpdateTabColor', onApiUpdateTabColor);
             api.asc_unregisterCallback('asc_onWorkbookLocked', onWorkbookLocked);
             api.asc_unregisterCallback('asc_onWorksheetLocked', onWorksheetLocked);
             api.asc_unregisterCallback('asc_onSheetsChanged', onApiSheetsChanged);
@@ -63,7 +62,8 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
     };
 
     const onWorksheetLocked = (index, locked) => {
-        let model = sheets.sheets.find(sheet => sheet.index === index);
+        // let model = sheets.sheets.find(sheet => sheet.index === index);
+        let model = sheets.at(index);
         if(model && model.locked != locked)
             model.locked = locked;
     };
@@ -75,7 +75,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
         const sheets_count = api.asc_getWorksheetsCount();
         const active_index = api.asc_getActiveWorksheetIndex();
 
-        let i = -1, items = [], hiddentems = [];
+        let i = -1, items = [];
 
         while (++i < sheets_count) {
             const tab = {
@@ -87,59 +87,57 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
                 color       : api.asc_getWorksheetTabColor(i)
             };
 
-            (api.asc_isWorksheetHidden(i) ? hiddentems : items).push(tab);
+            items.push(tab);
-            // items.push(tab);
         }
 
         sheets.resetSheets(items);
-        sheets.resetHiddenSheets(hiddentems);
+        // updateTabsColors();
-    
-        updateTabsColors();
     };
 
-    const loadTabColor = sheetindex => {
+    // const loadTabColor = sheetindex => {
-        const api = Common.EditorApi.get();
+    //     const api = Common.EditorApi.get();
-        let tab = sheets.sheets.find(sheet => sheet.index === sheetindex);
+    //     let tab = sheets.sheets.find(sheet => sheet.index === sheetindex);
 
-        if (tab) {
+    //     if (tab) {
-            setTabLineColor(tab, api.asc_getWorksheetTabColor(sheetindex));
+    //         setTabLineColor(tab, api.asc_getWorksheetTabColor(sheetindex));
-        }
+    //     }
         
-    };
+    // };
 
-    const onApiUpdateTabColor = index => {
+    // const onApiUpdateTabColor = index => {
-        loadTabColor(index);
+    //     loadTabColor(index);
-    };
+    // };
 
-    const setTabLineColor = (tab, color) => {
+    // const setTabLineColor = (tab, color) => {
-        if (tab) {
+    //     console.log(color);
-            if (null !== color) {
+    //     if (tab) {
-                color = '#' + Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
+    //         if (null !== color) {
-            } else {
+    //             color = '#' + Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
-                color = '';
+    //         } else {
-            }
+    //             color = '';
+    //         }
 
-            if (color.length) {
+    //         if (color.length) {
-                if (!tab.active) {
+    //             if (!tab.active) {
-                    color = '0px 4px 0 ' + Common.Utils.RGBColor(color).toRGBA(0.7) + ' inset';
+    //                 color = '0px 4px 0 ' + Common.Utils.RGBColor(color).toRGBA(0.7) + ' inset';
-                } else {
+    //             } else {
-                    color = '0px 4px 0 ' + color + ' inset';
+    //                 color = '0px 4px 0 ' + color + ' inset';
-                }
+    //             }
                 
-                $$('.sheet-tabs .tab').eq(tab.index).css('box-shadow', color);
+    //             $$('.sheet-tabs .tab a').eq(tab.index).css('box-shadow', color);
-            } else {
+    //         } else {
-                $$('.sheet-tabs .tab').eq(tab.index).css('box-shadow', '');
+    //             $$('.sheet-tabs .tab a').eq(tab.index).css('box-shadow', '');
-            }
+    //         }
-        }
+    //     }
-    };
+    // };
 
-    const updateTabsColors = () => {
+    // const updateTabsColors = () => {
-        const api = Common.EditorApi.get();
+    //     const api = Common.EditorApi.get();
 
-        sheets.sheets.forEach(model => {
+    //     sheets.sheets.forEach(model => {
-            setTabLineColor(model, api.asc_getWorksheetTabColor(model.index));
+    //         setTabLineColor(model, api.asc_getWorksheetTabColor(model.index));
-        });
+    //     });
-    };
+    // };
 
     const onTabClicked = i => {
         const model = sheets.at(i);
@@ -196,7 +194,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
         } else {
             f7.popover.close('#idx-tab-context-menu-popover', false);
             onTabClicked(i);
-            Common.Notifications.trigger('sheet:active', index);
+            // Common.Notifications.trigger('sheet:active', index);
         }
     };
 
@@ -306,7 +304,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => {
         } else {
             f7.popover.close('#idx-hidden-sheets-popover');
             api['asc_showWorksheet'](index);
-            loadTabColor(index);
+            // loadTabColor(index);
         }
     };
 

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

@@ -0,0 +1,207 @@
+import React, { useEffect, useState } from 'react';
+import { inject } from 'mobx-react';
+import { f7 } from 'framework7-react';
+import { useTranslation } from 'react-i18next';
+import ToolbarView from "../view/Toolbar";
+
+const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetInfo')(props => {
+    const {t} = useTranslation();
+    const _t = t("Toolbar", { returnObjects: true });
+
+    const appOptions = props.storeAppOptions;
+    const isDisconnected = props.users.isDisconnected;
+    const displayCollaboration = props.users.hasEditUsers || appOptions.canViewComments;
+    const docTitle = props.storeSpreadsheetInfo.dataDoc ? props.storeSpreadsheetInfo.dataDoc.title : '';
+
+    useEffect(() => {
+        const onDocumentReady = () => {
+            const api = Common.EditorApi.get();
+            api.asc_registerCallback('asc_onCanUndoChanged', onApiCanUndo);
+            api.asc_registerCallback('asc_onCanRedoChanged', onApiCanRedo);
+            api.asc_registerCallback('asc_onSelectionChanged', onApiSelectionChanged);
+            api.asc_registerCallback('asc_onWorkbookLocked', onApiSelectionChanged);
+            api.asc_registerCallback('asc_onWorksheetLocked', onApiSelectionChanged);
+            api.asc_registerCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged);
+            api.asc_registerCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect);
+
+            Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect);
+            Common.Notifications.on('toolbar:activatecontrols', activateControls);
+            Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls);
+            Common.Notifications.on('goback', goBack);
+            Common.Notifications.on('sheet:active', onApiActiveSheetChanged);
+        };
+        if ( !Common.EditorApi ) {
+            Common.Notifications.on('document:ready', onDocumentReady);
+            Common.Gateway.on('init', loadConfig);
+        } else {
+            onDocumentReady();
+        }
+
+        return () => {
+            Common.Notifications.off('document:ready', onDocumentReady);
+            Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect);
+            Common.Notifications.off('toolbar:activatecontrols', activateControls);
+            Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls);
+            Common.Notifications.off('goback', goBack);
+            Common.Notifications.off('sheet:active', onApiActiveSheetChanged);
+
+            const api = Common.EditorApi.get();
+            api.asc_unregisterCallback('asc_onCanUndoChanged', onApiCanUndo);
+            api.asc_unregisterCallback('asc_onCanRedoChanged', onApiCanRedo);
+            //api.asc_unregisterCallback('asc_onSelectionChanged', onApiSelectionChanged); TO DO
+            api.asc_unregisterCallback('asc_onWorkbookLocked', onApiSelectionChanged);
+            api.asc_unregisterCallback('asc_onWorksheetLocked', onApiSelectionChanged);
+            api.asc_unregisterCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged);
+            api.asc_unregisterCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect);
+        }
+    });
+
+    // Back button
+    const [isShowBack, setShowBack] = useState(false);
+    const loadConfig = (data) => {
+        if (data && data.config && data.config.canBackToFolder !== false &&
+            data.config.customization && data.config.customization.goback &&
+            (data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose)) {
+            setShowBack(true);
+        }
+    };
+    const onBack = () => {
+        const api = Common.EditorApi.get();
+        if (api.asc_isDocumentModified()) {
+            f7.dialog.create({
+                title   : _t.dlgLeaveTitleText,
+                text    : _t.dlgLeaveMsgText,
+                verticalButtons: true,
+                buttons : [
+                    {
+                        text: _t.leaveButtonText,
+                        onClick: function() {
+                            goBack();
+                        }
+                    },
+                    {
+                        text: _t.stayButtonText,
+                        bold: true
+                    }
+                ]
+            }).open();
+        } else {
+            goBack();
+        }
+    };
+    const goBack = (current) => {
+        //if ( !Common.Controllers.Desktop.process('goback') ) {
+        if (appOptions.customization.goback.requestClose && appOptions.canRequestClose) {
+            Common.Gateway.requestClose();
+        } else {
+            const href = appOptions.customization.goback.url;
+            if (!current && appOptions.customization.goback.blank !== false) {
+                window.open(href, "_blank");
+            } else {
+                parent.location.href = href;
+            }
+        }
+        //}
+    }
+
+    // Undo and Redo
+    const [isCanUndo, setCanUndo] = useState(false);
+    const [isCanRedo, setCanRedo] = useState(false);
+    const onApiCanUndo = (can) => {
+        if (isDisconnected) return;
+        setCanUndo(can);
+    };
+    const onApiCanRedo = (can) => {
+        if (isDisconnected) return;
+        setCanRedo(can);
+    };
+    const onUndo = () => {
+        const api = Common.EditorApi.get();
+        if (api) {
+            api.asc_Undo();
+        }
+    };
+    const onRedo = () => {
+        const api = Common.EditorApi.get();
+        if (api) {
+            api.asc_Redo();
+        }
+    }
+
+    const [disabledEditControls, setDisabledEditControls] = useState(false);
+    const onApiSelectionChanged = (cellInfo) => {
+        if (isDisconnected) return;
+
+        const api = Common.EditorApi.get();
+        const info = !!cellInfo ? cellInfo : api.asc_getCellInfo();
+        let islocked = false;
+
+        switch (info.asc_getSelectionType()) {
+            case Asc.c_oAscSelectionType.RangeChart:
+            case Asc.c_oAscSelectionType.RangeImage:
+            case Asc.c_oAscSelectionType.RangeShape:
+            case Asc.c_oAscSelectionType.RangeChartText:
+            case Asc.c_oAscSelectionType.RangeShapeText:
+                const objects = api.asc_getGraphicObjectProps();
+                for ( let i in objects ) {
+                    if ( objects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image ) {
+                        if ((islocked = objects[i].asc_getObjectValue().asc_getLocked()))
+                            break;
+                    }
+                }
+                break;
+            default:
+                islocked = info.asc_getLocked();
+        }
+
+        setDisabledEditControls(islocked);
+    };
+
+    const onApiActiveSheetChanged = (index) => {
+        Common.Notifications.trigger('comments:filterchange', ['doc', 'sheet' + Common.EditorApi.get().asc_getWorksheetId(index)], false );
+    };
+
+    const [disabledSettings, setDisabledSettings] = useState(false);
+    const deactivateEditControls = (enableDownload) => {
+        setDisabledEditControls(true);
+        if (enableDownload) {
+            //DE.getController('Settings').setMode({isDisconnected: true, enableDownload: enableDownload});
+        } else {
+            setDisabledSettings(true);
+        }
+    };
+
+
+    const [disabledControls, setDisabledControls] = useState(true);
+    const activateControls = () => {
+        setDisabledControls(false);
+    };
+
+    const onCoAuthoringDisconnect = (enableDownload) => {
+        deactivateEditControls(enableDownload);
+        setCanUndo(false);
+        setCanRedo(false);
+        f7.popover.close();
+        f7.sheet.close();
+        f7.popup.close();
+    };
+
+    return (
+        <ToolbarView openOptions={props.openOptions}
+                     isEdit={appOptions.isEdit}
+                     docTitle={docTitle}
+                     isShowBack={isShowBack}
+                     onBack={onBack}
+                     isCanUndo={isCanUndo}
+                     isCanRedo={isCanRedo}
+                     onUndo={onUndo}
+                     onRedo={onRedo}
+                     disabledControls={disabledControls}
+                     disabledEditControls={disabledEditControls}
+                     disabledSettings={disabledSettings}
+                     displayCollaboration={displayCollaboration}
+        />
+    )
+});
+
+export {ToolbarController as Toolbar};

apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx

@@ -47,7 +47,7 @@ class EditCellController extends Component {
         if (isDecrement) {
             typeof size === 'undefined' ? api.asc_decreaseFontSize() : size = Math.max(1, --size);
         } else {
-            typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(100, ++size);
+            typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(409, ++size);
         }
 
         if (typeof size !== 'undefined') {

apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx

@@ -69,7 +69,7 @@ class EditTextController extends Component {
         if (isDecrement) {
             typeof size === 'undefined' ? api.asc_decreaseFontSize() : size = Math.max(1, --size);
         } else {
-            typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(100, ++size);
+            typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(409, ++size);
         }
 
         if (typeof size !== 'undefined') {

apps/spreadsheeteditor/mobile/src/less/statusbar.less

@@ -16,7 +16,7 @@
         min-width: 48px;
 
         display: inline-block;
-        padding: 0 10px;
+        // padding: 0 10px;
         text-align: center;
         height: 100%;
         position: relative;
@@ -48,6 +48,8 @@
                     padding: 0 10px 0;
                     line-height: @statusbar-height;
                     color: @text-normal;
+                    height: 100%;
+                    display: block;
                 }
 
                 &:not(.active) {

apps/spreadsheeteditor/mobile/src/lib/patch.jsx

@@ -0,0 +1,6 @@
+
+const EditorUIController = () => null;
+
+EditorUIController.isSupportEditFeature = () => false;
+
+export default EditorUIController;

apps/spreadsheeteditor/mobile/src/page/main.jsx

@@ -1,21 +1,21 @@
 import React, { Component } from 'react';
-import { Page, View, Navbar, NavLeft, NavRight, Link, Icon } from 'framework7-react';
+import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react';
+import { observer, inject } from "mobx-react";
 
-// import EditOptions from '../view/edit/Edit';
 import Settings from '../view/settings/Settings';
 import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'
 import CellEditor from '../controller/CellEditor';
 import Statusbar from '../controller/StatusBar'
 import AddOptions from "../view/add/Add";
 import EditOptions from "../view/edit/Edit";
-import { Device } from '../../../../common/mobile/utils/device';
 import { Search, SearchSettings } from '../controller/Search';
 import { f7 } from 'framework7-react';
 
 import {FunctionGroups} from "../controller/add/AddFunction";
 import ContextMenu from '../controller/ContextMenu';
+import { Toolbar } from "../controller/Toolbar";
 
-export default class MainPage extends Component {
+class MainPage extends Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -61,23 +61,18 @@ export default class MainPage extends Component {
     };
 
   render() {
+      const appOptions = this.props.storeAppOptions;
+      const config = appOptions.config;
+      const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo)));
       return (
-            <Page name="home">
+            <Page name="home" className={showLogo && 'page-with-logo'}>
               {/* Top Navbar */}
-                <Navbar id='editor-navbar'>
+                <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
-                    {/*<div slot="before-inner" className="main-logo"><Icon icon="icon-logo"></Icon></div>*/}
+                    {showLogo && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
-                    <NavLeft>
+                    <Subnavbar>
-                        <Link icon='icon-undo'></Link>
+                        <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
-                        <Link icon='icon-redo'></Link>
+                        <Search useSuspense={false}/>
-                    </NavLeft>
+                    </Subnavbar>
-                    <NavRight>
-                        <Link id='btn-edit' icon='icon-edit-settings' href={false} onClick={e => this.handleClickToOpenOptions('edit')}></Link>
-                        <Link id='btn-add' icon='icon-plus' href={false} onClick={e => this.handleClickToOpenOptions('add')}></Link>
-                        { Device.phone ? null : <Link icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> }
-                        <Link id='btn-coauth' href={false} icon='icon-collaboration' onClick={e => this.handleClickToOpenOptions('coauth')}></Link>
-                        <Link id='btn-settings' icon='icon-settings' href={false} onClick={e => this.handleClickToOpenOptions('settings')}></Link>
-                    </NavRight>
-                    <Search useSuspense={false} />
                 </Navbar>
                 <CellEditor onClickToOpenAddOptions={(panels, button) => this.handleClickToOpenOptions('add', {panels: panels, button: button})}/>
                 {/* Page content */}
@@ -106,4 +101,6 @@ export default class MainPage extends Component {
             </Page>
       )
   }
-};
+}
+
+export default inject("storeAppOptions")(observer(MainPage));

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

@@ -12,8 +12,6 @@ export class storeAppOptions {
 
     isEdit = false;
     config = {};
-
-    isEdit = false;
     canViewComments = false;
 
     setConfigOptions (config) {

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

@@ -61,140 +61,19 @@ export class storeFocusObjects {
     }
 
     get selections () {
-        const _selections = [];
+        return !!this.intf ? this.intf.getSelections() : null;
-
-        let isCell, isRow, isCol, isAll, isChart, isImage, isTextShape, isShape, isTextChart,
-            selType             = this._cellInfo.asc_getSelectionType(),
-            isObjLocked         = false;
-
-        switch (selType) {
-            case Asc.c_oAscSelectionType.RangeCells:    isCell  = true; break;
-            case Asc.c_oAscSelectionType.RangeRow:      isRow   = true; break;
-            case Asc.c_oAscSelectionType.RangeCol:      isCol   = true; break;
-            case Asc.c_oAscSelectionType.RangeMax:      isAll   = true; break;
-            case Asc.c_oAscSelectionType.RangeImage:    isImage = true; break;
-            case Asc.c_oAscSelectionType.RangeShape:    isShape = true; break;
-            case Asc.c_oAscSelectionType.RangeChart:    isChart = true; break;
-            case Asc.c_oAscSelectionType.RangeChartText:isTextChart = true; break;
-            case Asc.c_oAscSelectionType.RangeShapeText: isTextShape = true; break;
-        }
-
-        if (isImage || isShape || isChart) {
-            isImage = isShape = isChart = false;
-            let has_chartprops = false;
-            let selectedObjects = Common.EditorApi.get().asc_getGraphicObjectProps();
-
-            for (let i = 0; i < selectedObjects.length; i++) {
-                if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
-                    const elValue = selectedObjects[i].asc_getObjectValue();
-                    isObjLocked = isObjLocked || elValue.asc_getLocked();
-                    const shapeProps = elValue.asc_getShapeProperties();
-
-                    if (shapeProps) {
-                        if (shapeProps.asc_getFromChart()) {
-                            isChart = true;
-                        } else {
-                            isShape = true;
-
-                        }
-                    } else if (elValue.asc_getChartProperties()) {
-                        isChart = true;
-                        has_chartprops = true;
-                    } else {
-                        isImage = true;
-                    }
-                }
-            }
-        } else if (isTextShape || isTextChart) {
-            const selectedObjects = Common.EditorApi.get().asc_getGraphicObjectProps();
-            let isEquation = false;
-
-            for (var i = 0; i < selectedObjects.length; i++) {
-                const elType = selectedObjects[i].asc_getObjectType();
-                if (elType == Asc.c_oAscTypeSelectElement.Image) {
-                    const value = selectedObjects[i].asc_getObjectValue();
-                    isObjLocked = isObjLocked || value.asc_getLocked();
-                } else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) {
-                } else if (elType == Asc.c_oAscTypeSelectElement.Math) {
-                    isEquation = true;
-                }
-            }
-        }
-        if (isChart || isTextChart) {
-            _selections.push('chart');
-
-            if (isTextChart) {
-                _selections.push('text');
-            }
-        } else if ((isShape || isTextShape) && !isImage) {
-            _selections.push('shape');
-
-            if (isTextShape) {
-                _selections.push('text');
-            }
-        } else if (isImage) {
-            _selections.push('image');
-
-            if (isShape) {
-                _selections.push('shape');
-            }
-        } else {
-            _selections.push('cell');
-
-            if (this._cellInfo.asc_getHyperlink()) {
-                _selections.push('hyperlink');
-            }
-        }
-        return _selections;
     }
 
     get shapeObject() {
-        const shapes = [];
+        return !!this.intf ? this.intf.getShapeObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Image) {
-                if (object.get_ObjectValue() && object.get_ObjectValue().get_ShapeProperties()) {
-                    shapes.push(object);    
-                }
-            }
-        }
-        if (shapes.length > 0) {
-            const object = shapes[shapes.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get imageObject() {
-        const images = [];
+        return !!this.intf ? this.intf.getImageObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Image) {
-                images.push(object);     
-            }
-        }
-        if (images.length > 0) {
-            const object = images[images.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
     get chartObject() {
-        const charts = [];
+        return !!this.intf ? this.intf.getChartObject() : null;
-        for (let object of this._focusObjects) {
-            if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Image) {
-                if (object.get_ObjectValue() && object.get_ObjectValue().get_ChartProperties()) {
-                    charts.push(object);
-                }  
-            }
-        }
-        if (charts.length > 0) {
-            const object = charts[charts.length - 1]; // get top
-            return object.get_ObjectValue();
-        } else {
-            return undefined;
-        }
     }
 
 }

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

@@ -21,28 +21,20 @@ class Worksheet {
 
 export class storeWorksheets {
     sheets;
-    hiddensheets;
 
     constructor() {
         makeObservable(this, {
             sheets: observable,
-            hiddensheets: observable,
             resetSheets: action,
-            resetHiddenSheets: action,
             setActiveWorksheet: action
         });
         this.sheets = [];
-        this.hiddensheets = [];
     }
 
     resetSheets(sheets) {
         this.sheets = Object.values(sheets)
     }
 
-    resetHiddenSheets(hiddensheets) {
-        this.hiddensheets = Object.values(hiddensheets)
-    }
-
     setActiveWorksheet(i) {
         if ( !this.sheets[i].active ) {
             this.sheets.forEach(model => {

apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx

@@ -14,8 +14,30 @@ const StatusbarView = inject('sheets')(observer(props => {
     const isAndroid = Device.android;
     const isPhone = Device.isPhone;
     const { sheets } = props;
-    const hiddenSheets = sheets.hiddensheets;
+    const hiddenSheets = sheets.hiddenWorksheets();
+    const allSheets = sheets.sheets;
     const getTabClassList = model => `tab ${model.active ? 'active' : ''} ${model.locked ? 'locked' : ''}`;
+
+    const getTabColor = model => {
+        let color = model.color;
+
+        if (color) {
+            color = '#' + Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
+        } else {
+            color = '';
+        }
+
+        if (color.length) {
+            if (!model.active) {
+                color = '0px 4px 0 ' + Common.Utils.RGBColor(color).toRGBA(0.7) + ' inset';
+            } else {
+                color = '0px 4px 0 ' + color + ' inset';
+            }
+        } 
+
+        return color;
+    }
+
     // const $boxTabs = $$('.sheet-tabs');
     // const $statusBar = $$('.statusbar');
 
@@ -102,11 +124,12 @@ const StatusbarView = inject('sheets')(observer(props => {
                 </div>
                 <div className="statusbar--box-tabs">
                     <ul className="sheet-tabs bottom">
-                        {sheets.sheets.map((model,i) =>
+                        {allSheets.map((model,i) => 
-                            model.hidden ? null :
+                            model.hidden ? null : 
                                 <li className={getTabClassList(model)} key={i} onClick={(e) => props.onTabClick(i, e.target)}>
-                                    <a /* onClick={e => props.onTabClicked(i)} */>{model.name}</a>
+                                    <a style={{boxShadow: getTabColor(model)}}>{model.name}</a>
                                 </li>
+                            
                         )}
                     </ul>
                 </div>

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

@@ -0,0 +1,33 @@
+import React, {Fragment} from 'react';
+import {NavLeft, NavRight, NavTitle, Link, Icon} from 'framework7-react';
+import { Device } from '../../../../common/mobile/utils/device';
+import EditorUIController from '../lib/patch'
+
+const ToolbarView = props => {
+    return (
+        <Fragment>
+            <NavLeft>
+                {props.isShowBack && <Link className={`btn-doc-back${props.disabledControls && ' disabled'}`} icon='icon-back' onClick={props.onBack}></Link>}
+                {props.isEdit && EditorUIController.toolbarOptions && EditorUIController.toolbarOptions.getUndoRedo({
+                    disabledUndo: !props.isCanUndo,
+                    disabledRedo: !props.isCanRedo,
+                    onUndoClick: props.onUndo,
+                    onRedoClick: props.onRedo
+                })}
+            </NavLeft>
+            {!Device.phone && <NavTitle>{props.docTitle}</NavTitle>}
+            <NavRight>
+                {props.isEdit && EditorUIController.toolbarOptions && EditorUIController.toolbarOptions.getEditOptions({
+                    disabled: props.disabledEditControls || props.disabledControls,
+                    onEditClick: () => props.openOptions('edit'),
+                    onAddClick: () => props.openOptions('add')
+                })}
+                { Device.phone ? null : <Link className={props.disabledControls && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> }
+                {props.displayCollaboration && <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link>}
+                <Link className={(props.disabledSettings || props.disabledControls) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
+            </NavRight>
+        </Fragment>
+    )
+};
+
+export default ToolbarView;

apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx

@@ -92,7 +92,8 @@ const SettingsList = withTranslation()(props => {
 
     const showHelp = () => {
         // let url = '{{HELP_URL}}';
-        let url = 'https://helpcenter.onlyoffice.com';
+        // let url = 'https://helpcenter.onlyoffice.com';
+        let url = __HELP_URL__;
 
         if (url.charAt(url.length-1) !== '/') {
             url += '/';

vendor/framework7-react/build/webpack.config.js

@@ -79,6 +79,8 @@ module.exports = {
           resolvePath('node_modules/ssr-window'),
 
           resolvePath('../../../web-apps-mobile/word'),
+          resolvePath('../../../web-apps-mobile/slide'),
+          resolvePath('../../../web-apps-mobile/cell')
         ],
       },
 
@@ -158,19 +160,24 @@ module.exports = {
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(env),
       'process.env.TARGET': JSON.stringify(target),
-      __PRODUCT_VERSION__: JSON.stringify(process.env.PRODUCT_VERSION ? process.env.PRODUCT_VERSION : '6.2.0'),
+      __PRODUCT_VERSION__: JSON.stringify(process.env.PRODUCT_VERSION ? process.env.PRODUCT_VERSION : '6.2.0d'),
       __PUBLISHER_ADDRESS__: JSON.stringify('20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050'),
       __SUPPORT_EMAIL__: JSON.stringify('support@onlyoffice.com'),
       __PUBLISHER_PHONE__: JSON.stringify('+371 633-99867'),
       __PUBLISHER_URL__: JSON.stringify('https://www.onlyoffice.com'),
       __PUBLISHER_NAME__: JSON.stringify('Ascensio System SIA'),
+      __APP_TITLE_TEXT__: JSON.stringify(process.env.APP_TITLE_TEXT ? process.env.APP_TITLE_TEXT : 'ONLYOFFICE'),
+      __COMPANY_NAME__: JSON.stringify(process.env.COMPANY_NAME ? process.env.COMPANY_NAME : 'ONLYOFFICE'),
+      __HELP_URL__: JSON.stringify('https://helpcenter.onlyoffice.com')
     }),
 
     ...(env === 'production' ? [
       new CssMinimizerPlugin({
-        processorOptions: {
+        minimizerOptions: {
-          safe: true,
+            processorOptions: {
-          map: { inline: false },
+                safe: true,
+                map: { inline: false },
+            },
         },
       }),
       new webpack.optimize.ModuleConcatenationPlugin(),