@rc-component/trigger 3.6.2 → 3.6.3

package/es/UniqueProvider/index.js

@@ -31,8 +31,13 @@ const UniqueProvider = ({
 
   // ========================== Register ==========================
   const [popupId, setPopupId] = React.useState(0);
+
+  // Store the isOpen function from the latest show call
+  const isOpenRef = React.useRef(null);
   const delayInvoke = useDelay();
-  const show = useEvent(showOptions => {
+  const show = useEvent((showOptions, isOpen) => {
+    // Store the isOpen function for later use in hide
+    isOpenRef.current = isOpen;
     delayInvoke(() => {
       if (showOptions.id !== options?.id) {
         setPopupId(i => i + 1);
@@ -42,6 +47,11 @@ const UniqueProvider = ({
   });
   const hide = delay => {
     delayInvoke(() => {
+      // Check if we should still hide by calling the isOpen function
+      // If isOpen returns true, it means another trigger wants to keep it open
+      if (isOpenRef.current?.()) {
+        return; // Don't hide if something else wants it open
+      }
       trigger(false);
       // Don't clear target, currentNode, options immediately, wait until animation completes
     }, delay);

package/es/context.d.ts

@@ -28,7 +28,7 @@ export interface UniqueShowOptions {
     getPopupClassNameFromAlign?: (align: AlignType) => string;
 }
 export interface UniqueContextProps {
-    show: (options: UniqueShowOptions) => void;
+    show: (options: UniqueShowOptions, isOpen: () => boolean) => void;
     hide: (delay: number) => void;
 }
 export declare const UniqueContext: React.Context<UniqueContextProps>;

package/es/index.js

@@ -150,6 +150,9 @@ export function generateTrigger(PortalComponent = Portal) {
         setInternalOpen(nextOpen);
       }
     });
+
+    // Support ref
+    const isOpen = useEvent(() => mergedOpen);
     useLayoutEffect(() => {
       setInternalOpen(popupVisible || false);
     }, [popupVisible]);
@@ -182,9 +185,7 @@ export function generateTrigger(PortalComponent = Portal) {
     useLayoutEffect(() => {
       if (uniqueContext && unique && targetEle && !openUncontrolled && !parentContext) {
         if (mergedOpen) {
-          Promise.resolve().then(() => {
-            uniqueContext.show(getUniqueOptions(0));
-          });
+          uniqueContext.show(getUniqueOptions(0), isOpen);
         } else {
           uniqueContext.hide(0);
         }
@@ -223,7 +224,7 @@ export function generateTrigger(PortalComponent = Portal) {
       // If there is a parentContext, don't call uniqueContext methods
       if (uniqueContext && unique && openUncontrolled && !parentContext) {
         if (nextOpen) {
-          uniqueContext.show(getUniqueOptions(delay));
+          uniqueContext.show(getUniqueOptions(delay), isOpen);
         } else {
           uniqueContext.hide(delay);
         }

package/lib/UniqueProvider/index.js

@@ -40,8 +40,13 @@ const UniqueProvider = ({
 
   // ========================== Register ==========================
   const [popupId, setPopupId] = React.useState(0);
+
+  // Store the isOpen function from the latest show call
+  const isOpenRef = React.useRef(null);
   const delayInvoke = (0, _useDelay.default)();
-  const show = (0, _util.useEvent)(showOptions => {
+  const show = (0, _util.useEvent)((showOptions, isOpen) => {
+    // Store the isOpen function for later use in hide
+    isOpenRef.current = isOpen;
     delayInvoke(() => {
       if (showOptions.id !== options?.id) {
         setPopupId(i => i + 1);
@@ -51,6 +56,11 @@ const UniqueProvider = ({
   });
   const hide = delay => {
     delayInvoke(() => {
+      // Check if we should still hide by calling the isOpen function
+      // If isOpen returns true, it means another trigger wants to keep it open
+      if (isOpenRef.current?.()) {
+        return; // Don't hide if something else wants it open
+      }
       trigger(false);
       // Don't clear target, currentNode, options immediately, wait until animation completes
     }, delay);

package/lib/context.d.ts

@@ -28,7 +28,7 @@ export interface UniqueShowOptions {
     getPopupClassNameFromAlign?: (align: AlignType) => string;
 }
 export interface UniqueContextProps {
-    show: (options: UniqueShowOptions) => void;
+    show: (options: UniqueShowOptions, isOpen: () => boolean) => void;
     hide: (delay: number) => void;
 }
 export declare const UniqueContext: React.Context<UniqueContextProps>;

package/lib/index.js

@@ -165,6 +165,9 @@ function generateTrigger(PortalComponent = _portal.default) {
         setInternalOpen(nextOpen);
       }
     });
+
+    // Support ref
+    const isOpen = (0, _useEvent.default)(() => mergedOpen);
     (0, _useLayoutEffect.default)(() => {
       setInternalOpen(popupVisible || false);
     }, [popupVisible]);
@@ -197,9 +200,7 @@ function generateTrigger(PortalComponent = _portal.default) {
     (0, _useLayoutEffect.default)(() => {
       if (uniqueContext && unique && targetEle && !openUncontrolled && !parentContext) {
         if (mergedOpen) {
-          Promise.resolve().then(() => {
-            uniqueContext.show(getUniqueOptions(0));
-          });
+          uniqueContext.show(getUniqueOptions(0), isOpen);
         } else {
           uniqueContext.hide(0);
         }
@@ -238,7 +239,7 @@ function generateTrigger(PortalComponent = _portal.default) {
       // If there is a parentContext, don't call uniqueContext methods
       if (uniqueContext && unique && openUncontrolled && !parentContext) {
         if (nextOpen) {
-          uniqueContext.show(getUniqueOptions(delay));
+          uniqueContext.show(getUniqueOptions(delay), isOpen);
         } else {
           uniqueContext.hide(delay);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"