blacklight 7.22.2 → 7.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef3dd1b10972d7cb0f68e8cff2414cb9e80a9f46d47a54d16b731069d1d4dcc7
-  data.tar.gz: 0ac493abfd5dbbc181f0d6cce796232f1a69e17d405cbf530460c2e43efccbde
+  metadata.gz: 982aa4e78d4586096d97f31ccfdd52bfbfe5ff7f562248454240bca9c409d910
+  data.tar.gz: b9fc47ba21552ab4f29c166f04585bbbf70b25bdbe818f70d8d3bfd2c891db58
 SHA512:
-  metadata.gz: 4103713063c0c9cafd4526039fcc858d79bc33c8c84d5c07b15b9a45bf01eebe0a7fa345cf1c43da509d22b78403f5ce80e95ac1d43200e0d662a5d2c5420420
-  data.tar.gz: cba37b2ceeb5fcb423361563e7da9004622e29ec7bd64d683625e5ba2b5a022e5c841d2d23f86ecdf2876ba8e004932709e03848731f90942cd0b5c9a1dbcc00
+  metadata.gz: 05d918ebf0f597eaaf5950e34a74785a79a0b7f0174f9d4458c8fa5f906abefb4016f8d307548d80cdc901a7b6a8288083623f9a7db52ebeb6bcc68f29140272
+  data.tar.gz: efcc57d374d646fe0f0113298383244c85180d059db1bb4e4f24537dbf24fee5f38b3a9f8f4ea8b5cbd0bffd3a3bfaffcbf3663d667ea48f33ae26ae0f6837e9

data/.github/workflows/ruby.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, 3.0]
+        ruby: [2.7, '3.0']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [3.0]
+        ruby: ['3.0']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -76,17 +76,17 @@ jobs:
     - name: Install dependencies
       run: bundle install
       env:
-        RAILS_VERSION: 6.0.3.4
+        RAILS_VERSION: 6.0.3.7
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 6.0.3.4
+        RAILS_VERSION: 6.0.3.7
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
   test_rails5_2:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5]
+        ruby: [2.7]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -96,17 +96,38 @@ jobs:
     - name: Install dependencies
       run: bundle install
       env:
-        RAILS_VERSION: 5.2.4.2
+        RAILS_VERSION: 5.2.4.6
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 5.2.4.2
+        RAILS_VERSION: 5.2.4.6
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+
+  test_rails7_0:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['3.0']
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+      env:
+        RAILS_VERSION: 7.0.0
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        RAILS_VERSION: 7.0.0
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-keeps --skip-action-cable --skip-test'
   api_test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, 3.0]
+        ruby: [2.7, '3.0']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/VERSION

@@ -1 +1 @@
-7.22.2
+7.23.0

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -62,6 +62,12 @@
 
   .card-header {
     @extend .bg-success;
+
+    .btn {
+      @if function-exists(color-contrast) {
+        color: color-contrast($success);
+      }
+    }
   }
 }
 

data/app/components/blacklight/advanced_search_form_component.rb

