fix(messagelist): Ensure opened message row is visible in list

Fixes: runbox#33
shadow-dot-cat · Jan 23, 2025 · 3f6eebe · 3f6eebe
1 parent c1b3cb1
commit 3f6eebe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -160,6 +160,7 @@
       <single-mail-viewer #singlemailviewer
       [messageActionsHandler]="messageActionsHandler"
       [adjustableHeight]="false"
+      (afterLoadMessage)="updateMessageListHeight()"
       (orientationChangeRequest)="mailViewerOrientationChangeRequest($event)"
       (onClose)="singleMailViewerClosed($event)"></single-mail-viewer>
       <div *ngIf="mailViewerOnRightSide && !singlemailviewer.messageId"
@@ -407,6 +408,7 @@ <h3 class="noMessageSelectedNotification">No Message Selected</h3>
           [adjustableHeight]="true"
           [showVerticalSplitButton]="allowMailViewerOrientationChange"
           [messageActionsHandler]="messageActionsHandler"
+          (afterLoadMessage)="updateMessageListHeight()"
           (orientationChangeRequest)="mailViewerOrientationChangeRequest($event)"
           (onClose)="singleMailViewerClosed($event)"></single-mail-viewer>
     </div>

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1064,6 +1064,10 @@ export class AppComponent implements OnInit, AfterViewInit, CanvasTableSelectLis
     this.updateUrlFragment();
   }
 
+  updateMessageListHeight() {
+    this.canvastable.jumpToOpenMessage();
+  }
+
   searchTextFieldFocus() {
     if (!this.usewebsocketsearch && !this.dataReady) {
       this.usewebsocketsearch = true;

diff --git a/src/app/canvastable/canvastable.ts b/src/app/canvastable/canvastable.ts
@@ -133,6 +133,8 @@ export class CanvasTableComponent implements AfterViewInit, DoCheck, OnInit {
   columnResizeInProgress = false;
   private scrollbarArea = false;
 
+  private jumpToMessage = false;
+
   visibleColumnSeparatorAlpha = 0;
   visibleColumnSeparatorIndex = 0;
   lastClientY: number;
@@ -856,11 +858,7 @@ export class CanvasTableComponent implements AfterViewInit, DoCheck, OnInit {
 
   // When loading a url with a fragment containing a msg id - scroll to there
   public jumpToOpenMessage() {
-    // currently selected row in the centre:
-    if (this.rows.rowCount() > 0 && this.rows.openedRowIndex) {
-      this.topindex = this.rows.openedRowIndex - Math.round(this.maxVisibleRows / 2);
-      this.enforceScrollLimit();
-    }
+    this.jumpToMessage = true;
   }
 
   private enforceScrollLimit() {
@@ -971,6 +969,13 @@ export class CanvasTableComponent implements AfterViewInit, DoCheck, OnInit {
       this.canv.height = this.wantedCanvasHeight;
 
       this.maxVisibleRows = this.canv.scrollHeight / this.rowheight;
+      if(this.jumpToMessage) {
+        // currently selected row in the centre:
+        if (this.rows.rowCount() > 0 && this.rows.openedRowIndex) {
+          this.topindex = this.rows.openedRowIndex - Math.round(this.maxVisibleRows / 2);
+        }
+        this.jumpToMessage = false;
+      }
       this.enforceScrollLimit();
       this.hasChanges = true;
       if (this.canv.clientWidth < this.autoRowWrapModeWidth) {

diff --git a/src/app/mailviewer/singlemailviewer.component.ts b/src/app/mailviewer/singlemailviewer.component.ts
@@ -79,6 +79,7 @@ export class SingleMailViewerComponent implements OnInit, DoCheck, AfterViewInit
   @Output() onClose: EventEmitter<string> = new EventEmitter();
   @Output() afterViewInit: EventEmitter<any> = new EventEmitter();
   @Output() orientationChangeRequest: EventEmitter<string> = new EventEmitter();
+  @Output() afterLoadMessage: EventEmitter<boolean> = new EventEmitter();
 
   @Input() messageActionsHandler: MessageActions;
   @Input() adjustableHeight: boolean;
@@ -777,6 +778,7 @@ export class SingleMailViewerComponent implements OnInit, DoCheck, AfterViewInit
             this.resizer.resizePercentage(50);
           }
         }
+        this.afterLoadMessage.emit();
       }, 0);
     }