From 3aafc98b3306a5aa77b0741a20773bfebec09216 Mon Sep 17 00:00:00 2001
From: "Julia.Radzhabova" <Julia.Radzhabova@onlyoffice.com>
Date: Sun, 1 Jun 2025 13:40:14 +0300
Subject: [PATCH] Bug 73308: fix request for the next users

---
 apps/common/main/lib/view/ReviewPopover.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js
index 00bddd2d70..51454a0915 100644
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@@ -1222,8 +1222,7 @@ define([
                     right: right,
                     from: 0,
                     count: 100,
-                    total: undefined,
-                    scrollTop: 0
+                    total: undefined
                 };
                 var data = this._state.emailSearch;
                 Common.UI.ExternalUsers.get('mention', undefined, data.from, data.count, data.str);
@@ -1277,10 +1276,8 @@ define([
                     }, 10);
                 });
                 !isClientSearch && menu.scroller.cmpEl.on('scroll', function (event) {
-                    let st = $(event.target).scrollTop();
-                    if (me._state.emailSearch && me._state.emailSearch.scrollTop < st)
+                    if (me._state.emailSearch && me._state.emailSearch.requestNext>0 && me._state.emailSearch.requestNext < $(event.target).scrollTop())
                         me.onEmailListMenuNext();
-                    me._state.emailSearch.scrollTop = st;
                 });
             }
 
@@ -1343,6 +1340,10 @@ define([
                 menu.cmpEl.css('display', '');
                 menu.alignPosition('bl-tl', -5);
                 menu.scroller.update({alwaysVisibleY: true});
+                if (!isClientSearch) {
+                    (from===0) && menu.scroller.scrollTop(0);
+                    me._state.emailSearch.requestNext = menu.items.length<me._state.emailSearch.total ? (1 - 10/menu.items.length) * menu.cmpEl.get(0).scrollHeight : -1;
+                }
             } else {
                 menu.rendered && menu.cmpEl.css('display', 'none');
             }