fix: offsetHeight null error (react-component#259)

bagrinsergiu · Jul 4, 2024 · 598fbd6 · 598fbd6
1 parent cf2e973
commit 598fbd6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/es/hooks/useHeights.js b/es/hooks/useHeights.js
@@ -1,7 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import * as React from 'react';
 import { useRef, useEffect } from 'react';
-import findDOMNode from "rc-util/es/Dom/findDOMNode";
 import raf from "rc-util/es/raf";
 import CacheMap from "../utils/CacheMap";
 export default function useHeights(getKey, onItemAdd, onItemRemove) {
@@ -21,10 +20,9 @@ export default function useHeights(getKey, onItemAdd, onItemRemove) {
     var doCollect = function doCollect() {
       instanceRef.current.forEach(function (element, key) {
         if (element && element.offsetParent) {
-          var htmlElement = findDOMNode(element);
-          var offsetHeight = htmlElement.offsetHeight;
+          var offsetHeight = element.offsetHeight;
           if (heightsRef.current.get(key) !== offsetHeight) {
-            heightsRef.current.set(key, htmlElement.offsetHeight);
+            heightsRef.current.set(key, offsetHeight);
           }
         }
       });

diff --git a/lib/hooks/useHeights.js b/lib/hooks/useHeights.js
@@ -9,7 +9,6 @@ exports.default = useHeights;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
-var _findDOMNode = _interopRequireDefault(require("rc-util/lib/Dom/findDOMNode"));
 var _raf = _interopRequireDefault(require("rc-util/lib/raf"));
 var _CacheMap = _interopRequireDefault(require("../utils/CacheMap"));
 function useHeights(getKey, onItemAdd, onItemRemove) {
@@ -29,10 +28,9 @@ function useHeights(getKey, onItemAdd, onItemRemove) {
     var doCollect = function doCollect() {
       instanceRef.current.forEach(function (element, key) {
         if (element && element.offsetParent) {
-          var htmlElement = (0, _findDOMNode.default)(element);
-          var offsetHeight = htmlElement.offsetHeight;
+          var offsetHeight = element.offsetHeight;
           if (heightsRef.current.get(key) !== offsetHeight) {
-            heightsRef.current.set(key, htmlElement.offsetHeight);
+            heightsRef.current.set(key, offsetHeight);
           }
         }
       });

diff --git a/src/hooks/useHeights.tsx b/src/hooks/useHeights.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { useRef, useEffect } from 'react';
-import findDOMNode from 'rc-util/lib/Dom/findDOMNode';
 import raf from 'rc-util/lib/raf';
 import type { GetKey } from '../interface';
 import CacheMap from '../utils/CacheMap';
@@ -30,10 +29,10 @@ export default function useHeights<T>(
     const doCollect = () => {
       instanceRef.current.forEach((element, key) => {
         if (element && element.offsetParent) {
-          const htmlElement = findDOMNode<HTMLElement>(element);
-          const { offsetHeight } = htmlElement;
+          const { offsetHeight } = element;
+
           if (heightsRef.current.get(key) !== offsetHeight) {
-            heightsRef.current.set(key, htmlElement.offsetHeight);
+            heightsRef.current.set(key, offsetHeight);
           }
         }
       });