blacklight 9.0.0.beta1 → 9.0.0

data/app/components/blacklight/facets/no_layout_component.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Facets
+    class NoLayoutComponent < Blacklight::Component
+      renders_one :label
+      renders_one :body
+
+      def initialize(**); end
+
+      def call
+        body.to_s
+      end
+    end
+  end
+end

data/app/components/blacklight/facets/pivot_list_component.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Facets
+    class PivotListComponent < Blacklight::Facets::ListComponent
+      def initialize(facet_field:,
+                     classes: %w[pivot-facet facet-values list-unstyled],
+                     role: 'tree',
+                     layout: nil)
+        super
+      end
+    end
+  end
+end

data/app/components/blacklight/facets/selected_value_component.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Facets
+    # Standard display of a selected facet value (e.g. without a link and with a remove button)
+    class SelectedValueComponent < Blacklight::Component
+      def initialize(label:, href:)
+        @label = label
+        @href = href
+        super()
+      end
+
+      attr_reader :label, :href
+
+      def call
+        tag.span(class: "facet-label") do
+          tag.span(label, class: "selected") + remove_link
+        end
+      end
+
+      def remove_link
+        link_to(href, class: "remove ps-2", rel: "nofollow") do
+          render(Blacklight::Icons::RemoveComponent.new(aria_hidden: true)) +
+            tag.span(t(:'blacklight.search.facets.selected.remove'), class: 'visually-hidden')
+        end
+      end
+    end
+  end
+end

data/app/components/blacklight/facets/suggest_component.html.erb

@@ -0,0 +1,17 @@
+<div class="input-group">
+  <label class="input-group-text" for="facet_suggest_<%= key %>">
+    <%= I18n.t('blacklight.search.facets.suggest.label', field_label: label.downcase.pluralize) %>
+  </label>
+  <%= search_field_tag "facet_suggest_#{key}",
+    nil,
+    class: "facet-suggest form-control",
+    data: {
+      facet_field: key,
+      facet_search_context: helpers.search_facet_path(id: key)
+    },
+    placeholder: I18n.t('blacklight.search.facets.suggest.placeholder')
+  %>
+  <span class="input-group-text">
+    <%= render Blacklight::Icons::SearchComponent.new %>
+  </span>
+</div>

data/app/components/blacklight/facets/suggest_component.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Facets
+    class SuggestComponent < Blacklight::Component
+      def initialize(presenter:)
+        @presenter = presenter
+      end
+
+      private
+
+      attr_accessor :presenter
+
+      delegate :key, :label, to: :presenter
+
+      def render?
+        presenter.suggest?
+      end
+    end
+  end
+end

data/app/components/blacklight/header_component.rb

@@ -19,8 +19,8 @@ module Blacklight
     # Hack so that the default lambdas are triggered
     # so that we don't have to do c.with_top_bar() in the call.
     def before_render
-      set_slot(:top_bar, nil) unless top_bar
-      set_slot(:search_bar, nil) unless search_bar
+      with_top_bar unless top_bar
+      with_search_bar unless search_bar
     end
   end
 end

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

@@ -7,8 +7,8 @@ module Blacklight
     #   Blacklight::Icons::RemoveComponent.svg = '<svg>your SVG here</svg>'
     class RemoveComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x fs-4" viewBox="0 0 16 16">
-          <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708"/>
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-lg" viewBox="0 0 16 16">
+          <path d="M2.146 2.854a.5.5 0 1 1 .708-.708L8 7.293l5.146-5.147a.5.5 0 0 1 .708.708L8.707 8l5.147 5.146a.5.5 0 0 1-.708.708L8 8.707l-5.146 5.147a.5.5 0 0 1-.708-.708L7.293 8z"/>
         </svg>
       SVG
     end

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

@@ -2,7 +2,7 @@
   <% component.with_label do %>
     <%= label %>
   <% end %>
-  <% component.with_value do %>
-    <%= render_field %>
+  <% render_field_values.each_with_index do |value, index| %>
+    <% component.with_value(value: value, index: index) %>
   <% end %>
 <% end %>

data/app/components/blacklight/metadata_field_component.rb

@@ -27,7 +27,8 @@ module Blacklight
     end
 
     # Override this method in a subclass to change the way this value is rendered
-    def render_field
+    # @return [Array]
+    def render_field_values
       @field.render
     end
 

data/app/components/blacklight/metadata_field_layout_component.rb

@@ -4,23 +4,28 @@ module Blacklight
   class MetadataFieldLayoutComponent < Blacklight::Component
     with_collection_parameter :field
     renders_one :label
