Merge branch 'develop' into feature/ve-mobile

This commit is contained in:
Julia Radzhabova
2024-11-28 00:41:03 +03:00
4 changed files with 12 additions and 8 deletions

View File

@ -1,4 +1,4 @@
import React, {Fragment} from 'react';
import React, {Fragment, useEffect } from 'react';
import {NavLeft, NavRight, Link} from 'framework7-react';
import { Device } from '../../../../common/mobile/utils/device';
import EditorUIController from '../lib/patch'

View File

@ -1,4 +1,4 @@
import React, {Fragment} from 'react';
import React, {Fragment, useEffect } from 'react';
import {NavLeft, NavRight, Link} from 'framework7-react';
import { Device } from '../../../../common/mobile/utils/device';
import EditorUIController from '../lib/patch'

View File

@ -80,11 +80,6 @@ class MainPage extends Component {
}
componentDidMount () {
if ($$('.skl-container').length) {
$$('.skl-container').remove();
}
document.addEventListener('touchmove', this.touchMoveHandler);
if (Device.ios) {

View File

@ -1,4 +1,4 @@
import React, {Fragment} from 'react';
import React, {Fragment, useEffect } from 'react';
import {NavLeft, NavRight, Link} from 'framework7-react';
import { Device } from '../../../../common/mobile/utils/device';
import { useTranslation } from 'react-i18next';
@ -9,6 +9,15 @@ const ToolbarView = props => {
const docTitle = props.docTitle;
const isOpenModal = props.isOpenModal;
useEffect(() => {
if ( $$('.skl-container').length ) {
$$('.skl-container').remove();
}
return () => {
}
}, []);
return (
<Fragment>
<NavLeft>