From 186e4c3c85b583d3c3527896a0e4e1bb9f3537fb Mon Sep 17 00:00:00 2001 From: Andrew Serong <14988353+andrewserong@users.noreply.github.com> Date: Fri, 24 Feb 2023 15:54:03 +1100 Subject: [PATCH] Revert Site Tagline placeholder attribute, move example to block.json (#48383) * Revert Site Tagline placeholder attribute, move example to block.json * Remove from docs * Fix bad commit --- docs/reference-guides/core-blocks.md | 2 +- packages/block-library/src/site-tagline/block.json | 4 +--- packages/block-library/src/site-tagline/edit.js | 4 ++-- packages/block-library/src/site-tagline/index.js | 10 ---------- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index 7708f57a8a7670..2917c8577b07da 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -744,7 +744,7 @@ Describe in a few words what the site is about. The tagline can be used in searc - **Name:** core/site-tagline - **Category:** theme - **Supports:** align (full, wide), anchor, color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~ -- **Attributes:** placeholder, textAlign +- **Attributes:** textAlign ## Site Title diff --git a/packages/block-library/src/site-tagline/block.json b/packages/block-library/src/site-tagline/block.json index 64a1f11f5d029f..a11eab4fbc243b 100644 --- a/packages/block-library/src/site-tagline/block.json +++ b/packages/block-library/src/site-tagline/block.json @@ -8,13 +8,11 @@ "keywords": [ "description" ], "textdomain": "default", "attributes": { - "placeholder": { - "type": "string" - }, "textAlign": { "type": "string" } }, + "example": {}, "supports": { "anchor": true, "align": [ "wide", "full" ], diff --git a/packages/block-library/src/site-tagline/edit.js b/packages/block-library/src/site-tagline/edit.js index 7fe00ab63c859d..1ce13c6eb43c49 100644 --- a/packages/block-library/src/site-tagline/edit.js +++ b/packages/block-library/src/site-tagline/edit.js @@ -22,7 +22,7 @@ export default function SiteTaglineEdit( { setAttributes, insertBlocksAfter, } ) { - const { placeholder, textAlign } = attributes; + const { textAlign } = attributes; const { canUserEdit, tagline } = useSelect( ( select ) => { const { canUser, getEntityRecord, getEditedEntityRecord } = select( coreStore ); @@ -57,7 +57,7 @@ export default function SiteTaglineEdit( { allowedFormats={ [] } onChange={ setTagline } aria-label={ __( 'Site tagline text' ) } - placeholder={ placeholder || __( 'Write site taglineā€¦' ) } + placeholder={ __( 'Write site taglineā€¦' ) } tagName="p" value={ tagline } disableLineBreaks diff --git a/packages/block-library/src/site-tagline/index.js b/packages/block-library/src/site-tagline/index.js index 0a8b99698dd519..1d0090f9dcea19 100644 --- a/packages/block-library/src/site-tagline/index.js +++ b/packages/block-library/src/site-tagline/index.js @@ -1,8 +1,3 @@ -/** - * WordPress dependencies - */ -import { __ } from '@wordpress/i18n'; - /** * Internal dependencies */ @@ -18,11 +13,6 @@ export { metadata, name }; export const settings = { icon, edit, - example: { - attributes: { - placeholder: __( 'A site tagline.' ), - }, - }, deprecated, };