_page.html.erb in blacklight-8.4.0

- old
+ new
@@ -6,14 +6,20 @@
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
 <% page_display = number_with_delimiter(page.to_s) %>
-
-<li class="page-item <%= 'active' if page.current? %>">
-  <% if page.current? %>
-    <span class="page-link" aria-current="true"><%= page_display %><span class="sr-only visually-hidden"> <%= t('views.pagination.aria.current_page', page: page_display) %></span></span>
-  <% else %>
-    <%= link_to page_display, url, :remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil, class: 'page-link', aria: { label: t('views.pagination.aria.go_to_page', page: page_display) } %>
+<% link_attrs = {
+                  remote: remote,
+                  rel: page.next? ? 'next' : page.prev? ? 'prev' : nil,
+                  class: 'page-link',
+                }
+%>
+<% if page.current? %>
+  <%= tag.li class: class_names('page-item', 'active'), aria_current: 'page'  do %>
+    <%= link_to page_display, url, link_attrs.merge(aria: { label:  t('views.pagination.aria.current_page', page: page_display) }) %>
   <% end %>
-</li>
-
+<% else %>
+  <%= tag.li class: 'page-item' do %>
+    <%= link_to page_display, url, link_attrs.merge(aria: { label:  t('views.pagination.aria.go_to_page', page: page_display) }) %>
+  <% end %>
+<% end %>