From 5060ca70ca41cb4d9060867906ca17ff1e8a27e4 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 9 Jan 2023 15:41:46 +0400 Subject: [PATCH 1/2] [DE mobile] Fix Bug 60359 --- apps/documenteditor/mobile/src/controller/Toolbar.jsx | 7 ++++--- apps/documenteditor/mobile/src/page/main.jsx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx index bfe8da00d..1ac29472b 100644 --- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx @@ -27,6 +27,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto const docInfo = props.storeDocumentInfo; const docExt = docInfo.dataDoc ? docInfo.dataDoc.fileType : ''; const docTitle = docInfo.dataDoc ? docInfo.dataDoc.title : ''; + const isAvailableExt = docExt && docExt !== 'oform'; useEffect(() => { Common.Gateway.on('init', loadConfig); @@ -54,7 +55,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto const navbarHeight = navbarBgHeight + subnavbarHeight; const onEngineCreated = api => { - if(isViewer) { + if(isAvailableExt && isViewer) { api.SetMobileTopOffset(navbarHeight, navbarHeight); api.asc_registerCallback('onMobileScrollDelta', scrollHandler); } @@ -69,14 +70,14 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto return () => { const api = Common.EditorApi.get(); - if (api) { + if (api && isAvailableExt && isViewer) { api.SetMobileTopOffset(navbarHeight, navbarHeight); api.asc_unregisterCallback('onMobileScrollDelta', scrollHandler); } Common.Notifications.off('engineCreated', onEngineCreated); } - }, [isViewer]); + }, [isAvailableExt, isViewer]); // Scroll handler diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index e88becd0e..9eef8105e 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -126,7 +126,7 @@ class MainPage extends Component { const appOptions = this.props.storeAppOptions; const storeDocumentInfo = this.props.storeDocumentInfo; const docExt = storeDocumentInfo.dataDoc ? storeDocumentInfo.dataDoc.fileType : ''; - const isAvailableExt = docExt && docExt !== 'djvu' && docExt !== 'pdf' && docExt !== 'xps'; + const isAvailableExt = docExt && docExt !== 'djvu' && docExt !== 'pdf' && docExt !== 'xps' && docExt !== 'oform'; const storeToolbarSettings = this.props.storeToolbarSettings; const isDisconnected = this.props.users.isDisconnected; const isViewer = appOptions.isViewer; From 930391be8f546660fe91d1979e239acf95c99ef8 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 9 Jan 2023 17:09:21 +0400 Subject: [PATCH 2/2] [DE PE SSE mobile] Fix Bug 58703 --- apps/common/mobile/resources/css/skeleton.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/common/mobile/resources/css/skeleton.css b/apps/common/mobile/resources/css/skeleton.css index f5a0aa1a7..b2824cfc0 100644 --- a/apps/common/mobile/resources/css/skeleton.css +++ b/apps/common/mobile/resources/css/skeleton.css @@ -2,6 +2,13 @@ body { margin: 0; } +body.theme-type-light { + --background-navbar-ios: #ffffff; + --background-navbar-word: #446995; + --background-navbar-cell: #40865c; + --background-navbar-slide: #aa5252; +} + body.theme-type-dark { --background-navbar-ios: #232323; --background-navbar-word: #232323;