Merge pull request #2092 from ONLYOFFICE/feature/fix-bugs

[PE mobile] Correct disabling toolbar

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

@@ -10,11 +10,15 @@ const SharingSettings = props => {
     const sharingSettingsUrl = storeAppOptions.sharingSettingsUrl;
     const _t = t('Common.Collaboration', {returnObjects: true});
 
+    function resizeHeightIframe(iFrame) {
+        iFrame.height = iFrame.contentWindow.document.body.scrollHeight;
+    }
+
     return (
         <Page>
             <Navbar title={t('Common.Collaboration.textSharingSettings')} backLink={_t.textBack} />
             <div id="sharing-placeholder" className="sharing-placeholder">
-                <iframe width="100%" height="100%" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl}></iframe>
+                <iframe width="100%" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl} onLoad={resizeHeightIframe(this)}></iframe>
             </div>
         </Page>
     )

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

@@ -1101,6 +1101,19 @@ input[type="number"]::-webkit-inner-spin-button {
     padding-bottom: 60px;
 }
 
+// Picker
+.picker-columns {
+    justify-content: space-around;
+}
+
+.row-picker {
+    .col-50 {
+        color: @text-secondary;
+        text-align: center;
+    }
+}
+
+
 
 
 

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

@@ -252,16 +252,7 @@
     }
 }
 
-// Picker
-
-.row-picker {
-    .col-50 {
-        color: @text-secondary;
-    }
-}
-
 // Calendar
-
 .calendar {
     background-color: @background-secondary;
     .toolbar {

apps/presentationeditor/mobile/src/controller/add/AddOther.jsx

@@ -37,7 +37,7 @@ class AddOtherController extends Component {
             text: '',
             content:
                 '<div class="content-block">' +
-                '<div class="row">' +
+                '<div class="row row-picker">' +
                 '<div class="col-50">' + _t.textColumns + '</div>' +
                 '<div class="col-50">' + _t.textRows + '</div>' +
                 '</div>' +

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

@@ -126,19 +126,17 @@ class MainPage extends Component {
                 {!this.state.previewVisible ? null : <Preview onclosed={this.handleOptionsViewClosed.bind(this, 'preview')} />}
                 <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
                     {/* Top Navbar */}
-                    {config?.customization &&
-                        <Navbar id='editor-navbar'
-                                className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
-                            {(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
-                                window.open(`${__PUBLISHER_URL__}`, "_blank");
-                            }}><Icon icon="icon-logo"></Icon></div>}
-                            <Subnavbar>
-                                <Toolbar openOptions={this.handleClickToOpenOptions}
-                                         closeOptions={this.handleOptionsViewClosed}/>
-                                <Search useSuspense={false}/>
-                            </Subnavbar>
-                        </Navbar>
-                    }
+                    <Navbar id='editor-navbar'
+                            className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
+                        {(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
+                            window.open(`${__PUBLISHER_URL__}`, "_blank");
+                        }}><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" />