From 2ae3305a2ed5d5b98c34972f49a6ef1dd1a43562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Sun, 4 Jun 2023 18:36:54 +0800
Subject: [PATCH] fix

---
 components/affix/index.tsx | 45 +++++++++++++++++++++++---------------
 package.json               |  2 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/components/affix/index.tsx b/components/affix/index.tsx
index 3122a7abc0..efb1f2b2b7 100644
--- a/components/affix/index.tsx
+++ b/components/affix/index.tsx
@@ -44,14 +44,6 @@ enum AffixStatus {
   Prepare,
 }
 
-export interface AffixState {
-  affixStyle?: React.CSSProperties;
-  placeholderStyle?: React.CSSProperties;
-  status: AffixStatus;
-  lastAffix: boolean;
-  prevTarget: Window | HTMLElement | null;
-}
-
 interface AffixRef {
   updatePosition: ReturnType<typeof throttleByAnimationFrame>;
 }
@@ -68,6 +60,7 @@ const Affix = React.forwardRef<AffixRef, AffixProps>((props, ref) => {
   } = props;
 
   const [lastAffix, setLastAffix] = useState<boolean>(false);
+  const [status, setStatus] = useState<AffixStatus>(AffixStatus.None);
   const [affixStyle, setAffixStyle] = useState<React.CSSProperties>();
   const [placeholderStyle, setPlaceholderStyle] = useState<React.CSSProperties>();
   const placeholderNodeRef = useRef<HTMLDivElement>(null);
@@ -89,7 +82,12 @@ const Affix = React.forwardRef<AffixRef, AffixProps>((props, ref) => {
   );
 
   const measure = () => {
-    if (!target || !fixedNodeRef.current || !placeholderNodeRef.current) {
+    if (
+      status === AffixStatus.Prepare ||
+      !target ||
+      !fixedNodeRef.current ||
+      !placeholderNodeRef.current
+    ) {
       return;
     }
     const placeholderRect = getTargetRect(placeholderNodeRef.current);
@@ -138,21 +136,30 @@ const Affix = React.forwardRef<AffixRef, AffixProps>((props, ref) => {
     });
   };
 
-  const updatePosition = throttleByAnimationFrame(() => {
+  const prepareMeasure = () => {
+    // event param is used before. Keep compatible ts define here.
+    setStatus(AffixStatus.Prepare);
+    setAffixStyle(undefined);
+    setPlaceholderStyle(undefined);
+  };
+
+  const updatePosition = throttleByAnimationFrame(prepareMeasure);
+
+  const lazyUpdatePosition = throttleByAnimationFrame(() => {
     // Check position change before measure to make Safari smooth
-    if (target && placeholderNodeRef.current) {
+    if (target && placeholderNodeRef.current && affixStyle) {
       const targetRect = getTargetRect(target);
       const placeholderRect = getTargetRect(placeholderNodeRef.current);
-      const fixedTop = getFixedTop(placeholderRect, targetRect, memoOffsetTop);
+      const fixedTop = getFixedTop(placeholderRect, targetRect, offsetTop);
       const fixedBottom = getFixedBottom(placeholderRect, targetRect, offsetBottom);
       if (
-        (fixedTop !== undefined && affixStyle?.top === fixedTop) ||
-        (fixedBottom !== undefined && affixStyle?.bottom === fixedBottom)
+        (fixedTop !== undefined && affixStyle.top === fixedTop) ||
+        (fixedBottom !== undefined && affixStyle.bottom === fixedBottom)
       ) {
         return;
       }
     }
-    measure();
+    prepareMeasure();
   });
 
   React.useImperativeHandle(ref, () => ({ updatePosition }));
@@ -160,8 +167,9 @@ const Affix = React.forwardRef<AffixRef, AffixProps>((props, ref) => {
   useEffect(() => {
     timerRef.current = setTimeout(() => {
       TRIGGER_EVENTS.forEach((eventName) => {
-        target?.addEventListener(eventName, updatePosition);
+        target?.addEventListener(eventName, lazyUpdatePosition);
       });
+      // updatePosition();
       measure();
     });
     return () => {
@@ -170,12 +178,13 @@ const Affix = React.forwardRef<AffixRef, AffixProps>((props, ref) => {
         timerRef.current = null;
       }
       TRIGGER_EVENTS.forEach((eventName) => {
-        target?.removeEventListener(eventName, updatePosition);
+        target?.removeEventListener(eventName, lazyUpdatePosition);
       });
-
       updatePosition.cancel();
+      lazyUpdatePosition.cancel();
     };
   }, [offsetTop, offsetBottom, customizeTarget, getTargetContainer]);
+
   const [wrapSSR, hashId] = useStyle(affixPrefixCls);
   const rootClassName = classNames(customizeRootClassName, hashId);
 
diff --git a/package.json b/package.json
index d51d89e766..1a78fdd2dd 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "qrcode.react": "^3.1.0",
     "rc-cascader": "~3.12.0",
     "rc-checkbox": "~3.0.0",
-    "rc-collapse": "~3.7.0",
+    "rc-collapse": "^3.7.0",
     "rc-dialog": "~9.1.0",
     "rc-drawer": "~6.2.0",
     "rc-dropdown": "~4.1.0",