chore: adjust

Author: aojunhao123

src/UniqueProvider/index.tsx

@@ -15,6 +15,7 @@ import { isDOM } from '@rc-component/util/lib/Dom/findDOMNode';
 import UniqueContainer from './UniqueContainer';
 import { clsx } from 'clsx';
 import { getAlignPopupClassName } from '../util';
+import useEscKeyDown from '../hooks/useEscKeyDown';
 
 export interface UniqueProviderProps {
   children: React.ReactNode;
@@ -91,6 +92,8 @@ const UniqueProvider = ({
     onTargetVisibleChanged(visible);
   });
 
+  useEscKeyDown(mergedOptions?.id, open, popupEle, () => trigger(false));
+
   // =========================== Align ============================
   const [
     ready,

src/hooks/useEscCancel.ts src/hooks/useEscKeyDown.tssrc/hooks/useEscCancel.ts renamed to src/hooks/useEscKeyDown.ts

@@ -62,7 +62,7 @@ function registerEscEntry(entry: EscEntry) {
   addEscListener(win);
 }
 
-export default function useEscCancel(
+export default function useEscKeyDown(
   popupId: string,
   open: boolean,
   popupEle: HTMLElement,
@@ -73,7 +73,7 @@ export default function useEscCancel(
   });
 
   React.useEffect(() => {
-    if (!open || !popupEle) {
+    if (!popupId || !open || !popupEle) {
       return;
     }
 

src/index.tsx

@@ -16,7 +16,7 @@ import useAlign from './hooks/useAlign';
 import useDelay from './hooks/useDelay';
 import useWatch from './hooks/useWatch';
 import useWinClick from './hooks/useWinClick';
-import useEscCancel from './hooks/useEscCancel';
+import useEscKeyDown from './hooks/useEscKeyDown';
 import type {
   ActionType,
   AlignType,
@@ -648,7 +648,7 @@ export function generateTrigger(
       triggerOpen,
     );
 
-    useEscCancel(id, mergedOpen, popupEle, triggerOpen);
+    useEscKeyDown(id, mergedOpen, popupEle, triggerOpen);
 
     // ======================= Action: Hover ========================
     const hoverToShow = showActions.has('hover');

tests/basic.test.jsx

@@ -1217,6 +1217,20 @@ describe('Trigger.Basic', () => {
       expect(isPopupHidden()).toBeTruthy();
     });
 
+    it('non-escape key should not close popup', async () => {
+      const { container } = render(
+        <Trigger action="click" popup={<strong>trigger</strong>}>
+          <div className="target" />
+        </Trigger>,
+      );
+
+      trigger(container, '.target');
+      expect(isPopupHidden()).toBeFalsy();
+
+      fireEvent.keyDown(window, { key: 'Enter' });
+      expect(isPopupHidden()).toBeFalsy();
+    });
+
     it('esc should close nested popup from inside out', async () => {
       const useIdModule = require('@rc-component/util/lib/hooks/useId');
       let seed = 0;

tests/unique.test.tsx

@@ -374,4 +374,21 @@ describe('Trigger.Unique', () => {
     // Verify onAlign was called due to target change
     expect(mockOnAlign).toHaveBeenCalled();
   });
+
+  it('esc should close unique popup', async () => {
+    const { container,baseElement } = render(
+      <UniqueProvider>
+        <Trigger action={['click']} popup={<div>Popup</div>} unique>
+          <div className="target" />
+        </Trigger>
+      </UniqueProvider>,
+    );
+    fireEvent.click(container.querySelector('.target'));
+    await awaitFakeTimer();
+    expect(baseElement.querySelector('.rc-trigger-popup-hidden')).toBeFalsy();
+
+    fireEvent.keyDown(window, { key: 'Escape' });
+    await awaitFakeTimer();
+    expect(baseElement.querySelector('.rc-trigger-popup-hidden')).toBeTruthy();
+  });
 });

tsconfig.json

@@ -8,6 +8,7 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
+    "types": ["@testing-library/jest-dom", "node"],
     "paths": {
       "@/*": ["src/*"],
       "@@/*": [".dumi/tmp/*"],