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

[DE PE SSE] Fix Bug 53972

Browse source
This commit is contained in:
ShimaginAndrey 2021-11-25 19:37:24 +03:00
parent 70cf0f2578
commit f73b06d373
5 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/mobile/lib/view/Search.jsx
View file

@ -261,7 +261,7 @@ class SearchView extends Component {
</div>
<div className="searchbar-inner__center">
<div className="searchbar-input-wrap">
<input value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
<input className="searchbar-input" value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
onChange={e => {this.changeSearchQuery(e.target.value)}} />
{isIos ? <i className="searchbar-icon" /> : null}
<span className="input-clear-button" onClick={() => this.changeSearchQuery('')} />

6
apps/common/mobile/lib/view/collaboration/Comments.jsx
View file

@ -23,6 +23,7 @@ const AddCommentPopup = inject("storeComments")(observer(props => {
const _t = t('Common.Collaboration', {returnObjects: true});
useEffect(() => {
f7.popup.open('.add-comment-popup');
if(!Device.android) f7.input.focus('.input-comment');
});
const userInfo = props.userInfo;
const [stateText, setText] = useState('');
@ -59,7 +60,7 @@ const AddCommentPopup = inject("storeComments")(observer(props => {
<div className='name'>{userInfo.name}</div>
</div>
<div className='wrap-textarea'>
<Input type='textarea' placeholder={_t.textAddComment} autofocus value={stateText} onChange={(event) => {setText(event.target.value);}}></Input>
<Input className="input-comment" type='textarea' placeholder={_t.textAddComment} value={stateText} onChange={(event) => {setText(event.target.value);}}></Input>
</div>
</div>
</Popup>
@ -94,12 +95,13 @@ const AddCommentDialog = inject("storeComments")(observer(props => {
<div class='name'>${userInfo.name}</div>
</div>
<div class='wrap-textarea'>
<textarea id='comment-text' placeholder='${_t.textAddComment}' autofocus></textarea>
<textarea id='comment-text' placeholder='${_t.textAddComment}'></textarea>
</div>
</div>`,
on: {
opened: () => {
const cancel = document.getElementById('comment-cancel');
if(!Device.android) $$('#comment-text').focus();
cancel.addEventListener('click', () => {
f7.dialog.close();
props.closeAddComment();

10
apps/documenteditor/mobile/src/controller/Search.jsx
View file

@ -1,4 +1,4 @@
import React from 'react';
import React, { useEffect } from 'react';
import { List, ListItem, Toggle, Page, Navbar, NavRight, Link } from 'framework7-react';
import { SearchController, SearchView, SearchSettingsView } from '../../../../common/mobile/lib/controller/Search';
import { f7 } from 'framework7-react';
@ -94,6 +94,14 @@ const Search = withTranslation()(props => {
const { t } = props;
const _t = t('Settings', {returnObjects: true});
useEffect(() => {
if (f7.searchbar.get('.searchbar')?.enabled && Device.phone) {
const api = Common.EditorApi.get();
$$('.searchbar-input').focus();
api.asc_enableKeyEvents(false);
}
});
const onSearchQuery = params => {
const api = Common.EditorApi.get();

10
apps/presentationeditor/mobile/src/controller/Search.jsx
View file

@ -1,4 +1,4 @@
import React from 'react';
import React, {useEffect} from 'react';
import { List, ListItem, Toggle, Page, Navbar, NavRight, Link } from 'framework7-react';
import { SearchController, SearchView, SearchSettingsView } from '../../../../common/mobile/lib/controller/Search';
import { f7 } from 'framework7-react';
@ -74,6 +74,14 @@ const Search = withTranslation()(props => {
const { t } = props;
const _t = t('View.Settings', {returnObjects: true});
useEffect(() => {
if (f7.searchbar.get('.searchbar')?.enabled && Device.phone) {
const api = Common.EditorApi.get();
$$('.searchbar-input').focus();
api.asc_enableKeyEvents(false);
}
});
const onSearchQuery = params => {
const api = Common.EditorApi.get();

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

@ -137,6 +137,14 @@ const Search = withTranslation()(props => {
const { t } = props;
const _t = t('View.Settings', {returnObjects: true});
useEffect(() => {
if (f7.searchbar.get('.searchbar')?.enabled && Device.phone) {
const api = Common.EditorApi.get();
$$('.searchbar-input').focus();
api.asc_enableKeyEvents(false);
}
});
const onSearchQuery = params => {
const api = Common.EditorApi.get();