Block Library: Allow changing Site Title block heading level. (#20361)

* Core Data: Fix null property access. * Edit Site: Provide site entity. * Block Library: Allow changing Site Title block heading level. * E2E Tests: Update fixtures.
WordPress · Feb 24, 2020 · 988ba5d · 988ba5d
1 parent 771a975
commit 988ba5d
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 44 deletions.
diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json
@@ -1,4 +1,10 @@
 {
 	"name": "core/site-title",
-	"category": "layout"
+	"category": "layout",
+	"attributes": {
+		"level": {
+			"type": "number",
+			"default": 1
+		}
+	}
 }
diff --git a/packages/block-library/src/site-title/edit.js b/packages/block-library/src/site-title/edit.js
diff --git a/packages/block-library/src/site-title/edit/index.js b/packages/block-library/src/site-title/edit/index.js
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { useEntityProp } from '@wordpress/core-data';
+import { BlockControls, RichText } from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import LevelToolbar from './level-toolbar';
+
+export default function SiteTitleEdit( {
+	attributes: { level },
+	setAttributes,
+} ) {
+	const [ title, setTitle ] = useEntityProp( 'root', 'site', 'title' );
+	const tagName = level === 0 ? 'p' : `h${ level }`;
+	return (
+		<>
+			<BlockControls>
+				<LevelToolbar
+					level={ level }
+					onChange={ ( newLevel ) =>
+						setAttributes( { level: newLevel } )
+					}
+				/>
+			</BlockControls>
+			<RichText
+				tagName={ tagName }
+				placeholder={ __( 'Site Title' ) }
+				value={ title }
+				onChange={ setTitle }
+				allowedFormats={ [] }
+			/>
+		</>
+	);
+}
diff --git a/packages/block-library/src/site-title/edit/level-icon.js b/packages/block-library/src/site-title/edit/level-icon.js
@@ -0,0 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/components';
+
+export default function LevelIcon( { level, isPressed = false } ) {
+	const levelToPath = {
+		0: 'M11 5v7H9.5C7.6 12 6 10.4 6 8.5S7.6 5 9.5 5H11m8-2H9.5C6.5 3 4 5.5 4 8.5S6.5 14 9.5 14H11v7h2V5h2v16h2V5h2V3z',
+		1: 'M9 5h2v10H9v-4H5v4H3V5h2v4h4V5zm6.6 0c-.6.9-1.5 1.7-2.6 2v1h2v7h2V5h-1.4z',
+		2: 'M7 5h2v10H7v-4H3v4H1V5h2v4h4V5zm8 8c.5-.4.6-.6 1.1-1.1.4-.4.8-.8 1.2-1.3.3-.4.6-.8.9-1.3.2-.4.3-.8.3-1.3 0-.4-.1-.9-.3-1.3-.2-.4-.4-.7-.8-1-.3-.3-.7-.5-1.2-.6-.5-.2-1-.2-1.5-.2-.4 0-.7 0-1.1.1-.3.1-.7.2-1 .3-.3.1-.6.3-.9.5-.3.2-.6.4-.8.7l1.2 1.2c.3-.3.6-.5 1-.7.4-.2.7-.3 1.2-.3s.9.1 1.3.4c.3.3.5.7.5 1.1 0 .4-.1.8-.4 1.1-.3.5-.6.9-1 1.2-.4.4-1 .9-1.6 1.4-.6.5-1.4 1.1-2.2 1.6V15h8v-2H15z',
+		3: 'M12.1 12.2c.4.3.8.5 1.2.7.4.2.9.3 1.4.3.5 0 1-.1 1.4-.3.3-.1.5-.5.5-.8 0-.2 0-.4-.1-.6-.1-.2-.3-.3-.5-.4-.3-.1-.7-.2-1-.3-.5-.1-1-.1-1.5-.1V9.1c.7.1 1.5-.1 2.2-.4.4-.2.6-.5.6-.9 0-.3-.1-.6-.4-.8-.3-.2-.7-.3-1.1-.3-.4 0-.8.1-1.1.3-.4.2-.7.4-1.1.6l-1.2-1.4c.5-.4 1.1-.7 1.6-.9.5-.2 1.2-.3 1.8-.3.5 0 1 .1 1.6.2.4.1.8.3 1.2.5.3.2.6.5.8.8.2.3.3.7.3 1.1 0 .5-.2.9-.5 1.3-.4.4-.9.7-1.5.9v.1c.6.1 1.2.4 1.6.8.4.4.7.9.7 1.5 0 .4-.1.8-.3 1.2-.2.4-.5.7-.9.9-.4.3-.9.4-1.3.5-.5.1-1 .2-1.6.2-.8 0-1.6-.1-2.3-.4-.6-.2-1.1-.6-1.6-1l1.1-1.4zM7 9H3V5H1v10h2v-4h4v4h2V5H7v4z',
+		4: 'M9 15H7v-4H3v4H1V5h2v4h4V5h2v10zm10-2h-1v2h-2v-2h-5v-2l4-6h3v6h1v2zm-3-2V7l-2.8 4H16z',
+		5: 'M12.1 12.2c.4.3.7.5 1.1.7.4.2.9.3 1.3.3.5 0 1-.1 1.4-.4.4-.3.6-.7.6-1.1 0-.4-.2-.9-.6-1.1-.4-.3-.9-.4-1.4-.4H14c-.1 0-.3 0-.4.1l-.4.1-.5.2-1-.6.3-5h6.4v1.9h-4.3L14 8.8c.2-.1.5-.1.7-.2.2 0 .5-.1.7-.1.5 0 .9.1 1.4.2.4.1.8.3 1.1.6.3.2.6.6.8.9.2.4.3.9.3 1.4 0 .5-.1 1-.3 1.4-.2.4-.5.8-.9 1.1-.4.3-.8.5-1.3.7-.5.2-1 .3-1.5.3-.8 0-1.6-.1-2.3-.4-.6-.2-1.1-.6-1.6-1-.1-.1 1-1.5 1-1.5zM9 15H7v-4H3v4H1V5h2v4h4V5h2v10z',
+		6: 'M9 15H7v-4H3v4H1V5h2v4h4V5h2v10zm8.6-7.5c-.2-.2-.5-.4-.8-.5-.6-.2-1.3-.2-1.9 0-.3.1-.6.3-.8.5l-.6.9c-.2.5-.2.9-.2 1.4.4-.3.8-.6 1.2-.8.4-.2.8-.3 1.3-.3.4 0 .8 0 1.2.2.4.1.7.3 1 .6.3.3.5.6.7.9.2.4.3.8.3 1.3s-.1.9-.3 1.4c-.2.4-.5.7-.8 1-.4.3-.8.5-1.2.6-1 .3-2 .3-3 0-.5-.2-1-.5-1.4-.9-.4-.4-.8-.9-1-1.5-.2-.6-.3-1.3-.3-2.1s.1-1.6.4-2.3c.2-.6.6-1.2 1-1.6.4-.4.9-.7 1.4-.9.6-.3 1.1-.4 1.7-.4.7 0 1.4.1 2 .3.5.2 1 .5 1.4.8 0 .1-1.3 1.4-1.3 1.4zm-2.4 5.8c.2 0 .4 0 .6-.1.2 0 .4-.1.5-.2.1-.1.3-.3.4-.5.1-.2.1-.5.1-.7 0-.4-.1-.8-.4-1.1-.3-.2-.7-.3-1.1-.3-.3 0-.7.1-1 .2-.4.2-.7.4-1 .7 0 .3.1.7.3 1 .1.2.3.4.4.6.2.1.3.3.5.3.2.1.5.2.7.1z',
+	};
+	return (
+		<SVG
+			width="20"
+			height="20"
+			viewBox="0 0 20 20"
+			xmlns="http://www.w3.org/2000/svg"
+			isPressed={ isPressed }
+		>
+			<Path d={ levelToPath[ level ] } />
+		</SVG>
+	);
+}
diff --git a/packages/block-library/src/site-title/edit/level-toolbar.js b/packages/block-library/src/site-title/edit/level-toolbar.js
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { ToolbarGroup } from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import LevelIcon from './level-icon';
+
+export default function LevelToolbar( { level, onChange } ) {
+	return (
+		<ToolbarGroup
+			isCollapsed
+			icon={ <LevelIcon level={ level } /> }
+			controls={ [ 0, 1, 2, 3, 4, 5, 6 ].map( ( currentLevel ) => {
+				const isActive = currentLevel === level;
+				return {
+					icon: (
+						<LevelIcon
+							level={ currentLevel }
+							isPressed={ isActive }
+						/>
+					),
+					title:
+						currentLevel === 0
+							? __( 'Paragraph' )
+							: // translators: %s: heading level e.g: "1", "2", "3"
+							  sprintf( __( 'Heading %d' ), currentLevel ),
+					isActive,
+					onClick: () => onChange( currentLevel ),
+				};
+			} ) }
+			label={ __( 'Change heading level' ) }
+		/>
+	);
+}
diff --git a/packages/block-library/src/site-title/index.php b/packages/block-library/src/site-title/index.php
@@ -8,10 +8,16 @@
 /**
  * Renders the `core/site-title` block on the server.
  *
+ * @param array $attributes The block attributes.
+ *
  * @return string The render.
  */
-function render_block_core_site_title() {
-	return sprintf( '<h1>%s</h1>', get_bloginfo( 'name' ) );
+function render_block_core_site_title( $attributes ) {
+	$tag_name = 'h1';
+	if ( isset( $attributes['level'] ) ) {
+		$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level'];
+	}
+	return sprintf( '<%1$s>%2$s</%1$s>', $tag_name, get_bloginfo( 'name' ) );
 }
 
 /**

diff --git a/packages/core-data/src/entity-provider.js b/packages/core-data/src/entity-provider.js
@@ -84,23 +84,20 @@ export function useEntityId( kind, type ) {
  */
 export function useEntityProp( kind, type, prop ) {
 	const id = useEntityId( kind, type );
-
 	const { value, fullValue } = useSelect(
 		( select ) => {
 			const { getEntityRecord, getEditedEntityRecord } = select( 'core' );
 			const entity = getEntityRecord( kind, type, id ); // Trigger resolver.
 			const editedEntity = getEditedEntityRecord( kind, type, id );
-			return (
-				entity &&
-				editedEntity && {
-					value: editedEntity[ prop ],
-					fullValue: entity[ prop ],
-				}
-			);
+			return entity && editedEntity
+				? {
+						value: editedEntity[ prop ],
+						fullValue: entity[ prop ],
+				  }
+				: {};
 		},
 		[ kind, type, id, prop ]
 	);
-
 	const { editEntityRecord } = useDispatch( 'core' );
 	const setValue = useCallback(
 		( newValue ) => {

diff --git a/packages/e2e-tests/fixtures/blocks/core__site-title.json b/packages/e2e-tests/fixtures/blocks/core__site-title.json
@@ -3,7 +3,9 @@
         "clientId": "_clientId_0",
         "name": "core/site-title",
         "isValid": true,
-        "attributes": {},
+        "attributes": {
+            "level": 1
+        },
         "innerBlocks": [],
         "originalContent": ""
     }

diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js
@@ -47,18 +47,20 @@ function Editor( { settings: _settings } ) {
 	return template ? (
 		<SlotFillProvider>
 			<DropZoneProvider>
-				<EntityProvider
-					kind="postType"
-					type={ settings.templateType }
-					id={ settings.templateId }
-				>
-					<Context.Provider value={ context }>
-						<Notices />
-						<Header />
-						<Sidebar />
-						<BlockEditor />
-						<Popover.Slot />
-					</Context.Provider>
+				<EntityProvider kind="root" type="site">
+					<EntityProvider
+						kind="postType"
+						type={ settings.templateType }
+						id={ settings.templateId }
+					>
+						<Context.Provider value={ context }>
+							<Notices />
+							<Header />
+							<Sidebar />
+							<BlockEditor />
+							<Popover.Slot />
+						</Context.Provider>
+					</EntityProvider>
 				</EntityProvider>
 			</DropZoneProvider>
 		</SlotFillProvider>