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

Merge pull request #1794 from ONLYOFFICE/feature/update-react

Browse source 
Feature/update react
This commit is contained in:
maxkadushkin 2022-06-09 23:47:46 +03:00 committed by GitHub
parent c590641e42 6c79e087d7
commit 2e43d25387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/documenteditor/mobile/src/app.js
View file

@ -1,6 +1,6 @@
// Import React and ReactDOM // Import React and ReactDOM
import React, { Suspense } from 'react'; import React, { Suspense } from 'react';
import ReactDOM from 'react-dom'; import { createRoot } from 'react-dom/client';
// Import Framework7 // Import Framework7
import Framework7 from 'framework7/lite-bundle'; import Framework7 from 'framework7/lite-bundle';
@ -37,17 +37,19 @@ import { Provider } from 'mobx-react'
import { stores } from './store/mainStore' import { stores } from './store/mainStore'
import { LocalStorage } from '../../../common/mobile/utils/LocalStorage'; import { LocalStorage } from '../../../common/mobile/utils/LocalStorage';
const container = document.getElementById('app');
const root = createRoot(container);
// Init F7 React Plugin // Init F7 React Plugin
Framework7.use(Framework7React) Framework7.use(Framework7React)
// Mount React App // Mount React App
ReactDOM.render( root.render(
<I18nextProvider i18n={i18n}> <I18nextProvider i18n={i18n}>
<Provider {...stores}> <Provider {...stores}>
{/*<Suspense fallback="loading...">*/} {/*<Suspense fallback="loading...">*/}
<App /> <App />
{/*</Suspense>*/} {/*</Suspense>*/}
</Provider> </Provider>
</I18nextProvider>, </I18nextProvider>
document.getElementById('app'), );
);

14
apps/presentationeditor/mobile/src/app.js
View file

@ -1,6 +1,6 @@
// Import React and ReactDOM // Import React and ReactDOM
import React, { Suspense } from 'react'; import React, { Suspense } from 'react';
import ReactDOM from 'react-dom'; import { createRoot } from 'react-dom/client';
// Import Framework7 // Import Framework7
import Framework7 from 'framework7/lite-bundle'; import Framework7 from 'framework7/lite-bundle';
@ -32,17 +32,19 @@ import { Provider } from 'mobx-react'
import { stores } from './store/mainStore' import { stores } from './store/mainStore'
import { LocalStorage } from '../../../common/mobile/utils/LocalStorage'; import { LocalStorage } from '../../../common/mobile/utils/LocalStorage';
const container = document.getElementById('app');
const root = createRoot(container);
// Init F7 React Plugin // Init F7 React Plugin
Framework7.use(Framework7React) Framework7.use(Framework7React)
// Mount React App // Mount React App
ReactDOM.render( root.render(
<I18nextProvider i18n={i18n}> <I18nextProvider i18n={i18n}>
<Provider {...stores}> <Provider {...stores}>
{/*<Suspense fallback="">*/} {/*<Suspense fallback="loading...">*/}
<App /> <App />
{/*</Suspense>*/} {/*</Suspense>*/}
</Provider> </Provider>
</I18nextProvider>, </I18nextProvider>
document.getElementById('app'), );
);

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

@ -1,6 +1,6 @@
// Import React and ReactDOM // Import React and ReactDOM
import React, { Suspense } from 'react'; import React, { Suspense } from 'react';
import ReactDOM from 'react-dom'; import { createRoot } from 'react-dom/client';
// Import Framework7 // Import Framework7
import Framework7 from 'framework7/lite-bundle'; import Framework7 from 'framework7/lite-bundle';
@ -37,15 +37,19 @@ import { Provider } from 'mobx-react';
import { stores } from './store/mainStore'; import { stores } from './store/mainStore';
import { LocalStorage } from '../../../common/mobile/utils/LocalStorage'; import { LocalStorage } from '../../../common/mobile/utils/LocalStorage';
const container = document.getElementById('app');
const root = createRoot(container);
// Init F7 React Plugin // Init F7 React Plugin
Framework7.use(Framework7React); Framework7.use(Framework7React);
// Mount React App // Mount React App
ReactDOM.render( root.render(
<I18nextProvider i18n={i18n}> <I18nextProvider i18n={i18n}>
<Provider {...stores}> <Provider {...stores}>
<App /> {/*<Suspense fallback="loading...">*/}
<App />
{/*</Suspense>*/}
</Provider> </Provider>
</I18nextProvider>, </I18nextProvider>
document.getElementById('app'),
); );

2
apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx
View file

@ -2,7 +2,7 @@
import React, { Fragment, useState, useEffect } from 'react'; import React, { Fragment, useState, useEffect } from 'react';
import { Input, View, Button, Link, Popover, ListItem, List, Icon, f7, Page, Navbar, NavRight } from 'framework7-react'; import { Input, View, Button, Link, Popover, ListItem, List, Icon, f7, Page, Navbar, NavRight } from 'framework7-react';
import {observer, inject} from "mobx-react"; import {observer, inject} from "mobx-react";
import { __interactionsRef } from 'scheduler/tracing'; // import { __interactionsRef } from 'scheduler/tracing';
import { Device } from '../../../../common/mobile/utils/device'; import { Device } from '../../../../common/mobile/utils/device';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';

4
vendor/framework7-react/package.json vendored
View file

@ -35,8 +35,8 @@
"i18next-fetch-backend": "^3.0.0", "i18next-fetch-backend": "^3.0.0",
"postcss": "^8.4.12", "postcss": "^8.4.12",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^17.0.1", "react": "^18.1.0",
"react-dom": "^17.0.1", "react-dom": "^18.1.0",
"react-i18next": "^11.8.5", "react-i18next": "^11.8.5",
"swiper": "^6.4.8", "swiper": "^6.4.8",
"template7": "^1.4.2" "template7": "^1.4.2"