Merge branch 'master' into site-content-fix

godaddy-wordpress · Apr 30, 2024 · 7a29f78 · 7a29f78
2 parents a0acd54 + 3e76e75
commit 7a29f78
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/blocks/post-carousel/index.php b/src/blocks/post-carousel/index.php
@@ -22,7 +22,7 @@ function coblocks_render_coblocks_post_carousel_block( $attributes ) {
 		'order'            => $attributes['order'],
 		'orderby'          => $attributes['orderBy'],
 		'suppress_filters' => false,
-		'post__not_in'     => array( $post->ID ),
+		'post__not_in'     => ! is_null( $post ) ? array( $post->ID ) : array(),
 	);
 
 	if ( isset( $attributes['categories'] ) ) {

diff --git a/src/blocks/posts/index.php b/src/blocks/posts/index.php
@@ -22,7 +22,7 @@ function coblocks_render_coblocks_posts_block( $attributes ) {
 		'order'            => $attributes['order'],
 		'orderby'          => $attributes['orderBy'],
 		'suppress_filters' => false,
-		'post__not_in'     => array( $post->ID ),
+		'post__not_in'     => ! is_null( $post ) ? array( $post->ID ) : array(),
 	);
 
 	if ( isset( $attributes['categories'] ) ) {

diff --git a/src/extensions/site-design/component.js b/src/extensions/site-design/component.js
@@ -74,7 +74,13 @@ export function SiteDesignStyles() {
 		// Here we move the style element so that we can continue to target and change on user action.
 		// Only move element if it is not yet under the desktop preview div.
 		if ( ! stylesElement.closest( 'div.is-desktop-preview' ) ) {
-			document.querySelectorAll( '.is-desktop-preview style:last-of-type' )?.[ 0 ]?.after?.( stylesElement );
+			const target =
+				document.querySelectorAll( '.is-desktop-preview style:last-of-type' )?.[ 0 ] ??
+				document.querySelectorAll( '.is-desktop-preview div' )?.[ 0 ];
+
+			if ( !! target ) {
+				target?.after?.( stylesElement );
+			}
 		}
 	}, [ isUpdating, designResp ] );