blacklight 8.2.2 → 8.4.0

data/app/components/blacklight/facet_field_checkboxes_component.html.erb

@@ -16,7 +16,7 @@
               <span class="facet-label"><%= presenter.label %></span>
               <span class="facet-count"><%= t('blacklight.search.facets.count', number: number_with_delimiter(presenter.hits)) %></span>
             <% end %>
-          <span>
+          </span>
         </li>
       <% end -%>
     </ul>

data/app/components/blacklight/facet_field_checkboxes_component.rb

@@ -17,7 +17,7 @@ module Blacklight
       return to_enum(:presenters) unless block_given?
 
       @facet_field.paginator.items.each do |item|
-        yield @facet_field.facet_field.item_presenter.new(item, @facet_field.facet_field, helpers, @facet_field.key, @facet_field.search_state)
+        yield Blacklight::FacetCheckboxItemPresenter.new(item, @facet_field.facet_field, helpers, @facet_field.key, @facet_field.search_state)
       end
     end
   end

data/app/components/blacklight/facet_field_inclusive_constraint_component.html.erb

@@ -1,6 +1,6 @@
 <div class="inclusive_or card card-body bg-light mb-3">
   <h5><%= t('blacklight.advanced_search.any_of') %></h5>
   <ul class="list-unstyled facet-values">
-    <%= helpers.render(Blacklight::FacetItemComponent.with_collection(presenters.to_a)) %>
+    <%= render(Blacklight::FacetItemComponent.with_collection(presenters.to_a)) %>
   </ul>
 </div>

data/app/components/blacklight/facet_field_list_component.html.erb

@@ -3,7 +3,7 @@
     <%= @facet_field.label %>
   <% end %>
   <% component.with_body do %>
-    <%= helpers.render(Blacklight::FacetFieldInclusiveConstraintComponent.new(facet_field: @facet_field)) %>
+    <%= render(Blacklight::FacetFieldInclusiveConstraintComponent.new(facet_field: @facet_field)) %>
     <ul class="facet-values list-unstyled">
       <%= render facet_items %>
     </ul>

data/app/components/blacklight/facet_item_component.rb

@@ -54,7 +54,7 @@ module Blacklight
         tag.span(label, class: "selected") +
           # remove link
           link_to(href, class: "remove", rel: "nofollow") do
