pass explicit prop to disable rich text editing

WordPress · Feb 12, 2024 · 7f33f24 · 7f33f24
1 parent 94ad853
commit 7f33f24
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
@@ -109,6 +109,7 @@ export function RichTextWrapper(
 		__unstableDisableFormats: disableFormats,
 		disableLineBreaks,
 		__unstableAllowPrefixTransformations,
+		disableEditing,
 		...props
 	},
 	forwardedRef
@@ -147,7 +148,7 @@ export function RichTextWrapper(
 		}
 
 		// Disable Rich Text editing if block bindings specify that.
-		let shouldDisableEditing = false;
+		let disableBoundBlocks = false;
 		if ( blockBindings && blockName in BLOCK_BINDINGS_ALLOWED_BLOCKS ) {
 			const blockTypeAttributes = getBlockType( blockName ).attributes;
 			const { getBlockBindingsSource } = unlock(
@@ -163,7 +164,7 @@ export function RichTextWrapper(
 						'rich-text' &&
 					getBlockBindingsSource( args.source )?.lockAttributesEditing
 				) {
-					shouldDisableEditing = true;
+					disableBoundBlocks = true;
 					break;
 				}
 			}
@@ -173,16 +174,19 @@ export function RichTextWrapper(
 			selectionStart: isSelected ? selectionStart.offset : undefined,
 			selectionEnd: isSelected ? selectionEnd.offset : undefined,
 			isSelected,
-			shouldDisableEditing,
+			disableBoundBlocks,
 		};
 	};
-	const { selectionStart, selectionEnd, isSelected, shouldDisableEditing } =
+	const { selectionStart, selectionEnd, isSelected, disableBoundBlocks } =
 		useSelect( selector, [
 			clientId,
 			identifier,
 			originalIsSelected,
 			isBlockSelected,
 		] );
+
+	const shouldDisableEditing = disableEditing || disableBoundBlocks;
+
 	const { getSelectionStart, getSelectionEnd, getBlockRootClientId } =
 		useSelect( blockEditorStore );
 	const { selectionChange } = useDispatch( blockEditorStore );

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
@@ -794,22 +794,15 @@ export default function Image( {
 			{ ! temporaryURL && controls }
 			{ img }
 
-			{ lockCaption && (
-				<figcaption>{ attributes.caption?.toHTMLString() }</figcaption>
-			) }
-
-			{ ! lockCaption && (
-				<Caption
-					attributes={ attributes }
-					setAttributes={ setAttributes }
-					isSelected={ isSingleSelected }
-					insertBlocksAfter={ insertBlocksAfter }
-					label={ __( 'Image caption text' ) }
-					showToolbarButton={
-						isSingleSelected && hasNonContentControls
-					}
-				/>
-			) }
+			<Caption
+				attributes={ attributes }
+				setAttributes={ setAttributes }
+				isSelected={ isSingleSelected }
+				insertBlocksAfter={ insertBlocksAfter }
+				label={ __( 'Image caption text' ) }
+				showToolbarButton={ isSingleSelected && hasNonContentControls }
+				disableEditing={ lockCaption }
+			/>
 		</>
 	);
 }
diff --git a/packages/block-library/src/utils/caption.js b/packages/block-library/src/utils/caption.js
@@ -28,6 +28,7 @@ export function Caption( {
 	label = __( 'Caption text' ),
 	showToolbarButton = true,
 	className,
+	disableEditing,
 } ) {
 	const caption = attributes[ key ];
 	const prevCaption = usePrevious( caption );
@@ -101,6 +102,7 @@ export function Caption( {
 								createBlock( getDefaultBlockName() )
 							)
 						}
+						disableEditing={ disableEditing }
 					/>
 				) }
 		</>