baseui 0.0.0-next-6e876dd → 0.0.0-next-cefa45f

package/data-table/data-table.js

@@ -62,6 +62,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // consider pulling this out to a prop if useful.
 var HEADER_ROW_HEIGHT = 48;
 
+var sum = function sum(ns) {
+  return ns.reduce(function (s, n) {
+    return s + n;
+  }, 0);
+};
+
 function CellPlacement(_ref) {
   var columnIndex = _ref.columnIndex,
       rowIndex = _ref.rowIndex,
@@ -320,7 +326,7 @@ function Header(props) {
   }))));
 }
 
-function Headers(props) {
+function Headers() {
   var _useStyletron5 = (0, _index2.useStyletron)(),
       _useStyletron6 = _slicedToArray(_useStyletron5, 2),
       css = _useStyletron6[0],
@@ -339,9 +345,7 @@ function Headers(props) {
       position: 'sticky',
       top: 0,
       left: 0,
-      width: "".concat(ctx.widths.reduce(function (sum, w) {
-        return sum + w;
-      }, 0), "px"),
+      width: "".concat(sum(ctx.widths), "px"),
       height: "".concat(HEADER_ROW_HEIGHT, "px"),
       display: 'flex',
       // this feels bad.. the absolutely positioned children elements
@@ -564,22 +568,27 @@ function DataTable(_ref2) {
     }
 
     return rowHeight;
-  }, [rowHeight]);
-  var gridRef = React.useRef(null);
+  }, [rowHeight]); // We use state for our ref, to allow hooks to  update when the ref changes.
+  // eslint-disable-next-line flowtype/no-weak-types
 
-  var _React$useState7 = React.useState(columns.map(function () {
-    return 0;
-  })),
+  var _React$useState7 = React.useState(null),
       _React$useState8 = _slicedToArray(_React$useState7, 2),
-      measuredWidths = _React$useState8[0],
-      setMeasuredWidths = _React$useState8[1];
+      gridRef = _React$useState8[0],
+      setGridRef = _React$useState8[1];
 
   var _React$useState9 = React.useState(columns.map(function () {
     return 0;
   })),
       _React$useState10 = _slicedToArray(_React$useState9, 2),