-            tag.span('✖', class: "remove-icon", aria: { hidden: true }) +
+            render(Blacklight::Icons::RemoveComponent.new) +
               tag.span(helpers.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only visually-hidden')
           end
       end + render_facet_count(classes: ["selected"])

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -52,13 +52,13 @@ module Blacklight
     private
 
     def has_items?
-      return unless @facet_item.respond_to? :facet_item_presenters
+      return false unless @facet_item.respond_to? :facet_item_presenters
 
       @facet_item.facet_item_presenters.any?
     end
 
     def expanded?
-      return unless @collapsing
+      return false unless @collapsing
 
       @facet_item.shown?
     end

data/app/components/blacklight/icons/bookmark_icon_component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Icons
+    class BookmarkIconComponent < Blacklight::Icons::IconComponent
+      self.svg = <<~SVG
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-bookmark-check-fill bookmark-checked" viewBox="0 0 16 16">
+          <path fill-rule="evenodd" d="M2 15.5V2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v13.5a.5.5 0 0 1-.74.439L8 13.069l-5.26 2.87A.5.5 0 0 1 2 15.5m8.854-9.646a.5.5 0 0 0-.708-.708L7.5 7.793 6.354 6.646a.5.5 0 1 0-.708.708l1.5 1.5a.5.5 0 0 0 .708 0z"/>
+        </svg>
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-bookmark-plus bookmark-unchecked" viewBox="0 0 16 16">
+          <path d="M2 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v13.5a.5.5 0 0 1-.777.416L8 13.101l-5.223 2.815A.5.5 0 0 1 2 15.5zm2-1a1 1 0 0 0-1 1v12.566l4.723-2.482a.5.5 0 0 1 .554 0L13 14.566V2a1 1 0 0 0-1-1z"/>
+          <path d="M8 4a.5.5 0 0 1 .5.5V6H10a.5.5 0 0 1 0 1H8.5v1.5a.5.5 0 0 1-1 0V7H6a.5.5 0 0 1 0-1h1.5V4.5A.5.5 0 0 1 8 4"/>
+        </svg>
+      SVG
+    end
+  end
+end

data/app/components/blacklight/icons/icon_component.rb

@@ -2,15 +2,16 @@
 
 module Blacklight
   module Icons
-    # This is the list icon for the search button.
+    # This is the base class for icon components. You should extend this class for each icon.
+    #
     # You can override the default svg by setting:
-    #   Blacklight::Icons::ListComponent.svg = '<svg>your SVG here</svg>'
+    #   Blacklight::Icons::MyIconComponent.svg = '<svg>your SVG here</svg>'
     class IconComponent < ::ViewComponent::Base
       # rubocop:disable Metrics/ParameterLists
       def initialize(svg: nil, tag: :span, name: nil, label: nil, aria_hidden: nil, classes: nil, **options)
         self.svg = svg if svg
-        @classes = Array(classes) + ['blacklight-icons', "blacklight-icons-#{name}"]
         @name = name
+        @assigned_classes = Array(classes)
         @tag = tag
         @options = options.merge(aria: options.fetch(:aria, {}).reverse_merge(label: label, hidden: aria_hidden))
       end
@@ -18,12 +19,16 @@ module Blacklight
 
       def call
         tag.public_send(@tag, svg&.html_safe, # rubocop:disable Rails/OutputSafety
-                        class: @classes,
+                        class: classes,
                         **@options)
       end
 
       class_attribute :svg
 
+      def classes
+        @classes ||= @assigned_classes + ['blacklight-icons', "blacklight-icons-#{name}"]
+      end
+
       def name
         @name ||= self.class.name.demodulize.underscore.sub('_component', '')
       end

data/app/components/blacklight/icons/remove_component.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Icons
+    # This is the remove (x) icon for the facets and constraints.
+    # You can override the default svg by setting:
+    #   Blacklight::Icons::RemoveComponent.svg = '<svg>your SVG here</svg>'
+    class RemoveComponent < Blacklight::Icons::IconComponent
+      self.svg = <<~SVG
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x fs-4" viewBox="0 0 16 16">
+          <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708"/>
+        </svg>
+      SVG
+    end
+  end
+end

data/app/components/blacklight/metadata_field_component.html.erb

@@ -3,6 +3,6 @@
     <%= label %>
   <% end %>
   <% component.with_value do %>
-    <%= @field.render %>
+    <%= render_field %>
   <% end %>
 <% end %>

data/app/components/blacklight/metadata_field_component.rb

@@ -26,6 +26,11 @@ module Blacklight
       @field.render_field?
     end
 
+    # Override this method in a subclass to change the way this value is rendered
+    def render_field
+      @field.render
+    end
+
     ##
     # Render the index field label for a document
     #

data/app/components/blacklight/response/facet_group_component.rb

@@ -35,7 +35,7 @@ module Blacklight
       # @deprecated
       def default_body
         Blacklight.deprecation.warn('Rendering the Blacklight::FacetGroupComponent without a body slot is deprecated.')
-        helpers.render(Blacklight::FacetComponent.with_collection(@fields, response: @response))
+        render(Blacklight::FacetComponent.with_collection(@fields, response: @response))
       end
 
       # @deprecated

data/app/components/blacklight/response/pagination_component.html.erb

@@ -1,3 +1,3 @@
-<%= content_tag :section, class: 'paginate-section',  **html_attr do %>
+<%= tag.nav class: 'paginate-section', **html_attr do %>
   <%= pagination %>
 <% end %>

data/app/components/blacklight/response/sort_component.html.erb

@@ -1,6 +1 @@
-<%= helpers.render(Blacklight::System::DropdownComponent.new(
-      param: @param,
-      choices: @choices,
-      id: @id,
-      search_state: @search_state,
-      selected: @selected)) %>
+<%= dropdown %>

data/app/components/blacklight/response/sort_component.rb

@@ -11,6 +11,21 @@ module Blacklight
         @classes = classes
         @selected = selected
       end
+
+      # You may override this method in a subclass if you want to use a different dropdown component
+      def dropdown_class
+        helpers.blacklight_config.view_config(:show).dropdown_component
+      end
+
+      def dropdown
+        render(dropdown_class.new(
+                 param: @param,
+                 choices: @choices,
+                 id: @id,
+                 search_state: @search_state,
+                 selected: @selected
+               ))
+      end
     end
   end
 end

data/app/components/blacklight/search/per_page_component.html.erb

@@ -0,0 +1,2 @@
+<span class="sr-only visually-hidden"><%= t('blacklight.search.per_page.title') %></span>
+<%= dropdown %>

data/app/components/blacklight/search/per_page_component.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Search
+    class PerPageComponent < Blacklight::Component
+      def initialize(blacklight_config:, response:, search_state:)
+        @blacklight_config = blacklight_config
+        @response = response
+        @search_state = search_state
+      end
+
+      def render?
+        helpers.show_sort_and_per_page?
+      end
+
+      # You may override this method in a subclass if you want to use a different dropdown component
+      def dropdown_class
+        @blacklight_config.view_config(:show).dropdown_component
+      end
+
+      def dropdown
+        render(dropdown_class.new(
+                 param: :per_page,
+                 choices: per_page_options_for_select,
+                 id: 'per_page-dropdown',
+                 search_state: @search_state,
+                 selected: current_per_page,
+                 interpolation: :count
+               ))
+      end
+
+      #
+      # @return [Integer]
+      def current_per_page
+        (@response.rows if @response && @response.rows > 0) || # rubocop:disable Style/NumericPredicate
+          params.fetch(:per_page, @blacklight_config.default_per_page).to_i
+      end
+
+      ##
+      # The available options for results per page, in the style of #options_for_select
+      def per_page_options_for_select
+        return [] if @blacklight_config.per_page.blank?
+
+        @blacklight_config.per_page.map do |count|
+          [t(:'blacklight.search.per_page.label', count: count).html_safe, count]
+        end
+      end
+    end
+  end
+end

data/app/components/blacklight/search_bar_component.html.erb

@@ -24,7 +24,7 @@
       <% if autocomplete_path.present? %>
         <auto-complete src="<%= autocomplete_path %>" for="autocomplete-popup" class="search-autocomplete-wrapper">
           <%= f.search_field @query_param, value: @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", autofocus: @autofocus, aria: { label: scoped_t('search.label'), autocomplete: 'list', controls: 'autocomplete-popup' }  %>
-          <ul id="autocomplete-popup" role="listbox" aria-label="<%= scoped_t('search.label') %>" hidden></ul>
+          <ul id="autocomplete-popup" class="dropdown-menu" role="listbox" aria-label="<%= scoped_t('search.label') %>" hidden></ul>
         </auto-complete>
       <% else %>
         <%= f.search_field @query_param, value: @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", autofocus: @autofocus, aria: { label: scoped_t('search.label') }  %>

data/app/components/blacklight/search_context/server_item_pagination_component.html.erb

@@ -1,10 +1,7 @@
-<div class='pagination-search-widgets'>
+<div class="search-context page-links">
+  <%= link_to_previous_document %> |
 
-  <div class="page-links">
-    <%= link_to_previous_document %> |
+  <%= item_page_entry_info %> |
 
-    <%= item_page_entry_info %> |
-
-    <%= link_to_next_document %>
-  </div>
+  <%= link_to_next_document %>
 </div>

data/app/components/blacklight/skip_link_component.html.erb

@@ -0,0 +1,7 @@
+<nav id="skip-link" role="navigation" class="visually-hidden-focusable sr-only sr-only-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
+  <div class="container-xl">
+    <%= link_to_search %>
+    <%= link_to_main %>
+    <%= content %>
+  </div>
+</nav>

data/app/components/blacklight/skip_link_component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class SkipLinkComponent < Blacklight::Component
+    def link_to_search
+      link_to t('blacklight.skip_links.search_field'), '#search_field', class: link_classes
+    end
+
+    def link_to_main
+      link_to t('blacklight.skip_links.main_content'), '#main-container', class: link_classes
+    end
+
+    def link_classes
+      'd-inline-flex p-2 m-1'
+    end
+  end
+end

data/app/components/blacklight/system/dropdown_button_component.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module System
+    class DropdownButtonComponent < Blacklight::Component
+      def initialize(label:, classes: %w[btn btn-outline-secondary dropdown-toggle])
+        @classes = classes
+        @label = label
+      end
+
+      def call
+        button_tag class: @classes, aria: { expanded: false }, data: { toggle: 'dropdown', 'bs-toggle': 'dropdown' } do
+          safe_join([@label, content_tag(:span, '', class: 'caret')])
+        end
+      end
+    end
+  end
+end

data/app/components/blacklight/system/dropdown_component.rb

@@ -3,11 +3,8 @@
 module Blacklight
   module System
     class DropdownComponent < Blacklight::Component
-      renders_one :button, (lambda do |classes:, label:|
-        button_tag class: classes, aria: { expanded: false }, data: { toggle: 'dropdown', 'bs-toggle': 'dropdown' } do
-          safe_join([label, content_tag(:span, '', class: 'caret')])
-        end
-      end)
+      renders_one :button, DropdownButtonComponent
+
       renders_many :options, (lambda do |text:, url:, selected: false|
         link_to(text, url, class: "dropdown-item #{'active' if selected}", role: 'menuitem', aria: { current: ('page' if selected) })
       end)
@@ -18,7 +15,7 @@ module Blacklight
         @choices = choices
         @search_state = search_state
         @id = id
-        @classes = classes.concat(['btn-group', "#{param.to_s.parameterize}-dropdown"])
+        @classes = classes.push('btn-group', "#{param.to_s.parameterize}-dropdown")
         @selected = selected || default || option_text_and_value(@choices.first)&.first
         @interpolation = interpolation
       end
@@ -29,7 +26,7 @@ module Blacklight
       end
 
       def before_render
-        with_button(classes: 'btn btn-outline-secondary dropdown-toggle', label: button_label) unless button
+        with_button(label: button_label) unless button
 
         return if options.any?
 

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

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

data/app/components/blacklight/top_navbar_component.html.erb

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
+<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" aria-label="<%= aria_label %>">
   <div class="<%= container_classes %>">
     <%= logo_link %>
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#user-util-collapse" data-bs-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
@@ -9,4 +9,4 @@
       <%= render 'shared/user_util_links' %>
     </div>
   </div>
-</nav>
+</nav>

data/app/components/blacklight/top_navbar_component.rb

@@ -10,6 +10,10 @@ module Blacklight
 
     delegate :application_name, :container_classes, to: :helpers
 
+    def aria_label
+      t('blacklight.top_navbar.aria.container_label')
+    end
+
     def logo_link(title: application_name)
       link_to title, blacklight_config.logo_link, class: 'mb-0 navbar-brand navbar-logo'
     end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -53,11 +53,7 @@ module Blacklight::CatalogHelperBehavior
                 collection.limit_value
               end
 
-    end_num = if collection.offset_value + end_num <= collection.total_count
-                collection.offset_value + end_num
-              else
-                collection.total_count
-              end
+    end_num = [collection.offset_value + end_num, collection.total_count].min
 
     case collection.total_count
     when 0
@@ -109,10 +105,12 @@ module Blacklight::CatalogHelperBehavior
   ##
   # Look up the current per page value, or the default if none if set
   #
+  # @deprecated
   # @return [Integer]
   def current_per_page
     (@response.rows if @response && @response.rows > 0) || params.fetch(:per_page, blacklight_config.default_per_page).to_i
   end
+  Blacklight.deprecation.deprecate_methods(self, current_per_page: 'has moved to Blacklight::Search::PerPageComponent')
 
   ##
   # Should we display the sort and per page widget?

data/app/helpers/blacklight/component_helper_behavior.rb

@@ -37,6 +37,10 @@ module Blacklight
       filter_partials(blacklight_config.view_config(:show).document_actions, { document: document }.merge(options)).map { |_k, v| v }
     end
 
+    def filter_partials(partials, options)
+      partials.select { |_, config| blacklight_configuration_context.evaluate_if_unless_configuration config, options }
+    end
+
     private
 
     def render_filtered_partials(partials, options = {})
@@ -52,9 +56,5 @@ module Blacklight
       end
       safe_join(content, "\n") unless block_given?
     end
-
-    def filter_partials(partials, options)
-      partials.select { |_, config| blacklight_configuration_context.evaluate_if_unless_configuration config, options }
-    end
   end
 end

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -92,6 +92,7 @@ module Blacklight::ConfigurationHelperBehavior
   end
 
   ##
+  # @deprecated
   # The available options for results per page, in the style of #options_for_select
   def per_page_options_for_select
     return [] if blacklight_config.per_page.blank?
@@ -100,6 +101,7 @@ module Blacklight::ConfigurationHelperBehavior
       [t(:'blacklight.search.per_page.label', count: count).html_safe, count]
     end
   end
+  Blacklight.deprecation.deprecate_methods(self, per_page_options_for_select: 'has moved to Blacklight::Search::PerPageComponent')
 
   ##
   # Determine whether to render a field by evaluating :if and :unless conditions

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -41,11 +41,11 @@ module Blacklight
     end
 
     ##
-    # Class used for specifying main layout container classes. Can be
-    # overwritten to return 'container-fluid' for Bootstrap full-width layout
+    # Class used for specifying main layout container classes.
+    # Set config.full_width_layout to true to use a fluid layout.
     # @return [String]
     def container_classes
-      'container'
+      blacklight_config.full_width_layout ? 'container-fluid' : 'container'
     end
 
     ##

data/app/javascript/blacklight/checkbox_submit.js

@@ -37,7 +37,7 @@ export default class CheckboxSubmit {
       this.labelTarget.removeAttribute('disabled')
       this.checkboxTarget.removeAttribute('disabled')
       this.updateStateFor(!this.checked)
-      document.querySelector('[data-role=bookmark-counter]').innerHTML = json.bookmarks.count
+      if (this.bookmarkCounter()) this.bookmarkCounter().innerHTML = json.bookmarks.count
     }).catch((error) => {
       this.handleError(error)
     })
