Fixing so empty caption isn't created when inserting global style.

DLXPlugins · Aug 19, 2024 · c6b61e1 · c6b61e1
1 parent 852f185
commit c6b61e1
Show file tree

Hide file tree

Showing 6 changed files with 55,057 additions and 44 deletions.
diff --git a/build/index.asset.php b/build/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-url'), 'version' => '4ca338746fe3ccac4ba9');
+<?php return array('dependencies' => array('react', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-url'), 'version' => '8399fdb3dcc261cff327');
diff --git a/build/index.css b/build/index.css
diff --git a/build/index.css.map b/build/index.css.map
diff --git a/build/index.js b/build/index.js
diff --git a/build/index.js.map b/build/index.js.map
diff --git a/src/components/GlobalStylesPicker/ButtonPreview/index.js b/src/components/GlobalStylesPicker/ButtonPreview/index.js
@@ -101,14 +101,14 @@ const GlobalStylesButtonPreview = ( props ) => {
 					};
 
 					// If there is no caption block, but there are attributes to apply, create one.
-					if ( ! captionBlock && ( captionAttributes || captionAttributes.length > 0 ) ) {
+					if ( ! captionBlock && ( Object.keys( captionAttributes ).length > 1 || captionAttributes.length > 1 ) ) {
 						const newBlocks = createBlock( 'dlxplugins/photo-caption-block', captionAttributes );
 						insertBlock( newBlocks, undefined, props.clientId );
 						props.setAttributes( { hasCaption: true } );
 					}
 
 					// If there is a caption block and attributes to apply, apply them.
-					if ( captionBlock && ( captionAttributes || captionAttributes.length > 0 ) ) {
+					if ( captionBlock && ( Object.keys( captionAttributes ).length > 1 || captionAttributes.length > 1 ) ) {
 						const captionBlockAttributes = { ...captionAttributes, ...uniqueIdAttribute };
 						updateBlockAttributes( captionBlock.clientId, captionBlockAttributes );
 					}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-url'), 'version' => '4ca338746fe3ccac4ba9');
		<?php return array('dependencies' => array('react', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-url'), 'version' => '8399fdb3dcc261cff327');