@elastic/eui 84.0.0 → 85.0.0

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

@@ -41,22 +41,29 @@ export var useFinalGridDimensions = function useFinalGridDimensions(_ref) {
 
   // Set the wrapper height on load, whenever the grid wrapper resizes, and whenever rowCount changes
   useEffect(function () {
-    var boundingRect = wrapperRef.current.getBoundingClientRect();
+    if (!wrapperRef.current) return;
+    var wrapperHeight = wrapperRef.current.getBoundingClientRect().height;
     if (isFullScreen) {
-      setFullScreenHeight(boundingRect.height);
+      setFullScreenHeight(wrapperHeight);
     } else {
-      if (boundingRect.height !== unconstrainedHeight) {
-        setHeight(boundingRect.height);
+      // NOTE: Math.round() is necessary here to account for browser zoom level
+      // Otherwise, both `wrapperHeight` and `unconstrainedHeight` can return values
+      // that are slightly off by small decimal rounding, which are essentially
+      // equivalent but causes the wrapper height to get set when it shouldn't
+      if (Math.round(wrapperHeight) !== Math.round(unconstrainedHeight)) {
+        setHeight(wrapperHeight);
       }
     }
-    if (boundingRect.width !== unconstrainedWidth) {
-      setWidth(boundingRect.width);
+  }, [rowCount, isFullScreen, wrapperDimensions.height, unconstrainedHeight, wrapperRef]);
+
+  // Set the wrapper width on load and whenever the grid wrapper resizes
+  useEffect(function () {
+    if (!wrapperRef.current) return;
+    var wrapperWidth = wrapperRef.current.getBoundingClientRect().width;
+    if (wrapperWidth !== unconstrainedWidth) {
+      setWidth(wrapperWidth);
     }
-  }, [
-  // Effects that should cause recalculations
-  rowCount, isFullScreen, wrapperDimensions,
-  // Dependencies
-  wrapperRef, unconstrainedHeight, unconstrainedWidth]);
+  }, [wrapperDimensions.width, unconstrainedWidth, wrapperRef]);
   var finalHeight = isFullScreen ? fullScreenHeight : height || unconstrainedHeight;
   var finalWidth = width || unconstrainedWidth;
   return IS_JEST_ENVIRONMENT ? {