Stabilize PlainText v2 and deprecate v1.

WordPress · Aug 8, 2022 · 218c54e · 218c54e
1 parent 433ff76
commit 218c54e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/packages/block-editor/src/components/plain-text/index.js b/packages/block-editor/src/components/plain-text/index.js
@@ -7,6 +7,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
+import deprecated from '@wordpress/deprecated';
 import { forwardRef } from '@wordpress/element';
 
 /**
@@ -17,11 +18,16 @@ import EditableText from '../editable-text';
 /**
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/plain-text/README.md
  */
-const PlainText = forwardRef( ( { __experimentalVersion, ...props }, ref ) => {
-	if ( __experimentalVersion === 2 ) {
+const PlainText = forwardRef( ( { version, ...props }, ref ) => {
+	if ( version === 2 ) {
 		return <EditableText ref={ ref } { ...props } />;
 	}
 
+	deprecated( 'Version 1 of `<PlainText>`', {
+		since: '6.0',
+		alternative: '`version={2}`',
+	} );
+
 	const { className, onChange, ...remainingProps } = props;
 
 	return (

diff --git a/packages/block-library/src/comments-pagination-next/edit.js b/packages/block-library/src/comments-pagination-next/edit.js
@@ -23,7 +23,7 @@ export default function CommentsPaginationNextEdit( {
 			{ ...useBlockProps() }
 		>
 			<PlainText
-				__experimentalVersion={ 2 }
+				version={ 2 }
 				tagName="span"
 				aria-label={ __( 'Newer comments page link' ) }
 				placeholder={ __( 'Newer Comments' ) }

diff --git a/packages/block-library/src/comments-pagination-previous/edit.js b/packages/block-library/src/comments-pagination-previous/edit.js
@@ -30,7 +30,7 @@ export default function CommentsPaginationPreviousEdit( {
 				</span>
 			) }
 			<PlainText
-				__experimentalVersion={ 2 }
+				version={ 2 }
 				tagName="span"
 				aria-label={ __( 'Older comments page link' ) }
 				placeholder={ __( 'Older Comments' ) }

diff --git a/packages/block-library/src/post-title/edit.js b/packages/block-library/src/post-title/edit.js
@@ -56,7 +56,7 @@ export default function PostTitleEdit( {
 					placeholder={ __( 'No Title' ) }
 					value={ rawTitle }
 					onChange={ setTitle }
-					__experimentalVersion={ 2 }
+					version={ 2 }
 					{ ...blockProps }
 				/>
 			) : (
@@ -81,7 +81,7 @@ export default function PostTitleEdit( {
 						}
 						value={ rawTitle }
 						onChange={ setTitle }
-						__experimentalVersion={ 2 }
+						version={ 2 }
 					/>
 				</TagName>
 			) : (

diff --git a/packages/block-library/src/query-pagination-next/edit.js b/packages/block-library/src/query-pagination-next/edit.js
@@ -23,7 +23,7 @@ export default function QueryPaginationNextEdit( {
 			{ ...useBlockProps() }
 		>
 			<PlainText
-				__experimentalVersion={ 2 }
+				version={ 2 }
 				tagName="span"
 				aria-label={ __( 'Next page link' ) }
 				placeholder={ __( 'Next Page' ) }

diff --git a/packages/block-library/src/query-pagination-previous/edit.js b/packages/block-library/src/query-pagination-previous/edit.js
@@ -31,7 +31,7 @@ export default function QueryPaginationPreviousEdit( {
 				</span>
 			) }
 			<PlainText
-				__experimentalVersion={ 2 }
+				version={ 2 }
 				tagName="span"
 				aria-label={ __( 'Previous page link' ) }
 				placeholder={ __( 'Previous Page' ) }