From 35239a7badef6f5c040653078a1d8c0c41fbcc7b Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:26:41 -0300
Subject: [PATCH 1/3] refactor: add _updateHeightByRows method

---
 .../META-INF/frontend/fcGridHelper/connector.js      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/META-INF/frontend/fcGridHelper/connector.js b/src/main/resources/META-INF/frontend/fcGridHelper/connector.js
index c926b03..35a6732 100644
--- a/src/main/resources/META-INF/frontend/fcGridHelper/connector.js
+++ b/src/main/resources/META-INF/frontend/fcGridHelper/connector.js
@@ -57,15 +57,19 @@ import { Grid } from '@vaadin/grid/src/vaadin-grid.js';
 				if (grid.fcGridHelper._heightByRowsObserver) {
 					grid.fcGridHelper._heightByRowsObserver.unobserve(grid);
 				}
-				
+
 				grid.fcGridHelper._heightByRowsObserver = new ResizeObserver(() => {
-					var height = grid.fcGridHelper.computeHeightByRows(n);
-					grid.style.setProperty('--height-by-rows',height+'px');
+					grid.fcGridHelper._updateHeightByRows(n);
 				});
-				
+	
 				grid.fcGridHelper._heightByRowsObserver.observe(grid);
 			},
 			
+			_updateHeightByRows : function(n) {
+				var height = grid.fcGridHelper.computeHeightByRows(n);
+				grid.style.setProperty('--height-by-rows',height+'px');
+			},
+			
 			computeHeightByRows : function(n) {
 				var height = 0;
 				var rows = grid.shadowRoot.querySelectorAll("tbody tr");

From bdfc1327f10e406cf14529781c1350a860daaaff Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:32:15 -0300
Subject: [PATCH 2/3] fix: compute heightByRows while loading

Close #117
---
 .../resources/META-INF/frontend/fcGridHelper/connector.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/resources/META-INF/frontend/fcGridHelper/connector.js b/src/main/resources/META-INF/frontend/fcGridHelper/connector.js
index 35a6732..292f7a8 100644
--- a/src/main/resources/META-INF/frontend/fcGridHelper/connector.js
+++ b/src/main/resources/META-INF/frontend/fcGridHelper/connector.js
@@ -63,6 +63,14 @@ import { Grid } from '@vaadin/grid/src/vaadin-grid.js';
 				});
 	
 				grid.fcGridHelper._heightByRowsObserver.observe(grid);
+				
+				grid.removeEventListener('loading-changed', grid.fcGridHelper._heightByRowsListener);
+				
+				grid.fcGridHelper._heightByRowsListener = ()=>{
+					if (!grid.loading) grid.fcGridHelper._updateHeightByRows(n);
+				};
+				
+				grid.addEventListener('loading-changed', grid.fcGridHelper._heightByRowsListener);
 			},
 			
 			_updateHeightByRows : function(n) {

From b08c70400c4809e45e246235cecc3993aad69563 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:32:53 -0300
Subject: [PATCH 3/3] ci(demo): upgrade commons-demo to 4.2.0 in v24 profile

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index ec54630..ab323df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,6 +563,12 @@
 				    <version>4.17.0</version>
 				    <scope>test</scope>
 				</dependency>
+				<dependency>
+				<groupId>com.flowingcode.vaadin.addons.demo</groupId>
+				<artifactId>commons-demo</artifactId>
+					<version>4.2.0</version>
+					<scope>test</scope>
+				</dependency>
 			</dependencies>
 		</profile>