Verified Commit 5b240ef4 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2998857 by Luke.Leber, e.chatrer, afem, bskibinski, mgifford: a11y:... 

Issue #2998857 by Luke.Leber, e.chatrer, afem, bskibinski, mgifford: a11y: Input type file fields lack aria-describedby to the description

(cherry picked from commit 74b6ceda)
parent 8f08ecc0

core/modules/file/src/Element/ManagedFile.php

+5 −0
Original line number Diff line number Diff line
@@ -320,6 +320,11 @@ public static function processManagedFile(&$element, FormStateInterface $form_st 
      '#weight' => -10,

      '#error_no_message' => TRUE,

    ];



    if (!empty($element['#description'])) {

      $element['upload']['#attributes']['aria-describedby'] = $element['#id'] . '--description';

    }



    if (!empty($element['#accept'])) {

      $element['upload']['#attributes'] = ['accept' => $element['#accept']];

    }

core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $tree = T 
    $form['nested']['file'] = [

      '#type' => 'managed_file',

      '#title' => $this->t('Managed <em>@type</em>', ['@type' => 'file & butter']),

      '#description' => $this->t('Upload a <em>@type</em> file', ['@type' => 'file & butter']),

      '#upload_location' => 'public://test',

      '#progress_message' => $this->t('Processing...'),

      '#extended' => (bool) $extended,

core/modules/file/tests/src/Functional/FileManagedFileElementTest.php

+8 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


namespace Drupal\Tests\file\Functional;



use Drupal\Component\Utility\Html;

use Drupal\file\Entity\File;



/**
@@ -40,8 +41,14 @@ public function testManagedFile(): void { 
          $input_base_name = $tree ? 'nested_file' : 'file';

          $file_field_name = $multiple ? 'files[' . $input_base_name . '][]' : 'files[' . $input_base_name . ']';



          // Submit without a file.

          $this->drupalGet($path);



          // Ensure the aria-describedby relationship works as expected.

          $input_id = Html::getId('edit_' . $input_base_name);

          $this->assertSession()->elementExists('css', '#' . $input_id . '--description');

          $this->assertSession()->elementExists('css', '[aria-describedby="' . $input_id . '--description"]');



          // Submit without a file.

          $this->submitForm([], 'Save');

          $this->assertSession()->pageTextContains("The file ids are .");