fix: optimize row height calculation in Row component

schummar · Jul 19, 2024 · e910dd8 · e910dd8
1 parent 119e9bd
commit e910dd8
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/components/row.tsx b/src/components/row.tsx
@@ -60,13 +60,18 @@ export const Row = memo(function Row<T>({
     };
   });
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     function update() {
       table.update((state) => {
-        const h1 = document.contains(divRef.current) ? divRef.current?.offsetHeight ?? 0 : 0;
-        const h2 = document.contains(detailsDivRef.current)
-          ? detailsDivRef.current?.offsetHeight ?? 0
-          : 0;
+        if (!divRef.current) {
+          return;
+        }
+
+        const h1 = divRef.current.offsetHeight;
+        const h2 =
+          detailsDivRef.current && document.contains(detailsDivRef.current)
+            ? detailsDivRef.current.offsetHeight
+            : 0;
 
         state.rowHeights.set(itemId, h1 + h2);
       });