Enable back dropCap for paragraph (#24932)

WordPress · Aug 31, 2020 · d37120d · d37120d
1 parent 0de26c5
commit d37120d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/lib/experimental-default-theme.json b/lib/experimental-default-theme.json
@@ -126,7 +126,7 @@
 		},
 		"features": {
 			"typography": {
-				"dropCap": false
+				"dropCap": true
 			},
 			"colors": {
 				"custom": true

diff --git a/packages/block-editor/src/components/use-editor-feature/index.js b/packages/block-editor/src/components/use-editor-feature/index.js
@@ -39,16 +39,17 @@ export default function useEditorFeature( featurePath ) {
 	const setting = useSelect(
 		( select ) => {
 			const path = `__experimentalFeatures.${ featurePath }`;
-			const { getSettings } = select( 'core/block-editor' );
-			const settings = getSettings();
 
+			// 1 - Use deprecated settings, if available.
+			const settings = select( 'core/block-editor' ).getSettings();
 			const deprecatedSettingsValue = deprecatedFlags[ featurePath ]
 				? deprecatedFlags[ featurePath ]( settings )
 				: undefined;
-
 			if ( deprecatedSettingsValue !== undefined ) {
 				return deprecatedSettingsValue;
 			}
+
+			// 2 - Use global __experimentalFeatures otherwise.
 			return get( settings, path );
 		},
 		[ blockName, featurePath ]

diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
@@ -35,11 +35,6 @@
 		},
 		"__experimentalFontSize": true,
 		"__experimentalLineHeight": true,
-		"__experimentalFeatures": {
-			"typography": {
-				"dropCap": true
-			}
-		},
 		"__experimentalSelector": "p",
 		"__unstablePasteTextInline": true
 	}