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

[SSE mobile] skip "Suspense" options on app launch

Browse source
This commit is contained in:
Maxim Kadushkin 2021-09-23 12:29:06 +03:00
parent f5674d8b9c
commit 07d6f30377
9 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/spreadsheeteditor/mobile/src/app.js
View file

@ -36,9 +36,7 @@ Framework7.use(Framework7React);
ReactDOM.render(
<I18nextProvider i18n={i18n}>
<Provider {...stores}>
<Suspense fallback="">
<App />
</Suspense>
<App />
</Provider>
</I18nextProvider>,
document.getElementById('app'),

8
apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
View file

@ -44,9 +44,11 @@ class ContextMenu extends ContextMenuController {
super.componentWillUnmount();
const api = Common.EditorApi.get();
api.asc_unregisterCallback('asc_onShowComment', this.onApiShowComment);
api.asc_unregisterCallback('asc_onHideComment', this.onApiHideComment);
api.asc_unregisterCallback('asc_onMouseMove', this.onApiMouseMove);
if ( api ) {
api.asc_unregisterCallback('asc_onShowComment', this.onApiShowComment);
api.asc_unregisterCallback('asc_onHideComment', this.onApiHideComment);
api.asc_unregisterCallback('asc_onMouseMove', this.onApiMouseMove);
}
}

2
apps/spreadsheeteditor/mobile/src/controller/Error.jsx
View file

@ -13,7 +13,7 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
});
return () => {
const api = Common.EditorApi.get();
api.asc_unregisterCallback('asc_onError', onError);
if ( api ) api.asc_unregisterCallback('asc_onError', onError);
}
});

6
apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx
View file

@ -19,7 +19,7 @@ const FilterOptionsController = () => {
api.asc_registerCallback('asc_onSetAFDialog',onApiFilterOptions);
}
if ( !Common.EditorApi ) {
if ( !Common.EditorApi.get() ) {
Common.Notifications.on('document:ready',onDocumentReady);
} else {
onDocumentReady();
@ -28,7 +28,9 @@ const FilterOptionsController = () => {
return () => {
Common.Notifications.off('document:ready', onDocumentReady);
const api = Common.EditorApi.get();
api.asc_unregisterCallback('asc_onSetAFDialog',onApiFilterOptions);
if ( api ) {
api.asc_unregisterCallback('asc_onSetAFDialog', onApiFilterOptions);
}
}
}, []);

10
apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx
View file

@ -36,10 +36,12 @@ const LongActionsController = () => {
return ( () => {
const api = Common.EditorApi.get();
api.asc_unregisterCallback('asc_onStartAction', onLongActionBegin);
api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd);
api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
api.asc_unregisterCallback('asc_onConfirmAction', onConfirmAction);
if ( api ) {
api.asc_unregisterCallback('asc_onStartAction', onLongActionBegin);
api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd);
api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
api.asc_unregisterCallback('asc_onConfirmAction', onConfirmAction);
}
Common.Notifications.off('preloader:endAction', onLongActionEnd);
Common.Notifications.off('preloader:beginAction', onLongActionBegin);

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

@ -20,6 +20,7 @@ import About from "../../../../common/mobile/lib/view/About";
import PluginsController from '../../../../common/mobile/lib/controller/Plugins.jsx';
import EncodingController from "./Encoding";
import { StatusbarController } from "./Statusbar";
import { useTranslation } from 'react-i18next';
@inject(
"users",
@ -281,7 +282,6 @@ class MainController extends Component {
});
Common.Notifications.trigger('engineCreated', this.api);
Common.EditorApi = {get: () => this.api};
this.appOptions = {};
this.bindEvents();
@ -507,8 +507,10 @@ class MainController extends Component {
}
applyLicense () {
const _t = this._t;
const warnNoLicense = _t.warnNoLicense.replace(/%1/g, __COMPANY_NAME__);
const { t } = this.props;
const _t = t('Controller.Main', {returnObjects:true});
const warnNoLicense = _t.warnNoLicense.replace(/%1/g, __COMPANY_NAME__);
const warnNoLicenseUsers = _t.warnNoLicenseUsers.replace(/%1/g, __COMPANY_NAME__);
const textNoLicenseTitle = _t.textNoLicenseTitle.replace(/%1/g, __COMPANY_NAME__);
const warnLicenseExceeded = _t.warnLicenseExceeded.replace(/%1/g, __COMPANY_NAME__);
@ -851,6 +853,7 @@ class MainController extends Component {
}
componentDidMount() {
Common.EditorApi = {get: () => this.api};
this.initSdk();
}
}

19
apps/spreadsheeteditor/mobile/src/index_dev.html
View file

@ -22,17 +22,28 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<link rel="apple-touch-icon" href="static/icons/apple-touch-icon.png">
<link rel="icon" href="static/icons/favicon.png">
<link rel="stylesheet" type="text/css" href="../../common/mobile/resources/less/skeleton.css">
<!-- built styles file will be auto injected -->
</head>
<body>
<section class="skl-container ">
<div class="skl-navbar skl-navbar--cell"></div>
</section>
<script>
const isAndroid = /Android/.test(navigator.userAgent);
if ( isAndroid && navigator.platform == 'Win32' )
// Framework7 doesn't set Device.android flag when navigator.platform == 'Win32', change it for debug
navigator.__defineGetter__('platform', () => 'Win32Debug');
let navbar = document.querySelector('.skl-navbar');
if ( window.devicePixelRatio ) {
if ( navbar ) {
navbar.classList.add(`skl-pixel-ratio--${Math.floor(window.devicePixelRatio)}`);
}
}
if ( !isAndroid ) {
const ua = navigator.userAgent;
const iPad = ua.match(/(iPad).*OS\s([\d_]+)/);
@ -43,6 +54,10 @@
get: function () { return `iPad; CPU OS 11_0 ${ua}`; }
});
}
} else {
if ( navbar ) {
navbar.classList.add('skl-navbar--md');
}
}
const getUrlParams = () => {

3
apps/spreadsheeteditor/mobile/src/lib/i18n.js
View file

@ -12,6 +12,9 @@ i18n.use(initReactI18next)
loadPath: './locale/{{lng}}.json'
},
interpolation: { escapeValue: false },
react: {
useSuspense: false,
},
});
export default i18n;

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

@ -91,6 +91,9 @@ class MainPage extends Component {
const config = appOptions.config;
const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo)));
const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
if ( $$('.skl-container').length ) {
$$('.skl-container').remove();
}
return (
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>