@@ -63,6 +63,10 @@ export default class CheckboxSubmit {
     return this.form.querySelector('[data-checkboxsubmit-target="span"]')
   }
 
+  bookmarkCounter() {
+    return document.querySelector('[data-role="bookmark-counter"]')
+  }
+
   handleError() {
     alert("Unable to save the bookmark at this time.")
   }

data/app/models/concerns/blacklight/document/semantic_fields.rb

@@ -31,7 +31,7 @@ module Blacklight::Document
     # but extensions should call super and modify hash returned, to avoid
     # unintentionally erasing values provided by other extensions.
     def to_semantic_values
-      @semantic_value_hash ||= self.class.field_semantics.each_with_object(Hash.new([])) do |(key, field_names), hash|
+      @semantic_value_hash ||= self.class.field_semantics.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |(key, field_names), hash|
         ##
         # Handles single string field_name or an array of field_names
         value = Array.wrap(field_names).map { |field_name| self[field_name] }.flatten.compact

data/app/presenters/blacklight/facet_checkbox_item_presenter.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class FacetCheckboxItemPresenter < Blacklight::FacetItemPresenter
+    # Check if the query parameters have any inclusive facets with the given value
+    # @return [Boolean]
+    def selected?
+      search_state.filter(facet_config).values(except: [:filters, :missing]).flatten.include?(value)
+    end
+  end
+end

