@elastic/eui 62.1.0 → 62.2.2

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

@@ -11,9 +11,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { useEffect, useState, useMemo, useCallback, useContext } from 'react';
-import { isObject, isNumber } from '../../../services/predicate';
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useForceRender, useLatest } from '../../../services';
+import { isNumber, isObject } from '../../../services/predicate';
 import { DataGridSortingContext } from './sorting'; // TODO: Once JS variables are available, use them here instead of hard-coded maps
 
 export var cellPaddingsMap = {
@@ -24,12 +24,14 @@ export var cellPaddingsMap = {
 export var AUTO_HEIGHT = 'auto';
 export var DEFAULT_ROW_HEIGHT = 34;
 export var RowHeightUtils = /*#__PURE__*/function () {
-  function RowHeightUtils(gridRef, rerenderGridBodyRef) {
+  function RowHeightUtils(gridRef, outerGridElementRef, gridItemsRenderedRef, rerenderGridBodyRef) {
     var _this = this;
 
     _classCallCheck(this, RowHeightUtils);
 
     this.gridRef = gridRef;
+    this.outerGridElementRef = outerGridElementRef;
+    this.gridItemsRenderedRef = gridItemsRenderedRef;
     this.rerenderGridBodyRef = rerenderGridBodyRef;
 
     _defineProperty(this, "styles", {
@@ -225,6 +227,31 @@ export var RowHeightUtils = /*#__PURE__*/function () {
       (_this$gridRef$current = this.gridRef.current) === null || _this$gridRef$current === void 0 ? void 0 : _this$gridRef$current.resetAfterRowIndex(this.lastUpdatedRow);
       this.lastUpdatedRow = Infinity;
     }
+  }, {
+    key: "compensateForLayoutShift",
+    value: function compensateForLayoutShift(rowIndex, verticalLayoutShift, anchorRow) {
+      var grid = this.gridRef.current;
+      var outerGridElement = this.outerGridElementRef.current;
+      var renderedItems = this.gridItemsRenderedRef.current;
+
+      if (grid == null || outerGridElement == null || renderedItems == null || anchorRow == null || !Number.isFinite(verticalLayoutShift)) {
+        return;
+      } // skip if the start row is the anchor row but it hasn't shifted
+
+
+      if (anchorRow === 'start' && renderedItems.visibleRowStartIndex !== rowIndex) {
+        return;
+      } // skip if the center row is the anchor row but it hasn't shifted
+
+
+      if (anchorRow === 'center' && Math.floor((renderedItems.visibleRowStopIndex - renderedItems.visibleRowStartIndex) / 2) !== rowIndex) {
+        return;
+      }
+
+      grid.scrollTo({
+        scrollTop: outerGridElement.scrollTop + verticalLayoutShift
+      });
+    }
   }]);
 
   return RowHeightUtils;
@@ -236,13 +263,15 @@ export var RowHeightUtils = /*#__PURE__*/function () {
 
 export var useRowHeightUtils = function useRowHeightUtils(_ref2) {
   var gridRef = _ref2.gridRef,
+      outerGridElementRef = _ref2.outerGridElementRef,
+      gridItemsRenderedRef = _ref2.gridItemsRenderedRef,
       gridStyles = _ref2.gridStyles,
       columns = _ref2.columns,
       rowHeightsOptions = _ref2.rowHeightsOptions;
   var forceRenderRef = useLatest(useForceRender());
 
   var _useState = useState(function () {
-    return new RowHeightUtils(gridRef, forceRenderRef);
+    return new RowHeightUtils(gridRef, outerGridElementRef, gridItemsRenderedRef, forceRenderRef);
   }),
       _useState2 = _slicedToArray(_useState, 1),
       rowHeightUtils = _useState2[0]; // Forces a rerender whenever the row heights change, as this can cause the

package/optimize/es/components/description_list/description_list_description.js

@@ -14,7 +14,8 @@ import React, { useContext } from 'react';
 import classNames from 'classnames';
 import { useEuiTheme } from '../../services';
 import { euiDescriptionListDescriptionStyles } from './description_list_description.styles';
-import { EuiDescriptionListContext } from './description_list_context';
+import { EuiDescriptionListContext } from './description_list_context'; // Export required for correct inference by HOCs
+
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiDescriptionListDescription = function EuiDescriptionListDescription(_ref) {
   var children = _ref.children,

package/optimize/es/components/description_list/description_list_title.js

@@ -14,7 +14,8 @@ import React, { useContext } from 'react';
 import classNames from 'classnames';
 import { useEuiTheme } from '../../services';
 import { euiDescriptionListTitleStyles } from './description_list_title.styles';
-import { EuiDescriptionListContext } from './description_list_context';
+import { EuiDescriptionListContext } from './description_list_context'; // Export required for correct inference by HOCs
+
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiDescriptionListTitle = function EuiDescriptionListTitle(_ref) {
   var children = _ref.children,

package/optimize/es/components/popover/wrapping_popover.js

@@ -1,8 +1,18 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["button"];
 
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -10,7 +20,7 @@ var _excluded = ["button"];
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import React, { useState, useEffect } from 'react';
+import React, { Component } from 'react';
 import { EuiPopover } from './popover';
 import { EuiPortal } from '../portal';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -20,43 +30,74 @@ import { jsx as ___EmotionJSX } from "@emotion/react";
  * then the button element is moved into the popover dom.
  * On unmount, the button is moved back to its original location.
  */
-export var EuiWrappingPopover = function EuiWrappingPopover(_ref) {
-  var button = _ref.button,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
-  var _useState = useState(null),
-      _useState2 = _slicedToArray(_useState, 2),
-      anchor = _useState2[0],
-      setAnchor = _useState2[1];
-
-  var _useState3 = useState(null),
-      _useState4 = _slicedToArray(_useState3, 2),
-      portal = _useState4[0],
-      setPortal = _useState4[1];
-
-  useEffect(function () {
-    if (anchor) {
-      // move the button into the popover DOM
-      anchor.insertAdjacentElement('beforebegin', button);
+export var EuiWrappingPopover = /*#__PURE__*/function (_Component) {
+  _inherits(EuiWrappingPopover, _Component);
+
+  var _super = _createSuper(EuiWrappingPopover);
+
+  function EuiWrappingPopover() {
+    var _this;
+
+    _classCallCheck(this, EuiWrappingPopover);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
 
-    return function () {
-      if (portal) {
-        // move the button back out of the popover DOM
-        portal.insertAdjacentElement('beforebegin', button);
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "portal", null);
+
+    _defineProperty(_assertThisInitialized(_this), "anchor", null);
+
+    _defineProperty(_assertThisInitialized(_this), "setPortalRef", function (node) {
+      _this.portal = node;
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "setAnchorRef", function (node) {
+      _this.anchor = node;
+    });
+
+    return _this;
+  }
+
+  _createClass(EuiWrappingPopover, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      if (this.anchor) {
+        this.anchor.insertAdjacentElement('beforebegin', this.props.button);
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (this.props.button.parentNode) {
+        if (this.portal) {
+          this.portal.insertAdjacentElement('beforebegin', this.props.button);
+        }
       }
-    };
-  }, [anchor, button, portal]);
-  return ___EmotionJSX(EuiPortal, {
-    portalRef: setPortal,
-    insert: {
-      sibling: button,
-      position: 'after'
     }
-  }, ___EmotionJSX(EuiPopover, _extends({}, rest, {
-    button: ___EmotionJSX("div", {
-      ref: setAnchor,
-      className: "euiWrappingPopover__anchor"
-    })
-  })));
-};
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+          button = _this$props.button,
+          rest = _objectWithoutProperties(_this$props, _excluded);
+
+      return ___EmotionJSX(EuiPortal, {
+        portalRef: this.setPortalRef,
+        insert: {
+          sibling: this.props.button,
+          position: 'after'
+        }
+      }, ___EmotionJSX(EuiPopover, _extends({}, rest, {
+        button: ___EmotionJSX("div", {
+          ref: this.setAnchorRef,
+          className: "euiWrappingPopover__anchor"
+        })
+      })));
+    }
+  }]);
+
+  return EuiWrappingPopover;
+}(Component);

package/optimize/es/components/portal/portal.js

@@ -1,4 +1,14 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -12,54 +22,76 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * NOTE: We can't test this component because Enzyme doesn't support rendering
  * into portals.
  */
-import { useState, useEffect } from 'react';
+import { Component } from 'react';
 import { createPortal } from 'react-dom';
 import { keysOf } from '../common';
-import { useUpdateEffect } from '../../services';
 export var insertPositions = {
   after: 'afterend',
   before: 'beforebegin'
 };
 export var INSERT_POSITIONS = keysOf(insertPositions);
-export var EuiPortal = function EuiPortal(_ref) {
-  var insert = _ref.insert,
-      portalRef = _ref.portalRef,
-      children = _ref.children;
+export var EuiPortal = /*#__PURE__*/function (_Component) {
+  _inherits(EuiPortal, _Component);
+
+  var _super = _createSuper(EuiPortal);
+
+  function EuiPortal(props) {
+    var _this;
 
-  var _useState = useState(null),
-      _useState2 = _slicedToArray(_useState, 2),
-      portalNode = _useState2[0],
-      setPortalNode = _useState2[1]; // pull `sibling` and `position` out of insert in case their wrapping object is recreated every render
+    _classCallCheck(this, EuiPortal);
 
+    _this = _super.call(this, props);
 
-  var _ref2 = insert || {},
-      sibling = _ref2.sibling,
-      position = _ref2.position;
+    _defineProperty(_assertThisInitialized(_this), "portalNode", null);
 
-  useEffect(function () {
-    var portalNode = document.createElement('div');
-    portalNode.dataset.euiportal = 'true';
-    setPortalNode(portalNode);
+    if (typeof window === 'undefined') return _possibleConstructorReturn(_this); // Prevent SSR errors
 
-    if (sibling == null || position == null) {
+    var insert = _this.props.insert;
+    _this.portalNode = document.createElement('div');
+    _this.portalNode.dataset.euiportal = 'true';
+
+    if (insert == null) {
       // no insertion defined, append to body
-      document.body.appendChild(portalNode);
+      document.body.appendChild(_this.portalNode);
     } else {
       // inserting before or after an element
-      sibling.insertAdjacentElement(insertPositions[position], portalNode);
+      var sibling = insert.sibling,
+          position = insert.position;
+      sibling.insertAdjacentElement(insertPositions[position], _this.portalNode);
+    }
+
+    return _this;
+  }
+
+  _createClass(EuiPortal, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.updatePortalRef(this.portalNode);
     }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      var _this$portalNode;
+
+      if ((_this$portalNode = this.portalNode) !== null && _this$portalNode !== void 0 && _this$portalNode.parentNode) {
+        this.portalNode.parentNode.removeChild(this.portalNode);
+      }
 
-    return function () {
-      if (portalNode && portalNode.parentNode) {
-        portalNode.parentNode.removeChild(portalNode);
+      this.updatePortalRef(null);
+    }
+  }, {
+    key: "updatePortalRef",
+    value: function updatePortalRef(ref) {
+      if (this.props.portalRef) {
+        this.props.portalRef(ref);
       }
-    };
-  }, [sibling, position]);
-  useUpdateEffect(function () {
-    portalRef === null || portalRef === void 0 ? void 0 : portalRef(portalNode);
-    return function () {
-      portalRef === null || portalRef === void 0 ? void 0 : portalRef(null);
-    };
-  }, [portalNode, portalRef]);
-  return portalNode == null ? null : /*#__PURE__*/createPortal(children, portalNode);
-};
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return this.portalNode ? /*#__PURE__*/createPortal(this.props.children, this.portalNode) : null;
+    }
+  }]);
+
+  return EuiPortal;
+}(Component);

package/optimize/es/services/breakpoint/{currentEuiBreakpoint.js → current_breakpoint.js}

@@ -1,4 +1,3 @@
-import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
 /*
@@ -8,7 +7,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import React, { createContext, useContext, useState, useEffect } from 'react';
+import React, { createContext, useState, useEffect } from 'react';
 import { useEuiTheme } from '../theme';
 import { throttle } from '../throttle';
 import { getBreakpoint } from './breakpoint';
@@ -25,7 +24,7 @@ export var CurrentEuiBreakpointProvider = function CurrentEuiBreakpointProvider(
   var _useEuiTheme = useEuiTheme(),
       breakpoints = _useEuiTheme.euiTheme.breakpoint;
 
-  var _useState = useState((typeof window === "undefined" ? "undefined" : _typeof(window)) !== undefined ? getBreakpoint(window.innerWidth, breakpoints) : undefined),
+  var _useState = useState(typeof window !== 'undefined' ? getBreakpoint(window.innerWidth, breakpoints) : undefined),
       _useState2 = _slicedToArray(_useState, 2),
       currentBreakpoint = _useState2[0],
       setCurrentBreakpoint = _useState2[1];
@@ -42,12 +41,4 @@ export var CurrentEuiBreakpointProvider = function CurrentEuiBreakpointProvider(
   return ___EmotionJSX(CurrentEuiBreakpointContext.Provider, {
     value: currentBreakpoint
   }, children);
-};
-/**
- * Hook util / syntactical sugar
- */
-
-export var useCurrentEuiBreakpoint = function useCurrentEuiBreakpoint() {
-  var currentBreakpoint = useContext(CurrentEuiBreakpointContext);
-  return currentBreakpoint;
 };

package/optimize/es/services/breakpoint/current_breakpoint_hook.js

@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { useContext } from 'react';
+import { CurrentEuiBreakpointContext } from './current_breakpoint';
+/**
+ * Hook util / syntactical sugar for useContext()
+ *
+ * This hook is in its own separate file to make mocking it
+ * as a testenv easy for Jest unit tests
+ */
+
+export var useCurrentEuiBreakpoint = function useCurrentEuiBreakpoint() {
+  var currentBreakpoint = useContext(CurrentEuiBreakpointContext);
+  return currentBreakpoint;
+};

package/optimize/es/services/breakpoint/index.js

@@ -6,5 +6,6 @@
  * Side Public License, v 1.
  */
 export * from './breakpoint';
-export * from './currentEuiBreakpoint';
+export * from './current_breakpoint';
+export * from './current_breakpoint_hook';
 export * from './useIsWithinBreakpoints';

package/optimize/es/services/breakpoint/useIsWithinBreakpoints.js

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { useCurrentEuiBreakpoint } from './currentEuiBreakpoint';
+import { useCurrentEuiBreakpoint } from './current_breakpoint_hook';
 /**
  * Given the current window.innerWidth and an array of breakpoint keys,
  * this hook stores state and returns true or false if the window.innerWidth

package/optimize/es/test/rtl/component_helpers.js

@@ -8,9 +8,10 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import '@testing-library/jest-dom';
 import { waitFor } from '@testing-library/react';
 /**
- * Ensure the EuiPopover being tested is open/closed before contiuning
+ * Ensure the EuiPopover being tested is open/closed before continuing
  * Note: Because EuiPopover is portalled, we want to query `document`
  * instead of the `container` returned by RTL's render()
  */
@@ -68,4 +69,62 @@ export var waitForEuiPopoverClose = /*#__PURE__*/function () {
   return function waitForEuiPopoverClose() {
     return _ref2.apply(this, arguments);
   };
+}();
+/**
+ * Ensure the EuiToolTip being tested is open and visible before continuing
+ */
+
+export var waitForEuiToolTipVisible = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return waitFor(function () {
+              var tooltip = document.querySelector('.euiToolTipPopover');
+              expect(tooltip).toBeVisible();
+            });
+
+          case 2:
+            return _context3.abrupt("return", _context3.sent);
+
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+
+  return function waitForEuiToolTipVisible() {
+    return _ref3.apply(this, arguments);
+  };
+}();
+export var waitForEuiToolTipHidden = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return waitFor(function () {
+              var tooltip = document.querySelector('.euiToolTipPopover');
+              expect(tooltip).toBeNull();
+            });
+
+          case 2:
+            return _context4.abrupt("return", _context4.sent);
+
+          case 3:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+
+  return function waitForEuiToolTipHidden() {
+    return _ref4.apply(this, arguments);
+  };
 }();

package/optimize/lib/components/datagrid/body/data_grid_body.js

@@ -354,6 +354,8 @@ var EuiDataGridBody = function EuiDataGridBody(props) {
 
   var rowHeightUtils = (0, _row_heights.useRowHeightUtils)({
     gridRef: gridRef,
+    outerGridElementRef: outerGridRef,
+    gridItemsRenderedRef: gridItemsRendered,
     gridStyles: gridStyles,
     columns: columns,
     rowHeightsOptions: rowHeightsOptions

package/optimize/lib/components/datagrid/body/data_grid_cell.js

@@ -413,7 +413,7 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this$props$rowHeight, _prevProps$rowHeights;
+      var _this$props$rowHeight, _prevProps$rowHeights, _this$props$rowHeight2, _this$props$style, _prevProps$style;
 
       this.recalculateAutoHeight();
 
@@ -421,6 +421,18 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
         this.recalculateLineHeight();
       }
 
+      if ((_this$props$rowHeight2 = this.props.rowHeightsOptions) !== null && _this$props$rowHeight2 !== void 0 && _this$props$rowHeight2.scrollAnchorRow && this.props.colIndex === 0 && // once per row
+      this.props.columnId === prevProps.columnId && // if this is still the same column
+      this.props.rowIndex === prevProps.rowIndex && // if this is still the same row
+      ((_this$props$style = this.props.style) === null || _this$props$style === void 0 ? void 0 : _this$props$style.top) !== ((_prevProps$style = prevProps.style) === null || _prevProps$style === void 0 ? void 0 : _prevProps$style.top) // if the top position has changed
+      ) {
+        var _prevProps$style2, _this$props$style2, _this$props$rowHeight3, _this$props$rowHeight4;
+
+        var previousTop = parseFloat((_prevProps$style2 = prevProps.style) === null || _prevProps$style2 === void 0 ? void 0 : _prevProps$style2.top);
+        var currentTop = parseFloat((_this$props$style2 = this.props.style) === null || _this$props$style2 === void 0 ? void 0 : _this$props$style2.top);
+        (_this$props$rowHeight3 = this.props.rowHeightUtils) === null || _this$props$rowHeight3 === void 0 ? void 0 : _this$props$rowHeight3.compensateForLayoutShift(this.props.rowIndex, currentTop - previousTop, (_this$props$rowHeight4 = this.props.rowHeightsOptions) === null || _this$props$rowHeight4 === void 0 ? void 0 : _this$props$rowHeight4.scrollAnchorRow);
+      }
+
       if (this.props.popoverContext.popoverIsOpen !== prevProps.popoverContext.popoverIsOpen || this.props.popoverContext.cellLocation !== prevProps.popoverContext.cellLocation || this.props.renderCellPopover !== prevProps.renderCellPopover) {
         this.handleCellPopover();
       }

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

@@ -19,10 +19,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = require("react");
 
-var _predicate = require("../../../services/predicate");
-
 var _services = require("../../../services");
 
+var _predicate = require("../../../services/predicate");
+
 var _sorting = require("./sorting");
 
 /*
@@ -45,11 +45,13 @@ var DEFAULT_ROW_HEIGHT = 34;
 exports.DEFAULT_ROW_HEIGHT = DEFAULT_ROW_HEIGHT;
 
 var RowHeightUtils = /*#__PURE__*/function () {
-  function RowHeightUtils(gridRef, rerenderGridBodyRef) {
+  function RowHeightUtils(gridRef, outerGridElementRef, gridItemsRenderedRef, rerenderGridBodyRef) {
     var _this = this;
 
     (0, _classCallCheck2.default)(this, RowHeightUtils);
     this.gridRef = gridRef;
+    this.outerGridElementRef = outerGridElementRef;
+    this.gridItemsRenderedRef = gridItemsRenderedRef;
     this.rerenderGridBodyRef = rerenderGridBodyRef;
     (0, _defineProperty2.default)(this, "styles", {
       paddingTop: 0,
@@ -240,6 +242,31 @@ var RowHeightUtils = /*#__PURE__*/function () {
       (_this$gridRef$current = this.gridRef.current) === null || _this$gridRef$current === void 0 ? void 0 : _this$gridRef$current.resetAfterRowIndex(this.lastUpdatedRow);
       this.lastUpdatedRow = Infinity;
     }
+  }, {
+    key: "compensateForLayoutShift",
+    value: function compensateForLayoutShift(rowIndex, verticalLayoutShift, anchorRow) {
+      var grid = this.gridRef.current;
+      var outerGridElement = this.outerGridElementRef.current;
+      var renderedItems = this.gridItemsRenderedRef.current;
+
+      if (grid == null || outerGridElement == null || renderedItems == null || anchorRow == null || !Number.isFinite(verticalLayoutShift)) {
+        return;
+      } // skip if the start row is the anchor row but it hasn't shifted
+
+
+      if (anchorRow === 'start' && renderedItems.visibleRowStartIndex !== rowIndex) {
+        return;
+      } // skip if the center row is the anchor row but it hasn't shifted
+
+
+      if (anchorRow === 'center' && Math.floor((renderedItems.visibleRowStopIndex - renderedItems.visibleRowStartIndex) / 2) !== rowIndex) {
+        return;
+      }
+
+      grid.scrollTo({
+        scrollTop: outerGridElement.scrollTop + verticalLayoutShift
+      });
+    }
   }]);
   return RowHeightUtils;
 }();
@@ -253,13 +280,15 @@ exports.RowHeightUtils = RowHeightUtils;
 
 var useRowHeightUtils = function useRowHeightUtils(_ref2) {
   var gridRef = _ref2.gridRef,
+      outerGridElementRef = _ref2.outerGridElementRef,
+      gridItemsRenderedRef = _ref2.gridItemsRenderedRef,
       gridStyles = _ref2.gridStyles,
       columns = _ref2.columns,
       rowHeightsOptions = _ref2.rowHeightsOptions;
   var forceRenderRef = (0, _services.useLatest)((0, _services.useForceRender)());
 
   var _useState = (0, _react.useState)(function () {
-    return new RowHeightUtils(gridRef, forceRenderRef);
+    return new RowHeightUtils(gridRef, outerGridElementRef, gridItemsRenderedRef, forceRenderRef);
   }),
       _useState2 = (0, _slicedToArray2.default)(_useState, 1),
       rowHeightUtils = _useState2[0]; // Forces a rerender whenever the row heights change, as this can cause the