Fix code review recommendations

WordPress · Oct 20, 2023 · 10cddb4 · 10cddb4
1 parent 6994f94
commit 10cddb4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Bug Fix
+
+-   Update the title when using enhanced pagination. ([#55446](https://github.com/WordPress/gutenberg/pull/55446))
+
 ## 2.5.0 (2023-10-18)
 
 ## 2.4.0 (2023-10-05)
@@ -16,7 +20,6 @@
 
 -   Remove `role` attribute when set to `null` in `data-wp-bind`. ([#54608](https://github.com/WordPress/gutenberg/pull/54608))
 -   Add `timeout` option to `navigate()`, with a default value of `10000` milliseconds. ([#54474](https://github.com/WordPress/gutenberg/pull/54474))
--   Update the title when using enhanced pagination. ([#55446](https://github.com/WordPress/gutenberg/pull/55446))
 
 ## 2.2.0 (2023-08-31)
 

diff --git a/packages/interactivity/src/router.js b/packages/interactivity/src/router.js
@@ -55,7 +55,7 @@ const regionsToVdom = ( dom ) => {
 		const id = region.getAttribute( attrName );
 		regions[ id ] = toVdom( region );
 	} );
-	const title = dom.querySelector( 'title' ).innerText || null;
+	const title = dom.querySelector( 'title' )?.innerText;
 	return { regions, title };
 };
 
@@ -75,10 +75,10 @@ const renderRegions = ( page ) => {
 		const id = region.getAttribute( attrName );
 		const fragment = getRegionRootFragment( region );
 		render( page.regions[ id ], fragment );
-		if ( page.title ) {
-			document.title = page.title;
-		}
 	} );
+	if ( page.title ) {
+		document.title = page.title;
+	}
 };
 
 // Variable to store the current navigation.

diff --git a/test/e2e/specs/interactivity/router-regions.spec.ts b/test/e2e/specs/interactivity/router-regions.spec.ts
@@ -98,19 +98,16 @@ test.describe( 'Router regions', () => {
 		await expect( nestedRegionSsr ).toHaveText( 'content from page 1' );
 	} );
 
-	test( 'Page title is updated', async ( { page } ) => {
-		expect( await page.title() ).toBe(
+	test( 'Page title is updated 2', async ( { page } ) => {
+		await expect( page ).toHaveTitle(
 			'router regions – page 1 – gutenberg'
 		);
 		await page.getByTestId( 'next' ).click();
-		await page.waitForFunction(
-			() => document.title === 'router regions – page 2 – gutenberg'
-		);
-		expect( await page.title() ).toBe(
+		await expect( page ).toHaveTitle(
 			'router regions – page 2 – gutenberg'
 		);
 		await page.getByTestId( 'back' ).click();
-		expect( await page.title() ).toBe(
+		await expect( page ).toHaveTitle(
 			'router regions – page 1 – gutenberg'
 		);
 	} );