blacklight 9.0.0.beta1 → 9.0.0

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

@@ -27,8 +27,8 @@
       <div class="limit-criteria mb-4">
         <h2 class="limit-criteria-heading h3"><%= t('blacklight.advanced_search.form.limit_criteria_heading_html')%></h2>
 
-        <div id="advanced_search_facets" class="limit_input row">
-          <div class="advanced-facet-limits panel-group col-md-9 offset-md-3">
+        <div id="advanced_search_facets" class="facets limit_input row">
+          <div class="advanced-facet-limits accordion col-md-9 offset-md-3">
             <% search_filter_controls.each do |control| %>
               <%= control %>
             <% end %>
@@ -39,7 +39,7 @@
   </div>
 
   <% if sort_fields_select %>
-    <div class="form-group row mb-4">
+    <div class="row mb-4">
       <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), id: 'advanced-search-sort-label', class: 'col-md-3 text-md-right' %>
       <div class="col-md-9">
         <%= sort_fields_select %>
@@ -47,7 +47,7 @@
     </div>
   <% end %>
 
-  <div class="form-group row">
+  <div class="row">
     <div class="submit-buttons col-md-9 offset-md-3">
       <%= submit_tag t('blacklight.advanced_search.form.search_btn_html'), class: 'btn btn-primary advanced-search-submit', id: "advanced-search-submit" %>
       <%= link_to t('blacklight.advanced_search.form.start_over_html'), request.path, :class =>"btn btn-link advanced-search-start-over" %>

data/app/components/blacklight/advanced_search_form_component.rb

@@ -11,8 +11,8 @@ module Blacklight
       component.new(facet_field: presenter, **kwargs)
     end)
 
-    def initialize(response:, **options)
-      super(**options)
+    def initialize(response:, **)
+      super(**)
       @response = response
     end
 
@@ -31,7 +31,7 @@ module Blacklight
       options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
       return unless options.any?
 
-      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select custom-select sort-select w-auto", aria: { labelledby: 'advanced-search-sort-label' })
+      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select sort-select w-auto", aria: { labelledby: 'advanced-search-sort-label' })
     end
 
     # Filtered params to pass to hidden search fields
@@ -46,7 +46,7 @@ module Blacklight
       search_fields.values.each.with_index do |field, i|
         with_search_field_control do
           fields_for('clause[]', i, include_id: false) do |f|
-            content_tag(:div, class: 'form-group advanced-search-field row mb-3') do
+            content_tag(:div, class: 'advanced-search-field row mb-3') do
               f.label(:query, field.display_label('search'), class: "col-sm-3 col-form-label text-md-right") +
                 content_tag(:div, class: 'col-sm-9') do
                   f.hidden_field(:field, value: field.key) +
@@ -68,7 +68,8 @@ module Blacklight
     end
 
     def initialize_constraints
-      params = helpers.search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
+      params = helpers.search_state.params_for_search.except :clause, :page, :f_inclusive, :q, :search_field, :op,
+                                                             :index, :sort
 
       adv_search_context = helpers.search_state.reset(params)
 

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

@@ -1,5 +1 @@
-<%= render(@layout.new(
-      classes: (Array(@classes) + ["filter-#{@facet_item_presenter.key.parameterize}"]).join(' '),
-      label: @facet_item_presenter.field_label,
-      value: @facet_item_presenter.constraint_label,
-      remove_path: @facet_item_presenter.remove_href)) %>
+<%= render @layout.new(classes: classes, label: field_label, value: constraint_label, remove_path: remove_href) %>

data/app/components/blacklight/constraint_component.rb

@@ -4,10 +4,21 @@ module Blacklight
   class ConstraintComponent < Blacklight::Component
     with_collection_parameter :facet_item_presenter
 
+    # @param [Blacklight::FacetItemPresenter] facet_item_presenter
+    # @param [Array<String>] classes
+    # @param [Blacklight::ConstraintLayoutComponent] layout
     def initialize(facet_item_presenter:, classes: %w[filter mx-1], layout: Blacklight::ConstraintLayoutComponent)
       @facet_item_presenter = facet_item_presenter
       @classes = classes
       @layout = layout
     end
