Merge pull request #307 from mediamonks/feature/memoize-resize-callback

Memoize resize callback
mediamonks · Feb 9, 2024 · ac16346 · ac16346
2 parents 3e74eb8 + 4908172
commit ac16346
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/hooks/useContentRect/useContentRect.ts b/src/hooks/useContentRect/useContentRect.ts
@@ -1,4 +1,4 @@
-import { useRef, type RefObject } from 'react';
+import { useRef, type RefObject, useCallback } from 'react';
 import { useMount } from '../../lifecycle/hooks/useMount/useMount.js';
 import { unref, type Unreffable } from '../../utils/unref/unref.js';
 import { useResizeObserver } from '../useResizeObserver/useResizeObserver.js';
@@ -12,9 +12,11 @@ export function useContentRect(
 ): RefObject<DOMRectReadOnly | null> {
   const contentRectRef = useRef<DOMRectReadOnly | null>(null);
 
-  useResizeObserver(target, (entries): void => {
+  const onResize = useCallback<ResizeObserverCallback>((entries): void => {
     contentRectRef.current = entries.at(0)?.contentRect ?? null;
-  });
+  }, []);
+
+  useResizeObserver(target, onResize);
 
   useMount(() => {
     contentRectRef.current = unref(target)?.getBoundingClientRect() ?? null;

diff --git a/src/hooks/useContentRectState/useContentRectState.ts b/src/hooks/useContentRectState/useContentRectState.ts
@@ -1,4 +1,4 @@
-import { useRef, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import { useMount } from '../../index.js';
 import { unref, type Unreffable } from '../../utils/unref/unref.js';
 import { useResizeObserver } from '../useResizeObserver/useResizeObserver.js';
@@ -11,12 +11,14 @@ export function useContentRectState(target: Unreffable<Element | null>): DOMRect
   const [contentRect, setContentRect] = useState<DOMRectReadOnly | null>(null);
   const rafRef = useRef(0);
 
-  useResizeObserver(target, (entries) => {
+  const onResize = useCallback<ResizeObserverCallback>((entries) => {
     cancelAnimationFrame(rafRef.current);
     rafRef.current = requestAnimationFrame(() => {
       setContentRect(entries.at(0)?.contentRect ?? null);
     });
-  });
+  }, []);
+
+  useResizeObserver(target, onResize);
 
   useMount(() => {
     setContentRect(unref(target)?.getBoundingClientRect() ?? null);

diff --git a/src/hooks/useResizeObserver/useResizeObserver.ts b/src/hooks/useResizeObserver/useResizeObserver.ts
@@ -1,5 +1,6 @@
 import { useEffect } from 'react';
 import { unref, type Unreffable } from '../../utils/unref/unref.js';
+import { useRefValue } from '../useRefValue/useRefValue.js';
 
 /**
  * This hook allows you to add a ResizeObserver for an element and remove it
@@ -14,19 +15,24 @@ export function useResizeObserver(
   callback?: ResizeObserverCallback | undefined,
   options?: ResizeObserverOptions,
 ): void {
+  const callbackRef = useRefValue(callback);
+
   useEffect(() => {
     const element = unref(target);
 
     if (element === null || callback === undefined) {
       return;
     }
 
-    const resizeObserver = new ResizeObserver(callback);
+    const resizeObserver = new ResizeObserver((..._arguments) => {
+      callbackRef.current?.(..._arguments);
+    });
+
     resizeObserver.observe(element, options);
 
     return () => {
       resizeObserver.disconnect();
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [target, callback, ...Object.values(options ?? {})]);
+  }, [target, ...Object.values(options ?? {})]);
 }