blacklight 8.8.1 → 9.0.0.beta1

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

@@ -1,8 +1,8 @@
-<div class="card facet-limit blacklight-<%= @facet_field.key %> <%= 'facet-limit-active' if @facet_field.active? %>">
-  <h3 class="card-header p-0 facet-field-heading" id="<%= header_html_id %>">
+<div class="accordion-item facet-limit blacklight-<%= @facet_field.key %> <%= 'facet-limit-active' if @facet_field.active? %>">
+  <h3 class="accordion-header p-0 facet-field-heading h6" id="<%= header_html_id %>">
     <button
       type="button"
-      class="btn w-100 d-block btn-block p-2 text-start text-left collapse-toggle <%= "collapsed" if @facet_field.collapsed? %>"
+      class="btn accordion-button <%= "collapsed" if @facet_field.collapsed? %>"
       data-toggle="collapse"
       data-bs-toggle="collapse"
       data-target="#<%= html_id %>"
@@ -14,7 +14,7 @@
     </button>
   </h3>
   <div id="<%= html_id %>" role="region" aria-labelledby="<%= header_html_id %>" class="panel-collapse facet-content collapse <%= "show" unless @facet_field.collapsed? %>">
-    <div class="card-body">
+    <div class="accordion-body">
       <%= body %>
 
       <% if @facet_field.modal_path %>

data/app/components/blacklight/facet_field_list_component.rb

@@ -7,24 +7,6 @@ module Blacklight
       @layout = layout == false ? FacetFieldNoLayoutComponent : Blacklight::FacetFieldComponent
     end
 
-    ##
-    # Renders the list of values
-    # removes any elements where render_facet_item returns a nil value. This enables an application
-    # to filter undesireable facet items so they don't appear in the UI
-    # @deprecated
-    def render_facet_limit_list(paginator, facet_field, wrapping_element = :li)
-      return render(facet_items(wrapping_element: wrapping_element)) if paginator == @facet_field.paginator && facet_field == @facet_field.key
-
-      facet_config ||= helpers.facet_configuration_for_field(facet_field)
-
-      collection = paginator.items.map do |item|
-        facet_item_presenter(item, facet_config, facet_field)
-      end
-
-      render(facet_item_component_class(facet_config).with_collection(collection, wrapping_element: wrapping_element))
-    end
-    Blacklight.deprecation.deprecate_methods(self, render_facet_limit_list: 'Call e.g. `render facet_items` instead')
-
     def facet_items(wrapping_element: :li, **item_args)
       facet_item_component_class.with_collection(facet_item_presenters, wrapping_element: wrapping_element, **item_args)
     end
@@ -39,12 +21,12 @@ module Blacklight
       @facet_field.paginator&.items&.any?
     end
 
-    def facet_item_presenter(facet_item, deprecated_facet_config = nil, facet_field = nil)
-      (deprecated_facet_config || facet_config).item_presenter.new(facet_item, deprecated_facet_config || facet_config, helpers, facet_field || @facet_field.key)
+    def facet_item_presenter(facet_item)
+      facet_config.item_presenter.new(facet_item, facet_config, helpers, @facet_field.key)
     end
 
-    def facet_item_component_class(deprecated_facet_config = nil)
-      (deprecated_facet_config || facet_config).item_component
+    def facet_item_component_class
+      facet_config.item_component
     end
 
     def facet_config

data/app/components/blacklight/facet_item_component.rb

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

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -32,7 +32,7 @@ module Blacklight
 
       id = "h-#{self.class.mint_id}" if @collapsing && has_items?
 