+
+    attr_accessor :facet_item_presenter
+
+    delegate :field_label, :constraint_label, :remove_href, to: :facet_item_presenter
+
+    def classes
+      @classes + ["filter-#{facet_item_presenter.key.parameterize}"]
+    end
   end
 end

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

@@ -7,10 +7,5 @@
       <%= content_tag :span, @value, class: 'filter-value', title: strip_tags(@value) %>
     <% end %>
   </span>
-  <% if @remove_path.present? %>
-    <%= link_to(@remove_path, class: 'btn btn-outline-secondary remove') do %>
-      <%= render Blacklight::Icons::RemoveComponent.new(aria_hidden: true) %>
-      <span class="visually-hidden"><%= remove_aria_label %></span>
-    <% end %>
-  <% end %>
+  <%= remove_button %>
 </span>

data/app/components/blacklight/constraint_layout_component.rb

@@ -21,5 +21,14 @@ module Blacklight
     def render?
       @value.present?
     end
+
+    def remove_button
+      return unless @remove_path
+
+      link_to(@remove_path, class: 'btn btn-outline-secondary remove') do
+        render(Blacklight::Icons::RemoveComponent.new(aria_hidden: true)) +
+          tag.span(remove_aria_label, class: "visually-hidden")
+      end
+    end
   end
 end

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

@@ -1,13 +1,6 @@
 <%= content_tag @tag || :div, id: @id, class: @classes do %>
-  <% if @render_headers %>
-    <h2 class="visually-hidden"><%= t('blacklight.search.search_constraints_header') %></h2>
-  <% end %>
-
-  <%= render @start_over_component.new if @start_over_component %>
+  <%= constraints_heading %>
 
-  <% if @render_headers %>
-    <span class="constraints-label visually-hidden"><%= t('blacklight.search.filters.title') %></span>
-  <% end %>
   <% if query_constraints_area.present? %>
     <% query_constraints_area.each do |constraint| %>
       <%= constraint %>
@@ -27,4 +20,6 @@
   <% additional_constraints.each do |constraints| %>
     <%= constraints %>
   <% end %>
+
+  <%= render @start_over_component.new if @start_over_component %>
 <% end %>

data/app/components/blacklight/constraints_component.rb

@@ -6,21 +6,23 @@ module Blacklight
     renders_many :facet_constraints_area
     renders_many :additional_constraints
 
