Fixed #1222

primefaces · Nov 7, 2016 · f7c4ebd · f7c4ebd
1 parent 02a9fa9
commit f7c4ebd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/components/datatable/datatable.ts b/components/datatable/datatable.ts
@@ -1315,7 +1315,10 @@ export class DataTable implements AfterViewChecked,AfterViewInit,AfterContentIni
         if(this.scrollHeight) {
             if(this.percentageScrollHeight) {
                 let relativeHeight = this.domHandler.getOuterHeight(this.el.nativeElement.parentElement) * (parseInt(this.scrollHeight) / 100);
-                let headerHeight = this.domHandler.getOuterHeight(tableHeader) + this.domHandler.getOuterHeight(this.scrollHeader);
+                let headerHeight =  this.domHandler.getOuterHeight(this.scrollHeader);
+                if(tableHeader) {
+                    headerHeight += this.domHandler.getOuterHeight(tableHeader);
+                }
                 this.scrollBody.style.maxHeight = (relativeHeight - headerHeight) + 'px';
             }
             else {