Update setCanvasMinHeight call placing

Mamaduka · Mamaduka · commit 759ac66bacc9 · 2025-10-31T12:57:49.000+04:00
diff --git a/packages/editor/src/components/collab-sidebar/comments.js b/packages/editor/src/components/collab-sidebar/comments.js
@@ -170,7 +170,7 @@ export function Comments( {
 			const offsets = {};
 
 			if ( ! isFloating ) {
-				return offsets;
+				return { offsets, minHeight: 0 };
 			}
 
 			// Find the index of the selected thread.
@@ -188,7 +188,7 @@ export function Comments( {
 				! selectedThreadData ||
 				! blockRefs[ selectedThreadData.id ]
 			) {
-				return offsets;
+				return { offsets, minHeight: 0 };
 			}
 
 			let blockElement = blockRefs[ selectedThreadData.id ];
@@ -289,15 +289,14 @@ export function Comments( {
 					lastThreadTop + lastThreadHeight + lastThreadOffset + 32;
 			}
 
-			// Ensure the editor has enough height to scroll to all notes.
-			setCanvasMinHeight( editorMinHeight );
-
-			return offsets;
+			return { offsets, minHeight: editorMinHeight };
 		};
-		const newOffsets = calculateAllOffsets();
+		const { offsets: newOffsets, minHeight } = calculateAllOffsets();
 		if ( Object.keys( newOffsets ).length > 0 ) {
 			setBoardOffsets( newOffsets );
 		}
+		// Ensure the editor has enough height to scroll to all notes.
+		setCanvasMinHeight( minHeight );
 	}, [
 		heights,
 		blockRefs,
