From 516d32bb66107d5e62f9559138aa16f4bd5e5111 Mon Sep 17 00:00:00 2001
From: Siarhei_Dzeraviannik <siarhei_dzeraviannik@epam.com>
Date: Wed, 23 Oct 2024 23:10:07 +0300
Subject: [PATCH] [VirtualList]: fixed estimatedHeight calculations in
 components with pagination

---
 changelog.md                                        | 1 +
 uui-core/src/hooks/useVirtualList/useVirtualList.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/changelog.md b/changelog.md
index e67868ca94..f92515cd9d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 **What's New**
 * [TabButton][VerticalTabButton]: decreased paddings, added gaps `3px` between internal items for all sizes according to design
 * [Tag]: changed layout - added gaps between internal items, changed padding
+* [VirtualList]: fixed estimatedHeight calculations in components with pagination
 
 
 # 5.10.2 - xx.xx.2024
diff --git a/uui-core/src/hooks/useVirtualList/useVirtualList.ts b/uui-core/src/hooks/useVirtualList/useVirtualList.ts
index 57a1b2b3c7..14744c5422 100644
--- a/uui-core/src/hooks/useVirtualList/useVirtualList.ts
+++ b/uui-core/src/hooks/useVirtualList/useVirtualList.ts
@@ -65,6 +65,8 @@ export function useVirtualList<List extends HTMLElement = any, ScrollContainer e
                 && scrollContainer.current?.clientHeight !== prevScrollContainerClientHeight
             ) {
                 ++scrollContainerHeightChangesCount.current;
+            } else {
+                scrollContainerHeightChangesCount.current = 0;
             }
             if (scrollContainerHeightChangesCount.current > 20 && !scrollContainerHeightIsNotLimited.current) {
                 scrollContainerHeightIsNotLimited.current = true;