Comments Section: Ensure comment heights are calculated and up to date.

Issue: cachedCommentHeight may hold old value.

Fix (2 steps):
* Ensure that a relayout action is proessed even if there are consecutive calls to update with differnet "reLayout" boolean values.
* Update the cached height of the comment to make sure that the correct height is read while layouting.

Signed-off-by: Gökay Şatır <gokay.satir@collabora.com>
Change-Id: I191dd539fdf8288284f0664adb7dbc7ab2a5be65

Author: Gökay Şatır

browser/src/canvas/sections/CommentListSection.ts

@@ -1323,7 +1323,7 @@ export class CommentSection extends CanvasSectionObject {
 				this.setThreadPopup(this.sectionProperties.selectedComment, false);
 				this.sectionProperties.showSelectedBigger = false;
 			}
-			
+
 			const previouslySelectedComment = this.sectionProperties.selectedComment;
 			this.sectionProperties.selectedComment = null;
 			if (app.map._docLayer._docType !== 'spreadsheet') {
@@ -2539,18 +2539,22 @@ export class CommentSection extends CanvasSectionObject {
 	}
 
 	private update (reLayout: boolean = true): void {
-		this.sectionProperties.reLayout = reLayout;
+		if (reLayout)
+			this.sectionProperties.reLayout = true;
 		this.updateDOM();
 	}
 
 	private updateDOM(): void {
 		if (!this.sectionProperties.firstImport) return;
 
 		app.layoutingService.appendLayoutingTask(() => {
-			if (this.sectionProperties.reLayout && app.map._docLayer._docType === 'text')
+			const reLayout = this.sectionProperties.reLayout;
+			this.sectionProperties.reLayout = false;
+
+			if (reLayout && app.map._docLayer._docType === 'text')
 				this.updateThreadInfoIndicator();
 
-			this.layout(this.sectionProperties.reLayout);
+			this.layout(reLayout);
 		});
 
 		app.sectionContainer.requestReDraw();
@@ -2733,8 +2737,19 @@ export class CommentSection extends CanvasSectionObject {
 								maxSize += moveUp;
 							}
 						}
-						if (maxSize > minMaxHeight)
-							this.sectionProperties.commentList[i].sectionProperties.contentNode.style.maxHeight = Math.round(maxSize) + 'px';
+						if (maxSize > minMaxHeight) {
+							const comment = this.sectionProperties.commentList[i];
+							const contentNode = comment.sectionProperties.contentNode;
+							const oldMaxHeight = parseFloat(contentNode.style.maxHeight) || minMaxHeight;
+							contentNode.style.maxHeight = Math.round(maxSize) + 'px';
+
+							// Without this, a later layout(false) would reuse a stale value.
+							if (comment.cachedCommentHeight !== null) {
+								const oldContent = Math.min(actHeight, oldMaxHeight);
+								const newContent = Math.min(actHeight, maxSize);
+								comment.cachedCommentHeight += newContent - oldContent;
+							}
+						}
 					}
 				}
 			}