-    renders_many :values, (lambda do |value: nil, &block|
+    renders_many :values, (lambda do |index:, value: nil, &block|
+      classes = [@value_class, "blacklight-#{@key}"]
+      classes.unshift @offset_class unless index.zero?
+      classes.join(' ')
+
       if @value_tag.nil?
         block&.call || value
       elsif block
-        content_tag @value_tag, class: "#{@value_class} blacklight-#{@key}", &block
+        content_tag @value_tag, class: classes, &block
       else
-        content_tag @value_tag, value, class: "#{@value_class} blacklight-#{@key}"
+        content_tag @value_tag, value, class: classes
       end
     end)
 
     # @param field [Blacklight::FieldPresenter]
-    def initialize(field:, value_tag: 'dd', label_class: 'col-md-3', value_class: 'col-md-9')
+    def initialize(field:, value_tag: 'dd', label_class: 'col-md-3', value_class: 'col-md-9', offset_class: 'offset-md-3')
       @field = field
       @key = @field.key.parameterize
       @label_class = label_class
       @value_tag = value_tag
       @value_class = value_class
+      @offset_class = offset_class
     end
   end
 end

data/app/components/blacklight/metadata_field_plain_text_layout_component.rb

@@ -4,8 +4,8 @@ module Blacklight
   class MetadataFieldPlainTextLayoutComponent < Blacklight::MetadataFieldLayoutComponent
     with_collection_parameter :field
 
-    def initialize(field:, **kwargs)
-      super(field: field, **kwargs, value_tag: nil)
+    def initialize(field:, **)
+      super(field: field, **, value_tag: nil)
     end
 
     # rubocop:disable Rails/OutputSafety

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

@@ -1,12 +1,12 @@
 <% # main container for facets/limits menu -%>
-<%= content_tag :div, id: @id,  class: 'facets sidenav facets-toggleable-md' do %>
+<%= content_tag :div, id: @id,  class: container_classes do %>
   <div class="facets-header">
-    <%= content_tag :h2, @title, class: 'facets-heading h4' if @title %>
+    <%= content_tag :h2, @title, class: header_classes if @title %>
 
     <%= collapse_toggle_button(@panel_id) %>
   </div>
 
-  <div id="<%= @panel_id %>" class="facets-collapse d-lg-block collapse accordion">
+  <div id="<%= @panel_id %>" class="<%= body_classes %>">
     <%= body %>
   </div>
 <% end %>

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

@@ -8,13 +8,20 @@ module Blacklight
 
       # @param [String] id a unique identifier for the group
       # @param [String] title the title of the facet group section
-      def initialize(id:, title: nil)
+      def initialize(id:, title: nil, body_classes: 'facets-collapse d-lg-block collapse accordion',
+                     header_classes: 'facets-heading h4',
+                     container_classes: 'facets sidenav facets-toggleable-md')
         @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'
+        @body_classes = body_classes
+        @header_classes = header_classes
+        @container_classes = container_classes
       end
 
+      attr_accessor :body_classes, :header_classes, :container_classes
+
       def collapse_toggle_button(panel_id)
         render button_component.new(panel_id: panel_id)
       end
@@ -24,6 +31,7 @@ module Blacklight
       end
 
       def render?
+        # debugger
         body.present?
       end
     end

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

@@ -15,7 +15,7 @@
                     options_for_select(search_fields, h(@search_field)),
                     {},
                     title: scoped_t('search_field.title'),
-                    class: "custom-select form-select search-field") %>
+                    class: "form-select search-field") %>
       <% elsif search_fields.length == 1 %>
         <%= f.hidden_field :search_field, value: search_fields.first.last %>
       <% end %>
@@ -36,6 +36,6 @@
   <% end %>
 
   <% if advanced_search_enabled? %>
-    <%= link_to t('blacklight.advanced_search.more_options'), @advanced_search_url, class: 'advanced_search btn btn-secondary'%>
+    <%= link_to t('blacklight.advanced_search.more_options'), @advanced_search_url, class: 'advanced_search btn btn-link text-body' %>
   <% end %>
 </search>

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

@@ -1,7 +1,7 @@
 <%= content_tag :div, id: @id, class: @classes.join(' ') do %>
   <%= button %>
 
-  <div class="dropdown-menu" role="menu">
+  <div class="dropdown-menu">
     <% options.each do |option| %>
       <%= option %>
     <% end %>

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

