diff --git a/apps/common/mobile/lib/view/Search.jsx b/apps/common/mobile/lib/view/Search.jsx index 6fb8d59b5e..a5a66cfb24 100644 --- a/apps/common/mobile/lib/view/Search.jsx +++ b/apps/common/mobile/lib/view/Search.jsx @@ -116,7 +116,12 @@ class SearchView extends Component { expandable: true, backdrop: false, on: { - search: (bar, curval, prevval) => { + search: (sb, query, previousQuery) => { + const api = Common.EditorApi.get(); + + if(!query) { + api.asc_selectSearchingResults(false); + } }, } }); diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 65dcf4142e..39292d4b3f 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -1088,16 +1088,6 @@ input[type="number"]::-webkit-inner-spin-button { border: 0.5px solid @background-menu-divider; } -// Navigation list - -.list.navigation-list { - overflow-y: auto; - height: 265px; - .item-title { - color: @text-normal; - } -} - // Sharing Settings .sharing-placeholder { height: 100%; diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 29da1b3dad..dbf4e46fe3 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -219,18 +219,37 @@ .sheet-modal.navigation-sheet { box-shadow: 0px -2px 20px rgba(0, 0, 0, 0.2); - overflow: hidden; .sheet-modal-inner { background: @background-tertiary; - overflow: hidden; + overflow-y: auto; + } + .swipe-container { + position: fixed; + top: 0; + width: 100%; + z-index: 1000; } &.sheet-modal-bottom:before, &.sheet-modal:not(.sheet-modal-top):before { display: none; } } -.navigation-list { - margin: 0; +.list.navigation-list { + margin-top: 72px; + .item-title { + color: @text-normal; + } +} + +.navigation-sheet { + &__title { + position: fixed; + left: 0; + width: 100%; + z-index: 100; + top: 40px; + z-index: 1000; + } } // Picker diff --git a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx index 7728ee25bd..f8511a6a21 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx @@ -207,7 +207,7 @@ const EditParagraph = props => { onStyleMenuDelete: props.onStyleMenuDelete }}> {curStyle && -
+
} @@ -278,7 +278,7 @@ const EditParagraphStyle = props => { }} >
{!api.asc_IsStyleDefault(style.name) && (
@@ -369,7 +369,7 @@ const ChangeNextParagraphStyle = props => { }} >
))} diff --git a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx index 7149df3f82..ec6226e606 100644 --- a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx @@ -29,7 +29,7 @@ const NavigationPopover = inject('storeNavigation')(observer(props => {

{t('Settings.textEmptyScreens')}

: - + {arrHeaders.map((header, index) => { return ( {