@@ -7,7 +7,7 @@ module Blacklight
     renders_many :constraints
     renders_many :search_field_controls
     renders_many :search_filter_controls, (lambda do |config:, display_facet:, presenter: nil, component: nil, **kwargs|
-      presenter ||= (config.presenter || Blacklight::FacetFieldPresenter).new(config, display_facet, @view_context)
+      presenter ||= (config.presenter || Blacklight::FacetFieldPresenter).new(config, display_facet, helpers)
       component = component || config.advanced_search_component || Blacklight::FacetFieldCheckboxesComponent
 
       component.new(facet_field: presenter, **kwargs)
@@ -30,7 +30,7 @@ module Blacklight
     end
 
     def sort_fields_select
-      options = sort_fields.values.map { |field_config| [@view_context.sort_field_label(field_config.key), field_config.key] }
+      options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
       select_tag(:sort, options_for_select(options, params[:sort]), class: "form-control sort-select")
     end
 
@@ -63,11 +63,11 @@ module Blacklight
 
     def initialize_constraints
       constraint do
-        params = @view_context.search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
+        params = helpers.search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
 
-        params.except!(*search_fields.map { |_key, field_def| field_def[:key] })
+        adv_search_context = helpers.search_state.reset(params)
 
-        @view_context.render_search_to_s(params)
+        Blacklight::ConstraintsComponent.for_search_history(search_state: adv_search_context)
       end
     end
 

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

@@ -1,9 +1,13 @@
-<%= content_tag :div, id: @id, class: @classes do %>
-  <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_constraints_header') %></h2>
+<%= content_tag @tag || :div, id: @id, class: @classes do %>
+  <% if @render_headers %>
+    <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_constraints_header') %></h2>
+  <% end %>
 
-  <%= link_to t('blacklight.search.start_over'), start_over_path, class: "catalog_startOverLink btn btn-primary" %>
+  <%= render @start_over_component.new if @start_over_component %>
 
-  <span class="constraints-label sr-only visually-hidden"><%= t('blacklight.search.filters.title') %></span>
+  <% if @render_headers %>
+    <span class="constraints-label sr-only visually-hidden"><%= t('blacklight.search.filters.title') %></span>
+  <% end %>
   <% if query_constraints_area.present? %>
     <% query_constraints_area.each do |constraint| %>
       <%= constraint %>

data/app/components/blacklight/constraints_component.rb

@@ -8,53 +8,78 @@ module Blacklight
     renders_many :facet_constraints_area
     renders_many :additional_constraints
 
+    def self.for_search_history(**kwargs)
+      new(tag: :span,
+          render_headers: false,
+          id: nil,
+          query_constraint_component: Blacklight::SearchHistoryConstraintLayoutComponent,
+          facet_constraint_component_options: { layout: Blacklight::SearchHistoryConstraintLayoutComponent },
+          start_over_component: nil,
+          **kwargs)
+    end
+
+    # rubocop:disable Metrics/ParameterLists
     def initialize(search_state:,
+                   tag: :div,
+                   render_headers: true,
                    id: 'appliedParams', classes: 'clearfix constraints-container',
-                   query_constraint_component: Blacklight::ConstraintLayoutComponent, facet_constraint_component: Blacklight::ConstraintComponent)
+                   query_constraint_component: Blacklight::ConstraintLayoutComponent,
+                   query_constraint_component_options: {},
+                   facet_constraint_component: Blacklight::ConstraintComponent,
+                   facet_constraint_component_options: {},
+                   start_over_component: Blacklight::StartOverButtonComponent)
       @search_state = search_state
       @query_constraint_component = query_constraint_component
+      @query_constraint_component_options = query_constraint_component_options
       @facet_constraint_component = facet_constraint_component
+      @facet_constraint_component_options = facet_constraint_component_options
+      @start_over_component = start_over_component
+      @render_headers = render_headers
+      @tag = tag
       @id = id
       @classes = classes
     end
+    # rubocop:enable Metrics/ParameterLists
 
     def query_constraints
       Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
         if @search_state.query_param.present?
-          @view_context.render(
+          helpers.render(
             @query_constraint_component.new(
               search_state: @search_state,
               value: @search_state.query_param,
               label: label,
-              remove_path: @view_context.remove_constraint_url(@search_state),
-              classes: 'query'
+              remove_path: helpers.remove_constraint_url(@search_state),
+              classes: 'query',
+              **@query_constraint_component_options
             )
           )
         else
           ''.html_safe
         end
-      end + @view_context.render(@facet_constraint_component.with_collection(clause_presenters.to_a))
+      end + helpers.render(@facet_constraint_component.with_collection(clause_presenters.to_a, **@facet_constraint_component_options))
     end
 
     def facet_constraints
-      @view_context.render(@facet_constraint_component.with_collection(facet_item_presenters.to_a))
-    end
-
-    def start_over_path
-      Deprecation.silence(Blacklight::UrlHelperBehavior) do
-        @view_context.start_over_path
-      end
+      helpers.render(@facet_constraint_component.with_collection(facet_item_presenters.to_a, **@facet_constraint_component_options))
     end
 
     def render?
-      Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) { @view_context.query_has_constraints? }
+      Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) { helpers.query_has_constraints?(@search_state.params) }
     end
 
     private
 