-      content_tag @wrapping_element, role: 'treeitem', class: 'treeitem' do
+      content_tag @wrapping_element, class: 'treeitem' do
         concat(content_tag('span', class: "d-flex flex-row align-items-center") do
           concat facet_toggle_button(id) if has_items? && @collapsing
           concat content_tag('span', render(facet), class: "facet-values d-flex flex-row flex-grow-1 #{'facet-leaf-node' if has_items? && @collapsing}", id: id && "#{id}_label")
@@ -75,7 +75,7 @@ module Blacklight
     def toggle_icon(type)
       content_tag 'span', class: type do
         concat @icons[type]
-        concat content_tag('span', t(type, scope: 'blacklight.search.facets.pivot'), class: 'sr-only visually-hidden')
+        concat content_tag('span', t(type, scope: 'blacklight.search.facets.pivot'), class: 'visually-hidden')
       end
     end
   end

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

@@ -1,27 +1,12 @@
 <% # main container for facets/limits menu -%>
 <%= content_tag :div, id: @id,  class: 'facets sidenav facets-toggleable-md' do %>
   <div class="facets-header">
-    <%= content_tag :h2, @title, class: 'facets-heading' if @title %>
+    <%= content_tag :h2, @title, class: 'facets-heading h4' if @title %>
 
-    <%= content_tag :button,
-      class: 'btn btn-outline-secondary facet-toggle-button d-block d-lg-none',
-      type: 'button',
-      data: {
-        toggle: 'collapse',
-        target: "##{@panel_id}",
-        'bs-toggle': 'collapse',
-        'bs-target': "##{@panel_id}"
-      },
-      aria: {
-        controls: @panel_id,
-        expanded: 'false',
-      } do %>
-      <span data-show-label><%= t('blacklight.search.facets.group.open') %></span>
-      <span data-hide-label><%= t('blacklight.search.facets.group.close') %></span>
-    <% end %>
+    <%= collapse_toggle_button(@panel_id) %>
   </div>
 
-  <div id="<%= @panel_id %>" class="facets-collapse collapse">
+  <div id="<%= @panel_id %>" class="facets-collapse d-lg-block collapse accordion">
     <%= body %>
   </div>
 <% end %>

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

@@ -6,42 +6,26 @@ module Blacklight
     class FacetGroupComponent < Blacklight::Component
       renders_one :body
 
-      # @param [Blacklight::Response] response
-      # @param [Array<Blacklight::Configuration::FacetField>] fields facet fields to render
-      # @param [String] title the title of the facet group section
       # @param [String] id a unique identifier for the group
-      def initialize(id:, title: nil, fields: [], response: nil)
+      # @param [String] title the title of the facet group section
+      def initialize(id:, title: nil)
         @groupname = id
         @id = id ? "facets-#{id}" : 'facets'
         @title = title || I18n.t("blacklight.search.#{@id}.title")
         @panel_id = id ? "facet-panel-#{id}-collapse" : 'facet-panel-collapse'
+      end
 
-        # deprecated variables
-        @fields = fields
-        @response = response
+      def collapse_toggle_button(panel_id)
+        render button_component.new(panel_id: panel_id)
       end
 
-      # Provide fallback behavior for rendering this object without a body slot
-      def before_render
-        set_slot(:body, nil) { default_body } unless body?
+      def button_component
+        Blacklight::Response::FacetToggleButtonComponent
       end
 
       def render?
         body.present?
       end
-
-      private
-
-      # @deprecated
-      def default_body
-        Blacklight.deprecation.warn('Rendering the Blacklight::FacetGroupComponent without a body slot is deprecated.')
-        render(Blacklight::FacetComponent.with_collection(@fields, response: @response))
-      end
-
-      # @deprecated
-      def blacklight_config
-        helpers.blacklight_config
-      end
     end
   end
 end

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

@@ -0,0 +1,16 @@
+<%= content_tag :button,
+  class: @classes,
+  type: 'button',
+  data: {
+    toggle: 'collapse',
+    target: "##{@panel_id}",
+    'bs-toggle': 'collapse',
+    'bs-target': "##{@panel_id}"
+  },
+  aria: {
+    controls: @panel_id,
+    expanded: 'false',
+  } do %>
+  <span data-show-label><%= t('blacklight.search.facets.group.open') %></span>
+  <span data-hide-label><%= t('blacklight.search.facets.group.close') %></span>
+<% end %>

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Response
+    # Render the button that shows or collapses the facets on a narrow viewport
+    class FacetToggleButtonComponent < Blacklight::Component
+      # @param [String] panel_id
+      def initialize(panel_id:, classes: 'btn btn-outline-secondary facet-toggle-button d-block d-lg-none')
+        @panel_id = panel_id
+        @classes = classes
+      end
+    end
+  end
+end

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

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

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

@@ -6,9 +6,10 @@ module Blacklight
     class PaginationComponent < Blacklight::Component
       # @param [Blacklight::Response] response
       # @param [Hash] html html options for the pagination container
-      def initialize(response:, html: {}, **pagination_args)
+      def initialize(response:, html: {}, classes: 'paginate-section', **pagination_args)
         @response = response
         @html = html
+        @classes = classes
         @pagination_args = pagination_args
       end
 

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

@@ -22,6 +22,7 @@ module Blacklight
                  param: @param,
                  choices: @choices,
                  id: @id,
+                 classes: @classes,
                  search_state: @search_state,
                  selected: @selected
                ))

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

