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

[mobile] Fix bug 51532

Browse source
This commit is contained in:
JuliaSvinareva 2021-07-27 16:58:54 +03:00
parent aab98b4beb
commit ae7767de66
3 changed files with 114 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -28,35 +28,49 @@ class MainPage extends Component {
handleClickToOpenOptions = (opts, showOpts) => { handleClickToOpenOptions = (opts, showOpts) => {
ContextMenu.closeContextMenu(); ContextMenu.closeContextMenu();
this.setState(state => { setTimeout(() => {
if ( opts == 'edit' ) let opened = false;
return {editOptionsVisible: true}; const newState = {};
else if ( opts == 'add' ) if ( opts === 'edit' ) {
return { this.state.editOptionsVisible && (opened = true);
addOptionsVisible: true, newState.editOptionsVisible = true;
addShowOptions: showOpts } else if ( opts === 'add' ) {
}; this.state.addOptionsVisible && (opened = true);
else if ( opts == 'settings' ) newState.addOptionsVisible = true;
return {settingsVisible: true}; newState.addShowOptions = showOpts;
else if ( opts == 'coauth' ) } else if ( opts === 'settings' ) {
return { this.state.settingsVisible && (opened = true);
collaborationVisible: true, newState.settingsVisible = true;
collaborationPage: showOpts } else if ( opts === 'coauth' ) {
}; this.state.collaborationVisible && (opened = true);
}); newState.collaborationVisible = true;
}
for (let key in this.state) {
if (this.state[key] && !opened) {
setTimeout(() => {
this.handleClickToOpenOptions(opts, showOpts);
}, 10);
return;
}
}
if (!opened) {
this.setState(newState);
if ((opts === 'edit' || opts === 'coauth') && Device.phone) { if ((opts === 'edit' || opts === 'coauth') && Device.phone) {
f7.navbar.hide('.main-navbar'); f7.navbar.hide('.main-navbar');
} }
}
}, 10);
}; };
handleOptionsViewClosed = opts => { handleOptionsViewClosed = opts => {
(async () => { setTimeout(() => {
await 1 && this.setState(state => { this.setState(state => {
if ( opts == 'edit' ) if ( opts == 'edit' )
return {editOptionsVisible: false}; return {editOptionsVisible: false};
else if ( opts == 'add' ) else if ( opts == 'add' )
return {addOptionsVisible: false}; return {addOptionsVisible: false, addShowOptions: null};
else if ( opts == 'settings' ) else if ( opts == 'settings' )
return {settingsVisible: false}; return {settingsVisible: false};
else if ( opts == 'coauth' ) else if ( opts == 'coauth' )
@ -65,7 +79,8 @@ class MainPage extends Component {
if ((opts === 'edit' || opts === 'coauth') && Device.phone) { if ((opts === 'edit' || opts === 'coauth') && Device.phone) {
f7.navbar.show('.main-navbar'); f7.navbar.show('.main-navbar');
} }
})(); }, 1);
}; };
render() { render() {

56
apps/presentationeditor/mobile/src/page/main.jsx
View file

@ -30,34 +30,52 @@ class MainPage extends Component {
handleClickToOpenOptions = (opts, showOpts) => { handleClickToOpenOptions = (opts, showOpts) => {
ContextMenu.closeContextMenu(); ContextMenu.closeContextMenu();
this.setState(state => { setTimeout(() => {
if ( opts == 'edit' ) let opened = false;
return {editOptionsVisible: true}; const newState = {};
else if ( opts == 'add' ) if ( opts === 'edit' ) {
return { this.state.editOptionsVisible && (opened = true);
addOptionsVisible: true, newState.editOptionsVisible = true;
addShowOptions: showOpts } else if ( opts === 'add' ) {
}; this.state.addOptionsVisible && (opened = true);
else if ( opts == 'settings' ) newState.addOptionsVisible = true;
return {settingsVisible: true}; newState.addShowOptions = showOpts;
else if ( opts == 'coauth' ) } else if ( opts === 'settings' ) {
return {collaborationVisible: true}; this.state.settingsVisible && (opened = true);
else if ( opts == 'preview' ) newState.settingsVisible = true;
return {previewVisible: true}; } else if ( opts === 'coauth' ) {
}); this.state.collaborationVisible && (opened = true);
newState.collaborationVisible = true;
} else if ( opts === 'preview' ) {
this.state.previewVisible && (opened = true);
newState.previewVisible = true;
}
for (let key in this.state) {
if (this.state[key] && !opened) {
setTimeout(() => {
this.handleClickToOpenOptions(opts, showOpts);
}, 10);
return;
}
}
if (!opened) {
this.setState(newState);
if ((opts === 'edit' || opts === 'coauth') && Device.phone) { if ((opts === 'edit' || opts === 'coauth') && Device.phone) {
f7.navbar.hide('.main-navbar'); f7.navbar.hide('.main-navbar');
} }
}
}, 10);
}; };
handleOptionsViewClosed = opts => { handleOptionsViewClosed = opts => {
(async () => { setTimeout(() => {
await 1 && this.setState(state => { this.setState(state => {
if ( opts == 'edit' ) if ( opts == 'edit' )
return {editOptionsVisible: false}; return {editOptionsVisible: false};
else if ( opts == 'add' ) else if ( opts == 'add' )
return {addOptionsVisible: false}; return {addOptionsVisible: false, addShowOptions: null};
else if ( opts == 'settings' ) else if ( opts == 'settings' )
return {settingsVisible: false}; return {settingsVisible: false};
else if ( opts == 'coauth' ) else if ( opts == 'coauth' )
@ -68,7 +86,7 @@ class MainPage extends Component {
if ((opts === 'edit' || opts === 'coauth') && Device.phone) { if ((opts === 'edit' || opts === 'coauth') && Device.phone) {
f7.navbar.show('.main-navbar'); f7.navbar.show('.main-navbar');
} }
})(); });
}; };
render() { render() {

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

@ -32,28 +32,45 @@ class MainPage extends Component {
handleClickToOpenOptions = (opts, showOpts) => { handleClickToOpenOptions = (opts, showOpts) => {
f7.popover.close('.document-menu.modal-in', false); f7.popover.close('.document-menu.modal-in', false);
this.setState(state => { setTimeout(() => {
if ( opts == 'edit' ) let opened = false;
return {editOptionsVisible: true}; const newState = {};
else if ( opts == 'add' ) if ( opts === 'edit' ) {
return { this.state.editOptionsVisible && (opened = true);
addOptionsVisible: true, newState.editOptionsVisible = true;
addShowOptions: showOpts } else if ( opts === 'add' ) {
}; this.state.addOptionsVisible && (opened = true);
else if ( opts == 'settings' ) newState.addOptionsVisible = true;
return {settingsVisible: true}; newState.addShowOptions = showOpts;
else if ( opts == 'coauth' ) } else if ( opts === 'settings' ) {
return {collaborationVisible: true}; this.state.settingsVisible && (opened = true);
}); newState.settingsVisible = true;
} else if ( opts === 'coauth' ) {
this.state.collaborationVisible && (opened = true);
newState.collaborationVisible = true;
}
for (let key in this.state) {
if (this.state[key] && !opened) {
setTimeout(() => {
this.handleClickToOpenOptions(opts, showOpts);
}, 10);
return;
}
}
if (!opened) {
this.setState(newState);
if ((opts === 'edit' || opts === 'coauth') && Device.phone) { if ((opts === 'edit' || opts === 'coauth') && Device.phone) {
f7.navbar.hide('.main-navbar'); f7.navbar.hide('.main-navbar');
} }
}
}, 10);
}; };
handleOptionsViewClosed = opts => { handleOptionsViewClosed = opts => {
(async () => { setTimeout(() => {
await 1 && this.setState(state => { this.setState(state => {
if ( opts == 'edit' ) if ( opts == 'edit' )
return {editOptionsVisible: false}; return {editOptionsVisible: false};
else if ( opts == 'add' ) else if ( opts == 'add' )
@ -66,7 +83,7 @@ class MainPage extends Component {
if ((opts === 'edit' || opts === 'coauth') && Device.phone) { if ((opts === 'edit' || opts === 'coauth') && Device.phone) {
f7.navbar.show('.main-navbar'); f7.navbar.show('.main-navbar');
} }
})(); }, 1);
}; };
render() { render() {