@rc-component/trigger 3.6.0 → 3.6.2

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
 }) => {
@@ -62,6 +63,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 +106,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,
@@ -125,8 +134,8 @@ const UniqueProvider = ({
     mask: options.mask,
     arrow: options.arrow,
     motion: options.popupMotion,
-    maskMotion: options.maskMotion,
-    getPopupContainer: options.getPopupContainer
+    maskMotion: options.maskMotion
+    // getPopupContainer={options.getPopupContainer}
   }, /*#__PURE__*/React.createElement(FloatBg, {
     prefixCls: prefixCls,
     isMobile: false,

package/es/context.d.ts

@@ -25,6 +25,7 @@ export interface UniqueShowOptions {
     maskMotion?: CSSMotionProps;
     arrow?: ArrowTypeOuter;
     getPopupContainer?: TriggerProps['getPopupContainer'];
+    getPopupClassNameFromAlign?: (align: AlignType) => string;
 }
 export interface UniqueContextProps {
     show: (options: UniqueShowOptions) => void;

package/es/index.js

@@ -172,13 +172,15 @@ export function generateTrigger(PortalComponent = Portal) {
       maskMotion,
       arrow: innerArrow,
       getPopupContainer,
+      getPopupClassNameFromAlign,
       id
     }));
 
     // Handle controlled state changes for UniqueProvider
     // Only sync to UniqueProvider when it's controlled mode
+    // If there is a parentContext, don't call uniqueContext methods
     useLayoutEffect(() => {
-      if (uniqueContext && unique && targetEle && !openUncontrolled) {
+      if (uniqueContext && unique && targetEle && !openUncontrolled && !parentContext) {
         if (mergedOpen) {
           Promise.resolve().then(() => {
             uniqueContext.show(getUniqueOptions(0));
@@ -187,7 +189,7 @@ export function generateTrigger(PortalComponent = Portal) {
           uniqueContext.hide(0);
         }
       }
-    }, [mergedOpen]);
+    }, [mergedOpen, targetEle]);
     const openRef = React.useRef(mergedOpen);
     openRef.current = mergedOpen;
     const lastTriggerRef = React.useRef([]);
@@ -218,7 +220,8 @@ export function generateTrigger(PortalComponent = Portal) {
       }
 
       // If UniqueContext exists and not controlled, pass delay to Provider instead of handling it internally
-      if (uniqueContext && unique && openUncontrolled) {
+      // If there is a parentContext, don't call uniqueContext methods
+      if (uniqueContext && unique && openUncontrolled && !parentContext) {
         if (nextOpen) {
           uniqueContext.show(getUniqueOptions(delay));
         } else {

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; }
@@ -71,6 +72,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 +115,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,
@@ -134,8 +143,8 @@ const UniqueProvider = ({
     mask: options.mask,
     arrow: options.arrow,
     motion: options.popupMotion,
-    maskMotion: options.maskMotion,
-    getPopupContainer: options.getPopupContainer
+    maskMotion: options.maskMotion
+    // getPopupContainer={options.getPopupContainer}
   }, /*#__PURE__*/React.createElement(_FloatBg.default, {
     prefixCls: prefixCls,
     isMobile: false,

package/lib/context.d.ts

@@ -25,6 +25,7 @@ export interface UniqueShowOptions {
     maskMotion?: CSSMotionProps;
     arrow?: ArrowTypeOuter;
     getPopupContainer?: TriggerProps['getPopupContainer'];
+    getPopupClassNameFromAlign?: (align: AlignType) => string;
 }
 export interface UniqueContextProps {
     show: (options: UniqueShowOptions) => void;

package/lib/index.js

@@ -187,13 +187,15 @@ function generateTrigger(PortalComponent = _portal.default) {
       maskMotion,
       arrow: innerArrow,
       getPopupContainer,
+      getPopupClassNameFromAlign,
       id
     }));
 
     // Handle controlled state changes for UniqueProvider
     // Only sync to UniqueProvider when it's controlled mode
+    // If there is a parentContext, don't call uniqueContext methods
     (0, _useLayoutEffect.default)(() => {
-      if (uniqueContext && unique && targetEle && !openUncontrolled) {
+      if (uniqueContext && unique && targetEle && !openUncontrolled && !parentContext) {
         if (mergedOpen) {
           Promise.resolve().then(() => {
             uniqueContext.show(getUniqueOptions(0));
@@ -202,7 +204,7 @@ function generateTrigger(PortalComponent = _portal.default) {
           uniqueContext.hide(0);
         }
       }
-    }, [mergedOpen]);
+    }, [mergedOpen, targetEle]);
     const openRef = React.useRef(mergedOpen);
     openRef.current = mergedOpen;
     const lastTriggerRef = React.useRef([]);
@@ -233,7 +235,8 @@ function generateTrigger(PortalComponent = _portal.default) {
       }
 
       // If UniqueContext exists and not controlled, pass delay to Provider instead of handling it internally
-      if (uniqueContext && unique && openUncontrolled) {
+      // If there is a parentContext, don't call uniqueContext methods
+      if (uniqueContext && unique && openUncontrolled && !parentContext) {
         if (nextOpen) {
           uniqueContext.show(getUniqueOptions(delay));
         } else {

package/package.json

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