-      resizeDeltas = _React$useState10[0],
-      setResizeDeltas = _React$useState10[1];
+      measuredWidths = _React$useState10[0],
+      setMeasuredWidths = _React$useState10[1];
+
+  var _React$useState11 = React.useState(columns.map(function () {
+    return 0;
+  })),
+      _React$useState12 = _slicedToArray(_React$useState11, 2),
+      resizeDeltas = _React$useState12[0],
+      setResizeDeltas = _React$useState12[1];
 
   React.useEffect(function () {
     setMeasuredWidths(function (prev) {
@@ -594,11 +603,11 @@ function DataTable(_ref2) {
     });
   }, [columns]);
   var resetAfterColumnIndex = React.useCallback(function (columnIndex) {
-    if (gridRef.current) {
+    if (gridRef) {
       // $FlowFixMe trigger react-window to layout the elements again
-      gridRef.current.resetAfterColumnIndex(columnIndex, true);
+      gridRef.resetAfterColumnIndex(columnIndex, true);
     }
-  }, [gridRef.current]);
+  }, [gridRef]);
   var handleWidthsChange = React.useCallback(function (nextWidths) {
     setMeasuredWidths(nextWidths);
     resetAfterColumnIndex(0);
@@ -611,20 +620,20 @@ function DataTable(_ref2) {
     resetAfterColumnIndex(columnIndex);
   }, [setResizeDeltas, resetAfterColumnIndex]);
 
-  var _React$useState11 = React.useState(0),
-      _React$useState12 = _slicedToArray(_React$useState11, 2),
-      scrollLeft = _React$useState12[0],
-      setScrollLeft = _React$useState12[1];
-
-  var _React$useState13 = React.useState(false),
+  var _React$useState13 = React.useState(0),
       _React$useState14 = _slicedToArray(_React$useState13, 2),
-      isScrollingX = _React$useState14[0],
-      setIsScrollingX = _React$useState14[1];
+      scrollLeft = _React$useState14[0],
+      setScrollLeft = _React$useState14[1];
 
   var _React$useState15 = React.useState(false),
       _React$useState16 = _slicedToArray(_React$useState15, 2),
-      recentlyScrolledX = _React$useState16[0],
-      setRecentlyScrolledX = _React$useState16[1];
+      isScrollingX = _React$useState16[0],
+      setIsScrollingX = _React$useState16[1];
+
+  var _React$useState17 = React.useState(false),
+      _React$useState18 = _slicedToArray(_React$useState17, 2),
+      recentlyScrolledX = _React$useState18[0],
+      setRecentlyScrolledX = _React$useState18[1];
 
   React.useLayoutEffect(function () {
     if (recentlyScrolledX !== isScrollingX) {
@@ -746,25 +755,18 @@ function DataTable(_ref2) {
     return result;
   }, [sortedIndices, filteredIndices, onIncludedRowsChange, allRows]);
 
-  var _React$useState17 = React.useState(0),
-      _React$useState18 = _slicedToArray(_React$useState17, 2),
-      browserScrollbarWidth = _React$useState18[0],
-      setBrowserScrollbarWidth = _React$useState18[1];
+  var _React$useState19 = React.useState(0),
+      _React$useState20 = _slicedToArray(_React$useState19, 2),
+      browserScrollbarWidth = _React$useState20[0],
+      setBrowserScrollbarWidth = _React$useState20[1];
 
   var normalizedWidths = React.useMemo(function () {
-    var sum = function sum(ns) {
-      return ns.reduce(function (s, n) {
-        return s + n;
-      }, 0);
-    };
-
     var resizedWidths = measuredWidths.map(function (w, i) {
       return Math.floor(w) + Math.floor(resizeDeltas[i]);
     });
 
-    if (gridRef.current) {
-      // $FlowFixMe
-      var gridProps = gridRef.current.props;
+    if (gridRef) {
+      var gridProps = gridRef.props;
       var isContentTallerThanContainer = false;
       var visibleRowHeight = 0;
 
@@ -801,7 +803,7 @@ function DataTable(_ref2) {
     }
 
     return resizedWidths;
-  }, [measuredWidths, resizeDeltas, browserScrollbarWidth, rows.length, columns]);
+  }, [gridRef, measuredWidths, resizeDeltas, browserScrollbarWidth, rows.length, columns]);
   var isSelectable = batchActions ? !!batchActions.length : false;
   var isSelectedAll = React.useMemo(function () {
     if (!selectedRowIds) {
@@ -845,23 +847,23 @@ function DataTable(_ref2) {
     }
   }, [onSort]);
 
-  var _React$useState19 = React.useState(-1),
-      _React$useState20 = _slicedToArray(_React$useState19, 2),
-      columnHighlightIndex = _React$useState20[0],
-      setColumnHighlightIndex = _React$useState20[1];
-
   var _React$useState21 = React.useState(-1),
       _React$useState22 = _slicedToArray(_React$useState21, 2),
-      rowHighlightIndex = _React$useState22[0],
-      setRowHighlightIndex = _React$useState22[1];
+      columnHighlightIndex = _React$useState22[0],
+      setColumnHighlightIndex = _React$useState22[1];
+
+  var _React$useState23 = React.useState(-1),
+      _React$useState24 = _slicedToArray(_React$useState23, 2),
+      rowHighlightIndex = _React$useState24[0],
+      setRowHighlightIndex = _React$useState24[1];
 
   function handleRowHighlightIndexChange(nextIndex) {
     setRowHighlightIndex(nextIndex);
 
-    if (gridRef.current) {
+    if (gridRef) {
       if (nextIndex >= 0) {
         // $FlowFixMe - unable to get react-window types
-        gridRef.current.scrollToItem({
+        gridRef.scrollToItem({
           rowIndex: nextIndex
         });
       }
@@ -952,8 +954,9 @@ function DataTable(_ref2) {
       }
     }, /*#__PURE__*/React.createElement(_reactWindow.VariableSizeGrid // eslint-disable-next-line flowtype/no-weak-types
     , {
-      ref: gridRef,
+      ref: setGridRef,
       overscanRowCount: 10,
+      overscanColumnCount: 5,
       innerElementType: InnerTableElement,
       columnCount: columns.length,
       columnWidth: function columnWidth(columnIndex) {

package/data-table/data-table.js.flow

@@ -87,6 +87,8 @@ type CellPlacementPropsT = {
   },
 };
 
+const sum = ns => ns.reduce((s, n) => s + n, 0);
+
 function CellPlacement({columnIndex, rowIndex, data, style}) {
   const [css, theme] = useStyletron();
 
@@ -411,7 +413,7 @@ function Header(props: HeaderProps) {
   );
 }
 
-function Headers(props: {||}) {
+function Headers() {
   const [css, theme] = useStyletron();
   const locale = React.useContext(LocaleContext);
   const ctx = React.useContext(HeaderContext);
@@ -423,7 +425,7 @@ function Headers(props: {||}) {
         position: 'sticky',
         top: 0,
         left: 0,
-        width: `${ctx.widths.reduce((sum, w) => sum + w, 0)}px`,
+        width: `${sum(ctx.widths)}px`,
         height: `${HEADER_ROW_HEIGHT}px`,
         display: 'flex',
         // this feels bad.. the absolutely positioned children elements
@@ -696,7 +698,10 @@ export function DataTable({
     },
     [rowHeight],
   );
-  const gridRef = React.useRef<typeof VariableSizeGrid | null>(null);
+
+  // We use state for our ref, to allow hooks to  update when the ref changes.
+  // eslint-disable-next-line flowtype/no-weak-types
+  const [gridRef, setGridRef] = React.useState<?VariableSizeGrid<any>>(null);
   const [measuredWidths, setMeasuredWidths] = React.useState(
     columns.map(() => 0),
   );
@@ -712,12 +717,12 @@ export function DataTable({
 
   const resetAfterColumnIndex = React.useCallback(
     columnIndex => {
-      if (gridRef.current) {
+      if (gridRef) {
         // $FlowFixMe trigger react-window to layout the elements again
-        gridRef.current.resetAfterColumnIndex(columnIndex, true);
+        gridRef.resetAfterColumnIndex(columnIndex, true);
       }
     },
-    [gridRef.current],
+    [gridRef],
   );
   const handleWidthsChange = React.useCallback(
     nextWidths => {
@@ -843,13 +848,11 @@ export function DataTable({
 
   const [browserScrollbarWidth, setBrowserScrollbarWidth] = React.useState(0);
   const normalizedWidths = React.useMemo(() => {
-    const sum = ns => ns.reduce((s, n) => s + n, 0);
     const resizedWidths = measuredWidths.map(
       (w, i) => Math.floor(w) + Math.floor(resizeDeltas[i]),
     );
-    if (gridRef.current) {
-      // $FlowFixMe
-      const gridProps = gridRef.current.props;
+    if (gridRef) {
+      const gridProps = gridRef.props;
 
       let isContentTallerThanContainer = false;
       let visibleRowHeight = 0;
@@ -886,6 +889,7 @@ export function DataTable({
     }
     return resizedWidths;
   }, [
+    gridRef,
     measuredWidths,
     resizeDeltas,
     browserScrollbarWidth,
@@ -948,10 +952,10 @@ export function DataTable({
 
   function handleRowHighlightIndexChange(nextIndex) {
     setRowHighlightIndex(nextIndex);
-    if (gridRef.current) {
+    if (gridRef) {
       if (nextIndex >= 0) {
         // $FlowFixMe - unable to get react-window types
-        gridRef.current.scrollToItem({rowIndex: nextIndex});
+        gridRef.scrollToItem({rowIndex: nextIndex});
       }
       if (onRowHighlightChange) {
         onRowHighlightChange(nextIndex, rows[nextIndex - 1]);
@@ -1051,8 +1055,9 @@ export function DataTable({
           >
             <VariableSizeGrid
               // eslint-disable-next-line flowtype/no-weak-types
-              ref={(gridRef: any)}
+              ref={(setGridRef: any)}
               overscanRowCount={10}
+              overscanColumnCount={5}
               innerElementType={InnerTableElement}
               columnCount={columns.length}
               columnWidth={columnIndex => normalizedWidths[columnIndex]}

package/data-table/measure-column-widths.js

@@ -19,14 +19,6 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -39,50 +31,61 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-// https://github.com/Swizec/useDimensions
-function useDimensions() {
-  var _React$useState = React.useState({}),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      dimensions = _React$useState2[0],
-      setDimensions = _React$useState2[1];
+// Measures the column header + sampled data
+function MeasureColumn(_ref) {
+  var sampleIndexes = _ref.sampleIndexes,
+      column = _ref.column,
+      columnIndex = _ref.columnIndex,
+      rows = _ref.rows,
+      isSelectable = _ref.isSelectable,
+      onLayout = _ref.onLayout;
 
-  var _React$useState3 = React.useState(null),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      node = _React$useState4[0],
-      setNode = _React$useState4[1];
+  var _useStyletron = (0, _index.useStyletron)(),
+      _useStyletron2 = _slicedToArray(_useStyletron, 1),
+      css = _useStyletron2[0];
 
-  var ref = React.useCallback(function (node) {
-    setNode(node);
-  }, []);
+  var ref = (0, React.useRef)();
   React.useEffect(function () {
-    if (typeof document !== 'undefined') {
-      if (node) {
-        window.requestAnimationFrame(function () {
-          setDimensions(node.getBoundingClientRect());
-        });
-      }
+    if (ref.current) {
+      onLayout(columnIndex, ref.current.getBoundingClientRect());
     }
-  }, [node]);
-  return [ref, dimensions];
-}
-
-function ElementMeasurer(props) {
-  var onDimensionsChange = props.onDimensionsChange;
-
-  var _useDimensions = useDimensions(),
-      _useDimensions2 = _slicedToArray(_useDimensions, 2),
-      ref = _useDimensions2[0],
-      dimensions = _useDimensions2[1];
-
-  React.useEffect(function () {
-    onDimensionsChange(dimensions);
-  }, [dimensions, onDimensionsChange]);
-  return /*#__PURE__*/React.cloneElement(props.item, {
-    ref: ref
-  });
+  }, []);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: ref,
+    className: css({
+      display: 'flex',
+      flexDirection: 'column',
+      width: 'fit-content'
+    })
+  }, /*#__PURE__*/React.createElement(_headerCell.default, {
+    index: columnIndex,
+    isHovered: true,
+    isMeasured: true,
+    isSelectedAll: false,
+    isSelectedIndeterminate: false,
+    onMouseEnter: function onMouseEnter() {},
+    onMouseLeave: function onMouseLeave() {},
+    onSelectAll: function onSelectAll() {},
+    onSelectNone: function onSelectNone() {},
+    onSort: function onSort(i) {},
+    sortable: column.sortable,
+    sortDirection: null,
+    title: column.title,
+    isSelectable: isSelectable
+  }), sampleIndexes.map(function (rowIndex, i) {
+    var Cell = column.renderCell;
+    return /*#__PURE__*/React.createElement(Cell, {
+      key: "measure-".concat(i),
+      value: column.mapDataToValue(rows[rowIndex].data),
+      isSelectable: isSelectable,
+      isMeasured: true,
+      sortable: column.sortable,
+      x: 0,
+      y: rowIndex
+    });
+  }));
 }
 
-// sample size could likely be generated based on row count, to have higher confidence
 var MAX_SAMPLE_SIZE = 50;
 
 function generateSampleIndices(inputMin, inputMax, maxSamples) {
@@ -114,57 +117,46 @@ function generateSampleIndices(inputMin, inputMax, maxSamples) {
   return indices;
 }
 
-function MeasureColumnWidths(_ref) {
-  var columns = _ref.columns,
-      rows = _ref.rows,
-      widths = _ref.widths,
-      isSelectable = _ref.isSelectable,
-      onWidthsChange = _ref.onWidthsChange;
+function MeasureColumnWidths(_ref2) {
+  var columns = _ref2.columns,
+      rows = _ref2.rows,
+      widths = _ref2.widths,
+      isSelectable = _ref2.isSelectable,
+      onWidthsChange = _ref2.onWidthsChange;
 
-  var _useStyletron = (0, _index.useStyletron)(),
-      _useStyletron2 = _slicedToArray(_useStyletron, 1),
-      css = _useStyletron2[0];
+  var _useStyletron3 = (0, _index.useStyletron)(),
+      _useStyletron4 = _slicedToArray(_useStyletron3, 1),
+      css = _useStyletron4[0];
 
-  var measurementCount = React.useRef(0);
-  var dimensionsCache = React.useRef(widths);
+  var widthMap = React.useMemo(function () {
+    return new Map();
+  }, []);
   var sampleSize = rows.length < MAX_SAMPLE_SIZE ? rows.length : MAX_SAMPLE_SIZE;
   var finishedMeasurementCount = (sampleSize + 1) * columns.length;
-  var sampleRowIndicesByColumn = React.useMemo(function () {
-    measurementCount.current = 0;
-    dimensionsCache.current = widths;
-    var indices = generateSampleIndices(0, rows.length - 1, sampleSize);
-    return columns.map(function () {
-      return indices;
-    });
+  var sampleIndexes = React.useMemo(function () {
+    return generateSampleIndices(0, rows.length - 1, sampleSize);
   }, [columns, rows, widths, sampleSize]);
-  var handleDimensionsChange = React.useCallback(function (columnIndex, rowIndex, dimensions) {
-    if (dimensions.width === undefined) return;
+  var handleDimensionsChange = React.useCallback(function (columnIndex, dimensions) {
+    var nextWidth = Math.min(Math.max(columns[columnIndex].minWidth || 0, widthMap.get(columnIndex) || 0, dimensions.width + 1), columns[columnIndex].maxWidth || Infinity);
 
-    if (columns[columnIndex] === undefined || dimensionsCache.current[columnIndex] === undefined) {
-      return;
+    if (nextWidth !== widthMap.get(columnIndex)) {
+      widthMap.set(columnIndex, nextWidth);
     }
 
-    measurementCount.current += 1;
-    var nextWidth = Math.min(Math.max(columns[columnIndex].minWidth || 0, dimensionsCache.current[columnIndex], dimensions.width + 1), columns[columnIndex].maxWidth || Infinity);
-
-    if (nextWidth !== dimensionsCache.current[columnIndex]) {
-      var nextWidths = _toConsumableArray(dimensionsCache.current);
-
-      nextWidths[columnIndex] = nextWidth;
-      dimensionsCache.current = nextWidths;
-    }
-
-    if (measurementCount.current >= finishedMeasurementCount) {
-      onWidthsChange(dimensionsCache.current);
+    if ( // Refresh at 100% of done
+    widthMap.size === columns.length || // ...50%
+    widthMap.size === Math.floor(columns.length / 2) || // ...25%
+    widthMap.size === Math.floor(columns.length / 4)) {
+      onWidthsChange(Array.from(widthMap.values()));
     }
   }, [columns, finishedMeasurementCount, onWidthsChange]);
   var hiddenStyle = css({
     position: 'absolute',
     overflow: 'hidden',
     height: 0
-  });
+  }); // Remove the measurement nodes after we are done updating our column width
 
-  if (measurementCount.current >= finishedMeasurementCount) {
+  if (widthMap.size === columns.length) {
     return null;
   }
 
@@ -175,45 +167,15 @@ function MeasureColumnWidths(_ref) {
       className: hiddenStyle,
       "aria-hidden": true,
       role: "none"
-    }, sampleRowIndicesByColumn.map(function (rowIndices, columnIndex) {
-      var Cell = columns[columnIndex].renderCell;
-      return rowIndices.map(function (rowIndex) {
-        return /*#__PURE__*/React.createElement(ElementMeasurer, {
-          key: "measure-".concat(columnIndex, "-").concat(rowIndex),
-          onDimensionsChange: function onDimensionsChange(dimensions) {
-            return handleDimensionsChange(columnIndex, rowIndex, dimensions);
-          },
-          item: /*#__PURE__*/React.createElement(Cell, {
-            value: columns[columnIndex].mapDataToValue(rows[rowIndex].data),
-            isMeasured: true,
-            onSelect: isSelectable && columnIndex === 0 ? function () {} : undefined,
-            x: columnIndex,
-            y: rowIndex
-          })
-        });
-      });
-    }), columns.map(function (column, columnIndex) {
-      return /*#__PURE__*/React.createElement(ElementMeasurer, {
-        key: "measure-column-".concat(columnIndex),
-        onDimensionsChange: function onDimensionsChange(dimensions) {
-          return handleDimensionsChange(columnIndex, -1, dimensions);
-        },
-        item: /*#__PURE__*/React.createElement(_headerCell.default, {
-          index: columnIndex,
-          isHovered: true,
-          isMeasured: true,
-          isSelectable: isSelectable && columnIndex === 0,
-          isSelectedAll: false,
-          isSelectedIndeterminate: false,
-          onMouseEnter: function onMouseEnter() {},
-          onMouseLeave: function onMouseLeave() {},
-          onSelectAll: function onSelectAll() {},
-          onSelectNone: function onSelectNone() {},
-          onSort: function onSort(i) {},
-          sortable: column.sortable,
-          sortDirection: null,
-          title: column.title
-        })
+    }, columns.map(function (column, i) {
+      return /*#__PURE__*/React.createElement(MeasureColumn, {
+        key: column.title + i,
+        column: column,
+        rows: rows,
+        isSelectable: isSelectable,
+        onLayout: handleDimensionsChange,
+        columnIndex: i,
+        sampleIndexes: sampleIndexes
       });
     }))
   );