Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions packages/@react-aria/utils/src/useResizeObserver.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {RefObject, useEffect, useRef} from 'react';
import {RefObject, useEffect} from 'react';

function hasResizeObserver() {
return typeof window.ResizeObserver !== 'undefined';
Expand All @@ -11,7 +11,6 @@ type useResizeObserverOptionsType<T> = {

export function useResizeObserver<T extends Element>(options: useResizeObserverOptionsType<T>) {
const {ref, onResize} = options;
let raf = useRef(null);

useEffect(() => {
let element = ref?.current;
Expand All @@ -25,28 +24,17 @@ export function useResizeObserver<T extends Element>(options: useResizeObserverO
window.removeEventListener('resize', onResize, false);
};
} else {

const resizeObserverInstance = new window.ResizeObserver((entries) => {
if (raf.current) {
if (!entries.length) {
return;
}
// avoid Error - ResizeObserver loop limit exceeded
// it's ok to use a raf, ResizeObservers are already async and now we're just debouncing on frames
raf.current = window.requestAnimationFrame(() => {
raf.current = null;
if (!Array.isArray(entries) || !entries.length) {
return;
}
onResize();
});
});

onResize();
});
resizeObserverInstance.observe(element);

return () => {
if (raf.current) {
window.cancelAnimationFrame(raf.current);
raf.current = null;
}
if (element) {
resizeObserverInstance.unobserve(element);
}
Expand Down
55 changes: 0 additions & 55 deletions packages/@react-aria/utils/stories/useResizeObserver.stories.tsx

This file was deleted.