blacklight 7.41.0 → 8.0.0.beta1

data/app/components/blacklight/constraints_component.rb

@@ -2,8 +2,6 @@
 
 module Blacklight
   class ConstraintsComponent < Blacklight::Component
-    include Blacklight::ContentAreasShim
-
     renders_many :query_constraints_area
     renders_many :facet_constraints_area
     renders_many :additional_constraints
@@ -42,60 +40,52 @@ module Blacklight
     # rubocop:enable Metrics/ParameterLists
 
     def query_constraints
-      Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
-        if @search_state.query_param.present?
-          helpers.render(
-            @query_constraint_component.new(
-              search_state: @search_state,
-              value: @search_state.query_param,
-              label: label,
-              remove_path: helpers.remove_constraint_url(@search_state),
-              classes: 'query',
-              **@query_constraint_component_options
-            )
+      if @search_state.query_param.present?
+        helpers.render(
+          @query_constraint_component.new(
+            search_state: @search_state,
+            value: @search_state.query_param,
+            label: label,
+            remove_path: remove_path,
+            classes: 'query',
+            **@query_constraint_component_options
           )
-        else
-          ''.html_safe
-        end
+        )
+      else
+        ''.html_safe
       end + helpers.render(@facet_constraint_component.with_collection(clause_presenters.to_a, **@facet_constraint_component_options))
     end
 
+    def remove_path
+      helpers.search_action_path(@search_state.remove_query_params)
+    end
+
     def facet_constraints
       helpers.render(@facet_constraint_component.with_collection(facet_item_presenters.to_a, **@facet_constraint_component_options))
     end
 
     def render?
-      Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) { helpers.query_has_constraints?(@search_state.params) }
+      @search_state.has_constraints?
     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
-        helpers.constraint_query_label(@search_state.params)
-      end
+      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?
 
-      Deprecation.silence(Blacklight::SearchState) do
-        @search_state.filters.map do |facet|
-          facet.values.map do |val|
-            next if val.blank?
+      @search_state.filters.map do |facet|
+        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?)
-            else
-              yield facet_item_presenter(facet.config, val, facet.key)
-            end
+          if val.is_a?(Array)
+            yield inclusive_facet_item_presenter(facet.config, val, facet.key) if val.any?(&:present?)
+          else
+            yield facet_item_presenter(facet.config, val, facet.key)
           end
         end
       end
@@ -111,7 +101,7 @@ module Blacklight
     end
 
     def facet_item_presenter(facet_config, facet_item, facet_field)
-      (facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, facet_config, helpers, facet_field)
+      facet_config.item_presenter.new(facet_item, facet_config, helpers, facet_field)
     end
 
     def inclusive_facet_item_presenter(facet_config, facet_item, facet_field)

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

@@ -23,10 +23,7 @@ module Blacklight
       end
 
       def using_default_document_action?
-        return true if @action.component
-        return false unless @action.partial == 'document_action'
-
-        helpers.partial_from_blacklight?(@action.partial)
+        @action.component || @action.partial == 'document_action'
       end
 
       def link_to_modal_control
@@ -42,9 +39,7 @@ module Blacklight
       end
 
       def label
-        Deprecation.silence(Blacklight::ComponentHelperBehavior) do
-          helpers.document_action_label(@action.name, @action)
-        end
+        t("blacklight.tools.#{@action.name}", default: @action.label || @action.name.to_s.humanize)
       end
 
       # Action buttons get their URLs in one of three ways:
@@ -55,12 +50,19 @@ module Blacklight
       #     default Rails routing behavior)
       # - calling out to an implicit helper method with a conventional name (unlikely)
       def url
-        Deprecation.silence(Blacklight::ComponentHelperBehavior) do
-          helpers.document_action_path(@action, @url_opts.merge(({ id: @document } if @document) || {}))
+        url_opts = @url_opts.merge(({ id: @document } if @document) || {})
+        if @action.path
+          helpers.public_send(@action.path, url_opts)
+        elsif url_opts[:id].class.respond_to?(:model_name)
+          helpers.url_for([@action.key.to_sym, url_opts[:id]])
+        else
+          helpers.public_send("#{@action.key}_#{helpers.controller_name}_path", url_opts)
         end
       end
 
-      delegate :key, to: :@action
+      def key
+        @action.key
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@
 
 module Blacklight
   module Document
