@elastic/eui 93.3.0 → 93.4.0

package/optimize/es/components/datagrid/controls/display_selector.js

@@ -195,113 +195,115 @@ export var useDataGridDisplaySelector = function useDataGridDisplaySelector(show
   }, []);
   var buttonLabel = useEuiI18n('euiDisplaySelector.buttonText', 'Display options');
   var resetButtonLabel = useEuiI18n('euiDisplaySelector.resetButtonText', 'Reset to default');
-  var displaySelector = showDensityControls || showRowHeightControls || additionalDisplaySettings ? ___EmotionJSX(EuiPopover, {
-    "data-test-subj": "dataGridDisplaySelectorPopover",
-    isOpen: isOpen,
-    closePopover: function closePopover() {
-      return setIsOpen(false);
-    },
-    anchorPosition: "downRight",
-    panelPaddingSize: "s",
-    panelClassName: "euiDataGrid__displayPopoverPanel",
-    button: ___EmotionJSX(EuiToolTip, {
-      content: buttonLabel,
-      delay: "long"
-    }, ___EmotionJSX(EuiButtonIcon, {
-      size: "xs",
-      iconType: "controlsHorizontal",
-      color: "text",
-      "data-test-subj": "dataGridDisplaySelectorButton",
-      onClick: function onClick() {
-        return setIsOpen(!isOpen);
+  var displaySelector = useMemo(function () {
+    return showDensityControls || showRowHeightControls || additionalDisplaySettings ? ___EmotionJSX(EuiPopover, {
+      "data-test-subj": "dataGridDisplaySelectorPopover",
+      isOpen: isOpen,
+      closePopover: function closePopover() {
+        return setIsOpen(false);
       },
-      "aria-label": buttonLabel
-    }))
-  }, showDensityControls && ___EmotionJSX(EuiI18n, {
-    tokens: ['euiDisplaySelector.densityLabel', 'euiDisplaySelector.labelCompact', 'euiDisplaySelector.labelNormal', 'euiDisplaySelector.labelExpanded'],
-    defaults: ['Density', 'Compact', 'Normal', 'Expanded']
-  }, function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 4),
-      densityLabel = _ref2[0],
-      labelCompact = _ref2[1],
-      labelNormal = _ref2[2],
-      labelExpanded = _ref2[3];
-    return ___EmotionJSX(EuiFormRow, {
-      label: densityLabel,
-      display: "columnCompressed"
-    }, ___EmotionJSX(EuiButtonGroup, {
-      legend: densityLabel,
-      buttonSize: "compressed",
-      isFullWidth: true,
-      options: [{
-        id: densityOptions[0],
-        label: labelCompact
-      }, {
-        id: densityOptions[1],
-        label: labelNormal
-      }, {
-        id: densityOptions[2],
-        label: labelExpanded
-      }],
-      onChange: setGridStyles,
-      idSelected: gridDensity,
-      "data-test-subj": "densityButtonGroup"
-    }));
-  }), showRowHeightControls && ___EmotionJSX(EuiI18n, {
-    tokens: ['euiDisplaySelector.rowHeightLabel', 'euiDisplaySelector.labelSingle', 'euiDisplaySelector.labelAuto', 'euiDisplaySelector.labelCustom', 'euiDisplaySelector.lineCountLabel'],
-    defaults: ['Row height', 'Single', 'Auto fit', 'Custom', 'Lines per row']
-  }, function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 5),
-      rowHeightLabel = _ref4[0],
-      labelSingle = _ref4[1],
-      labelAuto = _ref4[2],
-      labelCustom = _ref4[3],
-      lineCountLabel = _ref4[4];
-    return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiFormRow, {
-      label: rowHeightLabel,
-      display: "columnCompressed"
-    }, ___EmotionJSX(EuiButtonGroup, {
-      legend: rowHeightLabel,
-      buttonSize: "compressed",
-      isFullWidth: true,
-      options: [{
-        id: rowHeightButtonOptions[0],
-        label: labelSingle
-      }, {
-        id: rowHeightButtonOptions[1],
-        label: labelAuto
-      }, {
-        id: rowHeightButtonOptions[2],
-        label: labelCustom
-      }],
-      onChange: setRowHeight,
-      idSelected: rowHeightSelection,
-      "data-test-subj": "rowHeightButtonGroup"
-    })), rowHeightSelection === rowHeightButtonOptions[2] && ___EmotionJSX(EuiFormRow, {
-      label: lineCountLabel,
-      display: "columnCompressed"
-    }, ___EmotionJSX(EuiRange, {
-      compressed: true,
-      fullWidth: true,
-      showInput: true,
-      min: 1,
-      max: 20,
-      step: 1,
-      required: true,
-      value: lineCountInput,
-      onChange: setLineCountHeight,
-      "data-test-subj": "lineCountNumber"
-    })));
-  }), additionalDisplaySettings, showResetButton && ___EmotionJSX(EuiPopoverFooter, null, ___EmotionJSX(EuiFlexGroup, {
-    justifyContent: "flexEnd",
-    responsive: false
-  }, ___EmotionJSX(EuiFlexItem, {
-    grow: false
-  }, ___EmotionJSX("div", null, ___EmotionJSX(EuiButtonEmpty, {
-    flush: "both",
-    size: "xs",
-    onClick: resetToInitialState,
-    "data-test-subj": "resetDisplaySelector"
-  }, resetButtonLabel)))))) : null;
+      anchorPosition: "downRight",
+      panelPaddingSize: "s",
+      panelClassName: "euiDataGrid__displayPopoverPanel",
+      button: ___EmotionJSX(EuiToolTip, {
+        content: buttonLabel,
+        delay: "long"
+      }, ___EmotionJSX(EuiButtonIcon, {
+        size: "xs",
+        iconType: "controlsHorizontal",
+        color: "text",
+        "data-test-subj": "dataGridDisplaySelectorButton",
+        onClick: function onClick() {
+          return setIsOpen(!isOpen);
+        },
+        "aria-label": buttonLabel
+      }))
+    }, showDensityControls && ___EmotionJSX(EuiI18n, {
+      tokens: ['euiDisplaySelector.densityLabel', 'euiDisplaySelector.labelCompact', 'euiDisplaySelector.labelNormal', 'euiDisplaySelector.labelExpanded'],
+      defaults: ['Density', 'Compact', 'Normal', 'Expanded']
+    }, function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 4),
+        densityLabel = _ref2[0],
+        labelCompact = _ref2[1],
+        labelNormal = _ref2[2],
+        labelExpanded = _ref2[3];
+      return ___EmotionJSX(EuiFormRow, {
+        label: densityLabel,
+        display: "columnCompressed"
+      }, ___EmotionJSX(EuiButtonGroup, {
+        legend: densityLabel,
+        buttonSize: "compressed",
+        isFullWidth: true,
+        options: [{
+          id: densityOptions[0],
+          label: labelCompact
+        }, {
+          id: densityOptions[1],
+          label: labelNormal
+        }, {
+          id: densityOptions[2],
+          label: labelExpanded
+        }],
+        onChange: setGridStyles,
+        idSelected: gridDensity,
+        "data-test-subj": "densityButtonGroup"
+      }));
+    }), showRowHeightControls && ___EmotionJSX(EuiI18n, {
+      tokens: ['euiDisplaySelector.rowHeightLabel', 'euiDisplaySelector.labelSingle', 'euiDisplaySelector.labelAuto', 'euiDisplaySelector.labelCustom', 'euiDisplaySelector.lineCountLabel'],
+      defaults: ['Row height', 'Single', 'Auto fit', 'Custom', 'Lines per row']
+    }, function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 5),
+        rowHeightLabel = _ref4[0],
+        labelSingle = _ref4[1],
+        labelAuto = _ref4[2],
+        labelCustom = _ref4[3],
+        lineCountLabel = _ref4[4];
+      return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiFormRow, {
+        label: rowHeightLabel,
+        display: "columnCompressed"
+      }, ___EmotionJSX(EuiButtonGroup, {
+        legend: rowHeightLabel,
+        buttonSize: "compressed",
+        isFullWidth: true,
+        options: [{
+          id: rowHeightButtonOptions[0],
+          label: labelSingle
+        }, {
+          id: rowHeightButtonOptions[1],
+          label: labelAuto
+        }, {
+          id: rowHeightButtonOptions[2],
+          label: labelCustom
+        }],
+        onChange: setRowHeight,
+        idSelected: rowHeightSelection,
+        "data-test-subj": "rowHeightButtonGroup"
+      })), rowHeightSelection === rowHeightButtonOptions[2] && ___EmotionJSX(EuiFormRow, {
+        label: lineCountLabel,
+        display: "columnCompressed"
+      }, ___EmotionJSX(EuiRange, {
+        compressed: true,
+        fullWidth: true,
+        showInput: true,
+        min: 1,
+        max: 20,
+        step: 1,
+        required: true,
+        value: lineCountInput,
+        onChange: setLineCountHeight,
+        "data-test-subj": "lineCountNumber"
+      })));
+    }), additionalDisplaySettings, showResetButton && ___EmotionJSX(EuiPopoverFooter, null, ___EmotionJSX(EuiFlexGroup, {
+      justifyContent: "flexEnd",
+      responsive: false
+    }, ___EmotionJSX(EuiFlexItem, {
+      grow: false
+    }, ___EmotionJSX("div", null, ___EmotionJSX(EuiButtonEmpty, {
+      flush: "both",
+      size: "xs",
+      onClick: resetToInitialState,
+      "data-test-subj": "resetDisplaySelector"
+    }, resetButtonLabel)))))) : null;
+  }, [additionalDisplaySettings, buttonLabel, isOpen, resetButtonLabel, showDensityControls, showResetButton, showRowHeightControls, gridDensity, rowHeightSelection, lineCountInput, setGridStyles, setRowHeight, setLineCountHeight, resetToInitialState]);
   return [displaySelector, gridStyles, rowHeightsOptions];
 };