-    def self.for_search_history(**kwargs)
-      new(tag: :span,
-          render_headers: false,
+    # Constraints are stored and used to display search history - with this method, we initialize the ConstraintsComponent
+    # in a way that displays well in a table (and without a start-over button)
+    def self.for_search_history(**)
+      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 mb-2',
+                   heading_classes: 'constraints-label h6 mb-0',
+                   id: 'appliedParams', classes: 'clearfix constraints-container mb-2 align-items-center',
                    query_constraint_component: Blacklight::ConstraintLayoutComponent,
                    query_constraint_component_options: {},
                    facet_constraint_component: Blacklight::ConstraintComponent,
@@ -33,12 +35,14 @@ module Blacklight
       @facet_constraint_component_options = facet_constraint_component_options
       @start_over_component = start_over_component
       @render_headers = render_headers
+      @heading_classes = heading_classes
       @tag = tag
       @id = id
       @classes = classes
     end
     # rubocop:enable Metrics/ParameterLists
 
+    # @return [String] HTML representation of query constraints
     def query_constraints
       if @search_state.query_param.present?
         render(
@@ -56,41 +60,54 @@ module Blacklight
       end + render(@facet_constraint_component.with_collection(clause_presenters.to_a, **@facet_constraint_component_options))
     end
 
+    # @return [String] URL path to remove the current query
     def remove_path
       helpers.search_action_path(@search_state.remove_query_params)
     end
 
+    # @return [String] HTML representation of facet constraints
     def facet_constraints
-      render(@facet_constraint_component.with_collection(facet_item_presenters.to_a, **@facet_constraint_component_options))
+      render(@facet_constraint_component.with_collection(constraint_presenters.to_a, **@facet_constraint_component_options))
     end
 
+    # @return [Boolean] true if search state has constraints
     def render?
       @search_state.has_constraints?
     end
 
     private
 
+    # @return [String, nil] label for the search field if not the default search field
     def label
       search_field = @search_state.params[:search_field]
       helpers.label_for_search_field(search_field) unless helpers.default_search_field?(search_field)
     end
 
-    def facet_item_presenters
-      return to_enum(:facet_item_presenters) unless block_given?
+    # Yields constraint presenters for each facet value
+    #
+    # @yield [Blacklight::ConstraintPresenter] facet constraint presenter
+    # @return [Enumerator] if no block given
+    def constraint_presenters
+      return to_enum(:constraint_presenters) unless block_given?
 
       @search_state.filters.map do |facet|
+        facet_field_presenter = helpers.facet_field_presenter(facet.config, {})
         facet.each_value do |val|
           next if val.blank?
 
           if val.is_a?(Array)
-            yield inclusive_facet_item_presenter(facet.config, val, facet.key) if val.any?(&:present?)
+            yield inclusive_facet_constraint_presenter(facet_field_presenter, facet.config, val, facet.key) if val.any?(&:present?)
           else
-            yield facet_item_presenter(facet.config, val, facet.key)
+            yield facet_constraint_presenter(facet_field_presenter, facet.config, val)
           end
         end
       end
     end
 
+    # Yields clause presenters for search clauses
+    #
+    # @yield [Blacklight::ClausePresenter] clause presenter
+    # @return [Enumerator] if no block given
     def clause_presenters
       return to_enum(:clause_presenters) unless block_given?
 
@@ -100,12 +117,40 @@ module Blacklight
       end
     end
 
-    def facet_item_presenter(facet_config, facet_item, facet_field)
-      facet_config.item_presenter.new(facet_item, facet_config, helpers, facet_field)
+    # Creates a facet constraint presenter for a single facet item
+    #
+    # @param facet_field_presenter [Blacklight::FacetFieldPresenter] presenter for the facet field
+    # @param facet_config [Blacklight::Configuration::FacetField] configuration for the facet
+    # @param facet_item [String] the facet item
+    # @return [Blacklight::ConstraintPresenter] constraint presenter for the facet item
+    def facet_constraint_presenter(facet_field_presenter, facet_config, facet_item)
+      facet_config.constraint_presenter.new(facet_item_presenter: facet_field_presenter.item_presenter(facet_item), field_label: facet_field_presenter.label)
     end
 
-    def inclusive_facet_item_presenter(facet_config, facet_item, facet_field)
-      Blacklight::InclusiveFacetItemPresenter.new(facet_item, facet_config, helpers, facet_field)
+    # Creates a constraint presenter for an inclusive facet (multiple values)
+    #
+    # @param facet_field_presenter [Blacklight::FacetFieldPresenter] presenter for the facet field
+    # @param facet_config [Blacklight::Configuration::FacetField] configuration for the facet
+    # @param facet_item [Array] array of facet items
+    # @param facet_field [Symbol, String] the facet field name
+    # @return [Blacklight::ConstraintPresenter] constraint presenter for the inclusive facet
+    def inclusive_facet_constraint_presenter(facet_field_presenter, facet_config, facet_item, facet_field)
+      facet_config.constraint_presenter.new(
+        facet_item_presenter: Blacklight::InclusiveFacetItemPresenter.new(facet_item, facet_config, helpers, facet_field),
+        field_label: facet_field_presenter.label
+      )
+    end
+
+    # Returns a heading tag for the constraints section
+    #
+    # @return [ActiveSupport::SafeBuffer, nil] constraints heading html
+    def constraints_heading
+      return unless @render_headers
+
+      tag.h2(
+        t('blacklight.search.filters.title'),
+        class: @heading_classes
+      )
     end
   end
 end

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

@@ -61,9 +61,7 @@ module Blacklight
         end
       end
 
-      def key
-        @action.key
-      end
+      delegate :key, to: :@action
     end
   end
 end

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

@@ -1,7 +1,7 @@
 <%- # we don't use the per-form csrf token -%>
 <%= form_tag(bookmark_path,
              authenticity_token: false,
-             method:  bookmarked? ? :delete : :put,
+             method: bookmarked? ? :delete : :put,
              class: "bookmark-toggle",
              data: {
                present: t('blacklight.search.bookmarks.present'),
@@ -9,8 +9,8 @@
                inprogress: t('blacklight.search.bookmarks.inprogress')
             }) do %>
   <div class="toggle-bookmark">
-    <label class="toggle-bookmark-label" data-checkboxsubmit-target="label">
-      <input type="checkbox" class="toggle-bookmark-input <%= bookmark_icon ? 'd-none' : '' %>" data-checkboxsubmit-target="checkbox" <%= 'checked="checked"' if bookmarked? %>>
+    <label class="toggle-bookmark-label" data-checkboxsubmit-target="label" <% if bookmark_icon %>tabindex="0"<% end %>>
+      <input type="checkbox" class="toggle-bookmark-input <%= bookmark_icon ? 'd-none' : '' %>" data-checkboxsubmit-target="checkbox" <%= 'checked=checked' if bookmarked? %>>
       <%= bookmark_icon %>
       <span data-checkboxsubmit-target="span"><%= bookmarked? ? t('blacklight.search.bookmarks.present') : t('blacklight.search.bookmarks.absent') %></span>
     </label>

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

@@ -3,16 +3,22 @@
 module Blacklight
   module Document
     # Render a bookmark widget to bookmark / unbookmark a document
-    class BookmarkComponent < Blacklight::Document::ActionComponent
+    class BookmarkComponent < Blacklight::Component
       # @param [Blacklight::Document] document
-      # @param [Blacklight::Configuration::ToolConfig] action
+      # @param [Blacklight::Configuration::ToolConfig] action - only used to pass a key for the wrapping action.
       # @param [Boolean] checked
       # @param [Object] bookmark_path the rails route to use for bookmarks
-      def initialize(document:, action: nil, checked: nil, bookmark_path: nil, **kwargs)
+      def initialize(document:, action: nil, checked: nil, bookmark_path: nil, **)
         @document = document
         @checked = checked
         @bookmark_path = bookmark_path
-        super(document: document, action: action, **kwargs)
+        @action = action
+        super()
+      end
+
+      # Used by ActionsComponent
+      def key
+        @action&.key || :bookmark
       end
 
       def bookmarked?

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

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

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

@@ -15,8 +15,8 @@ module Blacklight
         @document.more_like_this.present?
       end
 
-      def link_to_document(*args)
-        helpers.link_to_document(*args)
+      def link_to_document(*)
+        helpers.link_to_document(*)
       end
     end
   end

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

@@ -4,12 +4,12 @@ module Blacklight
   module Document
     # Render the start over and prev/next displays
     class PageHeaderComponent < Blacklight::Component
-      attr_reader :document, :blacklight_config, :search_context, :search_session
+      attr_reader :document, :search_context, :search_session
 
       delegate :blacklight_config, to: :helpers
 
       def initialize(document:, search_context:, search_session:)
-        super
+        super()
         @search_context = search_context
         @search_session = search_session
         @document = document
@@ -40,7 +40,7 @@ module Blacklight
       end
 
       def header_container_classes
-        has_header_tools? ? 'row pagination-search-widgets pb-3' : 'pagination-search-widgets pb-3'
+        has_header_tools? ? 'row pagination-search-widgets pb-3 mb-3' : 'pagination-search-widgets pb-3 mb-3'
       end
 
       def header_actions

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

@@ -1,7 +1,3 @@
-<% value = presenter.thumbnail.render(@image_options) %>
-
-<% if value %>
-  <div class="document-thumbnail">
-    <%= helpers.link_to_document(presenter.document, value, 'aria-hidden': true, tabindex: -1, counter: @counter) %>
-  </div>
-<% end %>
+<div class="document-thumbnail">
+  <%= helpers.link_to_document(presenter.document, thumbnail_value, 'aria-hidden': true, tabindex: -1, counter: @counter) %>
+</div>

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

@@ -9,19 +9,20 @@ module Blacklight
       # @param [Blacklight::DocumentPresenter] presenter
       # @param [Integer] counter
       # @param [Hash] image_options options for the thumbnail presenter's image tag
-      def initialize(counter:, presenter: nil, document: nil, image_options: {})
+      def initialize(counter:, presenter: nil, image_options: {})
         @presenter = presenter
-        @document = presenter&.document || document
         @counter = counter
         @image_options = { alt: '' }.merge(image_options)
       end
 
-      def render?
-        presenter.thumbnail.exists?
+      attr_accessor :presenter
+
+      def thumbnail_value
+        @thumbnail_value ||= presenter.thumbnail.render(@image_options)
       end
 
-      def presenter
-        @presenter ||= helpers.document_presenter(@document)
+      def render?
+        presenter.thumbnail && thumbnail_value
       end
     end
   end

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

@@ -1,11 +1,11 @@
 <%= content_tag @component,
   id: @id,
   data: {
-    'document-id': @document.id.to_s.parameterize,
-    'document-counter': @counter,
+    'document-id': document.id.to_s.parameterize,
+    'document-counter': counter,
   },
   itemscope: true,
-  itemtype: @document.itemtype,
+  itemtype: document.itemtype,
   class: classes.flatten.join(' ') do %>
   <%= header %>
   <% if body.present? %>

data/app/components/blacklight/document_component.rb

@@ -33,40 +33,36 @@ module Blacklight
     renders_one :body
 
     # The document title with some reasonable default behavior
-    renders_one :title, (lambda do |*args, component: nil, **kwargs|
-      component ||= view_config.title_component || Blacklight::DocumentTitleComponent
+    renders_one :title, (lambda do |component: nil, **kwargs|
+      component ||= view_config.document_title_component
 
-      component.new(*args, counter: @counter, document: @document, presenter: @presenter, as: @title_component, actions: !@show, link_to_document: !@show, document_component: self, **kwargs)
+      component&.new(counter: @counter, presenter: @presenter, as: @title_component, actions: !@show, link_to_document: !@show, document_component: self, **kwargs)
     end)
 
-    renders_one :embed, (lambda do |static_content = nil, *args, component: nil, **kwargs|
+    renders_one :embed, (lambda do |static_content = nil, component: nil, **kwargs|
       next static_content if static_content.present?
 
-      component ||= view_config.embed_component
-
-      next unless component
-
-      component.new(*args, document: @document, presenter: @presenter, document_counter: @document_counter, **kwargs)
+      component ||= view_config.document_embed_component
+      component&.new(presenter: @presenter, document_counter: @document_counter, **kwargs)
     end)
 
     # The primary metadata section
-    renders_one :metadata, (lambda do |static_content = nil, *args, component: nil, fields: nil, **kwargs|
+    renders_one :metadata, (lambda do |static_content = nil, component: nil, fields: nil, **kwargs|
       next static_content if static_content.present?
 
-      component ||= view_config.metadata_component || Blacklight::DocumentMetadataComponent
-
-      component.new(*args, fields: fields || @presenter&.field_presenters || [], **kwargs)
+      component ||= view_config.document_metadata_component
+      component&.new(fields: fields || @presenter&.field_presenters || [], **kwargs)
     end)
 
     # Additional metadata sections
     renders_many :metadata_sections
 
-    renders_one :thumbnail, (lambda do |image_options_or_static_content = {}, *args, component: nil, **kwargs|
+    renders_one :thumbnail, (lambda do |image_options_or_static_content = {}, component: nil, **kwargs|
       next image_options_or_static_content if image_options_or_static_content.is_a? String
 
-      component ||= view_config.thumbnail_component || Blacklight::Document::ThumbnailComponent
+      component ||= view_config.document_thumbnail_component
 
-      component.new(*args, document: @document, presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
+      component&.new(presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
     end)
 
     # A container for partials rendered using the view config partials configuration. Its use is discouraged, but necessary until
@@ -90,18 +86,18 @@ module Blacklight
     def initialize(document: nil, partials: nil,
                    id: nil, classes: [], component: :article, title_component: nil,
                    counter: nil, document_counter: nil, counter_offset: 0,
-                   show: false, **args)
-      @presenter = document || args[self.class.collection_parameter]
+                   show: false)
+      @presenter = document
       @document = @presenter.document
       @view_partials = partials || []
 
       @component = component
       @title_component = title_component
-      @id = id || ('document' if show)
+      @id = id
       @classes = classes
 
       @counter = counter
-      @document_counter = document_counter || args.fetch(self.class.collection_counter_parameter, nil)
+      @document_counter = document_counter
       @counter ||= 1 + @document_counter + counter_offset if @document_counter.present?
 
       @show = show
@@ -119,14 +115,14 @@ module Blacklight
     end
 
     def before_render
-      set_slot(:title, nil) unless title
-      set_slot(:thumbnail, nil) unless thumbnail || show?
-      set_slot(:metadata, nil, fields: presenter.field_presenters, show: @show) unless metadata
-      set_slot(:embed, nil) unless embed
+      with_title unless title
+      with_thumbnail unless thumbnail
+      with_metadata(fields: presenter.field_presenters, show: @show) unless metadata
+      with_embed unless embed
 
       view_partials.each do |view_partial|
         with_partial(view_partial) do
-          helpers.render_document_partial @document, view_partial, component: self, document_counter: @counter
+          helpers.render_document_partial document, view_partial, component: self, document_counter: counter
         end
       end
     end
@@ -135,7 +131,7 @@ module Blacklight
 
     delegate :view_config, to: :@presenter
 
-    attr_reader :document_counter, :presenter, :view_partials
+    attr_reader :document_counter, :counter, :document, :presenter, :view_partials
 
     def show?
       @show

data/app/components/blacklight/document_title_component.rb

@@ -7,12 +7,9 @@ module Blacklight
     renders_many :actions
 
     # rubocop:disable Metrics/ParameterLists
-    def initialize(title = nil, document: nil, presenter: nil, as: :h3, counter: nil, classes: 'index_title document-title-heading col h5', link_to_document: true, document_component: nil,
+    def initialize(title = nil, presenter:, as: :h3, counter: nil, classes: 'index_title document-title-heading col h5', link_to_document: true, document_component: nil,
                    actions: true)
-      raise ArgumentError, 'missing keyword: :document or :presenter' if presenter.nil? && document.nil?
-
       @title = title
-      @document = document
       @presenter = presenter
       @as = as || :h3
       @counter = counter
@@ -20,9 +17,14 @@ module Blacklight
       @link_to_document = link_to_document
       @document_component = document_component
       @actions = actions
+      @document = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(@presenter.document,
+                                                                        "Don't use the @document instance variable. Instead use @presenter",
+                                                                        ActiveSupport::Deprecation.new)
     end
     # rubocop:enable Metrics/ParameterLists
 
+    attr_accessor :presenter
+
     # Content for the document title area; should be an inline element
     def title
       if @link_to_document
@@ -53,11 +55,5 @@ module Blacklight
         t('blacklight.search.documents.counter', counter: @counter)
       end
     end
-
-    private
-
-    def presenter
-      @presenter ||= helpers.document_presenter(@document)
-    end
   end
 end

data/app/components/blacklight/facet_field_checkboxes_component.rb

@@ -1,24 +1,10 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldCheckboxesComponent < Blacklight::Component
-    def initialize(facet_field:, layout: nil)
-      @facet_field = facet_field
-      @layout = layout == false ? FacetFieldNoLayoutComponent : Blacklight::FacetFieldComponent
-    end
-
-    def render?
-      presenters.any?
-    end
-
-    def presenters
-      return [] unless @facet_field.paginator
-
-      return to_enum(:presenters) unless block_given?
-
-      @facet_field.paginator.items.each do |item|
-        yield Blacklight::FacetCheckboxItemPresenter.new(item, @facet_field.facet_field, helpers, @facet_field.key, @facet_field.search_state)
-      end
+  class FacetFieldCheckboxesComponent < Facets::CheckboxesComponent
+    def initialize(...)
+      Rails.logger.warn("Blacklight::FacetFieldCheckboxesComponent is deprecated. Use Blacklight::Facets::CheckboxesComponent instead.")
+      super
     end
   end
 end