From 3733affd4cf462aab241c59db50303c0b9d33769 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Fri, 30 Jun 2017 17:09:50 +0200
Subject: [PATCH] Add aria-label to embed url input.

---
 blocks/library/embed/index.js        | 5 ++++-
 components/placeholder/index.js      | 2 +-
 components/placeholder/test/index.js | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/blocks/library/embed/index.js b/blocks/library/embed/index.js
index a346781c68353..3c276048b68df 100644
--- a/blocks/library/embed/index.js
+++ b/blocks/library/embed/index.js
@@ -138,14 +138,17 @@ function getEmbedBlockSettings( { title, icon, category = 'embed' } ) {
 				}
 
 				if ( ! html ) {
+					const label = sprintf( __( '%s URL' ), title );
+
 					return [
 						controls,
-						<Placeholder key="placeholder" icon={ icon } label={ sprintf( __( '%s URL' ), title ) } className="wp-block-embed">
+						<Placeholder key="placeholder" icon={ icon } label={ label } className="wp-block-embed">
 							<form onSubmit={ this.doServerSideRender }>
 								<input
 									type="url"
 									value={ url || '' }
 									className="components-placeholder__input"
+									aria-label={ label }
 									placeholder={ __( 'Enter URL to embed here…' ) }
 									onChange={ ( event ) => setAttributes( { url: event.target.value } ) } />
 								<Button
diff --git a/components/placeholder/index.js b/components/placeholder/index.js
index fdaf803246d27..be362bdf7866a 100644
--- a/components/placeholder/index.js
+++ b/components/placeholder/index.js
@@ -13,7 +13,7 @@ function Placeholder( { icon, children, label, instructions, className, ...addit
 	const classes = classnames( 'components-placeholder', className );
 
 	return (
-		<div { ...additionalProps } aria-label={ label } className={ classes }>
+		<div { ...additionalProps } className={ classes }>
 			<div className="components-placeholder__label">
 				{ !! icon && <Dashicon icon={ icon } /> }
 				{ label }
diff --git a/components/placeholder/test/index.js b/components/placeholder/test/index.js
index dc8c01ad076f3..4b84f0a56489a 100644
--- a/components/placeholder/test/index.js
+++ b/components/placeholder/test/index.js
@@ -35,13 +35,12 @@ describe( 'Placeholder', () => {
 			expect( placeholderLabel.find( 'Dashicon' ).exists() ).to.be.true();
 		} );
 
-		it( 'should render a label section and add aria label', () => {
+		it( 'should render a label section', () => {
 			const label = 'WordPress';
 			const placeholder = shallow( <Placeholder label={ label } /> );
 			const placeholderLabel = placeholder.find( '.components-placeholder__label' );
 			const child = placeholderLabel.childAt( 0 );
 
-			expect( placeholder.prop( 'aria-label' ) ).to.equal( label );
 			expect( child.text() ).to.equal( label );
 		} );