From 591f59c3f80f7e5be376eb68e7f74fab1a7b3327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Ventura?= <mv@matiasventura.com>
Date: Mon, 8 Feb 2021 12:46:34 +0100
Subject: [PATCH] Move template part title field to the block inspector.

---
 .../src/template-part/edit/index.js           | 10 ++++++-
 .../src/template-part/edit/name-panel.js      | 18 ++++++------
 .../src/template-part/editor.scss             | 28 -------------------
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 2e42f44a34ad84..078fd516a6bdb6 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -5,12 +5,14 @@ import { useSelect } from '@wordpress/data';
 import {
 	BlockControls,
 	InspectorAdvancedControls,
+	InspectorControls,
 	useBlockProps,
 	Warning,
 } from '@wordpress/block-editor';
 import {
 	SelectControl,
 	Dropdown,
+	PanelBody,
 	ToolbarGroup,
 	ToolbarButton,
 	Spinner,
@@ -80,6 +82,13 @@ export default function TemplatePartEdit( {
 
 	return (
 		<>
+			<InspectorControls>
+				<PanelBody>
+					{ isEntityAvailable && (
+						<TemplatePartNamePanel postId={ templatePartId } />
+					) }
+				</PanelBody>
+			</InspectorControls>
 			<InspectorAdvancedControls>
 				<SelectControl
 					label={ __( 'HTML element' ) }
@@ -108,7 +117,6 @@ export default function TemplatePartEdit( {
 				{ isEntityAvailable && (
 					<BlockControls>
 						<ToolbarGroup className="wp-block-template-part__block-control-group">
-							<TemplatePartNamePanel postId={ templatePartId } />
 							<Dropdown
 								className="wp-block-template-part__preview-dropdown-button"
 								contentClassName="wp-block-template-part__preview-dropdown-content"
diff --git a/packages/block-library/src/template-part/edit/name-panel.js b/packages/block-library/src/template-part/edit/name-panel.js
index e2f5ac90b322e0..74da6e5c19c8a5 100644
--- a/packages/block-library/src/template-part/edit/name-panel.js
+++ b/packages/block-library/src/template-part/edit/name-panel.js
@@ -14,15 +14,13 @@ export default function TemplatePartNamePanel( { postId } ) {
 	);
 
 	return (
-		<div className="wp-block-template-part__name-panel">
-			<TextControl
-				label={ __( 'Title' ) }
-				value={ title }
-				onChange={ ( value ) => {
-					setTitle( value );
-				} }
-				onFocus={ ( event ) => event.target.select() }
-			/>
-		</div>
+		<TextControl
+			label={ __( 'Title' ) }
+			value={ title }
+			onChange={ ( value ) => {
+				setTitle( value );
+			} }
+			onFocus={ ( event ) => event.target.select() }
+		/>
 	);
 }
diff --git a/packages/block-library/src/template-part/editor.scss b/packages/block-library/src/template-part/editor.scss
index af52ef32a67721..393d62d97d6c55 100644
--- a/packages/block-library/src/template-part/editor.scss
+++ b/packages/block-library/src/template-part/editor.scss
@@ -62,34 +62,6 @@
 	}
 }
 
-.wp-block-template-part__block-control-group {
-	display: flex;
-
-	.wp-block-template-part__name-panel {
-		outline: 1px solid transparent;
-		padding: $grid-unit-10 0 $grid-unit-10 $grid-unit-15;
-
-		.components-base-control__field {
-			align-items: center;
-			display: flex;
-			margin-bottom: 0;
-		}
-
-		.components-base-control__label {
-			margin-bottom: 0;
-			margin-right: 8px;
-		}
-	}
-}
-
-.is-navigate-mode .is-selected .wp-block-template-part__name-panel {
-	box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color);
-
-	.is-dark-theme & {
-		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color);
-	}
-}
-
 // Ensures a border is present when a child block is selected.
 .block-editor-block-list__block[data-type="core/template-part"] {
 	&.is-selected,