Skip to content

fix(dialog): moved close button to the top of dialog in dom, marked caption in dialog header as h2 #2561

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
PosikBoy wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(dialog): moved close button to the top of dialog in dom, marked caption in dialog header as h2 #2561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
314df9b
fix(Dialog): moved closeButton
PosikBoy Jan 23, 2026
2f4c831
fix(DialogHeader): marked caption as h2
PosikBoy Jan 23, 2026
152ee46
fix(DialogHeader): fixed styles
PosikBoy Jan 23, 2026
12f7ed3
fix(DialogHeader): added Text and as props
PosikBoy Jan 23, 2026
a71b164
fix(DialogHeader): fixed styles
PosikBoy Jan 23, 2026
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
8 changes: 4 additions & 4 deletions src/components/Dialog/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import * as React from 'react';

import {Modal} from '../Modal';
import type {ModalCloseReason, ModalProps} from '../Modal';
import {Modal} from '../Modal';
import type {AriaLabelingProps, QAProps} from '../types';
import {block} from '../utils/cn';
import {filterDOMProps} from '../utils/filterDOMProps';
Expand All @@ -13,8 +13,8 @@ import {DialogBody} from './DialogBody/DialogBody';
import {DialogDivider} from './DialogDivider/DialogDivider';
import {DialogFooter} from './DialogFooter/DialogFooter';
import {DialogHeader} from './DialogHeader/DialogHeader';
import {DialogPrivateContext} from './DialogPrivateContext';
import type {DialogPrivateContextProps} from './DialogPrivateContext';
import {DialogPrivateContext} from './DialogPrivateContext';

import './Dialog.scss';

Expand Down Expand Up @@ -148,11 +148,11 @@ export function Dialog({
className,
)}
>
{hasCloseButton && <ButtonClose onClose={handleCloseButtonClick} />}

<DialogPrivateContext.Provider value={privateContextProps}>
{children}
</DialogPrivateContext.Provider>

{hasCloseButton && <ButtonClose onClose={handleCloseButtonClick} />}
</div>
</Modal>
);
Expand Down
8 changes: 5 additions & 3 deletions src/components/Dialog/DialogHeader/DialogHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type * as React from 'react';

import {Text} from '../../Text';
import {block} from '../../utils/cn';

import './DialogHeader.scss';
Expand All @@ -11,18 +12,19 @@ export interface DialogHeaderProps {
insertBefore?: React.ReactNode;
insertAfter?: React.ReactNode;
className?: string;
as?: React.ElementType;
id?: string;
}

export function DialogHeader(props: DialogHeaderProps) {
const {caption = '', insertBefore, insertAfter, className, id} = props;
const {caption = '', as = 'div', insertBefore, insertAfter, className, id} = props;

return (
<div className={b(null, className)}>
{insertBefore}
<div className={b('caption')} id={id}>
<Text as={as} className={b('caption')} id={id}>
Copy link
Contributor

@amje amje Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use variant prop subheader-3 instead of setting font styles in CSS

{caption}
</div>
</Text>
{insertAfter}
</div>
);
Expand Down
Loading