+    # @deprecated
+    def start_over_path
+      Deprecation.silence(Blacklight::UrlHelperBehavior) do
+        helpers.start_over_path
+      end
+    end
+
     def label
       Deprecation.silence(Blacklight::ConfigurationHelperBehavior) do
-        @view_context.constraint_query_label(@search_state.params)
+        helpers.constraint_query_label(@search_state.params)
       end
     end
 
@@ -80,17 +105,17 @@ module Blacklight
       return to_enum(:clause_presenters) unless block_given?
 
       @search_state.clause_params.each do |key, clause|
-        field_config = @view_context.blacklight_config.search_fields[clause[:field]]
-        yield Blacklight::ClausePresenter.new(key, clause, field_config, @view_context)
+        field_config = helpers.blacklight_config.search_fields[clause[:field]]
+        yield Blacklight::ClausePresenter.new(key, clause, field_config, helpers)
       end
     end
 
     def facet_item_presenter(facet_config, facet_item, facet_field)
-      (facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, facet_config, @view_context, facet_field)
+      (facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, facet_config, helpers, facet_field)
     end
 
     def inclusive_facet_item_presenter(facet_config, facet_item, facet_field)
-      Blacklight::InclusiveFacetItemPresenter.new(facet_item, facet_config, @view_context, facet_field)
+      Blacklight::InclusiveFacetItemPresenter.new(facet_item, facet_config, helpers, facet_field)
     end
   end
 end

data/app/components/blacklight/document/action_component.html.erb

@@ -5,5 +5,5 @@
               class: @link_classes,
               data: {}.merge(({ blacklight_modal: "trigger" } if @action.modal != false) || {}) %>
 <% else %>
-  <%= @view_context.render(partial: @action.partial || @action.name.to_s, locals: { document: @document, document_action_config: @action }.merge(@options)) %>
+  <%= helpers.render(partial: @action.partial || @action.name.to_s, locals: { document: @document, document_action_config: @action }.merge(@options)) %>
 <% end %>

data/app/components/blacklight/document/action_component.rb

@@ -20,18 +20,25 @@ module Blacklight
         return true if @action.component
         return false unless @action.partial == 'document_action'
 
-        @view_context.partial_from_blacklight?(@action.partial)
+        helpers.partial_from_blacklight?(@action.partial)
       end
 
       def label
         Deprecation.silence(Blacklight::ComponentHelperBehavior) do
-          @view_context.document_action_label(@action.name, @action)
+          helpers.document_action_label(@action.name, @action)
         end
       end
 
+      # Action buttons get their URLs in one of three ways:
+      # - the action configuration explicitly specifies a helper method to call
+      # - a url route is inferred for ActiveModel-compliant objects (the default;
+      #     note that, although Rails routing is available here, we still call out to
+      #     helpers regardless, because that's where applications might have overridden the
+      #     default Rails routing behavior)
+      # - calling out to an implicit helper method with a conventional name (unlikely)
       def url
         Deprecation.silence(Blacklight::ComponentHelperBehavior) do
-          @view_context.document_action_path(@action, @url_opts.merge(({ id: @document } if @document) || {}))
+          helpers.document_action_path(@action, @url_opts.merge(({ id: @document } if @document) || {}))
         end
       end
 

data/app/components/blacklight/document/bookmark_component.rb

@@ -16,11 +16,11 @@ module Blacklight
       def bookmarked?
         return @checked unless @checked.nil?
 
-        @view_context.bookmarked? @document
+        helpers.bookmarked? @document
       end
 
       def bookmark_path
