Refactored #5303 fix with a setter

primefaces · Mar 26, 2018 · 35f0aa1 · 35f0aa1
1 parent 2a1fc0f
commit 35f0aa1
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts
@@ -117,8 +117,6 @@ export class Table implements OnInit, AfterContentInit {
 
     @Input() first: number = 0;
 
-    @Input() totalRecords: number = 0;
-
     @Input() pageLinks: number = 5;
 
     @Input() rowsPerPageOptions: number[];
@@ -245,6 +243,8 @@ export class Table implements OnInit, AfterContentInit {
 
     _value: any[] = [];
 
+    _totalRecords: number = 0;
+
     filteredValue: any[];
 
     headerTemplate: TemplateRef<any>;
@@ -401,9 +401,10 @@ export class Table implements OnInit, AfterContentInit {
     }
     set value(val: any[]) {
         this._value = val;
-        this.updateTotalRecords();
-
+
         if (!this.lazy) {
+            this.totalRecords = (this._value ? this._value.length : 0);
+
             if (this.sortMode == 'single')
                 this.sortSingle();
             else if (this.sortMode == 'multiple')
@@ -417,6 +418,14 @@ export class Table implements OnInit, AfterContentInit {
         this.tableService.onValueChange(val);
     }
 
+    @Input() get totalRecords(): number {
+        return this._totalRecords;
+    }
+    set totalRecords(val: number) {
+        this._totalRecords = val;
+        this.tableService.onTotalRecordsChange(this._totalRecords);
+    }
+
     @Input() get sortField(): string {
         return this._sortField;
     }
@@ -485,12 +494,6 @@ export class Table implements OnInit, AfterContentInit {
         }
     }
 
-    updateTotalRecords() {
-        this.totalRecords = this.lazy ? this.totalRecords : (this._value ? this._value.length : 0);
-
-        this.tableService.onTotalRecordsChange(this.totalRecords);
-    }
-
     onPageChange(event) {
         this.first = event.first;
         this.rows = event.rows;
@@ -1220,11 +1223,13 @@ export class Table implements OnInit, AfterContentInit {
         this.filters = {};
 
         this.first = 0;
-        this.updateTotalRecords();
 
         if(this.lazy) {
             this.onLazyLoad.emit(this.createLazyLoadMetadata());
         }
+        else {
+            this.totalRecords = (this._value ? this._value.length : 0);
+        }
     }
 
     public exportCSV(options?: any) {
@@ -1880,7 +1885,9 @@ export class ScrollableView implements AfterViewInit,OnDestroy {
     }
 
     setVirtualScrollerHeight() {
-        this.virtualScrollerViewChild.nativeElement.style.height = this.dt.totalRecords * this.dt.virtualRowHeight + 'px';
+        if(this.virtualScrollerViewChild.nativeElement) {
+            this.virtualScrollerViewChild.nativeElement.style.height = this.dt.totalRecords * this.dt.virtualRowHeight + 'px';
+        }
     }
 
     hasVerticalOverflow() {