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

Show file tree
Hide file tree
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
Add test to test data-wp-interactive topmost behaviour
  • Loading branch information
@luisherranz @DAreRodz
luisherranz authored and DAreRodz committed Jun 4, 2025
commit 68d079b22a74f79eff31e27548b6f89565093af5
27 changes: 20 additions & 7 deletions packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
>not hydrated</p>
</div>


<section>
<h2>Region 2</h2>
<div
Expand All @@ -74,7 +73,7 @@
data-wp-on--click="actions.counter.increment"
>NaN</button>

<div data-wp-ignore>
<div>
<div>
<p
data-testid="no-region-text-2"
Expand All @@ -92,10 +91,11 @@
content from page <?php echo $attributes['page']; ?>
</p>

<ul
data-wp-interactive="router-regions"
data-wp-router-region="nested-region-2"
>
<button data-testid="add-item" data-wp-on--click="actions.addItem">
Add item
</button>

<ul>
<template data-wp-each="state.items">
<li data-testid="nested-item" data-wp-key="context.item" data-wp-text="context.item"></li>
</template>
Expand All @@ -107,4 +107,17 @@
</section>
</div>
</div>
</section>
</section>

<div data-wp-interactive="router-regions">
<div data-wp-router-region="invalid-region-1">
<p data-testid="invalid-region-text-1">
content from page <?php echo $attributes['page']; ?>
</p>
</div>
<div data-wp-interactive="router-regions" data-wp-router-region="invalid-region-2">
<p data-testid="invalid-region-text-2">
content from page <?php echo $attributes['page']; ?>
</p>
</div>
</div>
3 changes: 3 additions & 0 deletions packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,8 @@ const { state } = store( 'router-regions', {
}
},
},
addItem() {
state.items.push( `item ${ state.items.length + 1 }` );
},
},
} );
34 changes: 31 additions & 3 deletions test/e2e/specs/interactivity/router-regions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ test.describe( 'Router regions', () => {
const region1Text = page.getByTestId( 'region-1-text' );
const region2Text = page.getByTestId( 'region-2-text' );
const noRegionText1 = page.getByTestId( 'no-region-text-1' );
const noRegionText2 = page.getByTestId( 'no-region-text-2' );

await expect( region1Text ).toHaveText( 'hydrated' );
await expect( region2Text ).toHaveText( 'hydrated' );
await expect( noRegionText1 ).toHaveText( 'not hydrated' );
await expect( noRegionText2 ).toHaveText( 'not hydrated' );
} );

test( 'should update after navigation', async ( { page } ) => {
Expand Down Expand Up @@ -97,10 +95,12 @@ test.describe( 'Router regions', () => {
await page.getByTestId( 'next' ).click();
await expect( nestedRegionSsr ).toHaveText( 'content from page 2' );
await expect( innerContent ).toHaveCount( 3 );
await page.getByTestId( 'add-item' ).click();
await expect( innerContent ).toHaveCount( 4 );

await page.getByTestId( 'back' ).click();
await expect( nestedRegionSsr ).toHaveText( 'content from page 1' );
await expect( innerContent ).toHaveCount( 3 );
await expect( innerContent ).toHaveCount( 4 );
} );

test( 'Page title is updated 2', async ( { page } ) => {
Expand All @@ -116,4 +116,32 @@ test.describe( 'Router regions', () => {
'router regions – page 1 – gutenberg'
);
} );

test( 'should not take into account regions that are not in the topmost `data-wp-interactive`.', async ( {
page,
} ) => {
const invalidRegionText1 = page.getByTestId( 'invalid-region-text-1' );
const invalidRegionText2 = page.getByTestId( 'invalid-region-text-2' );

await expect( invalidRegionText1 ).toHaveText( 'content from page 1' );
await expect( invalidRegionText2 ).toHaveText( 'content from page 1' );

await page.getByTestId( 'next' ).click();
// Waits until the navigation finishes so it doesn't read the text from
// the previous page.
await expect( page ).toHaveTitle(
'router regions – page 2 – gutenberg'
);
await expect( invalidRegionText1 ).toHaveText( 'content from page 1' );
await expect( invalidRegionText2 ).toHaveText( 'content from page 1' );

await page.getByTestId( 'back' ).click();
// Waits until the navigation finishes so it doesn't read the text from
// the previous page.
await expect( page ).toHaveTitle(
'router regions – page 1 – gutenberg'
);
await expect( invalidRegionText1 ).toHaveText( 'content from page 1' );
await expect( invalidRegionText2 ).toHaveText( 'content from page 1' );
} );
} );