From f66ba18566d8488c003e3023ec149c714bb5f476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Ka=CC=88gy?= <mail@fabian-kaegy.de>
Date: Fri, 6 Dec 2024 11:10:43 +0100
Subject: [PATCH] fix default controls

---
 packages/block-library/src/paragraph/edit.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js
index b98d4cc87f341..02ca1feceae55 100644
--- a/packages/block-library/src/paragraph/edit.js
+++ b/packages/block-library/src/paragraph/edit.js
@@ -48,7 +48,7 @@ function hasDropCapDisabled( align ) {
 	return align === ( isRTL() ? 'left' : 'right' ) || align === 'center';
 }
 
-function DropCapControl( { clientId, attributes, setAttributes } ) {
+function DropCapControl( { clientId, attributes, setAttributes, name } ) {
 	// Please do not add a useSelect call to the paragraph block unconditionally.
 	// Every useSelect added to a (frequently used) block will degrade load
 	// and type performance. By moving it within InspectorControls, the subscription is
@@ -70,17 +70,18 @@ function DropCapControl( { clientId, attributes, setAttributes } ) {
 		helpText = __( 'Show a large initial letter.' );
 	}
 
-	const defaultTypographyControls = getBlockSupport( name, [
-		'typography',
-		'__experimentalDefaultControls',
-	] );
+	const isDropCapControlEnabledByDefault = getBlockSupport(
+		name,
+		'typography.defaultControls.dropCap',
+		false
+	);
 
 	return (
 		<InspectorControls group="typography">
 			<ToolsPanelItem
 				hasValue={ () => !! dropCap }
 				label={ __( 'Drop cap' ) }
-				isShownByDefault={ defaultTypographyControls?.dropCap }
+				isShownByDefault={ isDropCapControlEnabledByDefault }
 				onDeselect={ () => setAttributes( { dropCap: undefined } ) }
 				resetAllFilter={ () => ( { dropCap: undefined } ) }
 				panelId={ clientId }
@@ -106,6 +107,7 @@ function ParagraphBlock( {
 	setAttributes,
 	clientId,
 	isSelected: isSingleSelected,
+	name,
 } ) {
 	const { align, content, direction, dropCap, placeholder } = attributes;
 	const blockProps = useBlockProps( {
@@ -143,6 +145,7 @@ function ParagraphBlock( {
 			) }
 			{ isSingleSelected && (
 				<DropCapControl
+					name={ name }
 					clientId={ clientId }
 					attributes={ attributes }
 					setAttributes={ setAttributes }