diff --git a/apps/documenteditor/mobile/src/view/DropdownList.jsx b/apps/documenteditor/mobile/src/view/DropdownList.jsx
index 9f9d978a8..8752b8f9f 100644
--- a/apps/documenteditor/mobile/src/view/DropdownList.jsx
+++ b/apps/documenteditor/mobile/src/view/DropdownList.jsx
@@ -10,8 +10,8 @@ const PageDropdownList = props => {
{listItems.length && listItems.map((elem, index) => (
- props.onChangeItemList(elem.value)}>
- ))}
+ props.onChangeItemList(elem.value)}>
+ ))}
@@ -26,7 +26,7 @@ class DropdownListView extends Component {
render() {
return (
Device.isPhone ?
-
+
{
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' && }
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx
index d5adc1262..413f2f595 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx
@@ -350,35 +350,35 @@ const EditTabs = props => {
component:
})
}
- if (!store.isLockedShape && settings.indexOf('shape') > -1) {
+ if (!(wsProps.Objects && store.isLockedShape) && settings.indexOf('shape') > -1) {
editors.push({
caption: _t.textShape,
id: 'edit-shape',
component:
})
}
+ if (!(wsProps.Objects && store.isLockedText) && settings.indexOf('text') > -1) {
+ editors.push({
+ caption: _t.textText,
+ id: 'edit-text',
+ component:
+ })
+ }
+ if (!(wsProps.Objects && store.isLockedShape) && settings.indexOf('chart') > -1) {
+ editors.push({
+ caption: _t.textChart,
+ id: 'edit-chart',
+ component:
+ })
+ }
+ if (!(wsProps.Objects && store.isLockedShape) && settings.indexOf('image') > -1) {
+ editors.push({
+ caption: _t.textImage,
+ id: 'edit-image',
+ component:
+ })
+ }
if(!wsProps.Objects) {
- if (settings.indexOf('image') > -1) {
- editors.push({
- caption: _t.textImage,
- id: 'edit-image',
- component:
- })
- }
- if (settings.indexOf('text') > -1) {
- editors.push({
- caption: _t.textText,
- id: 'edit-text',
- component:
- })
- }
- if (settings.indexOf('chart') > -1) {
- editors.push({
- caption: _t.textChart,
- id: 'edit-chart',
- component:
- })
- }
if (settings.indexOf('hyperlink') > -1 || (props.hyperinfo && props.isAddShapeHyperlink)) {
editors.push({
caption: _t.textHyperlink,