Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-fixes' into feature/bugfix-for-release-7-0

Browse source
This commit is contained in:
Maxim Kadushkin 2021-12-29 12:43:37 +03:00
parent 6e136ce5a9 5d2d58c2ad
commit ca9f247794
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/mobile/src/view/edit/EditShape.jsx
View file

@ -516,15 +516,18 @@ 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, const inControl = api.asc_IsContentControl();
fixedSize = false; const controlProps = (api && inControl) ? api.asc_GetContentControlProperties() : null;
const lockType = controlProps ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
let fixedSize = false;
if (controlProps) { if (controlProps) {
let spectype = controlProps.get_SpecificType(); 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(); 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 ( return (
<Fragment> <Fragment>

7
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -398,11 +398,18 @@ class MainController extends Component {
this.api.asc_registerCallback('asc_onEditCell', (state) => { this.api.asc_registerCallback('asc_onEditCell', (state) => {
if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) { if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) {
const isEditCell = state === Asc.c_oAscCellEditorState.editStart; const isEditCell = state === Asc.c_oAscCellEditorState.editStart;
const isEditEnd = state === Asc.c_oAscCellEditorState.editEnd;
if (storeFocusObjects.isEditCell !== isEditCell) { if (storeFocusObjects.isEditCell !== isEditCell) {
storeFocusObjects.setEditCell(isEditCell); storeFocusObjects.setEditCell(isEditCell);
} }
if(isEditEnd) {
storeFocusObjects.setEditFormulaMode(false);
}
} else { } else {
const isFormula = state === Asc.c_oAscCellEditorState.editFormula; const isFormula = state === Asc.c_oAscCellEditorState.editFormula;
if (storeFocusObjects.editFormulaMode !== isFormula) { if (storeFocusObjects.editFormulaMode !== isFormula) {
storeFocusObjects.setEditFormulaMode(isFormula); storeFocusObjects.setEditFormulaMode(isFormula);
} }