-        @bookmark_path || @view_context.bookmark_path(@document)
+        @bookmark_path || helpers.bookmark_path(@document)
       end
     end
   end

data/app/components/blacklight/document/citation_component.rb

@@ -23,7 +23,7 @@ module Blacklight
       # @return [String]
       def title
         Deprecation.silence(Blacklight::BlacklightHelperBehavior) do
-          @view_context.document_heading(@document)
+          helpers.document_heading(@document)
         end
       end
     end

data/app/components/blacklight/document/group_component.html.erb

@@ -4,6 +4,6 @@
     <%= grouped_documents %>
   </div>
   <%- if @group_limit > 0 && @group.total > @group_limit %>
-    <%= @view_context.link_to t('blacklight.search.group.more'), add_group_facet_params_and_redirect(@group), class: 'more-in-group' %>
+    <%= helpers.link_to t('blacklight.search.group.more'), add_group_facet_params_and_redirect(@group), class: 'more-in-group' %>
   <%- end %>
 </div>

data/app/components/blacklight/document/group_component.rb

@@ -13,12 +13,12 @@ module Blacklight
       end
 
       def grouped_documents
-        @view_context.render_document_index @group.docs
+        helpers.render_document_index @group.docs
       end
 
       def add_group_facet_params_and_redirect(group)
         Deprecation.silence(Blacklight::UrlHelperBehavior) do
-          @view_context.search_action_path(@view_context.add_group_facet_params_and_redirect(group))
+          helpers.search_action_path(helpers.add_group_facet_params_and_redirect(group))
         end
       end
     end

data/app/components/blacklight/document/more_like_this_component.html.erb

@@ -2,7 +2,7 @@
   <div class="card-header">More Like This</div>
   <div class="card-body">
     <ul>
-      <%= @document.more_like_this.each do |document| %>
+      <% @document.more_like_this.each do |document| %>
         <li class="more_like_this_document">
           <span class="mlt_title"><%= link_to_document document %></span>
         </li>

data/app/components/blacklight/document/more_like_this_component.rb

@@ -16,7 +16,7 @@ module Blacklight
       end
 
       def link_to_document(*args)
-        @view_context.link_to_document(*args)
+        helpers.link_to_document(*args)
       end
     end
   end

data/app/components/blacklight/document/thumbnail_component.rb

@@ -29,7 +29,7 @@ module Blacklight
       end
 
       def presenter
-        @presenter ||= @view_context.document_presenter(@document)
+        @presenter ||= helpers.document_presenter(@document)
       end
     end
   end

data/app/components/blacklight/document_component.rb

@@ -114,7 +114,7 @@ module Blacklight
     def classes
       [
         @classes,
-        @view_context.render_document_class(@document),
+        helpers.render_document_class(@document),
         'document',
         ("document-position-#{@counter}" if @counter)
       ].compact.flatten
@@ -130,7 +130,7 @@ module Blacklight
     private
 
     def presenter
-      @presenter ||= @view_context.document_presenter(@document)
+      @presenter ||= helpers.document_presenter(@document)
     end
 
     def show?

data/app/components/blacklight/document_title_component.rb

@@ -24,7 +24,7 @@ module Blacklight
     # Content for the document title area; should be an inline element
     def title
       if @link_to_document
-        @view_context.link_to_document presenter.document, @title.presence || content.presence, counter: @counter, itemprop: 'name'
+        helpers.link_to_document presenter.document, @title.presence || content.presence, counter: @counter, itemprop: 'name'
       else
         content_tag('span', @title.presence || content.presence || presenter.heading, itemprop: 'name')
       end
@@ -39,7 +39,7 @@ module Blacklight
 
       (@has_actions_slot && get_slot(:actions)) ||
         ([@document_component&.actions] if @document_component&.actions.present?) ||
-        [@view_context.render_index_doc_actions(presenter.document, wrapping_class: 'index-document-functions col-sm-3 col-lg-2')]
+        [helpers.render_index_doc_actions(presenter.document, wrapping_class: 'index-document-functions col-sm-3 col-lg-2')]
     end
 
     def counter
