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

Feature/fix bugs

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

@@ -109,9 +109,13 @@ class MainPage extends Component {
     render() {
         const { t } = this.props;
         const appOptions = this.props.storeAppOptions;
+        const storeDocumentInfo = this.props.storeDocumentInfo;
+        const docExt = storeDocumentInfo.dataDoc ? storeDocumentInfo.dataDoc.fileType : '';
+        const isAvailableExt = docExt && docExt !== 'djvu' && docExt !== 'pdf' && docExt !== 'xps';
         const storeToolbarSettings = this.props.storeToolbarSettings;
         const isDisconnected = this.props.users.isDisconnected;
         const isViewer = appOptions.isViewer;
+        const isEdit = appOptions.isEdit;
         const isMobileView = appOptions.isMobileView;
         const disabledControls = storeToolbarSettings.disabledControls;
         const disabledSettings = storeToolbarSettings.disabledSettings;
@@ -214,7 +218,7 @@ class MainPage extends Component {
                             text={isMobileView ? t("Toolbar.textSwitchedMobileView") : t("Toolbar.textSwitchedStandardView")}/>
                     </CSSTransition>
                 }
-                {isViewer && !disabledSettings && !disabledControls && !isDisconnected &&
+                {isViewer && !disabledSettings && !disabledControls && !isDisconnected && isAvailableExt && isEdit &&
                     <Fab position="right-bottom" slot="fixed" onClick={() => this.turnOffViewerMode()}>
                         <Icon icon="icon-edit-mode"/>
                     </Fab>
@@ -226,4 +230,4 @@ class MainPage extends Component {
     }
 }
 
-export default withTranslation()(inject("storeAppOptions", "storeToolbarSettings", "users")(observer(MainPage)));
+export default withTranslation()(inject("storeAppOptions", "storeToolbarSettings", "users", "storeDocumentInfo")(observer(MainPage)));

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

@@ -46,13 +46,11 @@ const ToolbarView = props => {
                     onUndoClick: props.onUndo,
                     onRedoClick: props.onRedo
                 })}
-                {(isViewer || !Device.phone) && isAvailableExt && <Link className={props.disabledControls ? 'disabled' : ''} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={async e => {
+                {(isViewer || !Device.phone) && isAvailableExt && !props.disabledControls && <Link icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={async e => {
-                    e.target.closest('.link').classList.add('disabled');
                     await props.changeMobileView();
                     await props.openOptions('snackbar');
                     setTimeout(() => {
                         props.closeOptions('snackbar');
-                        e.target.closest('.link').classList.remove('disabled');
                     },  1500);
                 }}></Link>}
                 {(props.showEditDocument && !isViewer) &&

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

@@ -500,6 +500,11 @@ const EditText = props => {
     const isAndroid = Device.android;
     const { t } = useTranslation();
     const storeTextSettings = props.storeTextSettings;
+    const storeFocusObjects = props.storeFocusObjects;
+    const shapeObject = storeFocusObjects.shapeObject;
+    const shapePr = shapeObject.get_ShapeProperties();
+    const inSmartArt = shapePr && shapePr.asc_getFromSmartArt();
+    const inSmartArtInternal = shapePr && shapePr.asc_getFromSmartArtInternal();
     const fontName = storeTextSettings.fontName || t('Edit.textFonts');
     const fontSize = storeTextSettings.fontSize;
     const fontColor = storeTextSettings.textColor;
@@ -589,16 +594,23 @@ const EditText = props => {
                         </a>
                     </Row>
                 </ListItem>
+                {!inSmartArtInternal &&
                     <ListItem className='buttons'>
                         <Row>
-                        <a className='button item-link' onClick={() => {props.onParagraphMove(true)}}>
+                            <a className='button item-link' onClick={() => {
+                                props.onParagraphMove(true)
+                            }}>
                                 <Icon slot="media" icon="icon-de-indent"></Icon>
                             </a>
-                        <a className='button item-link' onClick={() => {props.onParagraphMove(false)}}>
+                            <a className='button item-link' onClick={() => {
+                                props.onParagraphMove(false)
+                            }}>
                                 <Icon slot="media" icon="icon-in-indent"></Icon>
                             </a>
                         </Row>
                     </ListItem>
+                }
+                {!inSmartArt && !inSmartArtInternal &&
                     <ListItem title={t('Edit.textBulletsAndNumbers')} link='/edit-bullets-and-numbers/' routeProps={{
                         onBullet: props.onBullet,
                         onNumber: props.onNumber,
@@ -608,6 +620,7 @@ const EditText = props => {
                         <div className="preview">{previewList}</div>
                         {!isAndroid && <Icon slot="media" icon="icon-bullets"></Icon>}
                     </ListItem>
+                }
                 <ListItem title={t("Edit.textLineSpacing")} link='/edit-text-line-spacing/' routeProps={{
                     onLineSpacing: props.onLineSpacing
                 }}>

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

@@ -98,12 +98,12 @@ const PageApplicationSettings = props => {
                     </Toggle>
                 </ListItem>
             </List>
-            {!isViewer &&
+            {/*{!isViewer &&*/}
-                <List mediaList>
+            {/*    <List mediaList>*/}
-                    <ListItem title={t('Settings.textDirection')} link="/direction/"
+            {/*        <ListItem title={t('Settings.textDirection')} link="/direction/"*/}
-                              routeProps={{changeDirection: props.changeDirection}}></ListItem>
+            {/*                  routeProps={{changeDirection: props.changeDirection}}></ListItem>*/}
-                </List>
+            {/*    </List>*/}
-            }
+            {/*}*/}
             {_isShowMacros &&
                 <List mediaList>
                     <ListItem title={_t.textMacrosSettings} link="/macros-settings/" routeProps={{

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

@@ -52,7 +52,7 @@ const PageApplicationSettings = props => {
                             </Toggle>
                         </ListItem>
                     </List>
-                    <RTLSetting />
+                    {/*<RTLSetting />*/}
                 </Fragment>
             }
             {/* {_isShowMacros && */}

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

@@ -98,9 +98,9 @@ const PageApplicationSettings = props => {
                     </ListItem>
                 </List>
 
-                <List mediaList>
+                {/*<List mediaList>*/}
-                    <ListItem title={t("View.Settings.textDirection")} link="/direction/" routeProps={{changeDirection: props.changeDirection}}></ListItem>
+                {/*    <ListItem title={t("View.Settings.textDirection")} link="/direction/" routeProps={{changeDirection: props.changeDirection}}></ListItem>*/}
-                </List>
+                {/*</List>*/}
             {/* } */}
             {/* {_isShowMacros && */}
                 <List>