Query pagination: remove div (#28831)

* Query pagination: remove div * Remove formatting options
WordPress · Feb 8, 2021 · a340551 · a340551
1 parent 2b55fce
commit a340551
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 36 deletions.
diff --git a/packages/block-library/src/query-pagination-next/edit.js b/packages/block-library/src/query-pagination-next/edit.js
@@ -2,29 +2,22 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useBlockProps, RichText } from '@wordpress/block-editor';
+import { useBlockProps, PlainText } from '@wordpress/block-editor';
 
 export default function QueryPaginationNextEdit( {
 	attributes: { label },
 	setAttributes,
 } ) {
-	const placeholder = __( 'Next Page' );
 	return (
-		<>
-			<div { ...useBlockProps() }>
-				{
-					<RichText
-						tagName="a"
-						aria-label={ __( 'Next page link' ) }
-						placeholder={ placeholder }
-						value={ label }
-						allowedFormats={ [ 'core/bold', 'core/italic' ] }
-						onChange={ ( newLabel ) =>
-							setAttributes( { label: newLabel } )
-						}
-					/>
-				}
-			</div>
-		</>
+		<PlainText
+			__experimentalVersion={ 2 }
+			tagName="a"
+			aria-label={ __( 'Next page link' ) }
+			placeholder={ __( 'Next Page' ) }
+			value={ label }
+			keepPlaceholderOnFocus
+			onChange={ ( newLabel ) => setAttributes( { label: newLabel } ) }
+			{ ...useBlockProps() }
+		/>
 	);
 }
diff --git a/packages/block-library/src/query-pagination-previous/edit.js b/packages/block-library/src/query-pagination-previous/edit.js
@@ -2,29 +2,22 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useBlockProps, RichText } from '@wordpress/block-editor';
+import { useBlockProps, PlainText } from '@wordpress/block-editor';
 
 export default function QueryPaginationPreviousEdit( {
 	attributes: { label },
 	setAttributes,
 } ) {
-	const placeholder = __( 'Previous Page' );
 	return (
-		<>
-			<div { ...useBlockProps() }>
-				{
-					<RichText
-						tagName="a"
-						aria-label={ __( 'Previous page link' ) }
-						placeholder={ placeholder }
-						value={ label }
-						allowedFormats={ [ 'core/bold', 'core/italic' ] }
-						onChange={ ( newLabel ) =>
-							setAttributes( { label: newLabel } )
-						}
-					/>
-				}
-			</div>
-		</>
+		<PlainText
+			__experimentalVersion={ 2 }
+			tagName="a"
+			aria-label={ __( 'Previous page link' ) }
+			placeholder={ __( 'Previous Page' ) }
+			value={ label }
+			keepPlaceholderOnFocus
+			onChange={ ( newLabel ) => setAttributes( { label: newLabel } ) }
+			{ ...useBlockProps() }
+		/>
 	);
 }