Merge pull request 'fix/pdf-form-mobile-view' (#135) from fix/pdf-for…

…m-mobile-view into hotfix/v8.2.2
ONLYOFFICE · Nov 22, 2024 · c4fa817 · c4fa817
2 parents a6ddef9 + 475ef96
commit c4fa817
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -62,7 +62,7 @@ const ToolbarView = props => {
                     })
                 }
                 {!isEditableForms ? [
-                    ((isViewer || !Device.phone) && isAvailableExt && !props.disabledControls && !isVersionHistoryMode) && 
+                    ((isViewer || !Device.phone) && props.isMobileViewAvailable && !props.disabledControls && !isVersionHistoryMode) &&
                         <Link key='toggle-view-link' className={isOpenModal ? 'disabled' : ''} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={() => {
                             props.changeMobileView();
                             props.openOptions('snackbar');
@@ -96,6 +96,7 @@ const ToolbarView = props => {
                             <Link key='btn-settings'
                                   className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'}
                                   icon='icon-settings' href={false}
+                                  id='btn-settings'
                                   onClick={() => props.openOptions('settings')}></Link>,
                             <Link key='send-form-link'
                                   id='btn-submit-form'

diff --git a/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx b/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx
@@ -126,7 +126,7 @@ const SettingsPage = inject("storeAppOptions", "storeReview", "storeDocumentInfo
                         <Icon slot="media" icon="icon-spellcheck"></Icon>
                     </ListItem>
                 }
-                {((!isViewer && Device.phone) || isEditableForms) &&
+                {(appOptions.isMobileViewAvailable  && ((Device.phone && !isViewer) || isEditableForms)) &&
                     <ListItem title={t('Settings.textMobileView')}>
                         <Icon slot="media" icon="icon-mobile-view"></Icon>
                         <Toggle checked={isMobileView} onToggleChange={() => {