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

Merge pull request #1035 from ONLYOFFICE/fix/fix-bugs-on-mobiles

Browse source 
Fix/fix bugs on mobiles
This commit is contained in:
maxkadushkin 2021-07-30 18:45:16 +03:00 committed by GitHub
parent 57e509ba11 64fe6ae7f0
commit 407a5e89bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 6 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);
});
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) {

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

2
apps/spreadsheeteditor/mobile/src/page/main.jsx
View file

@ -74,7 +74,7 @@ class MainPage extends Component {
if ( opts == 'edit' )
return {editOptionsVisible: false};
else if ( opts == 'add' )
return {addOptionsVisible: false};
return {addOptionsVisible: false, addShowOptions: null};
else if ( opts == 'settings' )
return {settingsVisible: false};
else if ( opts == 'coauth' )

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

@ -15,7 +15,9 @@ export class storeFocusObjects {
imageObject: computed,
chartObject: computed,
isLocked: observable,
setIsLocked: action
setIsLocked: action,
editFormulaMode: observable,
setEditFormulaMode: action
});
}
@ -106,4 +108,10 @@ export class storeFocusObjects {
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'),
onAddClick: () => props.openOptions('add')
})}
{ Device.phone ? null : <Link className={props.disabledControls && '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}
{ 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 || 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>
</NavRight>
</Fragment>