@@ -6,7 +6,7 @@ module Blacklight
       renders_one :button, DropdownButtonComponent
 
       renders_many :options, (lambda do |text:, url:, selected: false|
-        link_to(text, url, class: "dropdown-item #{'active' if selected}", role: 'menuitem', aria: { current: ('page' if selected) })
+        link_to(text, url, class: "dropdown-item #{'active' if selected}", aria: { current: ('page' if selected) })
       end)
 
       # rubocop:disable Metrics/ParameterLists

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

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

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

@@ -16,15 +16,6 @@ module Blacklight
         with_message { @message } if @message
       end
 
-      # Bootstrap 4 requires the span, but Bootstrap 5 should not have it.
-      # See https://getbootstrap.com/docs/4.6/components/alerts/#dismissing
-      #     https://getbootstrap.com/docs/5.1/components/alerts/#dismissing
-      def button_contents
-        return if helpers.controller.blacklight_config.bootstrap_version == 5
-
-        tag.span '×'.html_safe, aria: { hidden: true }
-      end
-
       def alert_class(type)
         case type.to_s
         when 'success' then "alert-success"

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

@@ -6,8 +6,7 @@
       <h1 class="modal-title"><%= title %></h1>
     <% end) %>
 
-    <button type="button" class="blacklight-modal-close btn-close close" data-bl-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-      <span aria-hidden="true" class="visually-hidden">&times;</span>
+    <button type="button" class="blacklight-modal-close btn-close" data-bl-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
     </button>
   </div>
 

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 %>">
+<nav class="navbar navbar-expand-md bg-dark topbar" aria-label="<%= aria_label %>">
   <div class="<%= container_classes %>">
     <%= logo_link %>
-    <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">
+    <button class="navbar-toggler" type="button" data-bs-toggle="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/bookmarks.rb

@@ -36,8 +36,8 @@ module Blacklight::Bookmarks
 
   # Blacklight uses #search_action_url to figure out the right URL for
   # the global search box
-  def search_action_url *args
-    search_catalog_url(*args)
+  def search_action_url(*)
+    search_catalog_url(*)
   end
 
   # @return [Hash] a hash of context information to pass through to the search service
@@ -85,6 +85,11 @@ module Blacklight::Bookmarks
       false
     end
 
+    create_response(success)
+  end
+
+  # Override the create_response method to handle the response appropriately.
+  def create_response(success)
     if request.xhr?
       success ? render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count } }) : render(json: current_or_guest_user.errors.full_messages, status: :internal_server_error)
     else
@@ -110,9 +115,14 @@ module Blacklight::Bookmarks
 
     success = @bookmarks.all? do |bookmark|
       bookmark = current_or_guest_user.bookmarks.find_by(bookmark)
-      bookmark && bookmark.delete && bookmark.destroyed?
+      bookmark&.delete && bookmark.destroyed?
     end
 
+    destroy_response(success)
+  end
+
+  # Override the destroy_response method to handle the response appropriately.
+  def destroy_response(success)
     if success
       if request.xhr?
         render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count } })

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

@@ -15,7 +15,6 @@ module Blacklight::Catalog
   included do
     if respond_to? :helper_method
       helper_method :sms_mappings, :has_search_parameters?
-      helper_method :search_facet_path
     end
 
     record_search_parameters
@@ -23,16 +22,13 @@ module Blacklight::Catalog
 
   # get search results from the solr index
   def index
-    @response = search_service.search_results
+    @response = retrieve_search_results
 
     respond_to do |format|
       format.html { store_preferred_view }
       format.rss  { render layout: false }
       format.atom { render layout: false }
-      format.json do
-        @presenter = Blacklight::JsonPresenter.new(@response,
-                                                   blacklight_config)
-      end
+      format.json { @presenter = json_presenter(@response) }
       additional_response_formats(format)
       document_export_formats(format)
     end
@@ -80,17 +76,19 @@ module Blacklight::Catalog
 
   # displays values and pagination links for a single facet field
   def facet
+    # @facet is a Blacklight::Configuration::FacetField
     @facet = blacklight_config.facet_fields[params[:id]]
     raise ActionController::RoutingError, 'Not Found' unless @facet
 
-    query_fragment = params[:query_fragment] || ''
-    @response = if query_fragment.present?
+    @response = if params[:query_fragment].present?
                   search_service.facet_suggest_response(@facet.key, params[:query_fragment])
                 else
-                  @response = search_service.facet_field_response(@facet.key)
+                  search_service.facet_field_response(@facet.key)
                 end
