diff --git a/apps/common/mobile/lib/view/Search.jsx b/apps/common/mobile/lib/view/Search.jsx index 6547b0dc58..82d4dbc886 100644 --- a/apps/common/mobile/lib/view/Search.jsx +++ b/apps/common/mobile/lib/view/Search.jsx @@ -118,8 +118,6 @@ class SearchView extends Component { on: { search: (bar, curval, prevval) => { }, - enable: this.onSearchbarShow.bind(this, true), - disable: this.onSearchbarShow.bind(this, false) } }); } @@ -183,11 +181,11 @@ class SearchView extends Component { } } - onSearchbarShow(isshowed, bar) { - if ( !isshowed ) { - this.$replace.val(''); - } - } + // onSearchbarShow(isshowed, bar) { + // if ( !isshowed ) { + // // this.$replace.val(''); + // } + // } onEditorTouchStart(e) { console.log('taouch start'); @@ -260,7 +258,7 @@ class SearchView extends Component {
- {this.changeSearchQuery(e.target.value)}} /> {isIos ? : null} this.changeSearchQuery('')} /> @@ -268,7 +266,7 @@ class SearchView extends Component { {/* {usereplace || isReplaceAll ? */}
{/* style={!usereplace ? hidden: null} */} - {this.changeReplaceQuery(e.target.value)}} /> {isIos ? : null} this.changeReplaceQuery('')} /> diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index aa4f116eb1..0753627741 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -528,7 +528,7 @@ } } - .searchbar input[type=search] { + .searchbar input { box-sizing: border-box; width: 100%; height: 100%; diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index dfd53ab6f4..222cb54585 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -489,7 +489,7 @@ } } - .searchbar input[type=search] { + .searchbar input { box-sizing: border-box; width: 100%; display: block; @@ -513,7 +513,7 @@ .encoded-svg-background(''); } - .searchbar input[type=search]::placeholder { + .searchbar input::placeholder { color: @fill-white; } diff --git a/apps/documenteditor/mobile/src/controller/Search.jsx b/apps/documenteditor/mobile/src/controller/Search.jsx index b51fadee19..4e95b4684e 100644 --- a/apps/documenteditor/mobile/src/controller/Search.jsx +++ b/apps/documenteditor/mobile/src/controller/Search.jsx @@ -80,9 +80,9 @@ class DESearchView extends SearchView { } onSearchbarShow(isshowed, bar) { - super.onSearchbarShow(isshowed, bar); - + // super.onSearchbarShow(isshowed, bar); const api = Common.EditorApi.get(); + if ( isshowed && this.state.searchQuery.length ) { const checkboxMarkResults = f7.toggle.get('.toggle-mark-results'); api.asc_selectSearchingResults(checkboxMarkResults.checked); diff --git a/apps/presentationeditor/mobile/src/controller/Search.jsx b/apps/presentationeditor/mobile/src/controller/Search.jsx index d6dc11a945..c3c254ac3e 100644 --- a/apps/presentationeditor/mobile/src/controller/Search.jsx +++ b/apps/presentationeditor/mobile/src/controller/Search.jsx @@ -65,9 +65,9 @@ class PESearchView extends SearchView { return {...params, ...searchOptions}; } - onSearchbarShow(isshowed, bar) { - super.onSearchbarShow(isshowed, bar); - } + // onSearchbarShow(isshowed, bar) { + // super.onSearchbarShow(isshowed, bar); + // } } const Search = withTranslation()(props => { diff --git a/apps/spreadsheeteditor/mobile/src/controller/Search.jsx b/apps/spreadsheeteditor/mobile/src/controller/Search.jsx index c4d33a82ce..cb2fa3ddeb 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Search.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Search.jsx @@ -123,9 +123,9 @@ class SESearchView extends SearchView { } onSearchbarShow(isshowed, bar) { - super.onSearchbarShow(isshowed, bar); - + // super.onSearchbarShow(isshowed, bar); const api = Common.EditorApi.get(); + if ( isshowed && this.state.searchQuery.length ) { const checkboxMarkResults = f7.toggle.get('.toggle-mark-results'); api.asc_selectSearchingResults(checkboxMarkResults.checked);