Skip to content

feat: adapt semantic close #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −3
Open

feat: adapt semantic close #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Dialog/Content/Panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ const Panel = React.forwardRef<PanelRef, PanelProps>((props, ref) => {
onClick={onClose}
aria-label="Close"
{...ariaProps}
className={`${prefixCls}-close`}
className={clsx(`${prefixCls}-close`, modalClassNames?.close)}
disabled={closeBtnIsDisabled}
style={modalStyles?.close}
>
{closableObj.closeIcon}
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/IDialogPropTypes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { GetContainer } from '@rc-component/util/lib/PortalWrapper';
import type { CSSProperties, ReactNode, SyntheticEvent } from 'react';

export type SemanticName = 'header' | 'body' | 'footer' | 'container' | 'title' | 'wrapper' | 'mask';
export type SemanticName = 'header' | 'body' | 'footer' | 'container' | 'title' | 'wrapper' | 'mask' | 'close';

export type ModalClassNames = Partial<Record<SemanticName, string>>;

Expand Down
3 changes: 2 additions & 1 deletion tests/__snapshots__/index.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ exports[`dialog should support classNames 1`] = `
>
<button
aria-label="Close"
class="rc-dialog-close"
class="rc-dialog-close custom-close"
type="button"
>
<span
Expand Down Expand Up @@ -200,6 +200,7 @@ exports[`dialog should support styles 1`] = `
<button
aria-label="Close"
class="rc-dialog-close"
style="color: red;"
type="button"
>
<span
Expand Down
6 changes: 6 additions & 0 deletions tests/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ describe('dialog', () => {
mask: 'custom-mask',
wrapper: 'custom-wrapper',
container: 'custom-container',
close: 'custom-close',
}}
style={{ width: 600 }}
height={903}
Expand All @@ -631,6 +632,7 @@ describe('dialog', () => {
expect(document.querySelector('.rc-dialog-footer').className).toContain('custom-footer');
expect(document.querySelector('.rc-dialog-mask').className).toContain('custom-mask');
expect(document.querySelector('.rc-dialog-container').className).toContain('custom-container');
expect(document.querySelector('.rc-dialog-close').className).toContain('custom-close');
});

it('should support styles', () => {
Expand All @@ -647,6 +649,9 @@ describe('dialog', () => {
wrapper: { background: 'pink' },
container: { background: 'orange' },
title: { background: 'orange' },
close: {
color: 'red',
},
}}
style={{ width: 600 }}
height={903}
Expand All @@ -662,6 +667,7 @@ describe('dialog', () => {
expect(document.querySelector('.rc-dialog-mask')).toHaveStyle('background: yellow');
expect(document.querySelector('.rc-dialog-container')).toHaveStyle('background: orange');
expect(document.querySelector('.rc-dialog-title')).toHaveStyle('background: orange');
expect(document.querySelector('.rc-dialog-close')).toHaveStyle('color: red');
});

it('should warning', () => {
Expand Down
Loading