remove open in new tab, back out link to settings

WordPress · May 5, 2021 · 4c9ae36 · 4c9ae36
1 parent 2b13132
commit 4c9ae36
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 62 deletions.
diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss
@@ -25,7 +25,6 @@
 @import "./more/editor.scss";
 @import "./navigation/editor.scss";
 @import "./navigation-link/editor.scss";
-@import "./home-link/editor.scss";
 @import "./nextpage/editor.scss";
 @import "./page-list/editor.scss";
 @import "./paragraph/editor.scss";

diff --git a/packages/block-library/src/home-link/block.json b/packages/block-library/src/home-link/block.json
@@ -4,14 +4,11 @@
 	"category": "design",
 	"parent": [ "core/navigation" ],
 	"title": "Home Link",
+	"description": "Create a link that always points to the homepage of the site. Usually not necessary if there is already a site title link present in the header.",
 	"textdomain": "default",
 	"attributes": {
 		"label": {
 			"type": "string"
-		},
-		"opensInNewTab": {
-			"type": "boolean",
-			"default": false
 		}
 	},
 	"usesContext": [

diff --git a/packages/block-library/src/home-link/edit.js b/packages/block-library/src/home-link/edit.js
@@ -6,16 +6,11 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import {
-	RichText,
-	useBlockProps,
-	InspectorControls,
-} from '@wordpress/block-editor';
-import { __, _x } from '@wordpress/i18n';
+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';
-import { ToggleControl } from '@wordpress/components';
 
 const preventDefault = ( event ) => event.preventDefault();
 
@@ -51,7 +46,7 @@ export default function HomeEdit( {
 		},
 	} );
 
-	const { label, opensInNewTab } = attributes;
+	const { label } = attributes;
 
 	useEffect( () => {
 		if ( label === undefined ) {
@@ -61,20 +56,6 @@ export default function HomeEdit( {
 
 	return (
 		<>
-			<InspectorControls>
-				<div className="wp-block-home-link__settings">
-					<h2 className="wp-block-home-link__settings_label">
-						{ _x( 'Settings', 'Home link settings' ) }
-					</h2>
-					<ToggleControl
-						label={ __( 'Open in new tab' ) }
-						checked={ opensInNewTab }
-						onChange={ () => {
-							setAttributes( { opensInNewTab: ! opensInNewTab } );
-						} }
-					/>
-				</div>
-			</InspectorControls>
 			<li { ...blockProps }>
 				<a
 					className="wp-block-home-link__content"

diff --git a/packages/block-library/src/home-link/editor.scss b/packages/block-library/src/home-link/editor.scss
diff --git a/packages/block-library/src/home-link/index.js b/packages/block-library/src/home-link/index.js
@@ -3,7 +3,6 @@
  */
 import { _x } from '@wordpress/i18n';
 import { home } from '@wordpress/icons';
-import { createInterpolateElement } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -19,13 +18,6 @@ export { metadata, name };
 export const settings = {
 	icon: home,
 
-	description: createInterpolateElement(
-		_x( 'Link to <a>your homepage</a>.', 'block description' ),
-		//TODO: slot/fill to override link
-		// eslint-disable-next-line jsx-a11y/anchor-has-content
-		{ a: <a href="options-reading.php" /> }
-	),
-
 	edit,
 
 	save,

diff --git a/packages/block-library/src/home-link/index.php b/packages/block-library/src/home-link/index.php
@@ -132,18 +132,6 @@ function render_block_core_home( $attributes, $content, $block ) {
 	// Start appending HTML attributes to anchor tag.
 	$html .= ' href="' . esc_url( home_url() ) . '"';
 
-	if ( isset( $attributes['opensInNewTab'] ) && true === $attributes['opensInNewTab'] ) {
-		$html .= ' target="_blank" ';
-	}
-
-	if ( isset( $attributes['rel'] ) ) {
-		$html .= ' rel="' . esc_attr( $attributes['rel'] ) . '"';
-	}
-
-	if ( isset( $attributes['title'] ) ) {
-		$html .= ' title="' . esc_attr( $attributes['title'] ) . '"';
-	}
-
 	// End appending HTML attributes to anchor tag.
 	$html .= '>';
 

diff --git a/packages/e2e-tests/fixtures/blocks/core__home-link.html b/packages/e2e-tests/fixtures/blocks/core__home-link.html
@@ -1 +1 @@
-<!-- wp:home-link {"label":"Home","opensInNewTab":false} /-->
+<!-- wp:home-link {"label":"Home"} /-->
diff --git a/packages/e2e-tests/fixtures/blocks/core__home-link.json b/packages/e2e-tests/fixtures/blocks/core__home-link.json
@@ -4,8 +4,7 @@
 		"name": "core/home-link",
 		"isValid": true,
 		"attributes": {
-			"label": "Home",
-			"opensInNewTab": false
+			"label": "Home"
 		},
 		"innerBlocks": [],
 		"originalContent": ""

diff --git a/packages/e2e-tests/fixtures/blocks/core__home-link.parsed.json b/packages/e2e-tests/fixtures/blocks/core__home-link.parsed.json
@@ -2,8 +2,7 @@
 	{
 		"blockName": "core/home-link",
 		"attrs": {
-			"label": "Home",
-			"opensInNewTab": false
+			"label": "Home"
 		},
 		"innerBlocks": [],
 		"innerHTML": "",

diff --git a/packages/e2e-tests/fixtures/blocks/core__home-link.serialized.html b/packages/e2e-tests/fixtures/blocks/core__home-link.serialized.html
@@ -1 +1 @@
-<!-- wp:home-link {"label":"Home","opensInNewTab":false} /-->
+<!-- wp:home-link {"label":"Home"} /-->