rename home block to home-link

WordPress · Apr 20, 2021 · 3f7ba3f · 3f7ba3f
1 parent 95a94d0
commit 3f7ba3f
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 16 deletions.
diff --git a/lib/blocks.php b/lib/blocks.php
@@ -26,7 +26,7 @@ function gutenberg_reregister_core_block_types() {
 				'group',
 				'heading',
 				'html',
-				'home',
+				'home-link',
 				'image',
 				'list',
 				'media-text',
@@ -60,7 +60,7 @@ function gutenberg_reregister_core_block_types() {
 				'loginout.php'                  => 'core/loginout',
 				'navigation.php'                => 'core/navigation',
 				'navigation-link.php'           => 'core/navigation-link',
-				'home.php'                      => 'core/home',
+				'home-link.php'                 => 'core/home-link',
 				'rss.php'                       => 'core/rss',
 				'search.php'                    => 'core/search',
 				'shortcode.php'                 => 'core/shortcode',

diff --git a/packages/block-library/src/home/block.json → ...es/block-library/src/home-link/block.json b/packages/block-library/src/home/block.json → ...es/block-library/src/home-link/block.json
@@ -1,6 +1,6 @@
 {
 	"apiVersion": 2,
-	"name": "core/home",
+	"name": "core/home-link",
 	"category": "design",
 	"parent": [ "core/navigation" ],
 	"attributes": {
@@ -26,6 +26,6 @@
 		"reusable": false,
 		"html": false
 	},
-	"editorStyle": "wp-block-home-editor",
-	"style": "wp-block-home"
+	"editorStyle": "wp-block-home-link-editor",
+	"style": "wp-block-home-link"
 }
diff --git a/packages/block-library/src/home/edit.js → packages/block-library/src/home-link/edit.js b/packages/block-library/src/home/edit.js → packages/block-library/src/home-link/edit.js
@@ -5,6 +5,7 @@ import { RichText, useBlockProps } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
+import { useEffect } from '@wordpress/element';
 
 const preventDefault = ( event ) => event.preventDefault();
 
@@ -24,16 +25,22 @@ export default function HomeEdit( { attributes, setAttributes, clientId } ) {
 
 	const { label } = attributes;
 
+	useEffect( () => {
+		if ( label === undefined ) {
+			setAttributes( { label: __( 'Home' ) } );
+		}
+	}, [ clientId, label ] );
+
 	return (
 		<li { ...blockProps }>
 			<a
-				className="wp-block-home__content"
+				className="wp-block-home-link__content"
 				href={ homeUrl }
 				onClick={ preventDefault }
 			>
 				<RichText
 					identifier="label"
-					className="wp-block-home__label"
+					className="wp-block-home-link__label"
 					value={ label }
 					onChange={ ( labelValue ) => {
 						setAttributes( { label: labelValue } );

diff --git a/packages/block-library/src/home/index.js → ...ages/block-library/src/home-link/index.js b/packages/block-library/src/home/index.js → ...ages/block-library/src/home-link/index.js
@@ -30,7 +30,7 @@ export const settings = {
 
 	example: {
 		attributes: {
-			label: _x( 'Home', 'Home preview example' ),
+			label: _x( 'Home', 'Home Link preview example' ),
 		},
 	},
 };
diff --git a/packages/block-library/src/home/index.php → ...ges/block-library/src/home-link/index.php b/packages/block-library/src/home/index.php → ...ges/block-library/src/home-link/index.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Renders the `core/home` block.
+ * Renders the `core/home-link` block.
  *
  * @param array $attributes The block attributes.
  *
@@ -52,7 +52,7 @@ function render_block_core_home( $attributes ) {
  */
 function register_block_core_home() {
 	register_block_type_from_metadata(
-		__DIR__ . '/home',
+		__DIR__ . '/home-link',
 		array(
 			'render_callback' => 'render_block_core_home',
 		)

diff --git a/packages/block-library/src/home/save.js → packages/block-library/src/home-link/save.js b/packages/block-library/src/home/save.js → packages/block-library/src/home-link/save.js
diff --git a/packages/block-library/src/home-link/style.scss b/packages/block-library/src/home-link/style.scss
@@ -0,0 +1,29 @@
+.wp-block-navigation {
+	// Force links to inherit text decoration applied to navigation block.
+	// The extra selector adds specificity to ensure it works when user-set.
+	&[style*="text-decoration"] {
+		.wp-block-home-link {
+			text-decoration: inherit;
+		}
+
+		.wp-block-home-link__content {
+			text-decoration: inherit;
+
+			&:focus,
+			&:active {
+				text-decoration: inherit;
+			}
+		}
+	}
+
+	&:not([style*="text-decoration"]) {
+		.wp-block-home-link__content {
+			text-decoration: none;
+
+			&:focus,
+			&:active {
+				text-decoration: none;
+			}
+		}
+	}
+}
diff --git a/packages/block-library/src/home/style.scss b/packages/block-library/src/home/style.scss
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
@@ -36,7 +36,7 @@ import * as html from './html';
 import * as mediaText from './media-text';
 import * as navigation from './navigation';
 import * as navigationLink from './navigation-link';
-import * as home from './home';
+import * as homeLink from './home-link';
 import * as latestComments from './latest-comments';
 import * as latestPosts from './latest-posts';
 import * as legacyWidget from './legacy-widget';
@@ -216,7 +216,7 @@ export const __experimentalRegisterExperimentalCoreBlocks =
 				[
 					navigation,
 					navigationLink,
-					home,
+					homeLink,
 
 					// Register Legacy Widget block.
 					...( enableLegacyWidgetBlock ? [ legacyWidget ] : [] ),

diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
@@ -35,7 +35,7 @@ const ALLOWED_BLOCKS = [
 	'core/social-links',
 	'core/page-list',
 	'core/spacer',
-	'core/home',
+	'core/home-link',
 ];
 
 const LAYOUT = {