Remove caption restriction in pattern overrides

WordPress · Jul 1, 2024 · be4c4c2 · be4c4c2
1 parent ac597ee
commit be4c4c2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/packages/block-editor/src/hooks/use-bindings-attributes.js b/packages/block-editor/src/hooks/use-bindings-attributes.js
@@ -231,9 +231,8 @@ export const withBlockBindingSupport = createHigherOrderComponent(
 						) &&
 						Object.keys( keptAttributes ).length
 					) {
-						// Don't update caption and href until they are supported.
+						// Don't update href until they are supported.
 						if ( hasPatternOverridesDefaultBinding ) {
-							delete keptAttributes?.caption;
 							delete keptAttributes?.href;
 						}
 						setAttributes( keptAttributes );

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
@@ -454,7 +454,6 @@ export default function Image( {
 		lockAltControlsMessage,
 		lockTitleControls = false,
 		lockTitleControlsMessage,
-		lockCaption = false,
 		hideCaptionControls = false,
 	} = useSelect(
 		( select ) => {
@@ -491,10 +490,6 @@ export default function Image( {
 					// Disable editing the link of the URL if the image is inside a pattern instance.
 					// This is a temporary solution until we support overriding the link on the frontend.
 					hasParentPattern || arePatternOverridesEnabled,
-				lockCaption:
-					// Disable editing the caption if the image is inside a pattern instance.
-					// This is a temporary solution until we support overriding the caption on the frontend.
-					hasParentPattern,
 				lockAltControls:
 					!! altBinding &&
 					! altBindingSource?.canUserEditValue( {
@@ -1002,10 +997,9 @@ export default function Image( {
 				label={ __( 'Image caption text' ) }
 				showToolbarButton={
 					isSingleSelected &&
-					hasNonContentControls &&
-					! arePatternOverridesEnabled
+					( hasNonContentControls || isContentOnlyMode ) &&
+					! hideCaptionControls
 				}
-				readOnly={ lockCaption }
 			/>
 		</>
 	);

diff --git a/packages/patterns/src/components/pattern-overrides-controls.js b/packages/patterns/src/components/pattern-overrides-controls.js
@@ -76,13 +76,12 @@ function PatternOverridesControls( {
 	}
 
 	const hasUnsupportedImageAttributes =
-		blockName === 'core/image' &&
-		( !! attributes.caption?.length || !! attributes.href?.length );
+		blockName === 'core/image' && !! attributes.href?.length;
 
 	const helpText =
 		! hasOverrides && hasUnsupportedImageAttributes
 			? __(
-					`Overrides currently don't support image captions or links. Remove the caption or link first before enabling overrides.`
+					`Overrides currently don't support image links. Remove the link first before enabling overrides.`
 			  )
 			: __(
 					'Allow changes to this block throughout instances of this pattern.'