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

[SSE mobile] Fix bug 51623

Browse source
This commit is contained in:
JuliaSvinareva 2021-08-04 14:12:20 +03:00
parent cb10778723
commit ef74be1d0e
3 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

14
apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx
View file

@ -10,8 +10,12 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn
const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
const isDisconnected = props.users.isDisconnected; const isDisconnected = props.users.isDisconnected;
const isObjectLocked = props.storeFocusObjects.isLocked;
const editFormulaMode = props.storeFocusObjects.editFormulaMode; const storeFocusObjects = props.storeFocusObjects;
const isObjectLocked = storeFocusObjects.isLocked;
const isEditCell = storeFocusObjects.isEditCell;
const editFormulaMode = storeFocusObjects.editFormulaMode;
const displayCollaboration = props.users.hasEditUsers || appOptions.canViewComments; const displayCollaboration = props.users.hasEditUsers || appOptions.canViewComments;
const docTitle = props.storeSpreadsheetInfo.dataDoc ? props.storeSpreadsheetInfo.dataDoc.title : ''; const docTitle = props.storeSpreadsheetInfo.dataDoc ? props.storeSpreadsheetInfo.dataDoc.title : '';
@ -141,11 +145,11 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn
onUndo={onUndo} onUndo={onUndo}
onRedo={onRedo} onRedo={onRedo}
disabledControls={disabledControls} disabledControls={disabledControls}
disabledEditControls={disabledEditControls || isObjectLocked || editFormulaMode} disabledEditControls={disabledEditControls || isObjectLocked || editFormulaMode || isEditCell}
disabledSearch={editFormulaMode} disabledSearch={editFormulaMode}
disabledSettings={disabledSettings || editFormulaMode} disabledSettings={disabledSettings || editFormulaMode || isEditCell}
displayCollaboration={displayCollaboration} displayCollaboration={displayCollaboration}
disabledCollaboration={editFormulaMode} disabledCollaboration={editFormulaMode || isEditCell}
showEditDocument={showEditDocument} showEditDocument={showEditDocument}
onEditDocument={onEditDocument} onEditDocument={onEditDocument}
isDisconnected={isDisconnected} isDisconnected={isDisconnected}

10
apps/spreadsheeteditor/mobile/src/store/focusObjects.js
View file

@ -17,7 +17,9 @@ export class storeFocusObjects {
isLocked: observable, isLocked: observable,
setIsLocked: action, setIsLocked: action,
editFormulaMode: observable, editFormulaMode: observable,
setEditFormulaMode: action setEditFormulaMode: action,
isEditCell: observable,
setEditCell: action
}); });
} }
@ -114,4 +116,10 @@ export class storeFocusObjects {
this.editFormulaMode = value; this.editFormulaMode = value;
} }
isEditCell = false;
setEditCell(value) {
this.isEditCell = value;
}
} }