@rc-component/trigger 3.6.1 → 3.6.3

package/es/UniqueProvider/index.js

@@ -10,6 +10,7 @@ import { isDOM } from "@rc-component/util/es/Dom/findDOMNode";
 import FloatBg from "./FloatBg";
 import classNames from 'classnames';
 import MotionContent from "./MotionContent";
+import { getAlignPopupClassName } from "../util";
 const UniqueProvider = ({
   children
 }) => {
@@ -30,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);
@@ -41,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);
@@ -62,6 +73,14 @@ const UniqueProvider = ({
   // onPopupAlign
   false // isMobile
   );
+  const alignedClassName = React.useMemo(() => {
+    if (!options) {
+      return '';
+    }
+    const baseClassName = getAlignPopupClassName(options.builtinPlacements || {}, options.prefixCls || '', alignInfo, false // alignPoint is false for UniqueProvider
+    );
+    return classNames(baseClassName, options.getPopupClassNameFromAlign?.(alignInfo));
+  }, [alignInfo, options?.getPopupClassNameFromAlign, options?.builtinPlacements, options?.prefixCls]);
   const contextValue = React.useMemo(() => ({
     show,
     hide
@@ -97,7 +116,7 @@ const UniqueProvider = ({
       prefixCls: prefixCls,
       key: popupId
     }, options.popup),
-    className: classNames(options.popupClassName, `${prefixCls}-unique-controlled`),
+    className: classNames(options.popupClassName, alignedClassName, `${prefixCls}-unique-controlled`),
     style: options.popupStyle,
     target: options.target,
     open: open,

package/es/context.d.ts

@@ -25,9 +25,10 @@ export interface UniqueShowOptions {
     maskMotion?: CSSMotionProps;
     arrow?: ArrowTypeOuter;
     getPopupContainer?: TriggerProps['getPopupContainer'];
+    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]);
@@ -172,6 +175,7 @@ export function generateTrigger(PortalComponent = Portal) {
       maskMotion,
       arrow: innerArrow,
       getPopupContainer,
+      getPopupClassNameFromAlign,
       id
     }));
 
@@ -181,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);
         }
@@ -222,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

@@ -16,6 +16,7 @@ var _findDOMNode = require("@rc-component/util/lib/Dom/findDOMNode");
 var _FloatBg = _interopRequireDefault(require("./FloatBg"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _MotionContent = _interopRequireDefault(require("./MotionContent"));
+var _util2 = require("../util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -39,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);
@@ -50,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);
@@ -71,6 +82,14 @@ const UniqueProvider = ({
   // onPopupAlign
   false // isMobile
   );
+  const alignedClassName = React.useMemo(() => {
+    if (!options) {
+      return '';
+    }
+    const baseClassName = (0, _util2.getAlignPopupClassName)(options.builtinPlacements || {}, options.prefixCls || '', alignInfo, false // alignPoint is false for UniqueProvider
+    );
+    return (0, _classnames.default)(baseClassName, options.getPopupClassNameFromAlign?.(alignInfo));
+  }, [alignInfo, options?.getPopupClassNameFromAlign, options?.builtinPlacements, options?.prefixCls]);
   const contextValue = React.useMemo(() => ({
     show,
     hide
@@ -106,7 +125,7 @@ const UniqueProvider = ({
       prefixCls: prefixCls,
       key: popupId
     }, options.popup),
-    className: (0, _classnames.default)(options.popupClassName, `${prefixCls}-unique-controlled`),
+    className: (0, _classnames.default)(options.popupClassName, alignedClassName, `${prefixCls}-unique-controlled`),
     style: options.popupStyle,
     target: options.target,
     open: open,

package/lib/context.d.ts

@@ -25,9 +25,10 @@ export interface UniqueShowOptions {
     maskMotion?: CSSMotionProps;
     arrow?: ArrowTypeOuter;
     getPopupContainer?: TriggerProps['getPopupContainer'];
+    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]);
@@ -187,6 +190,7 @@ function generateTrigger(PortalComponent = _portal.default) {
       maskMotion,
       arrow: innerArrow,
       getPopupContainer,
+      getPopupClassNameFromAlign,
       id
     }));
 
@@ -196,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);
         }
@@ -237,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.1",
+  "version": "3.6.3",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"