Merge pull request #3068 from projectblacklight/adv-aria-labels

Add explicit labeling for select tags
projectblacklight · Aug 10, 2023 · b3d30bd · b3d30bd
2 parents b383961 + 552e07f
commit b3d30bd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/app/components/blacklight/advanced_search_form_component.html.erb b/app/components/blacklight/advanced_search_form_component.html.erb
@@ -40,7 +40,7 @@
 
   <% if sort_fields_select %>
     <div class="form-group row mb-4">
-      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), class: 'col-md-3 col-form-label text-md-right' %>
+      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), id: 'advanced-search-sort-label', class: 'col-md-3 col-form-label text-md-right' %>
       <div class="col">
         <%= sort_fields_select %>
       </div>

diff --git a/app/components/blacklight/advanced_search_form_component.rb b/app/components/blacklight/advanced_search_form_component.rb
@@ -24,14 +24,14 @@ def before_render
 
     def default_operator_menu
       options_with_labels = [:must, :should].index_by { |op| t(op, scope: 'blacklight.advanced_search.op') }
-      select_tag(:op, options_for_select(options_with_labels, params[:op]), class: 'input-small')
+      label_tag(:op, t('blacklight.advanced_search.op.label'), class: 'sr-only visually-hidden') + select_tag(:op, options_for_select(options_with_labels, params[:op]), class: 'input-small')
     end
 
     def sort_fields_select
       options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
       return unless options.any?
 
-      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select custom-select sort-select w-auto")
+      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select custom-select sort-select w-auto", aria: { labelledby: 'advanced-search-sort-label' })
     end
 
     private

diff --git a/config/locales/blacklight.en.yml b/config/locales/blacklight.en.yml
@@ -244,6 +244,7 @@ en:
       more_options: More options
       any_of: 'Any of:'
       op:
+        label: search operator
         must: all
         should: any
       page_title: Advanced search - %{application_name}

diff --git a/spec/features/axe_spec.rb b/spec/features/axe_spec.rb
@@ -21,6 +21,11 @@
     expect(page).to be_accessible
   end
 
+  it 'validates the advanced search form' do
+    visit advanced_search_catalog_path
+    expect(page).to be_accessible
+  end
+
   it 'validates the single results page' do
     visit solr_document_path('2007020969')
     expect(page).to be_accessible