Merge comflicts, and wp-themes support.

WordPress · Jun 19, 2024 · 54c6c58 · 54c6c58
1 parent 63c0834
commit 54c6c58
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/source/wp-content/themes/wporg-themes-2024/src/theme-previewer/iframe/render.php b/source/wp-content/themes/wporg-themes-2024/src/theme-previewer/iframe/render.php
@@ -7,6 +7,8 @@
 	return;
 }
 
+$using_playground = $_REQUEST['playground'] ?? false;
+
 $theme_post = get_post( $block->context['postId'] );
 $theme = wporg_themes_theme_information( $theme_post->post_name );
 
@@ -89,12 +91,15 @@ class="wp-block-button__link wp-element-button"
 		</section>
 		<iframe
 			title="<?php esc_attr_e( 'Theme preview', 'wporg-themes' ); ?>"
-			src="<?php echo esc_url_raw( $url ); ?>"
-			data-wp-bind--src="wporg/themes/preview::context.url"
 			data-wp-style--width="state.iframeWidthCSS"
 			data-wp-style--height="state.iframeHeightCSS"
-			data-wp-on--load="wporg/themes/preview::actions.onLoad"
-			data-wp-init="wporg/themes/preview::actions.startPlayground"
+			<?php if ( $using_playground ) { ?>
+				data-wp-init="wporg/themes/preview::actions.startPlayground"
+			<?php } else { ?>
+				src="<?php echo esc_url_raw( $url ); ?>"
+				data-wp-bind--src="wporg/themes/preview::context.url"
+				data-wp-on--load="wporg/themes/preview::actions.onLoad"
+			<?php } ?>
 		/>
 	<?php endif; ?>
 </div>
diff --git a/source/wp-content/themes/wporg-themes-2024/src/theme-previewer/view.js b/source/wp-content/themes/wporg-themes-2024/src/theme-previewer/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { getContext, store } from '@wordpress/interactivity';
+import { getContext, getElement, store } from '@wordpress/interactivity';
 import { startPlaygroundWeb } from 'https://playground.wordpress.net/client/index.js'; // or '@wp-playground/client';
 
 let playgroundClient = false;
@@ -26,8 +26,11 @@ store( 'wporg/themes/preview', {
 			const isSelected = 'wporg-select' === event.type;
 			if ( ! ref?.dataset ) {
 				return;
+			}
 
-			context.isLoaded = false;
+			if ( ! playgroundClient ) {
+				context.isLoaded = false;
+			}
 			if ( ref.dataset.style_variation ) {
 				context.selected.style_variation = isSelected ? ref.dataset.style_variation : null;
 			}
@@ -62,6 +65,9 @@ store( 'wporg/themes/preview', {
 			const context = getContext();
 			const { ref } = getElement();
 
+			// Set it as immediately loaded..
+			context.isLoaded = true;
+
 			fetch( 'https://wordpress.org/themes/wp-json/themes/v1/preview-blueprint/' + context.theme )
 			.then( ( response ) => response.json() )
 			.then( ( blueprint ) => {