From 02a98bc463c1c6f46ba2f22191dae86314d6e334 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 8 Dec 2021 00:13:54 +0400 Subject: [PATCH 1/4] [SSE mobile] Correct edit view --- .../mobile/src/view/edit/Edit.jsx | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) 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, From bbda6562e7724c65c08b96dd15e58f71f25bb926 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 8 Dec 2021 18:38:33 +0400 Subject: [PATCH 2/4] [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' && } From a9e619b4b83bd3403d400223356f55f58402827b Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 8 Dec 2021 19:31:18 +0400 Subject: [PATCH 3/4] [DE mobile] Fix Bug 54252 --- apps/documenteditor/mobile/src/view/DropdownList.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/view/DropdownList.jsx b/apps/documenteditor/mobile/src/view/DropdownList.jsx index 9f9d978a8..17ea0cb0b 100644 --- a/apps/documenteditor/mobile/src/view/DropdownList.jsx +++ b/apps/documenteditor/mobile/src/view/DropdownList.jsx @@ -26,7 +26,7 @@ class DropdownListView extends Component { render() { return ( Device.isPhone ? - + Date: Wed, 8 Dec 2021 19:47:16 +0400 Subject: [PATCH 4/4] [DE mobile] Fix Bug 54259 --- apps/documenteditor/mobile/src/view/DropdownList.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/DropdownList.jsx b/apps/documenteditor/mobile/src/view/DropdownList.jsx index 17ea0cb0b..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)}> + ))}