From bbda6562e7724c65c08b96dd15e58f71f25bb926 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 8 Dec 2021 18:38:33 +0400 Subject: [PATCH] [DE mobile] Fix Bug 54214 --- .../mobile/src/view/edit/EditShape.jsx | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 874dc135a..2a1d7a641 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -505,6 +505,7 @@ const PageReorder = props => { const EditShape = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); + const api = Common.EditorApi.get(); const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill(); const shapeObject = props.storeFocusObjects.shapeObject; const wrapType = props.storeShapeSettings.getWrapType(shapeObject); @@ -515,23 +516,32 @@ const EditShape = props => { || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='straightConnector1'; + let controlProps = api && api.asc_IsContentControl() ? api.asc_GetContentControlProperties() : null, + fixedSize = false; + + if (controlProps) { + let spectype = controlProps.get_SpecificType(); + fixedSize = (spectype == Asc.c_oAscContentControlSpecificType.CheckBox || spectype == Asc. c_oAscContentControlSpecificType.ComboBox || spectype == Asc.c_oAscContentControlSpecificType.DropDownList || spectype == Asc.c_oAscContentControlSpecificType.None || spectype == Asc.c_oAscContentControlSpecificType.Picture) && controlProps.get_FormPr() && controlProps.get_FormPr().get_Fixed(); + } + let disableRemove = !!props.storeFocusObjects.paragraphObject; return ( - {canFill ? - : - - } + {!fixedSize ? + canFill ? + : + + : null} { onOverlap: props.onOverlap, onWrapDistance: props.onWrapDistance }}> - { !hideChangeType && + {(!hideChangeType && !fixedSize) && } - { wrapType !== 'inline' && }