From 54fb6bb1428e869f68f5ed74f787272c73861f73 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Tue, 20 Jul 2021 12:10:13 +0300
Subject: [PATCH] Fix Bug 49412

---
 apps/documenteditor/mobile/src/view/edit/EditImage.jsx | 7 ++++---
 apps/documenteditor/mobile/src/view/edit/EditShape.jsx | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx
index d87558efc..e8ed780a6 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx
@@ -239,6 +239,7 @@ const EditImage = props => {
     const storeFocusObjects = props.storeFocusObjects;
     const imageObject = storeFocusObjects.imageObject;
     const pluginGuid = imageObject.asc_getPluginGuid();
+    const wrapType = props.storeImageSettings.getWrapType(imageObject);
 
     return (
         <Fragment>
@@ -254,9 +255,9 @@ const EditImage = props => {
                     onReplaceByFile: props.onReplaceByFile,
                     onReplaceByUrl: props.onReplaceByUrl
                 }}></ListItem>
-                <ListItem title={_t.textReorder} link='/edit-image-reorder/' routeProps={{
+                { wrapType !== 'inline' && <ListItem title={_t.textReorder} link='/edit-image-reorder/' routeProps={{
                     onReorder: props.onReorder
-                }}></ListItem>
+                }}></ListItem> }
             </List>
             <List className="buttons-list">
                 <ListButton className='button-fill button-raised' title={_t.textActualSize} onClick={() => {props.onDefaulSize()}}/>
@@ -266,7 +267,7 @@ const EditImage = props => {
     )
 };
 
-const EditImageContainer = inject("storeFocusObjects")(observer(EditImage));
+const EditImageContainer = inject("storeFocusObjects", "storeImageSettings")(observer(EditImage));
 const PageWrapContainer = inject("storeFocusObjects", "storeImageSettings")(observer(PageWrap));
 const PageReplaceContainer = inject("storeFocusObjects")(observer(PageReplace));
 const PageReorderContainer = inject("storeFocusObjects")(observer(PageReorder));
diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
index b4c785b50..85095537b 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
@@ -506,9 +506,8 @@ const EditShape = props => {
     const { t } = useTranslation();
     const _t = t('Edit', {returnObjects: true});
     const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill();
-    const storeShapeSettings = props.storeShapeSettings;
     const shapeObject = props.storeFocusObjects.shapeObject;
-    const wrapType = storeShapeSettings.getWrapType(shapeObject);
+    const wrapType = props.storeShapeSettings.getWrapType(shapeObject);
     
     let disableRemove = !!props.storeFocusObjects.paragraphObject;
 
@@ -537,9 +536,9 @@ const EditShape = props => {
                 <ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{
                     onReplace: props.onReplace
                 }}></ListItem>
-                <ListItem disabled={wrapType === 'inline' ? true : false } title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{
+                { wrapType !== 'inline' && <ListItem  title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{
                     onReorder: props.onReorder
-                }}></ListItem>
+                }}></ListItem> }
             </List>
             <List className="buttons-list">
                 <ListButton title={_t.textRemoveShape} onClick={() => {props.onRemoveShape()}} className={`button-red button-fill button-raised${disableRemove ? ' disabled' : ''}`} />