@@ -1,4 +1,4 @@
 <%= link_to url, title: label, aria: aria_attributes, class: "#{Array(@classes).join(' ')} view-type-#{ @key.to_s.parameterize } #{"active" if selected?}" do %>
   <%= icon %>
-  <span class="caption"><%= label %></span>
+  <span class="caption visually-hidden"><%= label %></span>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div class="view-type">
-  <span class="sr-only visually-hidden"><%= t('blacklight.search.view_title') %></span>
+  <span class="visually-hidden"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <% views.each do |view| %>
       <%= view %>

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

@@ -1,9 +1,9 @@
-<label for="facet_suggest_<%= facet.key %>">
+<label for="facet-suggest-<%= facet.key %>">
   <%= I18n.t('blacklight.search.facets.suggest.label', field_label: presenter&.label) %>
 </label>
-<%= text_field_tag "facet_suggest_#{facet.key}",
-  nil,
-  class: "facet-suggest form-control",
-  data: {facet_field: facet.key},
-  placeholder: I18n.t('blacklight.search.form.search.placeholder')
-%>
+<input class="facet-suggest form-control"
+       id="facet-suggest-<%= facet.key %>"
+       data-facet-field="<%= facet.key %>"
+       name="facet_suggest_<%= facet.key %>"
+       placeholder="<%= I18n.t('blacklight.search.form.search.placeholder') %>">
+</input>

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

@@ -11,10 +11,6 @@ module Blacklight
       private
 
       attr_accessor :facet, :presenter
-
-      def render?
-        facet&.suggest
-      end
     end
   end
 end

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

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

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

@@ -23,6 +23,7 @@ module Blacklight
                  param: :per_page,
                  choices: per_page_options_for_select,
                  id: 'per_page-dropdown',
+                 classes: ['mx-1'],
                  search_state: @search_state,
                  selected: current_per_page,
                  interpolation: :count

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

@@ -1,7 +1,7 @@
 <search>
   <% facet_group_names.each do |groupname| %>
     <% fields = facet_fields_in_group(groupname) %>
-    <%= render group_component_class.new(id: groupname, fields: fields, response: response) do |component| %>
+    <%= render group_component_class.new(id: groupname) do |component| %>
       <% component.with_body do %>
         <%= render Blacklight::FacetComponent.with_collection(fields, response: response) %>
       <% end %>

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

@@ -6,7 +6,7 @@ module Blacklight
       def initialize(blacklight_config:, response:, view_config:)
         @blacklight_config = blacklight_config
         @response = response
-        @group_component_class = view_config.facet_group_component || Blacklight::Response::FacetGroupComponent
+        @group_component_class = view_config.facet_group_component
       end
 
       attr_reader :group_component_class, :response

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

