Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions packages/edit-site/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Code Quality

- Migrate the registered-template duplicate dialog in Page Templates from `@wordpress/components` `Modal` to `@wordpress/ui` `Dialog`. ([#76837](https://github.com/WordPress/gutenberg/pull/76837))

## 6.45.0 (2026-04-29)

## 6.44.0 (2026-04-15)
Expand Down
58 changes: 47 additions & 11 deletions packages/edit-site/src/components/page-templates/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import { addQueryArgs } from '@wordpress/url';
import { useSelect, useDispatch } from '@wordpress/data';
import { useEvent } from '@wordpress/compose';
import { useView } from '@wordpress/views';
import { Modal } from '@wordpress/components';
// eslint-disable-next-line @wordpress/use-recommended-components
import { Dialog } from '@wordpress/ui';
import { store as noticesStore } from '@wordpress/notices';

/**
Expand Down Expand Up @@ -54,6 +55,7 @@ export default function PageTemplates() {
const [ selection, setSelection ] = useState( [ postId ] );
const [ selectedRegisteredTemplate, setSelectedRegisteredTemplate ] =
useState( false );
const [ isDuplicateOpen, setIsDuplicateOpen ] = useState( false );
const defaultView = DEFAULT_VIEW;
const activeViewOverrides = useMemo(
() => getActiveViewOverridesForTab( activeView ),
Expand Down Expand Up @@ -342,6 +344,7 @@ export default function PageTemplates() {
onClickItem={ ( item ) => {
if ( typeof item.id === 'string' ) {
setSelectedRegisteredTemplate( item );
setIsDuplicateOpen( true );
} else {
history.navigate(
`/${ item.type }/${ item.id }?canvas=edit`
Expand All @@ -359,17 +362,50 @@ export default function PageTemplates() {
: false
}
/>
{ selectedRegisteredTemplate && duplicateAction && (
<Modal
title={ __( 'Duplicate' ) }
onRequestClose={ () => setSelectedRegisteredTemplate() }
size="small"
{ duplicateAction && (
<Dialog.Root
open={ isDuplicateOpen }
onOpenChange={ setIsDuplicateOpen }
onOpenChangeComplete={ ( isOpen ) => {
if ( ! isOpen ) {
// Clear the cached template only after the exit
// animation finishes — keeps the modal contents
// rendered while the dialog slides out so the
// inner DataForm doesn't flash empty. The
// functional setter guards against a stale
// "complete" callback firing after the user has
// already re-opened the dialog with a different
// template (mid-animation re-open race).
setSelectedRegisteredTemplate( ( prev ) =>
isDuplicateOpen ? prev : false
);
Comment on lines +369 to +381
}
} }
>
<duplicateAction.RenderModal
items={ [ selectedRegisteredTemplate ] }
closeModal={ () => setSelectedRegisteredTemplate() }
/>
</Modal>
<Dialog.Popup size="small">
<Dialog.Header>
<Dialog.Title>{ __( 'Duplicate' ) }</Dialog.Title>
<Dialog.CloseIcon />
</Dialog.Header>
<Dialog.Content>
{ selectedRegisteredTemplate && (
// Keying on the template id ensures the
// RenderModal remounts with a fresh internal
// `useState` initializer if the user clicks a
// different row while the dialog is still
// closing — otherwise the previous template's
// title would persist into the new session.
<duplicateAction.RenderModal
key={ selectedRegisteredTemplate.id }
items={ [ selectedRegisteredTemplate ] }
closeModal={ () =>
setIsDuplicateOpen( false )
}
/>
) }
</Dialog.Content>
</Dialog.Popup>
</Dialog.Root>
) }
</Page>
);
Expand Down
Loading