@fundamental-ngx/platform 0.43.37 → 0.43.39

package/fesm2015/fundamental-ngx-platform-table-helpers.mjs

@@ -2660,7 +2660,13 @@ class TableVirtualScrollDirective extends TableVirtualScroll {
         const tableContainer = this._table.tableContainer.nativeElement;
         let tableHeight = tableContainer.clientHeight;
         tableHeight = tableHeight - tableContainer.querySelector('thead').clientHeight;
-        return Math.floor(tableHeight / (this.rowHeight + 2));
+        const numberOfRows = Math.floor(tableHeight / (this.rowHeight + 2));
+        if (this._table._tableRowsVisible.length < numberOfRows) {
+            return this._table._tableRowsVisible.length;
+        }
+        else {
+            return numberOfRows;
+        }
     }
     /**
      * @hidden
@@ -2682,10 +2688,7 @@ class TableVirtualScrollDirective extends TableVirtualScroll {
             startingNode = 0;
         }
         // This next 'if' statement is for triggering new page loads when 'pageScrolling' is true
-        if (count > 0 &&
-            startingNode === this._previousStartNodeIndex &&
-            this._table.pageScrolling &&
-            this._table._tableRowsVisible.length === this._table._tableRows.length) {
+        if (count > 0 && startingNode === this._previousStartNodeIndex && this._table.pageScrolling) {
             this._table._onSpyIntersect(true);
         }
         this._setRows(startingNode);