From 372e4cff908425a289ffe8151cf7103f4df1321a Mon Sep 17 00:00:00 2001
From: Davor Spasovski <davor@spasovski.net>
Date: Mon, 22 Nov 2021 10:26:08 -0600
Subject: [PATCH] re-calc lastTop

---
 packages/grid/src/GridMetricCalculator.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/grid/src/GridMetricCalculator.js b/packages/grid/src/GridMetricCalculator.js
index 9a3ebbb34e..4c23083e58 100644
--- a/packages/grid/src/GridMetricCalculator.js
+++ b/packages/grid/src/GridMetricCalculator.js
@@ -201,7 +201,8 @@ class GridMetricCalculator {
       null,
       width - gridX - scrollBarSize - rowFooterWidth
     );
-    const lastTop = this.getLastTop(
+
+    let lastTop = this.getLastTop(
       state,
       null,
       height - gridY - scrollBarSize - floatingBottomHeight
@@ -225,6 +226,8 @@ class GridMetricCalculator {
             barWidth - 1
           )
         : 0;
+
+    // Vertical scrollbar handle height.
     const handleHeight =
       lastTop > 0
         ? Math.min(
@@ -271,6 +274,12 @@ class GridMetricCalculator {
       ]);
     }
 
+    lastTop = this.getLastTop(
+      state,
+      null,
+      height - gridY - scrollBarSize - floatingBottomHeight
+    );
+
     let floatingColumns = [];
     if (floatingLeftColumnCount > 0 || floatingRightColumnCount > 0) {
       floatingColumns = [