@rc-component/trigger 3.7.2 → 3.8.1

package/es/Popup/index.d.ts

@@ -3,6 +3,7 @@ import { type ResizeObserverProps } from '@rc-component/resize-observer';
 import * as React from 'react';
 import type { TriggerProps } from '../';
 import type { AlignType, ArrowPos, ArrowTypeOuter } from '../interface';
+import type { PortalProps } from '@rc-component/portal';
 export interface MobileConfig {
     mask?: boolean;
     /** Set popup motion. You can ref `rc-motion` for more info. */
@@ -11,6 +12,7 @@ export interface MobileConfig {
     maskMotion?: CSSMotionProps;
 }
 export interface PopupProps {
+    onEsc?: PortalProps['onEsc'];
     prefixCls: string;
     className?: string;
     style?: React.CSSProperties;

package/es/Popup/index.js

@@ -12,6 +12,7 @@ import useOffsetStyle from "../hooks/useOffsetStyle";
 import { useEvent } from '@rc-component/util';
 const Popup = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
+    onEsc,
     popup,
     className,
     prefixCls,
@@ -120,7 +121,8 @@ const Popup = /*#__PURE__*/React.forwardRef((props, ref) => {
   return /*#__PURE__*/React.createElement(Portal, {
     open: forceRender || isNodeVisible,
     getContainer: getPopupContainer && (() => getPopupContainer(target)),
-    autoDestroy: autoDestroy
+    autoDestroy: autoDestroy,
+    onEsc: onEsc
   }, /*#__PURE__*/React.createElement(Mask, {
     prefixCls: prefixCls,
     open: open,

package/es/UniqueProvider/index.js

@@ -119,6 +119,7 @@ const UniqueProvider = ({
   }, /*#__PURE__*/React.createElement(Popup, {
     ref: setPopupRef,
     portal: Portal,
+    onEsc: mergedOptions.onEsc,
     prefixCls: prefixCls,
     popup: mergedOptions.popup,
     className: clsx(mergedOptions.popupClassName, alignedClassName, `${prefixCls}-unique-controlled`),

package/es/context.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import type { CSSMotionProps } from '@rc-component/motion';
+import type { PortalProps } from '@rc-component/portal';
 import type { TriggerProps } from './index';
 import type { AlignType, ArrowTypeOuter, BuildInPlacements } from './interface';
 export interface TriggerContextProps {
@@ -28,6 +29,7 @@ export interface UniqueShowOptions {
     arrow?: ArrowTypeOuter;
     getPopupContainer?: TriggerProps['getPopupContainer'];
     getPopupClassNameFromAlign?: (align: AlignType) => string;
+    onEsc?: PortalProps['onEsc'];
 }
 export interface UniqueContextProps {
     show: (options: UniqueShowOptions, isOpen: () => boolean) => void;

package/es/index.js

@@ -17,6 +17,7 @@ import useWinClick from "./hooks/useWinClick";
 import { getAlignPopupClassName } from "./util";
 import UniqueProvider from "./UniqueProvider";
 import { useControlledState } from '@rc-component/util';
+import { flushSync } from 'react-dom';
 export { UniqueProvider };
 
 // Removed Props List
@@ -175,7 +176,8 @@ export function generateTrigger(PortalComponent = Portal) {
       arrow: innerArrow,
       getPopupContainer,
       getPopupClassNameFromAlign,
-      id
+      id,
+      onEsc
     }));
 
     // Handle controlled state changes for UniqueProvider
@@ -192,19 +194,14 @@ export function generateTrigger(PortalComponent = Portal) {
     }, [mergedOpen, targetEle]);
     const openRef = React.useRef(mergedOpen);
     openRef.current = mergedOpen;
-    const lastTriggerRef = React.useRef([]);
-    lastTriggerRef.current = [];
     const internalTriggerOpen = useEvent(nextOpen => {
-      setInternalOpen(nextOpen);
-
-      // Enter or Pointer will both trigger open state change
-      // We only need take one to avoid duplicated change event trigger
-      // Use `lastTriggerRef` to record last open type
-      if ((lastTriggerRef.current[lastTriggerRef.current.length - 1] ?? mergedOpen) !== nextOpen) {
-        lastTriggerRef.current.push(nextOpen);
-        onOpenChange?.(nextOpen);
-        onPopupVisibleChange?.(nextOpen);
-      }
+      flushSync(() => {
+        if (mergedOpen !== nextOpen) {
+          setInternalOpen(nextOpen);
+          onOpenChange?.(nextOpen);
+          onPopupVisibleChange?.(nextOpen);
+        }
+      });
     });
 
     // Trigger for delay
@@ -233,6 +230,13 @@ export function generateTrigger(PortalComponent = Portal) {
         internalTriggerOpen(nextOpen);
       }, delay);
     };
+    function onEsc({
+      top
+    }) {
+      if (top) {
+        triggerOpen(false);
+      }
+    }
 
     // ========================== Motion ============================
     const [inMotion, setInMotion] = React.useState(false);
@@ -518,7 +522,8 @@ export function generateTrigger(PortalComponent = Portal) {
       ,
       forceRender: forceRender,
       autoDestroy: mergedAutoDestroy,
-      getPopupContainer: getPopupContainer
+      getPopupContainer: getPopupContainer,
+      onEsc: onEsc
       // Arrow
       ,
       align: alignInfo,

package/lib/Popup/index.d.ts

@@ -3,6 +3,7 @@ import { type ResizeObserverProps } from '@rc-component/resize-observer';
 import * as React from 'react';
 import type { TriggerProps } from '../';
 import type { AlignType, ArrowPos, ArrowTypeOuter } from '../interface';
+import type { PortalProps } from '@rc-component/portal';
 export interface MobileConfig {
     mask?: boolean;
     /** Set popup motion. You can ref `rc-motion` for more info. */
@@ -11,6 +12,7 @@ export interface MobileConfig {
     maskMotion?: CSSMotionProps;
 }
 export interface PopupProps {
+    onEsc?: PortalProps['onEsc'];
     prefixCls: string;
     className?: string;
     style?: React.CSSProperties;

package/lib/Popup/index.js

@@ -21,6 +21,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const Popup = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
+    onEsc,
     popup,
     className,
     prefixCls,
@@ -129,7 +130,8 @@ const Popup = /*#__PURE__*/React.forwardRef((props, ref) => {
   return /*#__PURE__*/React.createElement(Portal, {
     open: forceRender || isNodeVisible,
     getContainer: getPopupContainer && (() => getPopupContainer(target)),
-    autoDestroy: autoDestroy
+    autoDestroy: autoDestroy,
+    onEsc: onEsc
   }, /*#__PURE__*/React.createElement(_Mask.default, {
     prefixCls: prefixCls,
     open: open,

package/lib/UniqueProvider/index.js

@@ -128,6 +128,7 @@ const UniqueProvider = ({
   }, /*#__PURE__*/React.createElement(_Popup.default, {
     ref: setPopupRef,
     portal: _portal.default,
+    onEsc: mergedOptions.onEsc,
     prefixCls: prefixCls,
     popup: mergedOptions.popup,
     className: (0, _clsx.clsx)(mergedOptions.popupClassName, alignedClassName, `${prefixCls}-unique-controlled`),

package/lib/context.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import type { CSSMotionProps } from '@rc-component/motion';
+import type { PortalProps } from '@rc-component/portal';
 import type { TriggerProps } from './index';
 import type { AlignType, ArrowTypeOuter, BuildInPlacements } from './interface';
 export interface TriggerContextProps {
@@ -28,6 +29,7 @@ export interface UniqueShowOptions {
     arrow?: ArrowTypeOuter;
     getPopupContainer?: TriggerProps['getPopupContainer'];
     getPopupClassNameFromAlign?: (align: AlignType) => string;
+    onEsc?: PortalProps['onEsc'];
 }
 export interface UniqueContextProps {
     show: (options: UniqueShowOptions, isOpen: () => boolean) => void;

package/lib/index.js

@@ -30,6 +30,7 @@ var _useWinClick = _interopRequireDefault(require("./hooks/useWinClick"));
 var _util = require("./util");
 var _UniqueProvider = _interopRequireDefault(require("./UniqueProvider"));
 var _util2 = require("@rc-component/util");
+var _reactDom = require("react-dom");
 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; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -189,7 +190,8 @@ function generateTrigger(PortalComponent = _portal.default) {
       arrow: innerArrow,
       getPopupContainer,
       getPopupClassNameFromAlign,
-      id
+      id,
+      onEsc
     }));
 
     // Handle controlled state changes for UniqueProvider
@@ -206,19 +208,14 @@ function generateTrigger(PortalComponent = _portal.default) {
     }, [mergedOpen, targetEle]);
     const openRef = React.useRef(mergedOpen);
     openRef.current = mergedOpen;
-    const lastTriggerRef = React.useRef([]);
-    lastTriggerRef.current = [];
     const internalTriggerOpen = (0, _useEvent.default)(nextOpen => {
-      setInternalOpen(nextOpen);
-
-      // Enter or Pointer will both trigger open state change
-      // We only need take one to avoid duplicated change event trigger
-      // Use `lastTriggerRef` to record last open type
-      if ((lastTriggerRef.current[lastTriggerRef.current.length - 1] ?? mergedOpen) !== nextOpen) {
-        lastTriggerRef.current.push(nextOpen);
-        onOpenChange?.(nextOpen);
-        onPopupVisibleChange?.(nextOpen);
-      }
+      (0, _reactDom.flushSync)(() => {
+        if (mergedOpen !== nextOpen) {
+          setInternalOpen(nextOpen);
+          onOpenChange?.(nextOpen);
+          onPopupVisibleChange?.(nextOpen);
+        }
+      });
     });
 
     // Trigger for delay
@@ -247,6 +244,13 @@ function generateTrigger(PortalComponent = _portal.default) {
         internalTriggerOpen(nextOpen);
       }, delay);
     };
+    function onEsc({
+      top
+    }) {
+      if (top) {
+        triggerOpen(false);
+      }
+    }
 
     // ========================== Motion ============================
     const [inMotion, setInMotion] = React.useState(false);
@@ -532,7 +536,8 @@ function generateTrigger(PortalComponent = _portal.default) {
       ,
       forceRender: forceRender,
       autoDestroy: mergedAutoDestroy,
-      getPopupContainer: getPopupContainer
+      getPopupContainer: getPopupContainer,
+      onEsc: onEsc
       // Arrow
       ,
       align: alignInfo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "3.7.2",
+  "version": "3.8.1",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@rc-component/motion": "^1.1.4",
-    "@rc-component/portal": "^2.0.0",
+    "@rc-component/portal": "^2.2.0",
     "@rc-component/resize-observer": "^1.0.0",
     "@rc-component/util": "^1.2.1",
     "clsx": "^2.1.1"