Merge pull request #2 in INC/primereact-fork from feature/datatable-o…

…verride-virtual-scroll-height to master * commit 'bf7f8cc0e5dc73e5d0454cce3582ff07176325c1': virtual scroller height set to max of virtualScrollHeightOverride or totalCollapsedHeight virtual scroller height set to max of virtualScrollHeightOverride or totalCollapsedHeight virtual scroller height set to max of virtualScrollHeightOverride or totalCollapsedHeight virtual scroller height set to max of virtualScrollHeightOverride or totalCollapsedHeight
eirikaho · Aug 30, 2019 · e4da885 · e4da885
2 parents 5a94513 + bf7f8cc
commit e4da885
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "primereact-fork",
-  "version": "3.1.9-fork-1.0.1",
+  "version": "3.1.9-fork-1.0.2",
   "homepage": "/primereact",
   "repository": {
     "type": "git",

diff --git a/src/components/datatable/ScrollableView.js b/src/components/datatable/ScrollableView.js
@@ -67,13 +67,13 @@ export class ScrollableView extends Component {
 
         if(!this.props.frozen) {
             this.alignScrollBar();
-
-            if(this.props.virtualScroll) {
+
+            if (this.props.virtualScroll) {
+                const collapsedHeight = this.props.totalRecords * this.props.virtualRowHeight;
                 if (this.props.virtualScrollHeightOverride) {
-                    this.virtualScroller.style.height = this.props.virtualScrollHeightOverride + 'px'
-                }
-                else {
-                    this.virtualScroller.style.height = this.props.totalRecords * this.props.virtualRowHeight + 'px';
+                    this.virtualScroller.style.height = Math.max(collapsedHeight, this.props.virtualScrollHeightOverride) + 'px';
+                } else {
+                    this.virtualScroller.style.height = collapsedHeight + 'px';
                 }
             }
         }