@automattic/newspack-blocks 4.31.1 → 4.31.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @automattic/newspack-blocks [4.31.2](https://github.com/Automattic/newspack-workspace/compare/newspack-blocks@4.31.1...newspack-blocks@4.31.2) (2026-09-10)
+
+
+### Bug Fixes
+
+* **iframe:** keep Back working on iframe block pages (NPPM-3180) ([#1042](https://github.com/Automattic/newspack-workspace/issues/1042)) ([6a87cb2](https://github.com/Automattic/newspack-workspace/commit/6a87cb2c6dcab735a81b54e87fb11b93769baac1))
+
 ## @automattic/newspack-blocks [4.31.1](https://github.com/Automattic/newspack-workspace/compare/newspack-blocks@4.31.0...newspack-blocks@4.31.1) (2026-09-09)
 
 

package/dist/iframe/view.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready'), 'version' => 'b237b52924e68e8bf7a5');
+<?php return array('dependencies' => array('wp-dom-ready'), 'version' => '0adcb9c939693718d723');

package/dist/iframe/view.js

@@ -1 +1 @@
-(()=>{"use strict";var e={n:t=>{var n=t&&t.__esModule?()=>t.default:()=>t;return e.d(n,{a:n}),n},d:(t,n)=>{for(var r in n)e.o(n,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:n[r]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.domReady;e.n(t)()(()=>{Array.from(document.querySelectorAll(".wp-block-newspack-blocks-iframe iframe")).forEach(e=>{const t=setInterval(function(){e.src=e.src},2e3);e.onload=function(){clearInterval(t)},window.addEventListener("message",function(t){if(t.origin!==new URL(e.src).origin||e.contentWindow!==t.source)return;let n=0;t.data&&t.data.height&&("number"==typeof t.data.height?n=t.data.height:"string"==typeof t.data.height&&(n=Number(t.data.height))),!isNaN(n)&&n>0&&(e.parentElement&&"auto"!==e.parentElement.style.height&&(e.parentElement.style.height="auto"),e.style.height=n+"px")})})})})();
+(()=>{"use strict";var e={n:t=>{var n=t&&t.__esModule?()=>t.default:()=>t;return e.d(n,{a:n}),n},d:(t,n)=>{for(var a in n)e.o(n,a)&&!e.o(t,a)&&Object.defineProperty(t,a,{enumerable:!0,get:n[a]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.domReady;e.n(t)()(()=>{Array.from(document.querySelectorAll(".wp-block-newspack-blocks-iframe iframe")).forEach(e=>{let t=0;const n=setInterval(()=>{!(e=>{const t=e.contentDocument;return null!==t&&"about:blank"===t.URL})(e)||t>=10?clearInterval(n):(t++,e.contentWindow.location.replace(e.src))},2e3);window.addEventListener("message",function(t){if(t.origin!==new URL(e.src).origin||e.contentWindow!==t.source)return;let n=0;t.data&&t.data.height&&("number"==typeof t.data.height?n=t.data.height:"string"==typeof t.data.height&&(n=Number(t.data.height))),!isNaN(n)&&n>0&&(e.parentElement&&"auto"!==e.parentElement.style.height&&(e.parentElement.style.height="auto"),e.style.height=n+"px")})})})})();

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.31.1
+ * Version:         4.31.2
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '4.31.1' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.31.2' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.31.1",
+	"version": "4.31.2",
 	"author": "Automattic",
 	"description": "=== Newspack Blocks === Contributors: (this should be a list of wordpress.org userid's) Donate link: https://example.com/ Tags: comments, spam Requires at least: 4.5 Tested up to: 5.1.1 Stable tag: 0.1.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html",
 	"repository": {

package/src/blocks/iframe/view.js

@@ -9,17 +9,47 @@ import domReady from '@wordpress/dom-ready';
 
 import './view.scss';
 
+/**
+ * Whether the frame still shows its initial about:blank, so it has loaded nothing.
+ * Google Docs Viewer intermittently answers HTTP 204, which leaves the frame blank
+ * with no load event. That is the case the retry exists for.
+ *
+ * contentDocument is null for a loaded cross-origin document, a detached frame, and
+ * a sandboxed frame without allow-same-origin (from the first tick, so such a frame
+ * would never retry; this block renders no sandbox attribute).
+ *
+ * @param {HTMLIFrameElement} iframe The iframe.
+ * @return {boolean} Whether the frame is still on its initial about:blank.
+ */
+const isStillBlank = iframe => {
+	const doc = iframe.contentDocument;
+	return doc !== null && doc.URL === 'about:blank';
+};
+
+/**
+ * Re-navigations before giving up on a frame that never loads. A 204 resolves in a
+ * retry or two; without a bound, a permanently blank embed keeps requesting for as
+ * long as the page is open.
+ */
+const MAX_RETRIES = 10;
+
 domReady( () => {
 	const iframes = Array.from( document.querySelectorAll( '.wp-block-newspack-blocks-iframe iframe' ) );
 	iframes.forEach( iframe => {
-		const timerId = setInterval( function () {
-			iframe.src = iframe.src;
+		// Don't wait for the load event: it may have fired before this script ran
+		// (delayed JS). Navigate with location.replace(), since resetting src on a
+		// loaded frame adds a history entry and makes readers press Back twice
+		// (NPPM-3180).
+		let attempts = 0;
+		const retry = setInterval( () => {
+			if ( ! isStillBlank( iframe ) || attempts >= MAX_RETRIES ) {
+				clearInterval( retry );
+				return;
+			}
+			attempts++;
+			iframe.contentWindow.location.replace( iframe.src );
 		}, 2000 );
 
-		iframe.onload = function () {
-			clearInterval( timerId );
-		};
-
 		// Add a listener for dynamic resizing if the iframe supports it.
 		window.addEventListener( 'message', function ( event ) {
 			// Reject messages from untrusted origins.

package/src/blocks/iframe/view.test.js

@@ -0,0 +1,97 @@
+/**
+ * The iframe block's retry (NPPM-3180) must leave a frame that already holds a
+ * document alone, and must never reset `src`, which adds a history entry.
+ */
+
+const SRC = 'https://embed.example.test/widget';
+
+/**
+ * Render one iframe block and stub the frame state jsdom cannot provide.
+ *
+ * @param {Object|null} contentDocument What the attached frame reports: the initial
+ *                                      about:blank document while a navigation is in
+ *                                      flight or was abandoned (cross-origin included),
+ *                                      null once a cross-origin document has loaded.
+ *                                      A detached frame reports null, as does its
+ *                                      contentWindow.
+ * @return {Object} The iframe, its state holder, and the `replace` and `setSrc` spies.
+ */
+function renderIframe( contentDocument ) {
+	document.body.innerHTML = `<figure class="wp-block-newspack-blocks-iframe"><div class="wp-block-embed__wrapper"><iframe src="${ SRC }"></iframe></div></figure>`;
+	const iframe = document.querySelector( 'iframe' );
+	const state = { contentDocument };
+	const replace = jest.fn();
+	const setSrc = jest.fn();
+	const contentWindow = { location: { replace } };
+	Object.defineProperty( iframe, 'contentDocument', { configurable: true, get: () => ( iframe.isConnected ? state.contentDocument : null ) } );
+	Object.defineProperty( iframe, 'contentWindow', { configurable: true, get: () => ( iframe.isConnected ? contentWindow : null ) } );
+	Object.defineProperty( iframe, 'src', { configurable: true, get: () => SRC, set: setSrc } );
+	jest.isolateModules( () => require( './view' ) );
+	return { iframe, state, replace, setSrc };
+}
+
+describe( 'iframe block view script', () => {
+	beforeEach( () => {
+		jest.useFakeTimers();
+	} );
+
+	afterEach( () => {
+		jest.clearAllTimers();
+		jest.useRealTimers();
+		document.body.innerHTML = '';
+	} );
+
+	it.each( [
+		// The delayed-script case: the frame loaded before this script ran.
+		[ 'cross-origin', null ],
+		[ 'same-origin', { URL: 'https://example.test/embed' } ],
+	] )( 'leaves a frame that already holds a %s document alone', ( _, contentDocument ) => {
+		const { replace, setSrc } = renderIframe( contentDocument );
+		jest.advanceTimersByTime( 10000 );
+		expect( replace ).not.toHaveBeenCalled();
+		expect( setSrc ).not.toHaveBeenCalled();
+		expect( jest.getTimerCount() ).toBe( 0 );
+	} );
+
+	it( 'retries with location.replace while the frame is still blank, then stops', () => {
+		const { state, replace, setSrc } = renderIframe( { URL: 'about:blank' } );
+
+		jest.advanceTimersByTime( 2000 );
+		expect( replace ).toHaveBeenCalledTimes( 1 );
+		expect( replace ).toHaveBeenCalledWith( SRC );
+
+		jest.advanceTimersByTime( 2000 );
+		expect( replace ).toHaveBeenCalledTimes( 2 );
+
+		// The retry succeeded and a cross-origin document loaded.
+		state.contentDocument = null;
+		jest.advanceTimersByTime( 10000 );
+		expect( replace ).toHaveBeenCalledTimes( 2 );
+		expect( jest.getTimerCount() ).toBe( 0 );
+
+		// Resetting src is what adds the history entry.
+		expect( setSrc ).not.toHaveBeenCalled();
+	} );
+
+	it( 'gives up after 10 attempts on a frame that never loads', () => {
+		const { replace } = renderIframe( { URL: 'about:blank' } );
+		jest.advanceTimersByTime( 20000 );
+		expect( replace ).toHaveBeenCalledTimes( 10 );
+
+		jest.advanceTimersByTime( 20000 );
+		expect( replace ).toHaveBeenCalledTimes( 10 );
+		expect( jest.getTimerCount() ).toBe( 0 );
+	} );
+
+	it( 'checks the frame before touching contentWindow, so a removed frame does not throw', () => {
+		const { iframe, replace } = renderIframe( { URL: 'about:blank' } );
+		jest.advanceTimersByTime( 2000 );
+		expect( replace ).toHaveBeenCalledTimes( 1 );
+
+		// A detached frame has no contentWindow; dereferencing it would throw inside the tick.
+		iframe.remove();
+		expect( () => jest.advanceTimersByTime( 10000 ) ).not.toThrow();
+		expect( replace ).toHaveBeenCalledTimes( 1 );
+		expect( jest.getTimerCount() ).toBe( 0 );
+	} );
+} );

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '0ecdc9b7e9511799df668738a732ef6f0d808cb4',
+        'reference' => '6a87cb2c6dcab735a81b54e87fb11b93769baac1',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '0ecdc9b7e9511799df668738a732ef6f0d808cb4',
+            'reference' => '6a87cb2c6dcab735a81b54e87fb11b93769baac1',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),