Merge pull request #3657 from projectblacklight/remove-bs4-close

Remove vestiges of bootstrap 4 close

Author: seanaery

app/components/blacklight/system/flash_message_component.html.erb

@@ -1,6 +1,6 @@
 <div class="alert alert-dismissible <%= @classes %>">
   <%= message %>
-  <%= tag.button button_contents, type: "button", class: "btn-close",
+  <%= tag.button '', type: "button", class: "btn-close",
                      data: { dismiss: "alert", bs_dismiss: "alert" },
                      aria: { label: "Close" } %>
 </div>

app/components/blacklight/system/flash_message_component.rb

@@ -16,15 +16,6 @@ def before_render
         with_message { @message } if @message
       end
 
-      # Bootstrap 4 requires the span, but Bootstrap 5 should not have it.
-      # See https://getbootstrap.com/docs/4.6/components/alerts/#dismissing
-      #     https://getbootstrap.com/docs/5.1/components/alerts/#dismissing
-      def button_contents
-        return if helpers.controller.blacklight_config.bootstrap_version == 5
-
-        tag.span '×'.html_safe, aria: { hidden: true }
-      end
-
       def alert_class(type)
         case type.to_s
         when 'success' then "alert-success"

app/components/blacklight/system/modal_component.html.erb

@@ -6,8 +6,7 @@
       <h1 class="modal-title"><%= title %></h1>
     <% end) %>
 
-    <button type="button" class="blacklight-modal-close btn-close close" data-bl-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-      <span aria-hidden="true" class="visually-hidden">&times;</span>
+    <button type="button" class="blacklight-modal-close btn-close" data-bl-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
     </button>
   </div>
 

app/javascript/blacklight-frontend/modal.js

@@ -81,8 +81,7 @@ const Modal = (() => {
 
       const contents = `<div class="modal-header">
         <div class="modal-title">There was a problem with your request.</div>
-        <button type="button" class="blacklight-modal-close btn-close close" data-bl-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true" class="visually-hidden">&times;</span>
+        <button type="button" class="blacklight-modal-close btn-close" data-bl-dismiss="modal" aria-label="Close">
         </button>
         </div>
         <div class="modal-body">

spec/features/modal_spec.rb

@@ -6,7 +6,7 @@
     expect(page).to have_no_selector 'dialog#blacklight-modal'
     click_on 'Email'
     expect(page).to have_css 'dialog#blacklight-modal'
-    click_on '×'
+    find('button[aria-label=Close]').click
     expect(page).to have_no_selector 'dialog#blacklight-modal'
   end
 end