package/optimize/es/components/datagrid/data_grid.a11y.js

@@ -66,9 +66,19 @@ var commaSeparateNumbers = function commaSeparateNumbers(numberString) {
     );
   });
 };
+var renderCellValue = function renderCellValue(_ref2) {
+  var rowIndex = _ref2.rowIndex,
+    columnId = _ref2.columnId,
+    schema = _ref2.schema;
+  var value = storeData[rowIndex][columnId];
+  if (schema === 'numeric') {
+    value = commaSeparateNumbers(value);
+  }
+  return value;
+};
 var DataGrid = function DataGrid() {
-  var _useState = useState(columns.map(function (_ref2) {
-      var id = _ref2.id;
+  var _useState = useState(columns.map(function (_ref3) {
+      var id = _ref3.id;
       return id;
     })),
     _useState2 = _slicedToArray(_useState, 2),
@@ -110,16 +120,7 @@ var DataGrid = function DataGrid() {
     inMemory: {
       level: 'sorting'
     },
-    renderCellValue: function renderCellValue(_ref3) {
-      var rowIndex = _ref3.rowIndex,
-        columnId = _ref3.columnId,
-        schema = _ref3.schema;
-      var value = data[rowIndex][columnId];
-      if (schema === 'numeric') {
-        value = commaSeparateNumbers(value);
-      }
-      return value;
-    },
+    renderCellValue: renderCellValue,
     sorting: {
       columns: sortingColumns,
       onSort: setSorting

package/optimize/es/components/datagrid/data_grid.js

@@ -3,8 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["leadingControlColumns", "trailingControlColumns", "columns", "columnVisibility", "schemaDetectors", "rowCount", "renderCellValue", "cellContext", "renderCellPopover", "renderFooterCellValue", "className", "gridStyle", "toolbarVisibility", "pagination", "sorting", "inMemory", "onColumnResize", "minSizeForControls", "height", "width", "rowHeightsOptions", "virtualizationOptions", "renderCustomGridBody", "renderCustomToolbar"],
-  _excluded2 = ["focusProps"];
+var _excluded = ["leadingControlColumns", "trailingControlColumns", "columns", "columnVisibility", "schemaDetectors", "rowCount", "renderCellValue", "cellContext", "renderCellPopover", "renderFooterCellValue", "className", "gridStyle", "toolbarVisibility", "pagination", "sorting", "inMemory", "onColumnResize", "minSizeForControls", "height", "width", "rowHeightsOptions", "virtualizationOptions", "renderCustomGridBody", "renderCustomToolbar"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /*
@@ -16,7 +15,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 import classNames from 'classnames';
-import React, { forwardRef, useMemo, useRef, useState, memo } from 'react';
+import React, { forwardRef, useMemo, useRef, useState, memo, useCallback } from 'react';
 import { useGeneratedHtmlId } from '../../services';
 import { useEuiTablePaginationDefaults } from '../table/table_pagination';
 import { EuiFocusTrap } from '../focus_trap';
@@ -25,7 +24,7 @@ import { useMutationObserver } from '../observer/mutation_observer';
 import { useResizeObserver } from '../observer/resize_observer';
 import { EuiDataGridBody } from './body';
 import { useDataGridColumnSelector, useDataGridColumnSorting, useDataGridDisplaySelector, startingStyles, useDataGridFullScreenSelector, useDataGridKeyboardShortcuts, checkOrDefaultToolBarDisplayOptions, EuiDataGridToolbar } from './controls';
-import { DataGridSortingContext, useSorting } from './utils/sorting';
+import { DataGridSortedContext, useSorting } from './utils/sorting';
 import { DataGridFocusContext, useFocus, createKeyDownHandler, preventTabbing } from './utils/focus';
 import { useInMemoryValues, EuiDataGridInMemoryRenderer } from './utils/in_memory';
 import { DataGridCellPopoverContext, useCellPopover } from './body/cell';
@@ -65,8 +64,8 @@ var cellPaddingsToClassMap = {
   m: '',
   l: 'euiDataGrid--paddingLarge'
 };
+var emptyVirtualizationOptions = {};
 export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
-  var _gridItemsRendered$cu;
   var _props$leadingControl = props.leadingControlColumns,
     leadingControlColumns = _props$leadingControl === void 0 ? emptyControlColumns : _props$leadingControl,
     _props$trailingContro = props.trailingControlColumns,
@@ -186,8 +185,14 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
   /**
    * Sorting
    */
-  var columnSorting = useDataGridColumnSorting(orderedVisibleColumns, sorting, mergedSchema, allSchemaDetectors, displayValues);
-  var sortingContext = useSorting({
+  var columnSorting = useDataGridColumnSorting({
+    sorting: sorting,
+    columns: orderedVisibleColumns,
+    displayValues: displayValues,
+    schema: mergedSchema,
+    schemaDetectors: allSchemaDetectors
+  });
+  var sortedContext = useSorting({
     sorting: sorting,
     inMemory: inMemory,
     inMemoryValues: inMemoryValues,
@@ -201,7 +206,20 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
    */
   var _useFocus = useFocus(),
     wrappingDivFocusProps = _useFocus.focusProps,
-    focusContext = _objectWithoutProperties(_useFocus, _excluded2);
+    onFocusUpdate = _useFocus.onFocusUpdate,
+    focusedCell = _useFocus.focusedCell,
+    setFocusedCell = _useFocus.setFocusedCell,
+    setIsFocusedCellInView = _useFocus.setIsFocusedCellInView,
+    focusFirstVisibleInteractiveCell = _useFocus.focusFirstVisibleInteractiveCell;
+  var focusContext = useMemo(function () {
+    return {
+      onFocusUpdate: onFocusUpdate,
+      focusedCell: focusedCell,
+      setFocusedCell: setFocusedCell,
+      setIsFocusedCellInView: setIsFocusedCellInView,
+      focusFirstVisibleInteractiveCell: focusFirstVisibleInteractiveCell
+    };
+  }, [onFocusUpdate, focusedCell, setFocusedCell, setIsFocusedCellInView, focusFirstVisibleInteractiveCell]);
 
   /**
    * Cell popover
@@ -231,7 +249,7 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
     setIsFullScreen: setIsFullScreen,
     focusContext: focusContext,
     cellPopoverContext: cellPopoverContext,
-    sortingContext: sortingContext,
+    sortedContext: sortedContext,
     pagination: pagination,
     rowCount: rowCount,
     visibleColCount: visibleColCount
@@ -278,12 +296,25 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
     gridAriaProps['aria-labelledby'] = "".concat(rest['aria-labelledby'], " ").concat(pagination ? ariaLabelledById : '');
     delete rest['aria-labelledby'];
   }
+  var onKeyDown = useCallback(function (event) {
+    var _gridItemsRendered$cu;
+    createKeyDownHandler({
+      gridElement: contentRef.current,
+      visibleColCount: visibleColCount,
+      visibleRowCount: visibleRowCount,
+      visibleRowStartIndex: ((_gridItemsRendered$cu = gridItemsRendered.current) === null || _gridItemsRendered$cu === void 0 ? void 0 : _gridItemsRendered$cu.visibleRowStartIndex) || 0,
+      rowCount: rowCount,
+      pagination: pagination,
+      hasFooter: !!renderFooterCellValue,
+      focusContext: focusContext
+    })(event);
+  }, [focusContext, visibleColCount, visibleRowCount, rowCount, pagination, renderFooterCellValue]);
   return ___EmotionJSX(DataGridFocusContext.Provider, {
     value: focusContext
   }, ___EmotionJSX(DataGridCellPopoverContext.Provider, {
     value: cellPopoverContext
-  }, ___EmotionJSX(DataGridSortingContext.Provider, {
-    value: sortingContext
+  }, ___EmotionJSX(DataGridSortedContext.Provider, {
+    value: sortedContext
   }, ___EmotionJSX(EuiFocusTrap, {
     disabled: !isFullScreen,
     className: "euiDataGrid__focusWrap"
@@ -319,16 +350,7 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
   }) : null, ___EmotionJSX("div", _extends({
     // eslint-disable-line jsx-a11y/interactive-supports-focus
     ref: contentRef,
-    onKeyDown: createKeyDownHandler({
-      gridElement: contentRef.current,
-      visibleColCount: visibleColCount,
-      visibleRowCount: visibleRowCount,
-      visibleRowStartIndex: ((_gridItemsRendered$cu = gridItemsRendered.current) === null || _gridItemsRendered$cu === void 0 ? void 0 : _gridItemsRendered$cu.visibleRowStartIndex) || 0,
-      rowCount: rowCount,
-      pagination: pagination,
-      hasFooter: !!renderFooterCellValue,
-      focusContext: focusContext
-    }),
+    onKeyDown: onKeyDown,
     "data-test-subj": "euiDataGridBody",
     className: "euiDataGrid__content",
     role: "grid",
@@ -344,6 +366,7 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
     switchColumnPos: switchColumnPos,
     onColumnResize: onColumnResize,
     schemaDetectors: allSchemaDetectors,
+    sorting: sorting,
     pagination: pagination,
     renderCellValue: renderCellValue,
     cellContext: cellContext,
@@ -353,7 +376,7 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
     visibleRows: visibleRows,
     interactiveCellId: interactiveCellId,
     rowHeightsOptions: rowHeightsOptions,
-    virtualizationOptions: virtualizationOptions || {},
+    virtualizationOptions: virtualizationOptions || emptyVirtualizationOptions,
     isFullScreen: isFullScreen,
     gridStyles: gridStyles,
     gridWidth: gridWidth,

package/optimize/es/components/datagrid/utils/col_widths.js

@@ -1,5 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -48,10 +48,12 @@ export var useColumnWidths = function useColumnWidths(_ref) {
     onColumnResize = _ref.onColumnResize;
   var computeColumnWidths = useCallback(function () {
     return columns.filter(doesColumnHaveAnInitialWidth).reduce(function (initialWidths, column) {
-      initialWidths[column.id] = column.initialWidth;
-      return initialWidths;
+      return _objectSpread(_objectSpread({}, initialWidths), {}, _defineProperty({}, column.id, column.initialWidth));
     }, {});
   }, [columns]);
+
+  // Passes initializer function for performance, so computing only runs once on init
+  // @see https://react.dev/reference/react/useState#examples-initializer
   var _useState = useState(computeColumnWidths),
     _useState2 = _slicedToArray(_useState, 2),
     columnWidths = _useState2[0],
@@ -60,14 +62,16 @@ export var useColumnWidths = function useColumnWidths(_ref) {
     setColumnWidths(computeColumnWidths());
   }, [computeColumnWidths]);
   var setColumnWidth = useCallback(function (columnId, width) {
-    setColumnWidths(_objectSpread(_objectSpread({}, columnWidths), {}, _defineProperty({}, columnId, width)));
+    setColumnWidths(function (prevColumnWidths) {
+      return _objectSpread(_objectSpread({}, prevColumnWidths), {}, _defineProperty({}, columnId, width));
+    });
     if (onColumnResize) {
       onColumnResize({
         columnId: columnId,
         width: width
       });
     }
-  }, [columnWidths, onColumnResize]);
+  }, [onColumnResize]);
 
   // Used by react-window to determine actual column widths
   var getColumnWidth = useCallback(function (index) {

package/optimize/es/components/datagrid/utils/focus.js

@@ -87,14 +87,16 @@ export var useFocus = function useFocus() {
       }
     };
   }, [isFocusedCellInView, focusFirstVisibleInteractiveCell]);
-  return {
-    onFocusUpdate: onFocusUpdate,
-    focusedCell: focusedCell,
-    setFocusedCell: setFocusedCell,
-    setIsFocusedCellInView: setIsFocusedCellInView,
-    focusFirstVisibleInteractiveCell: focusFirstVisibleInteractiveCell,
-    focusProps: focusProps
-  };
+  return useMemo(function () {
+    return {
+      onFocusUpdate: onFocusUpdate,
+      focusedCell: focusedCell,
+      setFocusedCell: setFocusedCell,
+      setIsFocusedCellInView: setIsFocusedCellInView,
+      focusFirstVisibleInteractiveCell: focusFirstVisibleInteractiveCell,
+      focusProps: focusProps
+    };
+  }, [onFocusUpdate, focusedCell, setFocusedCell, setIsFocusedCellInView, focusFirstVisibleInteractiveCell, focusProps]);
 };
 export var notifyCellOfFocusState = function notifyCellOfFocusState(cellsUpdateFocus, cell, isFocused) {
   var key = "".concat(cell[0], "-").concat(cell[1]);

package/optimize/es/components/datagrid/utils/grid_height_width.js

@@ -7,11 +7,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * Side Public License, v 1.
  */
 
-import { useEffect, useState, useContext } from 'react';
+import { useEffect, useState, useContext, useMemo } from 'react';
 import { IS_JEST_ENVIRONMENT } from '../../../utils';
 import { useUpdateEffect, useForceRender } from '../../../services';
 import { useResizeObserver } from '../../observer/resize_observer';
-import { DataGridSortingContext } from './sorting';
+import { DataGridSortedContext } from './sorting';
 export var useFinalGridDimensions = function useFinalGridDimensions(_ref) {
   var unconstrainedHeight = _ref.unconstrainedHeight,
     unconstrainedWidth = _ref.unconstrainedWidth,
@@ -83,42 +83,43 @@ export var useUnconstrainedHeight = function useUnconstrainedHeight(_ref2) {
     footerRowHeight = _ref2.footerRowHeight,
     scrollBarHeight = _ref2.scrollBarHeight,
     innerGridRef = _ref2.innerGridRef;
-  var _useContext = useContext(DataGridSortingContext),
+  var _useContext = useContext(DataGridSortedContext),
     getCorrectRowIndex = _useContext.getCorrectRowIndex;
-  var knownHeight = 0; // tracks the pixel height of rows we know the size of
-  var knownRowCount = 0; // how many rows we know the size of
-  for (var i = startRow; i < endRow; i++) {
-    var correctRowIndex = getCorrectRowIndex(i); // map visible row to logical row
-
-    // lookup the height configuration of this row
-    var rowHeightOption = rowHeightUtils.getRowHeightOption(correctRowIndex, rowHeightsOptions);
-    if (rowHeightOption) {
-      // this row's height is known
-      knownRowCount++;
-      knownHeight += rowHeightUtils.getCalculatedHeight(rowHeightOption, defaultRowHeight, correctRowIndex, rowHeightUtils.isRowHeightOverride(correctRowIndex, rowHeightsOptions));
-    }
-  }
-
-  // how many rows to provide space for on the screen
-  var rowCountToAffordFor = endRow - startRow;
-
   // watch the inner element for a change to its width
   // which may cause the horizontal scrollbar to be added or removed
   var _useResizeObserver = useResizeObserver(innerGridRef.current, 'width'),
     innerWidth = _useResizeObserver.width;
   var forceRender = useForceRender();
   useUpdateEffect(forceRender, [innerWidth]);
-  var unconstrainedHeight = defaultRowHeight * (rowCountToAffordFor - knownRowCount) +
-  // guess how much space is required for unknown rows
-  knownHeight +
-  // computed pixel height of the known rows
-  headerRowHeight +
-  // account for header
-  footerRowHeight +
-  // account for footer
-  scrollBarHeight; // account for horizontal scrollbar
+  return useMemo(function () {
+    var knownHeight = 0; // tracks the pixel height of rows we know the size of
+    var knownRowCount = 0; // how many rows we know the size of
+    for (var i = startRow; i < endRow; i++) {
+      var correctRowIndex = getCorrectRowIndex(i); // map visible row to logical row
+
+      // lookup the height configuration of this row
+      var rowHeightOption = rowHeightUtils.getRowHeightOption(correctRowIndex, rowHeightsOptions);
+      if (rowHeightOption) {
+        // this row's height is known
+        knownRowCount++;
+        knownHeight += rowHeightUtils.getCalculatedHeight(rowHeightOption, defaultRowHeight, correctRowIndex, rowHeightUtils.isRowHeightOverride(correctRowIndex, rowHeightsOptions));
+      }
+    }
+
+    // how many rows to provide space for on the screen
+    var rowCountToAffordFor = endRow - startRow;
+    var unconstrainedHeight = defaultRowHeight * (rowCountToAffordFor - knownRowCount) +
+    // guess how much space is required for unknown rows
+    knownHeight +
+    // computed pixel height of the known rows
+    headerRowHeight +
+    // account for header
+    footerRowHeight +
+    // account for footer
+    scrollBarHeight; // account for horizontal scrollbar
 
-  return unconstrainedHeight;
+    return unconstrainedHeight;
+  }, [defaultRowHeight, endRow, footerRowHeight, headerRowHeight, startRow, getCorrectRowIndex, rowHeightUtils, rowHeightsOptions, scrollBarHeight]);
 };
 
 /**

package/optimize/es/components/datagrid/utils/ref.js

@@ -13,7 +13,7 @@ export var useImperativeGridRef = function useImperativeGridRef(_ref) {
     setIsFullScreen = _ref.setIsFullScreen,
     focusContext = _ref.focusContext,
     cellPopoverContext = _ref.cellPopoverContext,
-    sortedRowMap = _ref.sortingContext.sortedRowMap,
+    sortedRowMap = _ref.sortedContext.sortedRowMap,
     pagination = _ref.pagination,
     rowCount = _ref.rowCount,
     visibleColCount = _ref.visibleColCount;

package/optimize/es/components/datagrid/utils/row_heights.js

@@ -20,7 +20,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useForceRender, useLatest } from '../../../services';
 import { isNumber, isObject } from '../../../services/predicate';
-import { DataGridSortingContext } from './sorting';
+import { DataGridSortedContext } from './sorting';
 
 // TODO: Once JS variables are available, use them here instead of hard-coded maps
 export var cellPaddingsMap = {
@@ -325,7 +325,7 @@ export var useRowHeightUtils = function useRowHeightUtils(_ref2) {
 export var useDefaultRowHeight = function useDefaultRowHeight(_ref3) {
   var rowHeightsOptions = _ref3.rowHeightsOptions,
     rowHeightUtils = _ref3.rowHeightUtils;
-  var _useContext = useContext(DataGridSortingContext),
+  var _useContext = useContext(DataGridSortedContext),
     getCorrectRowIndex = _useContext.getCorrectRowIndex;
 
   // `minRowHeight` is primarily used by undefined & lineCount heights