@@ -53,7 +53,7 @@ module Blacklight
     private
 
     def presenter
-      @presenter ||= @view_context.document_presenter(@document)
+      @presenter ||= helpers.document_presenter(@document)
     end
   end
 end

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 || Blacklight::FacetItemPresenter).new(item, @facet_field.facet_field, @view_context, @facet_field.key, @facet_field.search_state)
+        yield (@facet_field.facet_field.item_presenter || Blacklight::FacetItemPresenter).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">
-    <%= @view_context.render(Blacklight::FacetItemComponent.with_collection(presenters.to_a)) %>
+    <%= helpers.render(Blacklight::FacetItemComponent.with_collection(presenters.to_a)) %>
   </ul>
 </div>

data/app/components/blacklight/facet_field_inclusive_constraint_component.rb

@@ -22,7 +22,7 @@ module Blacklight
       return to_enum(:presenters) unless block_given?
 
       values.each do |item|
-        yield Blacklight::FacetGroupedItemPresenter.new(values, item, @facet_field.facet_field, @view_context, @facet_field.key, @facet_field.search_state)
+        yield Blacklight::FacetGroupedItemPresenter.new(values, item, @facet_field.facet_field, helpers, @facet_field.key, @facet_field.search_state)
       end
     end
   end

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

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

data/app/components/blacklight/facet_field_list_component.rb

@@ -11,7 +11,7 @@ module Blacklight
     # @private
     def render_facet_limit_list(*args)
       Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-        @view_context.render_facet_limit_list(*args)
+        helpers.render_facet_limit_list(*args)
       end
     end
 

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

@@ -1,9 +1,9 @@
 <div class="prev_next_links btn-group">