@@ -2,7 +2,7 @@
   <%= form_with url: @url, local: true, method: @method, class: @classes.join(' '), scope: @prefix, role: 'search', **@form_options do |f| %>
     <%= render Blacklight::HiddenSearchStateComponent.new(params: @params) %>
     <% if search_fields.length > 1 %>
-      <%= f.label :search_field, scoped_t('search_field.label'), class: 'sr-only visually-hidden' %>
+      <%= f.label :search_field, scoped_t('search_field.label'), class: 'visually-hidden' %>
     <% end %>
     <% before_input_groups.each do |input_group| %>
       <%= input_group %>
@@ -20,9 +20,9 @@
         <%= f.hidden_field :search_field, value: search_fields.first.last %>
       <% end %>
 
-      <%= f.label @query_param, scoped_t('search.label'), class: 'sr-only visually-hidden' %>
+      <%= f.label @query_param, scoped_t('search.label'), class: 'visually-hidden' %>
       <% if autocomplete_path.present? %>
-        <auto-complete src="<%= autocomplete_path %>" for="autocomplete-popup" class="search-autocomplete-wrapper <%= rounded_border_class %>">
+        <auto-complete src="<%= autocomplete_path %>" for="autocomplete-popup" class="search-autocomplete-wrapper form-control <%= rounded_border_class %>">
           <%= f.search_field @query_param, value: @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control #{rounded_border_class}", autofocus: @autofocus, aria: { label: scoped_t('search.label'), autocomplete: 'list', controls: 'autocomplete-popup' }  %>
           <ul id="autocomplete-popup" class="dropdown-menu" role="listbox" aria-label="<%= scoped_t('search.label') %>" hidden></ul>
         </auto-complete>

data/app/components/blacklight/search_bar_component.rb

