diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index a2801fd532..97adb8ea46 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -347,7 +347,6 @@ class MainController extends Component { const isOForm = appOptions.isOForm; const appSettings = this.props.storeApplicationSettings; const customization = appOptions.customization; - const isStandardView = customization?.mobile?.standardView ?? false; f7.emit('resize'); @@ -378,10 +377,10 @@ class MainController extends Component { appSettings.changeShowTableEmptyLine(value); this.api.put_ShowTableEmptyLine(value); - - value = LocalStorage.getBool('mobile-view'); + value = LocalStorage.itemExists('mobile-view') ? + LocalStorage.getBool('mobile-view') : !(customization?.mobile?.standardView ?? false); - if(value || !isStandardView) { + if(appOptions.isMobileViewAvailable && value) { this.api.ChangeReaderMode(); } else { appOptions.changeMobileView(); @@ -466,7 +465,8 @@ class MainController extends Component { Common.Utils.Metric.setCurrentMetric(1); //pt - this.appOptions = {isCorePDF: isPDF}; + this.appOptions = {isCorePDF: isPDF}; + this.props.storeAppOptions.isMobileViewAvailable = !this.appOptions.isCorePDF; this.bindEvents(); Common.Gateway.on('init', loadConfig); diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx index 5f127d7c17..c851fabc6f 100644 --- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx @@ -418,6 +418,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto isViewer={isViewer} turnOnViewerMode={turnOnViewerMode} isMobileView={isMobileView} + isMobileViewAvailable={appOptions.isMobileViewAvailable} changeMobileView={changeMobileView} changeTitleHandler={changeTitleHandler} isVersionHistoryMode={isVersionHistoryMode} diff --git a/apps/documenteditor/mobile/src/store/appOptions.js b/apps/documenteditor/mobile/src/store/appOptions.js index 10513b6f84..ee26d13539 100644 --- a/apps/documenteditor/mobile/src/store/appOptions.js +++ b/apps/documenteditor/mobile/src/store/appOptions.js @@ -65,6 +65,7 @@ export class storeAppOptions { this.typeProtection = type; } + isMobileViewAvailable = true; isMobileView = true; changeMobileView() { this.isMobileView = !this.isMobileView; diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index a501573d50..c2122535bc 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -62,7 +62,7 @@ const ToolbarView = props => { }) } {!isEditableForms ? [ - ((isViewer || !Device.phone) && isAvailableExt && !props.disabledControls && !isVersionHistoryMode) && + ((isViewer || !Device.phone) && props.isMobileViewAvailable && !props.disabledControls && !isVersionHistoryMode) && { props.changeMobileView(); props.openOptions('snackbar'); @@ -96,6 +96,7 @@ const ToolbarView = props => { props.openOptions('settings')}>, } - {((!isViewer && Device.phone) || isEditableForms) && + {(appOptions.isMobileViewAvailable && ((Device.phone && !isViewer) || isEditableForms)) && {