data/app/presenters/blacklight/facet_field_presenter.rb

@@ -19,7 +19,15 @@ module Blacklight
     end
 
     def active?
-      search_state.filter(facet_field).any?
+      if in_advanced_search?
+        search_state.filter(facet_field).values(except: [:filters, :missing]).any?
+      else
+        search_state.filter(facet_field).any?
+      end
+    end
+
+    def in_advanced_search?
+      search_state.params[:action] == "advanced_search"
     end
 
     def in_modal?

data/app/services/blacklight/search_service.rb

@@ -148,7 +148,15 @@ module Blacklight
               .merge(blacklight_config.fetch_many_document_params)
               .merge(extra_controller_params)
 
-      solr_response = repository.search(query)
+      # find_many was introduced in Blacklight 8.4. Before that, we used the
+      # regular search method (possibly with a find-many specific `qt` parameter).
+      # In order to support Repository implementations that may not have a find_many,
+      # we'll fall back to search if find_many isn't available.
+      solr_response = if repository.respond_to?(:find_many)
+                        repository.find_many(query)
+                      else
+                        repository.search(query)
+                      end
 
       solr_response.documents
     end

data/app/views/catalog/_per_page_widget.html.erb

@@ -1,10 +1 @@
-<% if show_sort_and_per_page? %>
-  <span class="sr-only visually-hidden"><%= t('blacklight.search.per_page.title') %></span>
-  <%= render(Blacklight::System::DropdownComponent.new(
-    param: :per_page,
-    choices: per_page_options_for_select,
-    id: 'per_page-dropdown',
-    search_state: search_state,
-    selected: current_per_page,
-    interpolation: :count)) %>
-<% end %>
+<%= render Blacklight::Search::PerPageComponent.new(search_state:, blacklight_config:, response: @response) %>