+    # @display_facet is a Blacklight::Solr::Response::Facets::FacetField
     @display_facet = @response.aggregations[@facet.field]
 
+    # @presenter is a Blacklight::FacetFieldPresenter
     @presenter = @facet.presenter.new(@facet, @display_facet, view_context)
     @pagination = @presenter.paginator
     respond_to do |format|
@@ -139,16 +137,19 @@ module Blacklight::Catalog
     params[:search_field].present? || search_state.has_constraints?
   end
 
-  def search_facet_path(options = {})
-    opts = search_state
-           .to_h
-           .merge(action: "facet", only_path: true)
-           .merge(options)
-           .except(:page)
-    url_for opts
+  private
+
+  # @param [Blacklight::Solr::Response] repository_response
+  # @return [Blacklight::JsonPresenter]
+  def json_presenter(repository_response)
+    blacklight_config.index.json_presenter_class.new(repository_response, blacklight_config)
   end
 
-  private
+  # This method may be overridden to customize search behavior.
+  # @return [Blacklight::Solr::Response] the solr response object
+  def retrieve_search_results
+    search_service.search_results
+  end
 
   #
   # non-routable methods ->
@@ -236,25 +237,17 @@ module Blacklight::Catalog
   # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def email_action documents
     mail = RecordMailer.email_record(documents, { to: params[:to], message: params[:message], config: blacklight_config }, url_options)
-    if mail.respond_to? :deliver_now
-      mail.deliver_now
-    else
-      mail.deliver
-    end
+    mail.deliver_now
   end
 
   # SMS action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def sms_action documents
     to = "#{params[:to].gsub(/[^\d]/, '')}@#{params[:carrier]}"
     mail = RecordMailer.sms_record(documents, { to: to, config: blacklight_config }, url_options)
-    if mail.respond_to? :deliver_now
-      mail.deliver_now
-    else
-      mail.deliver
-    end
+    mail.deliver_now
   end
 
-  def validate_sms_params
+  def sms_params_valid?
     if params[:to].blank?
       flash[:error] = I18n.t('blacklight.sms.errors.to.blank')
     elsif params[:carrier].blank?
@@ -267,12 +260,14 @@ module Blacklight::Catalog
 
     flash[:error].blank?
   end
+  alias validate_sms_params sms_params_valid?
+  Blacklight.deprecation.deprecate_methods(Blacklight::Catalog, validate_sms_params: 'use Catalog#sms_params_valid? instead')
 
   def sms_mappings
     Blacklight::Engine.config.blacklight.sms_mappings
   end
 
-  def validate_email_params
+  def email_params_valid?
     if params[:to].blank?
       flash[:error] = I18n.t('blacklight.email.errors.to.blank')
     elsif !params[:to].match(Blacklight::Engine.config.blacklight.email_regexp)
@@ -281,6 +276,8 @@ module Blacklight::Catalog
 
     flash[:error].blank?
   end
+  alias validate_email_params email_params_valid?
+  Blacklight.deprecation.deprecate_methods(Blacklight::Catalog, validate_email_params: 'use Catalog#email_params_valid? instead')
 
   def start_new_search_session?
     action_name == "index"
@@ -293,7 +290,7 @@ module Blacklight::Catalog
   def blacklight_advanced_search_form_search_service
     form_search_state = search_state_class.new(blacklight_advanced_search_form_params, blacklight_config, self)
 
-    search_service_class.new(config: blacklight_config, search_state: form_search_state, user_params: form_search_state.to_h, **search_service_context)
+    search_service_class.new(config: blacklight_config, search_state: form_search_state, **search_service_context)
   end
 
   def blacklight_advanced_search_form_params

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

@@ -130,7 +130,7 @@ module Blacklight::Controller
     # send the user home if the access was previously denied by the same
     # request to avoid sending the user back to the login page
     #   (e.g. protected page -> logout -> returned to protected page -> home)
-    redirect_to(root_url) && flash.discard && return if request.referer && request.referer.ends_with?(request.fullpath)
+    redirect_to(root_url) && flash.discard && return if request.referer&.ends_with?(request.fullpath)
 
     redirect_to(root_url) && return unless has_user_authentication_provider?
 

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

@@ -40,7 +40,7 @@ module Blacklight::SearchContext
         @page_link_data[:prev] = page_links_document_path(documents.first, index)
         @page_link_data[:next] = page_links_document_path(documents.last, index + 2)
       end