-    # Render a bookmark widget to bookmark / unbookmark a document
+    # Render a the set of actions for a document. One of the default actions is the bookmark control.
     class ActionsComponent < Blacklight::Component
       renders_many :actions, (lambda do |action:, component: nil, **kwargs|
         component ||= action.component || Blacklight::Document::ActionComponent
@@ -28,7 +28,7 @@ module Blacklight
         return if actions.present?
 
         @actions.each do |a|
-          with_action(component: a.component, action: a)
+          action(component: a.component, action: a)
         end
       end
 

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

@@ -1,7 +1,9 @@
 <%-
 # the data-doc-id attribute is used by our JS that converts to a checkbox/label.
+# we don't use the per-form csrf token
 -%>
 <%= form_tag(bookmark_path,
+             authenticity_token: false,
              method:  bookmarked? ? :delete : :put,
              class: "bookmark-toggle",
              data: {
@@ -10,6 +12,13 @@
                absent: t('blacklight.search.bookmarks.absent'),
                inprogress: t('blacklight.search.bookmarks.inprogress')
             }) do %>
+  <div class="checkbox toggle-bookmark">
+    <label class="toggle-bookmark" data-checkboxsubmit-target="label">
+      <input type="checkbox" class="toggle-bookmark" data-checkboxsubmit-target="checkbox" <%= 'checked="checked"' if bookmarked? %>>
+      <span data-checkboxsubmit-target="span"><%= bookmarked? ? t('blacklight.search.bookmarks.present') : t('blacklight.search.bookmarks.absent') %></span>
+    </label>
+  </div>
+
   <%= submit_tag(t(bookmarked? ? 'remove.button' : 'add.button', scope: 'blacklight.bookmarks'),
                  id: "bookmark_toggle_#{@document.id.to_s.parameterize}",
                  class: "bookmark-#{bookmarked? ? 'remove' : 'add'} btn btn-outline-secondary") %>

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

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

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

@@ -22,9 +22,11 @@ module Blacklight
 
       # @return [String]
       def title
-        Deprecation.silence(Blacklight::BlacklightHelperBehavior) do
-          helpers.document_heading(@document)
-        end
+        presenter.heading
+      end
+
+      def presenter
+        helpers.document_presenter(@document)
       end
     end
   end

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

@@ -17,10 +17,14 @@ module Blacklight
         helpers.render_document_index @group.docs
       end
 
+      # Get path to a search within a grouped result set
+      #
+      # @param [Blacklight::Solr::Response::Group] group
+      # @return [Hash]
       def add_group_facet_params_and_redirect(group)
-        Deprecation.silence(Blacklight::UrlHelperBehavior) do
-          helpers.search_action_path(helpers.add_group_facet_params_and_redirect(group))
-        end
+        helpers.search_action_path(
+          helpers.search_state.add_facet_params_and_redirect(group.field, group.key)
+        )
       end
     end
   end

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

@@ -0,0 +1,2 @@
+<%= render 'show_tools', document: document %>
+<%= render(Blacklight::Document::MoreLikeThisComponent.new(document: document)) %>

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Document
+    # Render the sidebar on the show view
+    class SidebarComponent < Blacklight::Component
+      # @param [Blacklight::DocumentPresenter] presenter
+      def initialize(presenter:)
+        @presenter = presenter
+        @document = presenter.document
+      end
+
+      attr_reader :document
+    end
+  end
+end

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

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

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

@@ -9,7 +9,7 @@ module Blacklight
       # @param [Blacklight::DocumentPresenter] presenter
       # @param [Integer] counter
       # @param [Hash] image_options options for the thumbnail presenter's image tag
-      def initialize(presenter: nil, document: nil, counter:, image_options: {})
+      def initialize(counter:, presenter: nil, document: nil, image_options: {})
         @presenter = presenter
         @document = presenter&.document || document
         @counter = counter
@@ -20,14 +20,6 @@ module Blacklight
         presenter.thumbnail.exists?
       end
 
-      def use_thumbnail_tag_behavior?
-        !presenter.thumbnail.instance_of?(Blacklight::ThumbnailPresenter)
-      end
-
-      def warn_about_deprecated_behavior
-        Deprecation.warn(Blacklight::Document::ThumbnailComponent, 'Detected as custom thumbnail presenter; make sure it has a #render method that returns just the thumbnail image tag')
-      end
-
       def presenter
         @presenter ||= helpers.document_presenter(@document)
       end

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

@@ -22,7 +22,7 @@
 
       <% partials.each do |partial| %>
         <%= partial %>
-      <% end if render_partials? %>
+      <% end %>
     </div>
 
     <%= thumbnail %>

data/app/components/blacklight/document_component.rb

@@ -1,32 +1,7 @@
 # frozen_string_literal: true
 
-require 'view_component/version'
-
 module Blacklight
-  ##
-  # A component for rendering a single document
-  #
-  # @note when subclassing this component, if you override the initializer,
-  #    you must explicitly specify the counter variable `document_counter` even if you don't use it.
-  #    Otherwise view_component will not provide the count value when calling the component.
-  #
-  # @see https://viewcomponent.org/guide/collections.html#collection-counter
-  #
-  # @example
-  #  class MyDocumentComponent < Blacklight::DocumentComponent
-  #    def initialize(document_counter: nil, **kwargs)
-  #      super
-  #      ... custom code ...
-  #    end
-  #  end
   class DocumentComponent < Blacklight::Component
-    include Blacklight::ContentAreasShim
-
-    with_collection_parameter :document
-
-    # ViewComponent 3 changes iteration counters to begin at 0 rather than 1
-    COLLECTION_INDEX_OFFSET = ViewComponent::VERSION::MAJOR < 3 ? 0 : 1
-
     # Content appearing before the document
     renders_one :header
 
@@ -39,16 +14,17 @@ module Blacklight
 
     # The document title with some reasonable default behavior
     renders_one :title, (lambda do |*args, component: nil, **kwargs|
-      component ||= @presenter&.view_config&.title_component || Blacklight::DocumentTitleComponent
+      component ||= Blacklight::DocumentTitleComponent
 
-      component.new(*args, counter: @counter, document: @document, presenter: @presenter, as: @title_component, link_to_document: !@show, document_component: self, **kwargs)
+      component.new(*args, counter: @counter, document: @document, 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|
       next static_content if static_content.present?
-      next unless component
 
-      Deprecation.warn(Blacklight::DocumentComponent, 'Pass the presenter to the DocumentComponent') if @presenter.nil?
+      component ||= @presenter.view_config&.embed_component
+
+      next unless component
 
       component.new(*args, document: @document, presenter: @presenter, document_counter: @document_counter, **kwargs)
     end)
@@ -57,9 +33,7 @@ module Blacklight
     renders_one :metadata, (lambda do |static_content = nil, *args, component: nil, fields: nil, **kwargs|
       next static_content if static_content.present?
 
-      Deprecation.warn(Blacklight::DocumentComponent, 'Pass the presenter to the DocumentComponent') if !fields && @presenter.nil?
-
-      component ||= presenter&.view_config&.metadata_component || Blacklight::DocumentMetadataComponent
+      component ||= Blacklight::DocumentMetadataComponent
 
       component.new(*args, fields: fields || @presenter&.field_presenters || [], **kwargs)
     end)
@@ -70,8 +44,7 @@ module Blacklight
     renders_one :thumbnail, (lambda do |image_options_or_static_content = {}, *args, component: nil, **kwargs|
       next image_options_or_static_content if image_options_or_static_content.is_a? String
 
-      component ||= presenter&.view_config&.thumbnail_component || Blacklight::Document::ThumbnailComponent
-      Deprecation.warn(Blacklight::DocumentComponent, 'Pass the presenter to the DocumentComponent') if !component && @presenter.nil?
+      component ||= @presenter&.view_config&.thumbnail_component || Blacklight::Document::ThumbnailComponent
 
       component.new(*args, document: @document, presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
     end)
@@ -88,7 +61,6 @@ module Blacklight
     # rubocop:disable Metrics/ParameterLists
     # @param document [Blacklight::Document]
     # @param presenter [Blacklight::DocumentPresenter]
-    # @param partials [Array, nil] view partial names that should be used to provide content for the `partials` slot
     # @param id [String] HTML id for the root element
     # @param classes [Array, String] additional HTML classes for the root element
     # @param component [Symbol, String] HTML tag type to use for the root element
@@ -97,45 +69,27 @@ module Blacklight
     # @param document_counter [Number, nil] alternatively, the document's position in a collection and,
     # @param counter_offset [Number] with `document_counter`, the offset of the start of that collection counter to the overall result set
     # @param show [Boolean] are we showing only a single document (vs a list of search results); used for backwards-compatibility
-    def initialize(document: nil, presenter: nil, partials: nil,
+    def initialize(document: nil, presenter: nil,
                    id: nil, classes: [], component: :article, title_component: nil,
-                   metadata_component: nil,
-                   embed_component: nil,
-                   thumbnail_component: nil,
                    counter: nil, document_counter: nil, counter_offset: 0,
-                   show: false, **args)
+                   show: false)
       if presenter.nil? && document.nil?
         raise ArgumentError, 'missing keyword: :document or :presenter'
       end
 
-      if document.is_a?(Blacklight::DocumentPresenter) && presenter.nil?
-        @presenter = document
-        @document = @presenter.document || args[self.class.collection_parameter]
-      else
-        @document = document || presenter&.document || args[self.class.collection_parameter]
-        @presenter = presenter
-      end
+      @document = document || presenter&.document
+      @presenter = presenter
 
       @component = component
       @title_component = title_component
       @id = id || ('document' if show)
       @classes = classes
 
-      Deprecation.warn(Blacklight::DocumentComponent, 'Passing embed_component is deprecated') if @embed_component.present?
-      @embed_component = embed_component
-
-      Deprecation.warn(Blacklight::DocumentComponent, 'Passing metadata_component is deprecated') if @metadata_component.present?
-      @metadata_component = metadata_component
-
-      Deprecation.warn(Blacklight::DocumentComponent, 'Passing thumbnail_component is deprecated') if @thumbnail_component.present?
-      @thumbnail_component = thumbnail_component
-
+      @document_counter = document_counter
       @counter = counter
-      @document_counter = document_counter || args.fetch(self.class.collection_counter_parameter, nil)
-      @counter ||= @document_counter + COLLECTION_INDEX_OFFSET + counter_offset if @document_counter.present?
+      @counter ||= document_counter + 1 + counter_offset if document_counter.present?
 
       @show = show
-      @view_partials = partials
     end
     # rubocop:enable Metrics/ParameterLists
 
@@ -151,29 +105,13 @@ module Blacklight
 
     def before_render
       set_slot(:title, nil) unless title
-      set_slot(:thumbnail, nil, component: @thumbnail_component || presenter.view_config&.thumbnail_component) unless thumbnail || show?
-      set_slot(:metadata, nil, component: @metadata_component || presenter&.view_config&.metadata_component, fields: presenter.field_presenters, show: @show) unless metadata
-      set_slot(:embed, nil, component: @embed_component || presenter.view_config&.embed_component) unless embed
-
-      # Blacklight 8 allows applications to pass in the partials to render instead of requiring the template to render the slots.
-      if partials.empty? && view_partials.present? # rubocop:disable Style/GuardClause
-        @render_partials = true
-        view_partials.each do |view_partial|
-          with_partial(view_partial) do
-            helpers.render_document_partial @document, view_partial, component: self, document_counter: @counter
-          end
-        end
-      end
-    end
-
-    def render_partials?
-      @render_partials || presenter.view_config&.render_partials_in_component?
+      set_slot(:thumbnail, nil) unless thumbnail || show?
+      set_slot(:metadata, nil, fields: presenter.field_presenters) unless metadata
+      set_slot(:embed, nil) unless embed
     end
 
     private
 
-    attr_reader :view_partials
-
     def presenter
       @presenter ||= helpers.document_presenter(@document)
     end

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

@@ -1,7 +1,5 @@
-<% content = capture do %>
+<dl class="document-metadata dl-invert row">
   <% fields.each do |field| -%>
     <%= field %>
   <% end -%>
-<% end %>
-
-<%= @tag.nil? ? content : tag.public_send(@tag, content, class: @classes, **@component_args) %>
+</dl>

data/app/components/blacklight/document_metadata_component.rb

@@ -3,25 +3,22 @@
 module Blacklight
   class DocumentMetadataComponent < Blacklight::Component
     renders_many :fields, (lambda do |component: nil, **kwargs|
-      (component || Blacklight::MetadataFieldComponent).new(**kwargs)
+      component.new(**kwargs)
     end)
     with_collection_parameter :fields
 
     # @param fields [Enumerable<Blacklight::FieldPresenter>] Document field presenters
-    def initialize(fields: [], tag: 'dl', classes: %w[document-metadata dl-invert row], show: false, field_layout: nil, **component_args)
+    def initialize(fields: [], show: false, view_type: nil)
       @fields = fields
-      @tag = tag
-      @classes = classes
       @show = show
-      @field_layout = field_layout
-      @component_args = component_args
+      @view_type = view_type
     end
 
     def before_render
       return unless fields
 
       @fields.each do |field|
-        with_field(component: field_component(field), field: field, show: @show, layout: @field_layout)
+        field(component: field.component, field: field, show: @show, view_type: @view_type)
       end
     end
 
@@ -29,8 +26,6 @@ module Blacklight
       fields.present?
     end
 
-    def field_component(field)
-      field&.component || Blacklight::MetadataFieldComponent
-    end
+    attr_reader :view_type
   end
 end

data/app/components/blacklight/facet_component.rb

@@ -11,7 +11,7 @@ module Blacklight
     # @param [Blacklight::Solr::Response::Facets::FacetField] display_facet
     # @param [Blacklight::Configuration] blacklight_config
     # @param [Boolean] layout
-    # rubocop:disable Metrics/ParameterLists
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists
     def initialize(display_facet_or_field_config: nil, display_facet: nil, field_config: nil, response: nil, blacklight_config: nil, component: nil, **component_args)
       if display_facet_or_field_config.is_a? Blacklight::FacetFieldPresenter
         @facet_field_presenter = display_facet_or_field_config
@@ -30,10 +30,10 @@ module Blacklight
         raise ArgumentError, 'You must provide one of display_facet or field_config' unless @field_config
       end
 
-      @component = component || (@field_config.component == true ? Blacklight::FacetFieldListComponent : @field_config.component)
+      @component = component || @field_config.component
       @component_args = component_args
     end
-    # rubocop:enable Metrics/ParameterLists
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists
 
     def render?
       helpers.should_render_field?(@field_config, @display_facet)

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

@@ -1,9 +1,9 @@
 <%= render(@layout.new(facet_field: @facet_field)) do |component| %>
-  <% component.with_label do %>
+  <% component.label do %>
     <%= @facet_field.label %>
   <% end %>
 
-  <% component.with_body do %>
+  <% component.body do %>
     <ul class="facet-values list-unstyled blacklight-facet-checkboxes">
       <% presenters.each_with_index do |presenter, idx| -%>
         <li>
@@ -11,12 +11,12 @@
             <%= check_box_tag "f_inclusive[#{@facet_field.key}][]", presenter.value, presenter.selected?, id: "f_inclusive_#{@facet_field.key}_#{idx}"%>
           </span>
 
-          <span class="label-and-count">
+          <span>
             <%= label_tag "f_inclusive_#{@facet_field.key}_#{idx}" do %>
               <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 || Blacklight::FacetItemPresenter).new(item, @facet_field.facet_field, helpers, @facet_field.key, @facet_field.search_state)
+        yield @facet_field.facet_field.item_presenter.new(item, @facet_field.facet_field, helpers, @facet_field.key, @facet_field.search_state)
       end
     end
   end

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

@@ -1,19 +1,18 @@
 <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="<%= @facet_field.html_id %>-header">
+  <h3 class="card-header p-0 facet-field-heading" 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? %>"
       data-toggle="collapse"
       data-bs-toggle="collapse"
-      data-target="#<%= @facet_field.html_id %>"
-      data-bs-target="#<%= @facet_field.html_id %>"
+      data-target="#<%= html_id %>"
+      data-bs-target="#<%= html_id %>"
       aria-expanded="<%= @facet_field.collapsed? ? 'false' : 'true' %>"
-      arial-controls="<%= @facet_field.html_id %>"
     >
       <%= label %>
     </button>
   </h3>
-  <div id="<%= @facet_field.html_id %>" role="region" aria-labelledby="<%= @facet_field.html_id %>-header" class="panel-collapse facet-content collapse <%= "show" unless @facet_field.collapsed? %>">
+  <div id="<%= html_id %>" aria-labelledby="<%= header_html_id %>" class="panel-collapse facet-content collapse <%= "show" unless @facet_field.collapsed? %>">
     <div class="card-body">
       <%= body %>
 

data/app/components/blacklight/facet_field_component.rb

@@ -2,13 +2,20 @@
 
 module Blacklight
   class FacetFieldComponent < Blacklight::Component
-    include Blacklight::ContentAreasShim
-
     renders_one :label
     renders_one :body
 
+    # @param [Blacklight::FacetFieldPresenter] facet_field
     def initialize(facet_field:)
       @facet_field = facet_field
     end
+
+    def html_id
+      "facet-#{@facet_field.key.parameterize}"
+    end
+
+    def header_html_id
+      "#{html_id}-header"
+    end
   end
 end