Merge branch 'develop' into fix/1142-amp-dev-mode

Author: felixarntz

assets/js/components/dialog.js

@@ -28,6 +28,7 @@ import FocusTrap from 'focus-trap-react';
 /**
  * WordPress dependencies
  */
+import { withInstanceId } from '@wordpress/compose';
 import { Component, createRef } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
@@ -61,16 +62,21 @@ class Dialog extends Component {
 			subtitle,
 			confirmButton,
 			dependentModules,
+			instanceId,
 		} = this.props;
 
+		const labelledByID = `googlesitekit-dialog-label-${ instanceId }`;
+		const describedByID = `googlesitekit-dialog-description-${ instanceId }`;
+		const hasProvides = !! ( provides && provides.length );
+
 		return (
 			<div
 				ref={ this.dialogRef }
 				className={ `mdc-dialog ${ dialogActive ? 'mdc-dialog--open' : '' }` }
 				role="alertdialog"
 				aria-modal="true"
-				aria-labelledby="remove-module-dialog"
-				aria-describedby="remove-module-dialog-description"
+				aria-labelledby={ title ? labelledByID : undefined }
+				aria-describedby={ hasProvides ? describedByID : undefined }
 				aria-hidden={ dialogActive ? 'false' : 'true' }
 				tabIndex="-1"
 			>
@@ -80,7 +86,7 @@ class Dialog extends Component {
 						<div className="mdc-dialog__container">
 							<div className="mdc-dialog__surface">
 								{ title &&
-									<h2 id="remove-module-dialog" className="mdc-dialog__title">
+									<h2 id={ labelledByID } className="mdc-dialog__title">
 										{ title }
 									</h2>
 								}
@@ -89,15 +95,17 @@ class Dialog extends Component {
 										{ subtitle }
 									</p>
 								}
-								<section id="remove-module-dialog-description" className="mdc-dialog__content">
-									<ul className="mdc-list mdc-list--underlined mdc-list--non-interactive">
-										{ provides && provides.map( ( attribute ) => (
-											<li className="mdc-list-item" key={ attribute }>
-												<span className="mdc-list-item__text">{ attribute }</span>
-											</li>
-										) ) }
-									</ul>
-								</section>
+								{ hasProvides &&
+									<section id={ describedByID } className="mdc-dialog__content">
+										<ul className="mdc-list mdc-list--underlined mdc-list--non-interactive">
+											{ provides.map( ( attribute ) => (
+												<li className="mdc-list-item" key={ attribute }>
+													<span className="mdc-list-item__text">{ attribute }</span>
+												</li>
+											) ) }
+										</ul>
+									</section>
+								}
 								{ dependentModules &&
 									<p className="mdc-dialog__dependecies">
 										<strong>{ __( 'Note: ', 'google-site-kit' ) }</strong>{ dependentModules }
@@ -140,4 +148,4 @@ Dialog.defaultProps = {
 	confirmButton: null,
 };
 
-export default Dialog;
+export default withInstanceId( Dialog );