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

Merge pull request #1189 from ONLYOFFICE/feature/fix-bug-reactjs

Browse source 
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2021-09-22 22:17:41 +03:00 committed by GitHub
parent 94aa05aaa7 858c2e2483
commit 47b576f207
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,7 +150,7 @@ class MainPage extends Component {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} page={this.state.collaborationPage} /> <Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} page={this.state.collaborationPage} />
} }
<ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} /> {appOptions.isDocReady && <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} /> }
</Page> </Page>
) )
} }

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

@ -142,7 +142,8 @@ class MainPage extends Component {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} /> <CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
} }
<ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} /> {appOptions.isDocReady && <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />}
</Page> </Page>
</Fragment> </Fragment>
) )

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

@ -1,10 +1,10 @@
import React, { useEffect,useRef,useState } from 'react'; import React, { memo, useEffect,useRef,useState } from 'react';
import FilterView from '../../src/view/FilterOptions'; import FilterView from '../../src/view/FilterOptions';
import { f7,Sheet,Popover } from 'framework7-react'; import { f7,Sheet,Popover } from 'framework7-react';
import { Device } from '../../../../common/mobile/utils/device'; import { Device } from '../../../../common/mobile/utils/device';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
const FilterOptionsController = () => { const FilterOptionsController = memo( () => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const configRef = useRef(); const configRef = useRef();
@ -126,6 +126,6 @@ const FilterOptionsController = () => {
<FilterView onSort={onSort} listVal={listVal} checkSort={checkSort} isValid={isValid} onUpdateCell={onUpdateCell} <FilterView onSort={onSort} listVal={listVal} checkSort={checkSort} isValid={isValid} onUpdateCell={onUpdateCell}
onDeleteFilter={onDeleteFilter} onClearFilter={onClearFilter}/> onDeleteFilter={onDeleteFilter} onClearFilter={onClearFilter}/>
) )
}; });
export default FilterOptionsController; export default FilterOptionsController;

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

@ -1,4 +1,4 @@
import React, { Component } from 'react'; import React, { Component, Fragment } from 'react';
import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react'; import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react';
import { observer, inject } from "mobx-react"; import { observer, inject } from "mobx-react";
import { Device } from '../../../../common/mobile/utils/device'; import { Device } from '../../../../common/mobile/utils/device';
@ -130,14 +130,16 @@ class MainPage extends Component {
<CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} /> <CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
} }
{!appOptions.isDocReady ? null : {appOptions.isDocReady &&
<FilterOptionsController /> <Fragment key='filter-context'>
<FilterOptionsController />
<ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />
</Fragment>
} }
<Statusbar /> <Statusbar />
<FunctionGroups /> {/* hidden component*/} <FunctionGroups /> {/* hidden component*/}
<ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />
</Page> </Page>
) )
} }