[DE mobile] Fix Bug 54214

This commit is contained in:
SergeyEzhin 2021-12-08 18:38:33 +04:00
parent 02a98bc463
commit bbda6562e7

View file

@ -505,6 +505,7 @@ const PageReorder = props => {
const EditShape = props => { const EditShape = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Edit', {returnObjects: true}); const _t = t('Edit', {returnObjects: true});
const api = Common.EditorApi.get();
const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill(); const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill();
const shapeObject = props.storeFocusObjects.shapeObject; const shapeObject = props.storeFocusObjects.shapeObject;
const wrapType = props.storeShapeSettings.getWrapType(shapeObject); const wrapType = props.storeShapeSettings.getWrapType(shapeObject);
@ -515,23 +516,32 @@ const EditShape = props => {
|| shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
|| shapeType=='straightConnector1'; || 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; let disableRemove = !!props.storeFocusObjects.paragraphObject;
return ( return (
<Fragment> <Fragment>
<List> <List>
{canFill ? {!fixedSize ?
<ListItem title={_t.textStyle} link='/edit-shape-style/' routeProps={{ canFill ?
onFillColor: props.onFillColor, <ListItem title={_t.textStyle} link='/edit-shape-style/' routeProps={{
onBorderSize: props.onBorderSize, onFillColor: props.onFillColor,
onBorderColor: props.onBorderColor, onBorderSize: props.onBorderSize,
onOpacity: props.onOpacity onBorderColor: props.onBorderColor,
}}></ListItem> : onOpacity: props.onOpacity
<ListItem title={_t.textStyle} link='/edit-shape-style-no-fill/' routeProps={{ }}></ListItem> :
onBorderSize: props.onBorderSize, <ListItem title={_t.textStyle} link='/edit-shape-style-no-fill/' routeProps={{
onBorderColor: props.onBorderColor onBorderSize: props.onBorderSize,
}}></ListItem> onBorderColor: props.onBorderColor
} }}></ListItem>
: null}
<ListItem title={_t.textWrap} link='/edit-shape-wrap/' routeProps={{ <ListItem title={_t.textWrap} link='/edit-shape-wrap/' routeProps={{
onWrapType: props.onWrapType, onWrapType: props.onWrapType,
onShapeAlign: props.onShapeAlign, onShapeAlign: props.onShapeAlign,
@ -539,12 +549,12 @@ const EditShape = props => {
onOverlap: props.onOverlap, onOverlap: props.onOverlap,
onWrapDistance: props.onWrapDistance onWrapDistance: props.onWrapDistance
}}></ListItem> }}></ListItem>
{ !hideChangeType && {(!hideChangeType && !fixedSize) &&
<ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{ <ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{
onReplace: props.onReplace onReplace: props.onReplace
}}></ListItem> }}></ListItem>
} }
{ wrapType !== 'inline' && <ListItem title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{ {wrapType !== 'inline' && <ListItem title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{
onReorder: props.onReorder onReorder: props.onReorder
}}></ListItem> } }}></ListItem> }
</List> </List>