update

Author: li-jia-nan

src/index.tsx

@@ -483,43 +483,45 @@ export function generateTrigger(
         // Between 1 frame and 1 second
         const refreshDelay = clamp(mouseLeaveDelay * 1000, 1000 / 60, 1000);
 
+        const cancelRefresh = () => {
+          const safeHover = safeHoverRef.current;
+          if (safeHover?.refreshTimer) {
+            clearTimeout(safeHover.refreshTimer);
+            safeHover.refreshTimer = null;
+          }
+        };
+
         const scheduleRefresh = () => {
           const safeHover = safeHoverRef.current;
 
-          if (!safeHover || !refreshDelay) {
+          if (!safeHover || safeHover.refreshTimer) {
             return;
           }
 
           safeHover.refreshTimer = setTimeout(() => {
             if (isPointSafe(latestPoint)) {
-              triggerOpen(false, mouseLeaveDelay);
-              scheduleRefresh();
+              safeHover.refreshTimer = null;
             } else {
               clearSafeHover();
-              triggerOpen(false, mouseLeaveDelay);
+              triggerOpen(false);
             }
           }, refreshDelay);
         };
 
-        // Keep the existing close delay alive while the cursor crosses the gap.
         const handler = (nativeEvent: MouseEvent) => {
           latestPoint = [nativeEvent.clientX, nativeEvent.clientY];
 
           if (isPointSafe(latestPoint)) {
-            triggerOpen(false, mouseLeaveDelay);
+            cancelRefresh();
           } else {
-            clearSafeHover();
-            triggerOpen(false, mouseLeaveDelay);
+            scheduleRefresh();
           }
         };
 
         doc.addEventListener('mousemove', handler);
 
         safeHoverRef.current = { doc, handler, refreshTimer: null };
 
-        triggerOpen(false, mouseLeaveDelay);
-        scheduleRefresh();
-
         return true;
       },
     );
@@ -536,7 +538,7 @@ export function generateTrigger(
       }
     }, [mergedOpen, clearSafeHover]);
 
-    function onEsc({ top }: Parameters<PortalProps['onEsc']>[0]) {
+    function onEsc({ top }: Parameters<NonNullable<PortalProps['onEsc']>>[0]) {
       if (top) {
         triggerOpen(false);
       }
@@ -555,7 +557,7 @@ export function generateTrigger(
     );
 
     const [motionPrepareResolve, setMotionPrepareResolve] =
-      React.useState<VoidFunction>(null);
+      React.useState<VoidFunction | null>(null);
 
     // =========================== Align ============================
     const [mousePos, setMousePos] = React.useState<

tests/basic.test.jsx

@@ -298,7 +298,7 @@ describe('Trigger.Basic', () => {
         expect(isPopupHidden()).toBeTruthy();
       });
 
-      it('closes popup when safe hover area disappears while mouse is paused', () => {
+      it('waits for mousemove to start refresh close detection after safe hover area disappears', () => {
         const { container } = render(
           <Trigger
             action={['hover']}
@@ -324,6 +324,11 @@ describe('Trigger.Basic', () => {
         mockRect(popup, { left: 10, top: 10, width: 60, height: 30 });
         act(() => jest.advanceTimersByTime(150));
 
+        expect(isPopupHidden()).toBeFalsy();
+
+        fireEvent.mouseMove(document, { clientX: 150, clientY: 40 });
+        act(() => jest.advanceTimersByTime(100));
+
         expect(isPopupHidden()).toBeTruthy();
       });