Fix table row-recalculation on panel switch

ndsev · Aug 23, 2024 · b973613 · b973613
1 parent 12af92f
commit b973613
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/erdblick_app/app/feature.panel.component.ts b/erdblick_app/app/feature.panel.component.ts
@@ -7,7 +7,7 @@ import {MapService} from "./map.service";
 import {distinctUntilChanged} from "rxjs";
 import {coreLib} from "./wasm";
 import {ClipboardService} from "./clipboard.service";
-import {TTScrollableView} from "primeng/treetable";
+import {TreeTable} from "primeng/treetable";
 
 interface Column {
     field: string;
@@ -185,8 +185,7 @@ export class FeaturePanelComponent implements OnInit  {
     filterGeometryEntries = false;
     jsonTree = "";
 
-    @ViewChild('tt')
-    table!: TTScrollableView;
+    @ViewChild('tt') table!: TreeTable;
 
     @ViewChild('inspectionMenu') inspectionMenu!: Menu;
     inspectionMenuItems: MenuItem[] | undefined;
@@ -206,7 +205,14 @@ export class FeaturePanelComponent implements OnInit  {
         });
 
         this.inspectionService.inspectionPanelChanged.subscribe(() => {
-            this.table.scroller!.calculateOptions();
+            // We have to force recalculate the tables number of visible items
+            setTimeout(() => {
+                let scroller = (<any>this.table.scrollableViewChild)?.scroller;
+                if (scroller) {
+                    scroller.init();
+                    scroller.calculateAutoSize();
+                }
+            }, 0);
         })
     }
 

diff --git a/erdblick_app/app/inspection.panel.component.ts b/erdblick_app/app/inspection.panel.component.ts
@@ -136,7 +136,7 @@ export class InspectionPanelComponent implements OnInit
         if (index < 0)
             index = this.tabs.length - 1;
         this.inspectionService.inspectionPanelChanged.emit();
-        this.activeIndex = index
+        this.activeIndex = Math.max(0, index)
     }
 
     onGoBack(event: any) {
@@ -145,7 +145,7 @@ export class InspectionPanelComponent implements OnInit
             const onClose = this.tabs[this.activeIndex]['onClose'];
             if (onClose)
                 onClose();
-            this.activeIndex = this.activeIndex - 1;
+            this.setTab(this.activeIndex - 1);
             if (this.tabs.length > 1)
                 this.tabs.pop();
         }