-      if response&.total && response.total.positive?
+      if response&.total&.positive?
         @page_link_data[:counterRaw] = counter_param
         @page_link_data[:counterDelimited] = helpers.number_with_delimiter(counter_param.to_i)
         @page_link_data[:totalRaw] = response.total

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

@@ -21,7 +21,7 @@ module Blacklight::Searchable
 
   # @return [Blacklight::SearchService]
   def search_service
-    search_service_class.new(config: blacklight_config, search_state: search_state, user_params: search_state.to_h, **search_service_context)
+    search_service_class.new(config: blacklight_config, search_state: search_state, **search_service_context)
   end
 
   # Override this method on the class that includes Blacklight::Searchable to provide more context to the search service if necessary.

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -130,10 +130,12 @@ module Blacklight::CatalogHelperBehavior
   # @return [String]
   def render_search_to_page_title_filter(facet, values)
     facet_config = facet_configuration_for_field(facet)
-    filter_label = facet_field_label(facet_config.key)
+    facet_presenter = facet_field_presenter(facet_config, {})
+    filter_label = facet_presenter.label
     filter_value = if values.size < 3
                      values.map do |value|
-                       label = facet_item_presenter(facet_config, value, facet).label
+                       item_presenter = facet_presenter.item_presenter(value)
+                       label = item_presenter.label
                        label = strip_tags(label) if label.html_safe?
                        label
                      end.to_sentence
@@ -169,7 +171,7 @@ module Blacklight::CatalogHelperBehavior
       constraints += search_state.filters.collect { |filter| render_search_to_page_title_filter(filter.key, filter.values) }
     end
 
-    constraints.join(' / ')
+    constraints.join(t('blacklight.search.page_title.joiner'))
   end
 
   ##

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -96,7 +96,7 @@ module Blacklight::ConfigurationHelperBehavior
   #
   # @param [Blacklight::Solr::Configuration::Field] field_config
   # @return [Boolean]
-  def should_render_field?(field_config, *args)
-    blacklight_configuration_context.evaluate_if_unless_configuration field_config, *args
+  def should_render_field?(field_config, *)
+    blacklight_configuration_context.evaluate_if_unless_configuration(field_config, *)
   end
 end

data/app/helpers/blacklight/document_helper_behavior.rb

@@ -38,10 +38,12 @@ module Blacklight::DocumentHelperBehavior
 
   ##
   # Check if the document is in the user's bookmarks
+  # Note: we do string comparison of the classes, because hot reloading in the development environment may cause each to have
+  #       separate versions of the class loaded (see document.class.object_id and Bookmark#document_type.object_id)
   # @param [Blacklight::Document] document
   # @return [Boolean]
   def bookmarked? document
-    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type == document.class }
+    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type.to_s == document.class.to_s }
   end
 
   ##

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -7,17 +7,12 @@ module Blacklight::FacetsHelperBehavior
     facet_config.presenter.new(facet_config, display_facet, self)
   end
 
-  private
-
-  def facet_value_for_facet_item item
-    if item.respond_to? :value
-      item.value
-    else
-      item
-    end
-  end
-
-  def facet_item_presenter(facet_config, facet_item, facet_field)
-    facet_config.item_presenter.new(facet_item, facet_config, self, facet_field)
+  def search_facet_path(options = {})
+    opts = search_state
+           .to_h
+           .merge(action: "facet", only_path: true)
+           .merge(options)
+           .except(:page)
+    url_for opts
   end
 end

data/app/helpers/blacklight/icon_helper_behavior.rb

@@ -7,7 +7,7 @@ module Blacklight::IconHelperBehavior
   # 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)
+  def blacklight_icon(icon_name, **)
+    render "Blacklight::Icons::#{icon_name.to_s.camelize}Component".constantize.new(**)
   end
 end

data/app/javascript/blacklight-frontend/bookmark_toggle.js

@@ -1,12 +1,17 @@
 import CheckboxSubmit from 'blacklight-frontend/checkbox_submit'
 
 const BookmarkToggle = (e) => {
-  if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
-    const form = e.target.closest('form')
+  const elementType = e.target.getAttribute('data-checkboxsubmit-target');
+  if (elementType == 'checkbox' || elementType == 'label') {
+    const form = e.target.closest('form');
     if (form) new CheckboxSubmit(form).clicked(e);
+    if (e.code == 'Space') e.preventDefault();
   }
 };
 
 document.addEventListener('click', BookmarkToggle);
+document.addEventListener('keydown', function (e) {
+  if (e.key === 'Enter' || e.code == 'Space') { BookmarkToggle(e); } }
+);
 
 export default BookmarkToggle