Update Line-Height Settings for opt-in (rather than opt-out) (#23904)

This update adjusts the line-height theme support setting to be opt-in via `add_theme_support( 'experimental-line-height' );` rather than enabled by default. This keeps it consistent with the other recently added style theme support settings like padding (spacing).
WordPress · Jul 15, 2020 · 3e2b49b · 3e2b49b
1 parent 7aacd09
commit 3e2b49b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/client-assets.php b/lib/client-assets.php
@@ -655,7 +655,7 @@ function gutenberg_extend_settings_block_patterns( $settings ) {
  * @return array Filtered editor settings.
  */
 function gutenberg_extend_settings_custom_line_height( $settings ) {
-	$settings['__experimentalDisableCustomLineHeight'] = get_theme_support( 'disable-custom-line-height' );
+	$settings['__experimentalEnableCustomLineHeight'] = get_theme_support( 'experimental-line-height' );
 	return $settings;
 }
 add_filter( 'block_editor_settings', 'gutenberg_extend_settings_custom_line_height' );

diff --git a/packages/block-editor/src/hooks/line-height.js b/packages/block-editor/src/hooks/line-height.js
@@ -59,7 +59,7 @@ export function useIsLineHeightDisabled( { name: blockName } = {} ) {
 	const isDisabled = useSelect( ( select ) => {
 		const editorSettings = select( 'core/block-editor' ).getSettings();
 
-		return editorSettings.__experimentalDisableCustomLineHeight;
+		return ! editorSettings.__experimentalEnableCustomLineHeight;
 	} );
 
 	return (

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -115,7 +115,7 @@ class EditorProvider extends Component {
 				'__experimentalBlockPatterns',
 				'__experimentalBlockPatternCategories',
 				'__experimentalDisableCustomUnits',
-				'__experimentalDisableCustomLineHeight',
+				'__experimentalEnableCustomLineHeight',
 				'__experimentalEnableCustomSpacing',
 				'__experimentalEnableLegacyWidgetBlock',
 				'__experimentalEnableLinkColor',