chore: refactor

Author: zombieJ

src/SingleObserver/index.tsx

@@ -1,16 +1,16 @@
 import { getDOM } from '@rc-component/util/lib/Dom/findDOMNode';
 import { supportRef, useComposeRef, getNodeRef } from '@rc-component/util/lib/ref';
 import * as React from 'react';
-import type { ResizeObserverProps } from '..';
+import type { ResizeObserverProps, SizeInfo } from '..';
 import { CollectionContext } from '../Collection';
-import { observe, unobserve } from '../utils/observerUtil';
+import useResizeObserver from '../useResizeObserver';
 
 export interface SingleObserverProps extends ResizeObserverProps {
   children: React.ReactElement | ((ref: React.RefObject<Element>) => React.ReactElement);
 }
 
 function SingleObserver(props: SingleObserverProps, ref: React.Ref<HTMLElement>) {
-  const { children, disabled } = props;
+  const { children, disabled, onResize, data } = props;
   const elementRef = React.useRef<Element>(null);
 
   const onCollectionResize = React.useContext(CollectionContext);
@@ -19,14 +19,6 @@ function SingleObserver(props: SingleObserverProps, ref: React.Ref<HTMLElement>)
   const isRenderProps = typeof children === 'function';
   const mergedChildren = isRenderProps ? children(elementRef) : children;
 
-  // ============================= Size =============================
-  const sizeRef = React.useRef({
-    width: -1,
-    height: -1,
-    offsetWidth: -1,
-    offsetHeight: -1,
-  });
-
   // ============================= Ref ==============================
   const canRef =
     !isRenderProps && React.isValidElement(mergedChildren) && supportRef(mergedChildren);
@@ -35,81 +27,22 @@ function SingleObserver(props: SingleObserverProps, ref: React.Ref<HTMLElement>)
   const mergedRef = useComposeRef(originRef, elementRef);
 
   const getDomElement = () => {
-    return getDOM( elementRef.current ) as HTMLElement
-  }
-  
+    return getDOM(elementRef.current) as HTMLElement;
+  };
 
   React.useImperativeHandle(ref, () => getDomElement());
 
   // =========================== Observe ============================
-  const propsRef = React.useRef<SingleObserverProps>(props);
-  propsRef.current = props;
-
-  // Handler
-  const onInternalResize = React.useCallback((target: HTMLElement) => {
-    const { onResize, data } = propsRef.current;
-
-    const { width, height } = target.getBoundingClientRect();
-    const { offsetWidth, offsetHeight } = target;
-
-    /**
-     * Resize observer trigger when content size changed.
-     * In most case we just care about element size,
-     * let's use `boundary` instead of `contentRect` here to avoid shaking.
-     */
-    const fixedWidth = Math.floor(width);
-    const fixedHeight = Math.floor(height);
-
-    if (
-      sizeRef.current.width !== fixedWidth ||
-      sizeRef.current.height !== fixedHeight ||
-      sizeRef.current.offsetWidth !== offsetWidth ||
-      sizeRef.current.offsetHeight !== offsetHeight
-    ) {
-      const size = { width: fixedWidth, height: fixedHeight, offsetWidth, offsetHeight };
-      sizeRef.current = size;
-
-      // IE is strange, right?
-      const mergedOffsetWidth = offsetWidth === Math.round(width) ? width : offsetWidth;
-      const mergedOffsetHeight = offsetHeight === Math.round(height) ? height : offsetHeight;
-
-      const sizeInfo = {
-        ...size,
-        offsetWidth: mergedOffsetWidth,
-        offsetHeight: mergedOffsetHeight,
-      };
-
-      // Let collection know what happened
-      onCollectionResize?.(sizeInfo, target, data);
-
-      if (onResize) {
-        // defer the callback but not defer to next frame
-        Promise.resolve().then(() => {
-          onResize(sizeInfo, target);
-        });
-      }
-    }
-  }, []);
-
-  // Dynamic observe
-  React.useEffect(() => {
-    const currentElement: HTMLElement = getDomElement();
-
-    if (currentElement && !disabled) {
-      observe(currentElement, onInternalResize);
-    }
-
-    return () => unobserve(currentElement, onInternalResize);
-  }, [elementRef.current, disabled]);
+  useResizeObserver(!disabled, getDomElement, onResize, (sizeInfo, target) => {
+    onCollectionResize?.(sizeInfo, target, data);
+  });
 
   // ============================ Render ============================
-  return (
-      canRef
-        ? React.cloneElement(mergedChildren as any, {
-            ref: mergedRef,
-          })
-        : mergedChildren
-  );
+  return canRef
+    ? React.cloneElement(mergedChildren as any, {
+        ref: mergedRef,
+      })
+    : mergedChildren;
 }
 
 const RefSingleObserver = React.forwardRef(SingleObserver);

src/useResizeObserver.ts

@@ -1,8 +1,79 @@
-import type { OnResize } from '.';
+import * as React from 'react';
+import type { OnResize, SizeInfo } from '.';
+import { observe, unobserve } from './utils/observerUtil';
+import { useEvent } from '@rc-component/util';
 
-// TODO: Ref observerUtil.ts, realize this.
 export default function useResizeObserver(
   enabled: boolean,
   getTarget: () => HTMLElement,
-  onResize: OnResize,
-) {}
+  onDelayResize?: OnResize,
+  onSyncResize?: OnResize,
+) {
+  // ============================= Size =============================
+  const sizeRef = React.useRef<SizeInfo>({
+    width: -1,
+    height: -1,
+    offsetWidth: -1,
+    offsetHeight: -1,
+  });
+
+  // =========================== Observe ============================
+
+  // Handler
+  const onInternalResize = useEvent((target: HTMLElement) => {
+    const { width, height } = target.getBoundingClientRect();
+    const { offsetWidth, offsetHeight } = target;
+
+    /**
+     * Resize observer trigger when content size changed.
+     * In most case we just care about element size,
+     * let's use `boundary` instead of `contentRect` here to avoid shaking.
+     */
+    const fixedWidth = Math.floor(width);
+    const fixedHeight = Math.floor(height);
+
+    if (
+      sizeRef.current.width !== fixedWidth ||
+      sizeRef.current.height !== fixedHeight ||
+      sizeRef.current.offsetWidth !== offsetWidth ||
+      sizeRef.current.offsetHeight !== offsetHeight
+    ) {
+      const size = { width: fixedWidth, height: fixedHeight, offsetWidth, offsetHeight };
+      sizeRef.current = size;
+
+      // IE is strange, right?
+      const mergedOffsetWidth = offsetWidth === Math.round(width) ? width : offsetWidth;
+      const mergedOffsetHeight = offsetHeight === Math.round(height) ? height : offsetHeight;
+
+      const sizeInfo = {
+        ...size,
+        offsetWidth: mergedOffsetWidth,
+        offsetHeight: mergedOffsetHeight,
+      };
+
+      // Call the callback immediately, let the caller decide whether to defer
+      // onResize(sizeInfo, target);
+      onSyncResize?.(sizeInfo, target);
+
+      // defer the callback but not defer to next frame
+      Promise.resolve().then(() => {
+        onDelayResize?.(sizeInfo, target);
+      });
+    }
+  });
+
+  // Dynamic observe
+  React.useEffect(() => {
+    const target = getTarget();
+
+    if (target && enabled) {
+      observe(target, onInternalResize);
+    }
+
+    return () => {
+      if (target) {
+        unobserve(target, onInternalResize);
+      }
+    };
+  }, [enabled, getTarget]);
+}