diff --git a/src/Table/Table.js b/src/Table/Table.js index e2f97b69d..eeb915d0f 100644 --- a/src/Table/Table.js +++ b/src/Table/Table.js @@ -271,7 +271,7 @@ class Table extends React.Component { } getTBody(columns, data, sortBy, itemHeight) { - const buildRowOptions = this.props.buildRowOptions; + const { buildRowOptions, virtualizeDataThreshold } = this.props; let childToMeasure; if (itemHeight === 0 && data.length) { @@ -290,13 +290,32 @@ class Table extends React.Component { return {this.getEmptyRowCell(columns)}; } + const sortedData = sortData(columns, data, sortBy); + + if (data.length < virtualizeDataThreshold) { + // Do not use virtual list for "small" data sets + return ( + + {sortedData.map((item, index) => { + return this.getRowCells( + columns, + sortBy, + buildRowOptions, + item, + index + ); + })} + + ); + } + return (