@rc-component/trigger 3.6.2 → 3.6.4

package/es/UniqueProvider/index.js

@@ -9,7 +9,6 @@ import useTargetState from "./useTargetState";
 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,18 +29,23 @@ 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);
-      }
       trigger(showOptions);
     }, showOptions.delay);
   });
   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);
@@ -102,10 +106,7 @@ const UniqueProvider = ({
     ref: setPopupRef,
     portal: Portal,
     prefixCls: prefixCls,
-    popup: /*#__PURE__*/React.createElement(MotionContent, {
-      prefixCls: prefixCls,
-      key: popupId
-    }, options.popup),
+    popup: options.popup,
     className: classNames(options.popupClassName, alignedClassName, `${prefixCls}-unique-controlled`),
     style: options.popupStyle,
     target: options.target,

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

@@ -15,7 +15,6 @@ var _useTargetState = _interopRequireDefault(require("./useTargetState"));
 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); }
@@ -39,18 +38,23 @@ 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);
-      }
       trigger(showOptions);
     }, showOptions.delay);
   });
   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);
@@ -111,10 +115,7 @@ const UniqueProvider = ({
     ref: setPopupRef,
     portal: _portal.default,
     prefixCls: prefixCls,
-    popup: /*#__PURE__*/React.createElement(_MotionContent.default, {
-      prefixCls: prefixCls,
-      key: popupId
-    }, options.popup),
+    popup: options.popup,
     className: (0, _classnames.default)(options.popupClassName, alignedClassName, `${prefixCls}-unique-controlled`),
     style: options.popupStyle,
     target: options.target,

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.4",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"

package/es/UniqueProvider/MotionContent.d.ts

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import type { TriggerProps } from '..';
-export interface MotionContentProps {
-    prefixCls: string;
-    children: TriggerProps['popup'];
-}
-declare const MotionContent: {
-    (props: MotionContentProps): React.JSX.Element;
-    displayName: string;
-};
-export default MotionContent;

package/es/UniqueProvider/MotionContent.js

@@ -1,32 +0,0 @@
-import * as React from 'react';
-import CSSMotion from '@rc-component/motion';
-import classNames from 'classnames';
-const MotionContent = props => {
-  const {
-    prefixCls,
-    children
-  } = props;
-  const childNode = typeof children === 'function' ? children() : children;
-
-  // motion name: `${prefixCls}-motion-content-fade`, apply in index.less
-  const motionName = `${prefixCls}-motion-content-fade`;
-  return /*#__PURE__*/React.createElement(CSSMotion, {
-    motionAppear: true,
-    motionLeave: false,
-    visible: true,
-    motionName: motionName
-  }, ({
-    className: motionClassName,
-    style: motionStyle
-  }) => {
-    const cls = classNames(`${prefixCls}-motion-content`, motionClassName);
-    return /*#__PURE__*/React.createElement("div", {
-      className: cls,
-      style: motionStyle
-    }, childNode);
-  });
-};
-if (process.env.NODE_ENV !== 'production') {
-  MotionContent.displayName = 'MotionContent';
-}
-export default MotionContent;

package/lib/UniqueProvider/MotionContent.d.ts

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import type { TriggerProps } from '..';
-export interface MotionContentProps {
-    prefixCls: string;
-    children: TriggerProps['popup'];
-}
-declare const MotionContent: {
-    (props: MotionContentProps): React.JSX.Element;
-    displayName: string;
-};
-export default MotionContent;

package/lib/UniqueProvider/MotionContent.js

@@ -1,41 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var React = _interopRequireWildcard(require("react"));
-var _motion = _interopRequireDefault(require("@rc-component/motion"));
-var _classnames = _interopRequireDefault(require("classnames"));
-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; }
-const MotionContent = props => {
-  const {
-    prefixCls,
-    children
-  } = props;
-  const childNode = typeof children === 'function' ? children() : children;
-
-  // motion name: `${prefixCls}-motion-content-fade`, apply in index.less
-  const motionName = `${prefixCls}-motion-content-fade`;
-  return /*#__PURE__*/React.createElement(_motion.default, {
-    motionAppear: true,
-    motionLeave: false,
-    visible: true,
-    motionName: motionName
-  }, ({
-    className: motionClassName,
-    style: motionStyle
-  }) => {
-    const cls = (0, _classnames.default)(`${prefixCls}-motion-content`, motionClassName);
-    return /*#__PURE__*/React.createElement("div", {
-      className: cls,
-      style: motionStyle
-    }, childNode);
-  });
-};
-if (process.env.NODE_ENV !== 'production') {
-  MotionContent.displayName = 'MotionContent';
-}
-var _default = exports.default = MotionContent;