Skip to content

iAPI: Fix duplicated nested regions #70302

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
merged 4 commits into from
Jun 4, 2025
Merged

iAPI: Fix duplicated nested regions #70302

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64f98c1
Add failing test
luisherranz Feb 27, 2025
68d079b
Add test to test data-wp-interactive topmost behaviour
luisherranz Feb 27, 2025
16d28a4
Fix the tests
luisherranz Feb 27, 2025
89fbac0
Update changelog
DAreRodz Jun 4, 2025
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
Prev Previous commit
Next Next commit
Fix the tests
  • Loading branch information
@luisherranz @DAreRodz
luisherranz authored and DAreRodz committed Jun 4, 2025
commit 16d28a4371cc2232a5e7f1ad2d703718d8517159
17 changes: 11 additions & 6 deletions packages/interactivity-router/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const {
'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
);

const regionAttr = `data-${ directivePrefix }-router-region`;
const interactiveAttr = `data-${ directivePrefix }-interactive`;

interface NavigateOptions {
force?: boolean;
html?: string;
Expand Down Expand Up @@ -78,9 +81,10 @@ const fetchPage = async ( url: string, { html }: { html: string } ) => {
const regionsToVdom: RegionsToVdom = async ( dom, { vdom } = {} ) => {
const regions = { body: undefined };
if ( navigationMode === 'regionBased' ) {
const attrName = `data-${ directivePrefix }-router-region`;
dom.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
const id = region.getAttribute( attrName );
dom.querySelectorAll(
`[${ interactiveAttr }][${ regionAttr }]:not([${ interactiveAttr }] [${ interactiveAttr }])`
).forEach( ( region ) => {
const id = region.getAttribute( regionAttr );
regions[ id ] = vdom?.has( region )
? vdom.get( region )
: toVdom( region );
Expand All @@ -94,13 +98,14 @@ const regionsToVdom: RegionsToVdom = async ( dom, { vdom } = {} ) => {
// Render all interactive regions contained in the given page.
const renderRegions = async ( page: Page ) => {
if ( navigationMode === 'regionBased' ) {
const attrName = `data-${ directivePrefix }-router-region`;
batch( () => {
populateServerData( page.initialData );
document
.querySelectorAll( `[${ attrName }]` )
.querySelectorAll(
`[${ interactiveAttr }][${ regionAttr }]:not([${ interactiveAttr }] [${ interactiveAttr }])`
)
.forEach( ( region ) => {
const id = region.getAttribute( attrName );
const id = region.getAttribute( regionAttr );
const fragment = getRegionRootFragment( region );
render( page.regions[ id ], fragment );
} );
Expand Down