-  <%= @view_context.link_to_previous_page @facet_field.paginator, raw(t('views.pagination.previous')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
+  <%= helpers.link_to_previous_page @facet_field.paginator, raw(t('views.pagination.previous')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
     <%= content_tag :span, raw(t('views.pagination.previous')), class: 'disabled btn' %>
   <% end %>
 
-  <%= @view_context.link_to_next_page @facet_field.paginator, raw(t('views.pagination.next')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link',  data: { blacklight_modal: "preserve" } do %>
+  <%= helpers.link_to_next_page @facet_field.paginator, raw(t('views.pagination.next')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link',  data: { blacklight_modal: "preserve" } do %>
     <%= content_tag :span, raw(t('views.pagination.next')), class: 'disabled btn' %>
   <% end %>
 </div>
@@ -11,9 +11,9 @@
 <div class="sort-options btn-group">
   <% if @facet_field.paginator.sort == 'index' -%>
     <span class="active az btn btn-outline-secondary"><%= t('blacklight.search.facets.sort.index') %></span>
-    <%= @view_context.link_to(t('blacklight.search.facets.sort.count'), sort_facet_url('count'), class: "sort_change numeric btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>
+    <%= helpers.link_to(t('blacklight.search.facets.sort.count'), sort_facet_url('count'), class: "sort_change numeric btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>
   <% elsif @facet_field.paginator.sort == 'count' -%>
-    <%= @view_context.link_to(t('blacklight.search.facets.sort.index'), sort_facet_url('index'), class: "sort_change az btn btn-outline-secondary",  data: { blacklight_modal: "preserve" }) %>
+    <%= helpers.link_to(t('blacklight.search.facets.sort.index'), sort_facet_url('index'), class: "sort_change az btn btn-outline-secondary",  data: { blacklight_modal: "preserve" }) %>
     <span class="active numeric btn btn-outline-secondary"><%= t('blacklight.search.facets.sort.count') %></span>
   <% end -%>
 </div>

data/app/components/blacklight/facet_item_component.rb

@@ -87,7 +87,7 @@ module Blacklight
           # remove link
           link_to(@href, class: "remove", rel: "nofollow") do
             tag.span('✖', class: "remove-icon", aria: { hidden: true }) +
-              tag.span(@view_context.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only visually-hidden')
+              tag.span(helpers.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only visually-hidden')
           end
       end + render_facet_count(classes: ["selected"])
     end
@@ -101,7 +101,7 @@ module Blacklight
     # @return [String]
     # @private
     def render_facet_count(options = {})
-      return @view_context.render_facet_count(@hits, options) unless @view_context.method(:render_facet_count).owner == Blacklight::FacetsHelperBehavior || explicit_component_configuration?
+      return helpers.render_facet_count(@hits, options) unless helpers.method(:render_facet_count).owner == Blacklight::FacetsHelperBehavior || explicit_component_configuration?
 
       return '' if @hits.blank?
 

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -74,11 +74,11 @@ module Blacklight
     # with overrides of deprecated helpers. In 8.x, we can just call Component#render_in
     # and call it a day
     def render_component(component)
-      @view_context.render(component)
+      helpers.render(component)
     end
 
     def facet_item_presenter(facet_item)
-      (@facet_item.facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, @facet_item.facet_config, @view_context, @facet_item.facet_field, @facet_item.search_state)
+      (@facet_item.facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, @facet_item.facet_config, helpers, @facet_item.facet_field, @facet_item.search_state)
     end
   end
 end

data/app/components/blacklight/metadata_field_component.rb

@@ -17,9 +17,9 @@ module Blacklight
     def label
       Deprecation.silence(Blacklight::BlacklightHelperBehavior) do
         if @show
-          @view_context.render_document_show_field_label @field.document, label: @field.label('show'), field: @field.key
+          helpers.render_document_show_field_label @field.document, label: @field.label('show'), field: @field.key
         else
-          @view_context.render_index_field_label @field.document, label: @field.label, field: @field.key
+          helpers.render_index_field_label @field.document, label: @field.label, field: @field.key
         end
       end
     end

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

@@ -23,7 +23,7 @@
 
   <%= content_tag :div, id: @panel_id, class: 'facets-collapse collapse' do %>
     <% Deprecation.silence(Blacklight::FacetsHelperBehavior) do %>
-      <%= @view_context.render_facet_partials @fields, response: @response %>
+      <%= helpers.render_facet_partials @fields, response: @response %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -18,7 +18,7 @@ module Blacklight
 
       def render?
         Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-          @view_context.has_facet_values?(@fields, @response)
+          helpers.has_facet_values?(@fields, @response)
         end
       end
     end

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

@@ -13,7 +13,7 @@ module Blacklight
       end
 
       def pagination
-        @view_context.paginate @response, **@pagination_args
+        helpers.paginate @response, **@pagination_args
       end
     end
   end

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

@@ -1,4 +1,4 @@
-<%= @view_context.render(Blacklight::System::DropdownComponent.new(
+<%= helpers.render(Blacklight::System::DropdownComponent.new(
       param: @param,
       choices: @choices,
       id: @id,

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

@@ -8,18 +8,29 @@ module Blacklight
       # @param [Array<String>] options explicit spellcheck options to render
       def initialize(response:, options: nil)
         @response = response
-        @options = options || @response&.spelling&.words
+        @options = options
+        @options ||= options_from_response(@response)
       end
 
       def link_to_query(query)
         Deprecation.silence(Blacklight::UrlHelperBehavior) do
-          @view_context.link_to_query(query)
+          helpers.link_to_query(query)
         end
       end
 
       def render?
         Deprecation.silence(Blacklight::BlacklightHelperBehavior) do
-          @options.any? && @view_context.should_show_spellcheck_suggestions?(@response)
+          @options&.any? && helpers.should_show_spellcheck_suggestions?(@response)
+        end
+      end
+
+      private
+
+      def options_from_response(response)
+        if response&.spelling&.collation
+          [response.spelling.collation]
+        elsif response&.spelling&.words
+          response.spelling.words
         end
       end
     end