diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx
index 75c6e4ee4..fc8be7b61 100644
--- a/apps/documenteditor/mobile/src/page/main.jsx
+++ b/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")}/>
}
- {isViewer && !disabledSettings && !disabledControls && !isDisconnected &&
+ {isViewer && !disabledSettings && !disabledControls && !isDisconnected && isAvailableExt && isEdit &&
this.turnOffViewerMode()}>
@@ -226,4 +230,4 @@ class MainPage extends Component {
}
}
-export default withTranslation()(inject("storeAppOptions", "storeToolbarSettings", "users")(observer(MainPage)));
\ No newline at end of file
+export default withTranslation()(inject("storeAppOptions", "storeToolbarSettings", "users", "storeDocumentInfo")(observer(MainPage)));
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx
index a4f4f557a..0e8025401 100644
--- a/apps/documenteditor/mobile/src/view/Toolbar.jsx
+++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx
@@ -46,13 +46,11 @@ const ToolbarView = props => {
onUndoClick: props.onUndo,
onRedoClick: props.onRedo
})}
- {(isViewer || !Device.phone) && isAvailableExt && {
- e.target.closest('.link').classList.add('disabled');
+ {(isViewer || !Device.phone) && isAvailableExt && !props.disabledControls && {
await props.changeMobileView();
await props.openOptions('snackbar');
setTimeout(() => {
props.closeOptions('snackbar');
- e.target.closest('.link').classList.remove('disabled');
}, 1500);
}}>}
{(props.showEditDocument && !isViewer) &&
diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index 72cef561a..d739c4a36 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/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,25 +594,33 @@ const EditText = props => {
-
-
- {props.onParagraphMove(true)}}>
-
-
- {props.onParagraphMove(false)}}>
-
-
-
-
-
- {previewList}
- {!isAndroid && }
-
+ {!inSmartArtInternal &&
+
+
+ {
+ props.onParagraphMove(true)
+ }}>
+
+
+ {
+ props.onParagraphMove(false)
+ }}>
+
+
+
+
+ }
+ {!inSmartArt && !inSmartArtInternal &&
+
+ {previewList}
+ {!isAndroid && }
+
+ }
diff --git a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx
index e529f4a1f..e2e56a1b2 100644
--- a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx
@@ -98,12 +98,12 @@ const PageApplicationSettings = props => {
- {!isViewer &&
-
-
-
- }
+ {/*{!isViewer &&*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/*}*/}
{_isShowMacros &&
{
-
+ {/**/}
}
{/* {_isShowMacros && */}
diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
index 868187eb6..bb20c5897 100644
--- a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
@@ -98,9 +98,9 @@ const PageApplicationSettings = props => {
-
-
-
+ {/**/}
+ {/* */}
+ {/*
*/}
{/* } */}
{/* {_isShowMacros && */}