@rc-component/select 1.2.0-alpha.2 → 1.2.0

package/es/BaseSelect/index.js

@@ -318,7 +318,9 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
       }
     }
     if (!disabled) {
-      triggerOpen(false);
+      triggerOpen(false, {
+        lazy: true
+      });
       onBlur?.(event);
     }
   };
@@ -331,7 +333,9 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     // We should give focus back to selector if clicked item is not focusable
     if (popupElement?.contains(target) && triggerOpen) {
       // Tell `open` not to close since it's safe in the popup
-      triggerOpen(true, true);
+      triggerOpen(true, {
+        ignoreNext: true
+      });
     }
     onMouseDown?.(event, ...restArgs);
   };

package/es/hooks/useOpen.d.ts

@@ -2,7 +2,10 @@
  * Trigger by latest open call, if nextOpen is undefined, means toggle.
  * ignoreNext will skip next call in the macro task queue.
  */
-export type TriggerOpenType = (nextOpen?: boolean, ignoreNext?: boolean) => void;
+export type TriggerOpenType = (nextOpen?: boolean, config?: {
+    ignoreNext?: boolean;
+    lazy?: boolean;
+}) => void;
 /**
  * When `open` is controlled, follow the controlled value;
  * Otherwise use uncontrolled logic.

package/es/hooks/useOpen.js

@@ -48,27 +48,33 @@ export default function useOpen(propOpen, onOpen, postOpen) {
     }
     internalSetOpen(nextOpen);
   });
-  const toggleOpen = useEvent((nextOpen, ignoreNext = false) => {
+  const toggleOpen = useEvent((nextOpen, config = {}) => {
+    const {
+      ignoreNext = false,
+      lazy = false
+    } = config;
     taskIdRef.current += 1;
     const id = taskIdRef.current;
     const nextOpenVal = typeof nextOpen === 'boolean' ? nextOpen : !mergedOpen;
 
     // Since `mergedOpen` is post-processed, we need to check if the value really changed
-    if (nextOpenVal) {
-      triggerEvent(true);
+    if (nextOpenVal || !lazy) {
+      if (!taskLockRef.current) {
+        triggerEvent(nextOpenVal);
 
-      // Lock if needed
-      if (ignoreNext) {
-        taskLockRef.current = ignoreNext;
-        macroTask(() => {
-          taskLockRef.current = false;
-        }, 2);
+        // Lock if needed
+        if (ignoreNext) {
+          taskLockRef.current = ignoreNext;
+          macroTask(() => {
+            taskLockRef.current = false;
+          }, 2);
+        }
       }
       return;
     }
     macroTask(() => {
       if (id === taskIdRef.current && !taskLockRef.current) {
-        triggerEvent(false);
+        triggerEvent(nextOpenVal);
       }
     });
   });

package/lib/BaseSelect/index.js

@@ -327,7 +327,9 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
       }
     }
     if (!disabled) {
-      triggerOpen(false);
+      triggerOpen(false, {
+        lazy: true
+      });
       onBlur?.(event);
     }
   };
@@ -340,7 +342,9 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     // We should give focus back to selector if clicked item is not focusable
     if (popupElement?.contains(target) && triggerOpen) {
       // Tell `open` not to close since it's safe in the popup
-      triggerOpen(true, true);
+      triggerOpen(true, {
+        ignoreNext: true
+      });
     }
     onMouseDown?.(event, ...restArgs);
   };

package/lib/hooks/useOpen.d.ts

@@ -2,7 +2,10 @@
  * Trigger by latest open call, if nextOpen is undefined, means toggle.
  * ignoreNext will skip next call in the macro task queue.
  */
-export type TriggerOpenType = (nextOpen?: boolean, ignoreNext?: boolean) => void;
+export type TriggerOpenType = (nextOpen?: boolean, config?: {
+    ignoreNext?: boolean;
+    lazy?: boolean;
+}) => void;
 /**
  * When `open` is controlled, follow the controlled value;
  * Otherwise use uncontrolled logic.

package/lib/hooks/useOpen.js

@@ -54,27 +54,33 @@ function useOpen(propOpen, onOpen, postOpen) {
     }
     internalSetOpen(nextOpen);
   });
-  const toggleOpen = (0, _util.useEvent)((nextOpen, ignoreNext = false) => {
+  const toggleOpen = (0, _util.useEvent)((nextOpen, config = {}) => {
+    const {
+      ignoreNext = false,
+      lazy = false
+    } = config;
     taskIdRef.current += 1;
     const id = taskIdRef.current;
     const nextOpenVal = typeof nextOpen === 'boolean' ? nextOpen : !mergedOpen;
 
     // Since `mergedOpen` is post-processed, we need to check if the value really changed
-    if (nextOpenVal) {
-      triggerEvent(true);
+    if (nextOpenVal || !lazy) {
+      if (!taskLockRef.current) {
+        triggerEvent(nextOpenVal);
 
-      // Lock if needed
-      if (ignoreNext) {
-        taskLockRef.current = ignoreNext;
-        macroTask(() => {
-          taskLockRef.current = false;
-        }, 2);
+        // Lock if needed
+        if (ignoreNext) {
+          taskLockRef.current = ignoreNext;
+          macroTask(() => {
+            taskLockRef.current = false;
+          }, 2);
+        }
       }
       return;
     }
     macroTask(() => {
       if (id === taskIdRef.current && !taskLockRef.current) {
-        triggerEvent(false);
+        triggerEvent(nextOpenVal);
       }
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/select",
-  "version": "1.2.0-alpha.2",
+  "version": "1.2.0",
   "description": "React Select",
   "engines": {
     "node": ">=8.x"