data/app/views/catalog/_search_results.html.erb

@@ -8,7 +8,7 @@
 <% end %>
 
 <% content_for(:skip_links) do -%>
-    <%= link_to t('blacklight.skip_links.first_result'), '#documents', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+    <%= link_to t('blacklight.skip_links.first_result'), '#documents', class: 'd-inline-flex p-2 m-1', data: { turbolinks: 'false' } %>
 <% end %>
 
 <% content_for(:container_header) do -%>

data/app/views/catalog/_show_main_content.html.erb

@@ -1,4 +1,4 @@
-<%= render blacklight_config.track_search_session.item_pagination_component.new(search_context: @search_context, search_session: search_session, current_document: @document) if blacklight_config.track_search_session.item_pagination_component %>
+<%= render blacklight_config.view_config(:show).document_header_component.new(document: @document, search_context: @search_context, search_session: search_session) %>
 <% @page_title = t('blacklight.search.show.title', document_title: document_presenter(@document).html_title, application_name: application_name).html_safe %>
 <% content_for(:head) { render_link_rel_alternates } %>
 

data/app/views/catalog/show.html.erb

@@ -1,5 +1,3 @@
-<%= render blacklight_config.track_search_session.applied_params_component.new if blacklight_config.track_search_session.applied_params_component %>
-
 <%= render 'show_main_content' %>
 
 <% content_for(:sidebar) do %>

data/app/views/catalog/suggest.html.erb

@@ -1,3 +1,3 @@
 <% @suggestions.each do |suggestion| %>
-  <li role="option"><span><%= suggestion['term'] %></span></li>
+  <li role="option" class="dropdown-item"><span><%= suggestion['term'] %></span></li>
 <% end %>

data/app/views/kaminari/blacklight/_page.html.erb

@@ -8,12 +8,18 @@
     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 %>