From e179f7576e3252dfdafc56d783148f7f5b3f43c0 Mon Sep 17 00:00:00 2001 From: Andrey Shimagin Date: Mon, 14 Mar 2022 12:35:05 +0300 Subject: [PATCH] [DE PE SSE] Fix Bug 55970 --- .../mobile/src/view/edit/EditShape.jsx | 23 +++++++++++-------- .../mobile/src/view/edit/EditShape.jsx | 13 +++++++---- .../mobile/src/view/edit/EditShape.jsx | 12 ++++++---- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 930652b741..e6ba1a45d5 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -511,11 +511,14 @@ const EditShape = props => { const wrapType = props.storeShapeSettings.getWrapType(shapeObject); const shapeType = shapeObject.get_ShapeProperties().asc_getType(); - const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3' + const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeObject.get_ShapeProperties().get_FromSmartArt() + || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3' || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2' || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='straightConnector1'; + const isSmartArtInternal = shapeObject.get_ShapeProperties().get_FromSmartArtInternal(); + const isFromGroup = shapeObject.get_ShapeProperties().get_FromGroup(); const inControl = api.asc_IsContentControl(); const controlProps = (api && inControl) ? api.asc_GetContentControlProperties() : null; const lockType = controlProps ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; @@ -545,19 +548,21 @@ const EditShape = props => { onBorderColor: props.onBorderColor }}> : null} - + { !isFromGroup && + + } {(!hideChangeType && !fixedSize) && } - {wrapType !== 'inline' && } diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index d476f12cd0..bd41e6a977 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -13,11 +13,13 @@ const EditShape = props => { const canFill = shapeObject && shapeObject.get_CanFill(); const shapeType = shapeObject.asc_getType(); - const hideChangeType = shapeObject.get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3' + const hideChangeType = shapeObject.get_FromChart() || shapeObject.get_FromSmartArt() + || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3' || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2' || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='straightConnector1'; + const isSmartArtInternal = shapeObject.get_FromSmartArtInternal(); let disableRemove = !!props.storeFocusObjects.paragraphObject; return ( @@ -41,10 +43,11 @@ const EditShape = props => { onReplace: props.onReplace }}> } - - + { !isSmartArtInternal && + + } diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx index b8a17a049a..a8cef28099 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx @@ -13,11 +13,13 @@ const EditShape = props => { const canFill = shapeObject && shapeObject.get_ShapeProperties().asc_getCanFill(); const shapeType = shapeObject.get_ShapeProperties().asc_getType(); - const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3' + const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeObject.get_ShapeProperties().get_FromSmartArt() + || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3' || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2' || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='straightConnector1'; + const isSmartArtInternal = shapeObject.get_ShapeProperties().get_FromSmartArtInternal(); let disableRemove = storeFocusObjects.selections.indexOf('text') > -1; return ( @@ -41,9 +43,11 @@ const EditShape = props => { onReplace: props.onReplace }}> } - + { !isSmartArtInternal && + + } {_t.textRemoveShape}