From 36388f536038c17fb2383ff651a66356d7043971 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 28 Dec 2021 18:15:04 +0300 Subject: [PATCH 1/2] [SSE mobile] Fix Bug 54703 --- apps/spreadsheeteditor/mobile/src/controller/Main.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 2f0bd5c32..2116ebef0 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -398,11 +398,18 @@ class MainController extends Component { this.api.asc_registerCallback('asc_onEditCell', (state) => { if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) { const isEditCell = state === Asc.c_oAscCellEditorState.editStart; + const isEditEnd = state === Asc.c_oAscCellEditorState.editEnd; + if (storeFocusObjects.isEditCell !== isEditCell) { storeFocusObjects.setEditCell(isEditCell); } + + if(isEditEnd) { + storeFocusObjects.setEditFormulaMode(false); + } } else { const isFormula = state === Asc.c_oAscCellEditorState.editFormula; + if (storeFocusObjects.editFormulaMode !== isFormula) { storeFocusObjects.setEditFormulaMode(isFormula); } From 5d2d58c2ad6026a3416018220ea68f173e2b6779 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 29 Dec 2021 12:05:11 +0300 Subject: [PATCH 2/2] [DE mobile] For Bug 54712 --- apps/documenteditor/mobile/src/view/edit/EditShape.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 2a1d7a641..930652b74 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -516,15 +516,18 @@ const EditShape = props => { || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='straightConnector1'; - let controlProps = api && api.asc_IsContentControl() ? api.asc_GetContentControlProperties() : null, - fixedSize = false; + const inControl = api.asc_IsContentControl(); + const controlProps = (api && inControl) ? api.asc_GetContentControlProperties() : null; + const lockType = controlProps ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; + + let 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 || (lockType == Asc.c_oAscSdtLockType.SdtContentLocked || lockType == Asc.c_oAscSdtLockType.SdtLocked); return (