Merge pull request #11 from datafold/sergey-revert-bad-code

Revert "Virtualize columns"

Author: sklinov

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@datafoldcom/react-base-table",
-  "version": "1.15.3",
+  "version": "1.15.4",
   "description": "a react table component to display large data set with high performance and flexibility, forked from https://github.com/Autodesk/react-base-table.git",
   "main": "lib/index.js",
   "module": "es/index.js",

package.json

@@ -1088,7 +1088,6 @@ BaseTable.defaultProps = {
   sortBy: {},
   useIsScrolling: false,
   overscanRowCount: 1,
-  overscanColumnCount: 1,
   onEndReachedThreshold: 500,
   getScrollbarSize: defaultGetScrollbarSize,
   ignoreFunctionInColumnCompare: true,
@@ -1302,14 +1301,6 @@ BaseTable.propTypes = {
    * Number of rows to render above/below the visible bounds of the list
    */
   overscanRowCount: PropTypes.number,
-  /**
-   * Number of columns to render left/right the visible bounds of the list
-   */
-  overscanColumnCount: PropTypes.number,
-  /**
-  * Array of column widths, when column virtualization is required
-  */
-  columnWidths: PropTypes.arrayOf(PropTypes.number),
   /**
    * Custom scrollbar size measurement
    */

src/BaseTable.js

@@ -74,14 +74,6 @@ class GridTable extends React.PureComponent {
     return rowRenderer({ ...args, columns, rowData });
   }
 
-  getColumnWidthFunction(columnWidths) {
-    return (index) => columnWidths[index];
-  }
-
-  getColumnCount() {
-    return this.props.columnWidths && Array.isArray(this.props.columnWidths) ? this.props.columnWidths.length : 1
-  }
-
   render() {
     const {
       containerStyle,
@@ -100,20 +92,17 @@ class GridTable extends React.PureComponent {
       onScroll,
       hoveredRowKey,
       overscanRowCount,
-      overscanColumnCount,
       // omit from rest
       style,
       onScrollbarPresenceChange,
-      columnWidths,
       ...rest
     } = this.props;
     const headerHeight = this._getHeaderHeight();
     const frozenRowCount = frozenData.length;
     const frozenRowsHeight = rowHeight * frozenRowCount;
     const cls = cn(`${classPrefix}__table`, className);
     const containerProps = containerStyle ? { style: containerStyle } : null;
-    const Grid = (estimatedRowHeight || columnWidths) ? VariableSizeGrid : FixedSizeGrid;
-    const columnCount = this.getColumnCount();
+    const Grid = estimatedRowHeight ? VariableSizeGrid : FixedSizeGrid;
 
     this._resetColumnWidthCache(bodyWidth);
     return (
@@ -128,13 +117,13 @@ class GridTable extends React.PureComponent {
           frozenData={frozenData}
           width={width}
           height={Math.max(height - headerHeight - frozenRowsHeight, 0)}
-          rowHeight={(estimatedRowHeight || columnWidths) ? (getRowHeight ? getRowHeight : () => rowHeight)  : rowHeight}
+          rowHeight={estimatedRowHeight ? getRowHeight : rowHeight}
           estimatedRowHeight={typeof estimatedRowHeight === 'function' ? undefined : estimatedRowHeight}
           rowCount={data.length}
           overscanRowCount={overscanRowCount}
-          columnWidth={columnWidths ? this.getColumnWidthFunction(columnWidths) : estimatedRowHeight ? this._getBodyWidth : bodyWidth}
-          columnCount={columnCount}
-          overscanColumnCount={overscanColumnCount}
+          columnWidth={estimatedRowHeight ? this._getBodyWidth : bodyWidth}
+          columnCount={1}
+          overscanColumnCount={0}
           useIsScrolling={useIsScrolling}
           hoveredRowKey={hoveredRowKey}
           onScroll={onScroll}
@@ -221,15 +210,13 @@ GridTable.propTypes = {
   rowKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   useIsScrolling: PropTypes.bool,
   overscanRowCount: PropTypes.number,
-  overscanColumnCount: PropTypes.number,
   hoveredRowKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   style: PropTypes.object,
   onScrollbarPresenceChange: PropTypes.func,
   onScroll: PropTypes.func,
   onRowsRendered: PropTypes.func,
   headerRenderer: PropTypes.func.isRequired,
   rowRenderer: PropTypes.func.isRequired,
-  columnWidths: PropTypes.arrayOf(PropTypes.number),
 };
 
 export default GridTable;

src/GridTable.js

@@ -426,14 +426,6 @@ declare module '@datafoldcom/react-base-table' {
      * Number of rows to render above/below the visible bounds of the list
      */
     overscanRowCount?: number;
-    /**
-     * Number of columns to render left/right the visible bounds of the list
-     */
-    overscanColumnCount?: number;
-    /**
-     * Array of column widths, when column virtualization is required
-     */
-    columnWidths?: number[];
     /**
      * Custom scrollbar size measurement
      */