chore: adjust

Author: zombieJ

src/BaseSelect/index.tsx

@@ -564,13 +564,12 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
   };
 
   const onRootBlur = () => {
-    macroTask(() => {
-      if (!isInside(getSelectElements(), document.activeElement as HTMLElement)) {
-        triggerOpen(false, {
-          weak: true,
-        });
-      }
-    });
+    // Delay close should check the activeElement
+    if (mergedOpen) {
+      triggerOpen(false, {
+        cancelFun: () => isInside(getSelectElements(), document.activeElement as HTMLElement),
+      });
+    }
   };
 
   const onInternalBlur: React.FocusEventHandler<HTMLElement> = (event) => {

src/SelectInput/index.tsx

@@ -170,13 +170,14 @@ export default React.forwardRef<SelectInputRef, SelectInputProps>(function Selec
   // ====================== Open ======================
   const onInternalMouseDown: SelectInputProps['onMouseDown'] = useEvent((event) => {
     if (!disabled) {
+      const inputDOM = getDOM(inputRef.current);
+
       // https://github.com/ant-design/ant-design/issues/56002
       // Tell `useSelectTriggerControl` to ignore this event
       // When icon is dynamic render, the parentNode will miss
       // so we need to mark the event directly
-      (event.nativeEvent as any)._ignore_global_close = true;
+      (event.nativeEvent as any)._ori_target = inputDOM;
 
-      const inputDOM = getDOM(inputRef.current);
       if (inputDOM && event.target !== inputDOM && !inputDOM.contains(event.target as Node)) {
         event.preventDefault();
       }

src/hooks/useOpen.ts

@@ -26,6 +26,7 @@ export type TriggerOpenType = (
   nextOpen?: boolean,
   config?: {
     weak?: boolean;
+    cancelFun?: () => boolean;
   },
 ) => void;
 
@@ -67,7 +68,7 @@ export default function useOpen(
   });
 
   const toggleOpen = useEvent<TriggerOpenType>((nextOpen, config = {}) => {
-    const { weak = false } = config;
+    const { weak = false, cancelFun } = config;
 
     taskIdRef.current += 1;
     const id = taskIdRef.current;
@@ -79,17 +80,18 @@ export default function useOpen(
         // Always check if id is match
         id === taskIdRef.current &&
         // Only weak update when not locked
-        (!weak || !weakLockRef.current)
+        (!weak || !weakLockRef.current) &&
+        // Check if need to cancel
+        !cancelFun?.()
       ) {
         triggerEvent(nextOpenVal);
-        weakLockRef.current = false;
       }
     }
 
     // Since `mergedOpen` is post-processed, we need to check if the value really changed
     if (!weak) {
       // Only `true` need lock
-      weakLockRef.current = nextOpenVal;
+      weakLockRef.current = true;
     }
 
     // Weak update can be ignored
@@ -98,6 +100,7 @@ export default function useOpen(
     } else {
       macroTask(() => {
         triggerUpdate();
+        weakLockRef.current = false;
       });
     }
   });

src/hooks/useSelectTriggerControl.ts

@@ -26,16 +26,17 @@ export default function useSelectTriggerControl(
       target = (event.composedPath()[0] || target) as HTMLElement;
     }
 
+    if ((event as any)._ori_target) {
+      target = (event as any)._ori_target;
+    }
+
     if (
       open &&
       // Marked by SelectInput mouseDown event
-      !(event as any)._ignore_global_close &&
       !isInside(elements(), target)
     ) {
       // Should trigger close
-      triggerOpen(false, {
-        weak: true,
-      });
+      triggerOpen(false);
     }
   });
 

tests/Select.test.tsx

@@ -1951,6 +1951,7 @@ describe('Select.Basic', () => {
 
     toggleOpen(container);
 
+    console.log('!~~~~~~~~');
     const clickEvent = new Event('mousedown');
     Object.defineProperty(clickEvent, 'target', {
       get: () => document.body,