Changeset 53912

Timestamp:

08/19/2022 10:05:00 PM (2 years ago)

Author:

joedolson

Message:

Embeds: Fix missing labels and duplicate IDs.

Add aria-label and aria-describedby to provide embed form fields with accessible names and ensure each embed has a unique ID attribute to prevent duplicate IDs.

Props afercia, swissspidy.
Fixes #55664.

File:

• trunk/src/wp-includes/embed.php (modified) (2 diffs)

trunk/src/wp-includes/embed.php

@@ -1152 +1152 @@
         return;
     }
+
+    $unique_suffix            = get_the_ID() . '-' . wp_rand();
+    $share_tab_wordpress_id   = 'wp-embed-share-tab-wordpress-' . $unique_suffix;
+    $share_tab_html_id        = 'wp-embed-share-tab-html-' . $unique_suffix;
+    $description_wordpress_id = 'wp-embed-share-description-wordpress-' . $unique_suffix;
+    $description_html_id      = 'wp-embed-share-description-html-' . $unique_suffix;
     ?>
     <div class="wp-embed-share-dialog hidden" role="dialog" aria-label="<?php esc_attr_e( 'Sharing options' ); ?>">
@@ -1158 +1164 @@
                 <ul class="wp-embed-share-tabs" role="tablist">
                     <li class="wp-embed-share-tab-button wp-embed-share-tab-button-wordpress" role="presentation">
-                        <button type="button" role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed' ); ?></button>
+                        <button type="button" role="tab" aria-controls="<?php echo $share_tab_wordpress_id; ?>" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed' ); ?></button>
                     </li>
                     <li class="wp-embed-share-tab-button wp-embed-share-tab-button-html" role="presentation">
-                        <button type="button" role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed' ); ?></button>
+                        <button type="button" role="tab" aria-controls="<?php echo $share_tab_html_id; ?>" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed' ); ?></button>
                     </li>
                 </ul>
-                <div id="wp-embed-share-tab-wordpress" class="wp-embed-share-tab" role="tabpanel" aria-hidden="false">
-                    <input type="text" value="<?php the_permalink(); ?>" class="wp-embed-share-input" aria-describedby="wp-embed-share-description-wordpress" tabindex="0" readonly/>
-
-                    <p class="wp-embed-share-description" id="wp-embed-share-description-wordpress">
+                <div id="<?php echo $share_tab_wordpress_id; ?>" class="wp-embed-share-tab" role="tabpanel" aria-hidden="false">
+                    <input type="text" value="<?php the_permalink(); ?>" class="wp-embed-share-input" aria-label="<?php esc_attr_e( 'URL' ); ?>" aria-describedby="<?php echo $description_wordpress_id; ?>" tabindex="0" readonly/>
+
+                    <p class="wp-embed-share-description" id="<?php echo $description_wordpress_id; ?>">
                         <?php _e( 'Copy and paste this URL into your WordPress site to embed' ); ?>
                     </p>
                 </div>
-                <div id="wp-embed-share-tab-html" class="wp-embed-share-tab" role="tabpanel" aria-hidden="true">
-                    <textarea class="wp-embed-share-input" aria-describedby="wp-embed-share-description-html" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( 600, 400 ) ); ?></textarea>
-
-                    <p class="wp-embed-share-description" id="wp-embed-share-description-html">
+                <div id="<?php echo $share_tab_html_id; ?>" class="wp-embed-share-tab" role="tabpanel" aria-hidden="true">
+                    <textarea class="wp-embed-share-input" aria-label="<?php esc_attr_e( 'HTML' ); ?>" aria-describedby="<?php echo $description_html_id; ?>" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( 600, 400 ) ); ?></textarea>
+
+                    <p class="wp-embed-share-description" id="<?php echo $description_html_id; ?>">
                         <?php _e( 'Copy and paste this code into your site to embed' ); ?>
                     </p>