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-07-30 18:37:03 +03:00
parent 57e509ba11
commit b867694b44
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -374,6 +374,13 @@ class MainController extends Component {
storeToolbarSettings.setCanRedo(can); storeToolbarSettings.setCanRedo(can);
}); });
const storeFocusObjects = this.props.storeFocusObjects;
this.api.asc_registerCallback('asc_onEditCell', (state) => {
const isFormula = state === Asc.c_oAscCellEditorState.editFormula;
if (storeFocusObjects.editFormulaMode !== isFormula) {
storeFocusObjects.setEditFormulaMode(isFormula);
}
});
} }
_onLongActionEnd(type, id) { _onLongActionEnd(type, id) {

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

@ -11,6 +11,7 @@ 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 isObjectLocked = props.storeFocusObjects.isLocked;
const editFormulaMode = props.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 : '';
@ -140,9 +141,11 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn
onUndo={onUndo} onUndo={onUndo}
onRedo={onRedo} onRedo={onRedo}
disabledControls={disabledControls} disabledControls={disabledControls}
disabledEditControls={disabledEditControls || isObjectLocked} disabledEditControls={disabledEditControls || isObjectLocked || editFormulaMode}
disabledSettings={disabledSettings} disabledSearch={editFormulaMode}
disabledSettings={disabledSettings || editFormulaMode}
displayCollaboration={displayCollaboration} displayCollaboration={displayCollaboration}
disabledCollaboration={editFormulaMode}
showEditDocument={showEditDocument} showEditDocument={showEditDocument}
onEditDocument={onEditDocument} onEditDocument={onEditDocument}
isDisconnected={isDisconnected} isDisconnected={isDisconnected}

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

@ -15,7 +15,9 @@ export class storeFocusObjects {
imageObject: computed, imageObject: computed,
chartObject: computed, chartObject: computed,
isLocked: observable, isLocked: observable,
setIsLocked: action setIsLocked: action,
editFormulaMode: observable,
setEditFormulaMode: action
}); });
} }
@ -106,4 +108,10 @@ export class storeFocusObjects {
this.isLocked = islocked; this.isLocked = islocked;
} }
editFormulaMode = false;
setEditFormulaMode(value) {
this.editFormulaMode = value;
}
} }

4
apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx
View file

@ -28,8 +28,8 @@ const ToolbarView = props => {
onEditClick: () => props.openOptions('edit'), onEditClick: () => props.openOptions('edit'),
onAddClick: () => props.openOptions('add') onAddClick: () => props.openOptions('add')
})} })}
{ Device.phone ? null : <Link className={props.disabledControls && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> } { Device.phone ? null : <Link className={(props.disabledControls || props.disabledSearch) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link> }
{props.displayCollaboration && window.matchMedia("(min-width: 360px)").matches ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null} {props.displayCollaboration && window.matchMedia("(min-width: 360px)").matches ? <Link className={(props.disabledControls || props.disabledCollaboration) && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
<Link className={(props.disabledSettings || props.disabledControls) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link> <Link className={(props.disabledSettings || props.disabledControls) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
</NavRight> </NavRight>
</Fragment> </Fragment>