Skip to content

ui/Dialog: update Header layout, refactor Title to use Text #77161

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

Merged
ciampo merged 3 commits into from
Apr 10, 2026
+20 −15
Merged

ui/Dialog: update Header layout, refactor Title to use Text #77161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed254c5
ui `Dialog`: update Header layout to support multiple trailing elements
ciampo Apr 8, 2026
fe7d566
ui `Dialog.Title`: use `Text` internally with `heading-xl` variant
ciampo Apr 9, 2026
a705a59
Use global css defense module variables to override margin
ciampo Apr 10, 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
2 changes: 2 additions & 0 deletions packages/ui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

### Enhancements

- `Dialog`: Update `Header` layout to support multiple trailing elements alongside the title ([#77161](https://github.com/WordPress/gutenberg/pull/77161)).
- `Dialog`: Use `Text` internally for `Dialog.Title`, adopting the `heading-xl` variant for consistent typography ([#77161](https://github.com/WordPress/gutenberg/pull/77161)).
- Add defensive styles against global WordPress stylesheets like common.css and forms.css ([#76783](https://github.com/WordPress/gutenberg/pull/76783)).

### Internal
Expand Down
1 change: 0 additions & 1 deletion packages/ui/src/alert-dialog/popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ const Popup = forwardRef< HTMLDivElement, PopupProps >(
<Text
variant="heading-xl"
render={ <_AlertDialog.Title /> }
className={ dialogStyles.title }
>
{ title }
</Text>
Expand Down
13 changes: 7 additions & 6 deletions packages/ui/src/dialog/style.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,18 @@

.header {
display: flex;
justify-content: space-between;
align-items: center;
gap: var(--wpds-dimension-gap-sm);
margin-bottom: var(--wpds-dimension-gap-lg);
}

.title {
margin: 0;
font-size: var(--wpds-font-size-xl);
font-weight: var(--wpds-font-weight-medium);
line-height: var(--wpds-font-line-height-xl);
color: var(--wpds-color-fg-content-neutral);
/* Workaround the higher specificity of the global CSS defense styles */
--_gcd-heading-margin: 0 auto 0 0;

&:dir(rtl) {
--_gcd-heading-margin: 0 0 0 auto;
}
}

.footer {
Expand Down
19 changes: 11 additions & 8 deletions packages/ui/src/dialog/title.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Dialog as _Dialog } from '@base-ui/react/dialog';
import clsx from 'clsx';
import { useMergeRefs } from '@wordpress/compose';
import { forwardRef, useLayoutEffect, useRef } from '@wordpress/element';
import { Text } from '../text';
import { useDialogValidationContext } from './context';
import styles from './style.module.css';
import type { TitleProps } from './types';
Expand All @@ -11,11 +11,12 @@ import type { TitleProps } from './types';
* and serves as both the visible heading and the accessible label for
* the dialog.
*
* Base UI's Dialog.Title renders an `<h2>` by default. Use the `render` prop
* Uses the `heading-xl` text variant, matching Popover. Base UI's
* Dialog.Title renders an `<h2>` by default. Use the `render` prop
* to customize the element if needed.
*/
const Title = forwardRef< HTMLHeadingElement, TitleProps >(
function DialogTitle( { className, render, ...props }, forwardedRef ) {
function DialogTitle( { children, ...props }, forwardedRef ) {
const validationContext = useDialogValidationContext();
const internalRef = useRef< HTMLHeadingElement >( null );
const mergedRef = useMergeRefs( [ internalRef, forwardedRef ] );
Expand All @@ -26,12 +27,14 @@ const Title = forwardRef< HTMLHeadingElement, TitleProps >(
}, [ validationContext ] );

return (
<_Dialog.Title
<Text
ref={ mergedRef }
className={ clsx( styles.title, className ) }
render={ render }
{ ...props }
/>
variant="heading-xl"
render={ <_Dialog.Title { ...props } /> }
className={ styles.title }
>
{ children }
</Text>
);
}
);
Expand Down
Loading