From 113dcc58f163b63e365a1f0fa686e92e30a58b9f Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 30 Sep 2021 13:13:27 +0300 Subject: [PATCH] [DE PE SSE] Fix Bug 52819 --- .../mobile/src/view/edit/EditShape.jsx | 16 ++++++++++++---- .../mobile/src/view/edit/EditShape.jsx | 15 ++++++++++++--- .../mobile/src/view/edit/EditShape.jsx | 14 +++++++++++--- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 85095537b..f15ee3cab 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -508,7 +508,13 @@ const EditShape = props => { const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill(); const shapeObject = props.storeFocusObjects.shapeObject; 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' + || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2' + || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' + || shapeType=='straightConnector1'; + let disableRemove = !!props.storeFocusObjects.paragraphObject; return ( @@ -533,9 +539,11 @@ const EditShape = props => { onOverlap: props.onOverlap, onWrapDistance: props.onWrapDistance }}> - + { !hideChangeType && + + } { wrapType !== 'inline' && } diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index 39a55a8b4..d476f12cd 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -12,6 +12,12 @@ const EditShape = props => { const shapeObject = storeFocusObjects.shapeObject; const canFill = shapeObject && shapeObject.get_CanFill(); + const shapeType = shapeObject.asc_getType(); + const hideChangeType = shapeObject.get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3' + || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2' + || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' + || shapeType=='straightConnector1'; + let disableRemove = !!props.storeFocusObjects.paragraphObject; return ( @@ -30,9 +36,12 @@ const EditShape = props => { onBorderColor: props.onBorderColor }}> } - + { !hideChangeType && + + } + diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx index ef6ffd9d7..b8a17a049 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx @@ -12,6 +12,12 @@ const EditShape = props => { const shapeObject = storeFocusObjects.shapeObject; 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' + || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2' + || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' + || shapeType=='straightConnector1'; + let disableRemove = storeFocusObjects.selections.indexOf('text') > -1; return ( @@ -30,9 +36,11 @@ const EditShape = props => { onBorderColor: props.onBorderColor }}> } - + { !hideChangeType && + + }