@@ -11,7 +11,7 @@ module Blacklight
     def initialize(
       url:, params:,
       advanced_search_url: nil,
-      classes: ['search-query-form'], prefix: nil,
+      classes: %w[search-query-form col-md-12 col-lg-8], prefix: nil,
       method: 'GET', q: nil, query_param: :q,
       search_field: nil, autocomplete_path: nil,
       autofocus: nil, i18n: { scope: 'blacklight.search.form' },
@@ -63,7 +63,7 @@ module Blacklight
     def rounded_border_class
       return 'rounded-0' if search_fields.length > 1
 
-      'rounded-left rounded-start'
+      'rounded-start'
     end
 
     private

data/app/components/blacklight/search_button_component.rb

@@ -8,8 +8,8 @@ module Blacklight
     end
 
     def call
-      tag.button(class: 'btn btn-primary search-btn', type: 'submit', id: @id) do
-        tag.span(@text, class: "visually-hidden-sm me-sm-1 submit-search-text") +
+      tag.button(class: 'btn btn-primary search-btn', type: 'submit', id: @id, aria: { label: @text }) do
+        tag.span(@text, class: "d-none d-md-inline me-sm-1 submit-search-text", aria: { hidden: true }) +
           render(Blacklight::Icons::SearchComponent.new)
       end
     end

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

@@ -1,4 +1,4 @@
-<div id="appliedParams" class="clearfix constraints-container">
-  <%= render 'start_over' %>
+<div id="appliedParams" class="clearfix constraints-container mb-2">
+  <%= start_over %>
   <%= link_back_to_catalog class: 'btn btn-outline-secondary' %>
 </div>

data/app/components/blacklight/search_context/server_applied_params_component.rb

@@ -2,12 +2,21 @@
 
 module Blacklight
   module SearchContext
+    # This is displayed on the show page when the user has a search session.
     class ServerAppliedParamsComponent < Blacklight::Component
       delegate :current_search_session, :link_back_to_catalog, to: :helpers
 
       def render?
         current_search_session
       end
+
+      def start_over
+        render start_over_component.new
+      end
+
+      def start_over_component
+        Blacklight::StartOverButtonComponent
+      end
     end
   end
 end

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

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

data/app/components/blacklight/skip_link_component.rb

@@ -3,11 +3,11 @@
 module Blacklight
   class SkipLinkComponent < Blacklight::Component
     def link_to_search
-      link_to t('blacklight.skip_links.search_field'), search_id, class: link_classes
+      render skip_link_item_component.new(text: t('blacklight.skip_links.search_field'), href: search_id)
     end
 
     def link_to_main
-      link_to t('blacklight.skip_links.main_content'), '#main-container', class: link_classes
+      render skip_link_item_component.new(text: t('blacklight.skip_links.main_content'), href: '#main-container')
     end
 
     def search_id
@@ -16,8 +16,12 @@ module Blacklight
       '#q'
     end
 
+    delegate :blacklight_config, to: :helpers
+    delegate :skip_link_item_component, to: :blacklight_config
+
     def link_classes
-      'd-inline-flex p-2 m-1'
+      Blacklight.deprecation.warn("Use SkipLinkItemComponent instead")
+      'visually-hidden-focusable rounded-bottom py-2 px-3'
     end
   end
 end

data/app/components/blacklight/skip_link_item_component.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class SkipLinkItemComponent < Blacklight::Component
+    def initialize(text:, href:)
+      @text = text
+      @href = href
+    end
+
+    def call
+      link_to @text, @href, class: link_classes
+    end
+
+    def link_classes
+      'd-inline-flex py-2 px-3'
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 <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">
+    <button class="navbar-toggler" 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">
       <span class="navbar-toggler-icon"></span>
     </button>
 

data/app/controllers/concerns/blacklight/catalog.rb

@@ -83,10 +83,11 @@ module Blacklight::Catalog
     @facet = blacklight_config.facet_fields[params[:id]]
     raise ActionController::RoutingError, 'Not Found' unless @facet
 
-    @response = if params[:query_fragment].present?
+    query_fragment = params[:query_fragment] || ''
+    @response = if query_fragment.present?
                   search_service.facet_suggest_response(@facet.key, params[:query_fragment])
                 else
-                  search_service.facet_field_response(@facet.key)
+                  @response = search_service.facet_field_response(@facet.key)
                 end
     @display_facet = @response.aggregations[@facet.field]
 

data/app/controllers/concerns/blacklight/search_context.rb

@@ -133,21 +133,9 @@ module Blacklight::SearchContext
 
   # A list of query parameters that should not be persisted for a search
   def nonpersisted_search_session_params
-    unless method(:blacklisted_search_session_params).source_location.first.end_with?('deprecation/method_wrappers.rb')
-      # The blacklisted_search_session_params was overridden, so call it.
-      Blacklight.deprecation.warn(self, "blacklisted_search_session_params was overriden in your app, " \
-                                        "but that method should be renamed to `nonpersisted_search_session_params'. " \
-                                        "The original behavior will be removed in the next major release.")
-      return blacklisted_search_session_params
-    end
     [:commit, :counter, :total, :search_id, :page, :per_page]
   end
 
-  def blacklisted_search_session_params
-    nonpersisted_search_session_params
-  end
-  Blacklight.deprecation.deprecate_methods(self, blacklisted_search_session_params: 'use nonpersisted_search_session_params instead')
-
   # calls setup_previous_document then setup_next_document.
   # used in the show action for single view pagination.
   def setup_next_and_previous_documents

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -41,10 +41,4 @@ module Blacklight::BlacklightHelperBehavior
   def self.blacklight_gem_path
     @blacklight_gem_path ||= Gem.loaded_specs["blacklight"].full_gem_path
   end
-
-  def partial_from_blacklight?(partial)
-    path = lookup_context.find_all(partial, lookup_context.prefixes + [""], true).first&.identifier
-
-    path.nil? ? false : path.starts_with?(Blacklight::BlacklightHelperBehavior.blacklight_gem_path)
-  end
 end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -102,16 +102,6 @@ module Blacklight::CatalogHelperBehavior
     (blacklight_config.sort_fields.values.find { |f| f.sort == @response.sort } if @response && @response.sort.present?) || blacklight_config.sort_fields[params[:sort]] || default_sort_field
   end
 
-  ##
-  # 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?
   #
@@ -197,7 +187,7 @@ module Blacklight::CatalogHelperBehavior
   # Get the current "view type" (and ensure it is a valid type)
   #
   # @param [Hash] query_params the query parameters to check
-  # @return [Symbol]
+  # @return [Symbol] (e.g. :index, :gallery)
   def document_index_view_type query_params = params || {}
     view_param = query_params[:view]
     view_param ||= session[:preferred_view] if respond_to?(:session)

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -91,18 +91,6 @@ module Blacklight::ConfigurationHelperBehavior
     (active_sort_fields.find { |_k, config| config.respond_to?(:default) && config.default } || active_sort_fields.first)&.last
   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?
-
-    blacklight_config.per_page.map do |count|
-      [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/document_helper_behavior.rb

@@ -24,32 +24,6 @@ module Blacklight::DocumentHelperBehavior
     'blacklight-'
   end
 
-  ##
-  # Render the sidebar partial for a document
-  # This is used as an integration point by downstream apps to add to the
-  # default sidebar.
-  # See: https://github.com/geoblacklight/geoblacklight/blob/7d3c31c7af3362879b97e2c1351a2496c728c59c/app/helpers/blacklight_helper.rb#L7
-  #
-  # @param [SolrDocument] document
-  # @deprecated
-  # @return [String]
-  def render_document_sidebar_partial(document)
-    unless @render_document_sidebar_partials_deprecation_warning_shown
-      partials = lookup_context.find_all('show_sidebar', lookup_context.prefixes, true, [], {})
-      unless partials.first.identifier.starts_with? Blacklight.root
-        Blacklight.deprecation.warn('The partial catalog/_show_sidebar.html.erb will not be rendered by #render_document_sidebar_partial in Blacklight 9.0.' \
-                                    'Configure blacklight_config.show.sidebar_component instead (default Blacklight::Search::SidebarComponent).')
-        @render_document_sidebar_partials_deprecation_warning_shown = true
-      end
-    end
-
-    render 'show_sidebar', document: document
-  end
-
-  Blacklight.deprecation.deprecate_methods(self,
-                                           render_document_sidebar_partial: 'has been replaced by calling the sidebar component (Blacklight::Search::SidebarComponent) directly. ' \
-                                                                            'Set sidebar_component in the view config.')
-
   ##
   # return the Bookmarks on a set of documents (all bookmarks on the page)
   # @private

data/app/helpers/blacklight/icon_helper_behavior.rb

@@ -4,18 +4,10 @@
 # Module to help generate icon helpers for SVG images
 module Blacklight::IconHelperBehavior
   ##
-  # Returns the raw SVG (String) for a Blacklight Icon located in
-  # app/assets/images/blacklight/*.svg. Caches them so we don't have to look up
-  # the svg everytime.
+  # Returns the raw SVG (String) for a Blacklight Icon
   # @param [String, Symbol] icon_name
   # @return [String]
   def blacklight_icon(icon_name, **kwargs)
     render "Blacklight::Icons::#{icon_name.to_s.camelize}Component".constantize.new(**kwargs)
-  rescue NameError
-    Blacklight.deprecation.warn(
-      "Falling back on the LegacyIconComponent with \"#{icon_name}\" is deprecated. Instead create the component `Blacklight::Icons::#{icon_name.to_s.camelize}Component` for this icon."
-    )
-
-    render Blacklight::Icons::LegacyIconComponent.new(name: icon_name, **kwargs)
   end
 end

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -55,8 +55,8 @@ module Blacklight
     #
     # @param [Hash] options
     # @return [String]
-    def render_nav_actions(options = {}, &block)
-      render_filtered_partials(blacklight_config.navbar.partials, options, &block)
+    def render_nav_actions(options = {}, &)
+      render_filtered_partials(blacklight_config.navbar.partials, options, &)
     end
 
     ##