From ef7a42ec324c49802d8504279c27182a03daf33e Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Thu, 8 Dec 2022 18:49:35 +0400
Subject: [PATCH] [DE mobile] Correct offset

---
 apps/common/mobile/resources/less/common.less |  7 ++++---
 .../mobile/src/controller/Toolbar.jsx         | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index 39292d4b3..a2e973376 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -61,10 +61,11 @@
 .page.page-with-subnavbar {
     .page-content {
         --f7-page-subnavbar-offset: 0px;
+        padding-top: 0;
     }
-    &.page-with-logo .page-content {
-        --f7-page-subnavbar-offset: 26px;
-    }
+    // &.page-with-logo .page-content {
+    //     --f7-page-subnavbar-offset: 26px;
+    // }
 }
 
 .popup, .popover, .sheet-modal {
diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx
index bb1cf0cb5..209ad8580 100644
--- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx
+++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx
@@ -49,8 +49,11 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
 
     useEffect(() => {
         const api = Common.EditorApi.get();
+        const subnavbarHeight = document.querySelector('.subnavbar').clientHeight;
+
         const onEngineCreated = api => {
             if(isViewer) {
+                api.SetMobileTopOffset(subnavbarHeight, subnavbarHeight);
                 api.asc_registerCallback('onMobileScrollDelta', scrollHandler);
             }
         };
@@ -64,7 +67,11 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
         return () => {
             const api = Common.EditorApi.get();
 
-            if (api) api.asc_unregisterCallback('onMobileScrollDelta', scrollHandler);
+            if (api) {
+                api.SetMobileTopOffset(subnavbarHeight, subnavbarHeight);
+                api.asc_unregisterCallback('onMobileScrollDelta', scrollHandler);
+            }
+
             Common.Notifications.off('engineCreated', onEngineCreated);
         }
     }, [isViewer]);
@@ -73,18 +80,18 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
 
     const scrollHandler = offset => {
         const api = Common.EditorApi.get();
-        const navbarBgHeight = document.querySelector('.navbar-bg').clientHeight;
+        // const navbarBgHeight = document.querySelector('.navbar-bg').clientHeight;
         const subnavbarHeight = document.querySelector('.subnavbar').clientHeight;
-        const navbarHeight = navbarBgHeight + subnavbarHeight;
+        // const navbarHeight = navbarBgHeight + subnavbarHeight;
 
-        if(offset > navbarHeight) {
+        if(offset > subnavbarHeight) {
             f7.navbar.hide('.main-navbar');
             props.closeOptions('fab');
             api.SetMobileTopOffset(undefined, 0);
-        } else if(offset < -navbarHeight) {
+        } else if(offset < -subnavbarHeight) {
             f7.navbar.show('.main-navbar');
             props.openOptions('fab');
-            api.SetMobileTopOffset(undefined, navbarHeight);
+            api.SetMobileTopOffset(undefined, subnavbarHeight);
         }
     }