From 2487b8c93c1b4de42fde44f0a22ebde5e6987151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= Date: Fri, 20 Nov 2026 09:36:55 +0800 Subject: [PATCH] fix: support data attributes in closable --- src/Dialog/Content/Panel.tsx | 2 +- src/IDialogPropTypes.ts | 4 +++- tests/index.spec.tsx | 19 ++++++++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/Dialog/Content/Panel.tsx b/src/Dialog/Content/Panel.tsx index 08256843..18759c0b 100644 --- a/src/Dialog/Content/Panel.tsx +++ b/src/Dialog/Content/Panel.tsx @@ -110,7 +110,7 @@ const Panel = React.forwardRef((props, ref) => { return {}; }, [closable, closeIcon, prefixCls]); - const ariaProps = pickAttrs(closableObj, true); + const ariaProps = pickAttrs(closableObj, { aria: true, data: true }); const closeBtnIsDisabled = typeof closable === 'object' && closable.disabled; const closerNode = closable ? ( diff --git a/src/IDialogPropTypes.ts b/src/IDialogPropTypes.ts index 03531715..f5fb405a 100644 --- a/src/IDialogPropTypes.ts +++ b/src/IDialogPropTypes.ts @@ -1,13 +1,15 @@ import type { GetContainer } from '@rc-component/util'; import type { CSSProperties, ReactNode, SyntheticEvent } from 'react'; -export type SemanticName = 'header' | 'body' | 'footer' | 'container' | 'title' | 'wrapper' | 'mask' | 'close'; +export type SemanticName = + 'header' | 'body' | 'footer' | 'container' | 'title' | 'wrapper' | 'mask' | 'close'; export type ModalClassNames = Partial>; export type ModalStyles = Partial>; export type ClosableType = { + [key: `data-${string}`]: unknown; closeIcon?: React.ReactNode; disabled?: boolean; afterClose?: () => any; diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx index dcb33153..1ed351a4 100644 --- a/tests/index.spec.tsx +++ b/tests/index.spec.tsx @@ -705,13 +705,17 @@ describe('dialog', () => { spy.mockRestore(); }); - it('support aria-* in closable', () => { + it('support aria-* and data-* in closable', () => { const onClose = jest.fn(); - render( + const onClick = jest.fn(); + const { getByTestId } = render( { ); jest.runAllTimers(); - const btn = document.querySelector('.rc-dialog-close'); + const btn = getByTestId('dialog-close'); + expect(btn).toBe(document.querySelector('button.rc-dialog-close')); expect(btn.textContent).toBe('test'); expect(btn.getAttribute('aria-label')).toBe('test aria-label'); + expect(btn).toHaveAttribute('role', 'button'); + expect(btn).toHaveAttribute('data-count', '0'); + expect(btn).not.toHaveAttribute('title'); + expect(btn).not.toHaveAttribute('closeIcon'); fireEvent.click(btn); jest.runAllTimers(); expect(onClose).toHaveBeenCalledTimes(1); + expect(onClose).toHaveBeenCalledWith(expect.objectContaining({ type: 'click' })); + expect(onClick).not.toHaveBeenCalled(); }); it('support disable button in closable', () => { @@ -735,6 +746,7 @@ describe('dialog', () => { closable={{ closeIcon: 'test', disabled: true, + 'data-testid': 'disabled-dialog-close', }} visible onClose={onClose} @@ -744,6 +756,7 @@ describe('dialog', () => { const btn = document.querySelector('.rc-dialog-close'); expect(btn.disabled).toBeTruthy(); + expect(btn).toHaveAttribute('data-testid', 'disabled-dialog-close'); fireEvent.click(btn); jest.runAllTimers();