blacklight 9.0.0.beta4 → 9.0.0.beta6

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

@@ -1,4 +1,4 @@
-.sidenav {
+.facets {
   --bl-facet-active-bg: var(--bs-success);
   --bl-facet-active-color: var(--bs-white);
   --bl-facet-active-item-color: var(--bs-success);
@@ -151,32 +151,33 @@
   position: relative;
 }
 
-/* Sidenav
+/* Pivot Facets
 -------------------------------------------------- */
 
 .pivot-facet {
-  &.show {
-    display: flex;
+  --bl-facet-toggle-width: 1em;
+  --bl-facet-toggle-height: var(--bl-facet-toggle-width);
+  --bl-facet-toggle-margin: 0.5em;
+  --bl-facet-toggle-show-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" /></svg>');
+  --bl-facet-toggle-hide-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z" /></svg>');
+
+  // If the item has no expand button, we align it with its siblings that do
+  // by giving it left margin equal to the sum of the button's width & margin
+  li.treeitem:not(:has(button.facet-toggle-handle)) {
+    margin-left: calc(var(--bl-facet-toggle-width) + var(--bl-facet-toggle-margin));
   }
 }
 
-$facet-toggle-show-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" /></svg>') !default;
-$facet-toggle-hide-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z" /></svg>') !default;
-$facet-toggle-width: 1em !default;
-$facet-toggle-height: $facet-toggle-width !default;
-
 .facet-toggle-handle {
+  --bs-btn-hover-bg: var(--bs-btn-hover-bg);
+  --bs-btn-active-bg: var(--bs-btn-active-bg);
   margin-block: 0;
   padding-block: 0;
-  padding-inline: 0.5rem;
-
-  // keep the icon span centered in the button, but shift to the left for equal spacing inside row
-  margin-inline-start: -1 * $btn-padding-x;
-
-  .pivot-facet & {
-    // shift pivot values a little more aggressively for better compact display
-    margin-inline-start: -2 * $btn-padding-x;
-  }
+  padding: 0;
+  border: 0;
+  width: var(--bl-facet-toggle-width);
+  height: var(--bl-facet-toggle-height);
+  margin-right: var(--bl-facet-toggle-margin);
 
   &.collapsed {
     .show {
@@ -198,18 +199,17 @@ $facet-toggle-height: $facet-toggle-width !default;
 
   .show .icon,
   .hide .icon {
-    width: $facet-toggle-width;
-    height: $facet-toggle-height;
-    padding: $btn-padding-y $btn-padding-x;
+    width: var(--bl-facet-toggle-width);
+    height: var(--bl-facet-toggle-height);
   }
 
   .show .icon {
-    background: transparent escape-svg($facet-toggle-show-icon) center /
-      $facet-toggle-width auto no-repeat;
+    background: transparent escape-svg(var(--bl-facet-toggle-show-icon)) center /
+      var(--bl-facet-toggle-width) auto no-repeat;
   }
 
   .hide .icon {
-    background: transparent escape-svg($facet-toggle-hide-icon) center /
-      $facet-toggle-width auto no-repeat;
+    background: transparent escape-svg(var(--bl-facet-toggle-hide-icon)) center /
+      var(--bl-facet-toggle-width) auto no-repeat;
   }
 }

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

@@ -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) +

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/constraints_component.rb

@@ -85,7 +85,7 @@ module Blacklight
           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)
+            yield facet_item_presenter(facet.config, val)
           end
         end
       end
@@ -100,8 +100,10 @@ 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)
+    # @params [Blacklight::Configuration::FacetField] facet_config
+    # @params [String] facet_item the value of the facet item
+    def facet_item_presenter(facet_config, facet_item)
+      helpers.facet_field_presenter(facet_config, {}).item_presenter(facet_item)
     end
 
     def inclusive_facet_item_presenter(facet_config, facet_item, facet_field)

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'),

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, **)
         @document = document
         @checked = checked
         @bookmark_path = bookmark_path
-        super(document: document, action: action, **)
+        @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/facet_item_pivot_component.rb

@@ -38,7 +38,7 @@ module Blacklight
           concat content_tag('span', render(facet), class: "facet-values d-flex flex-row flex-grow-1 #{'facet-leaf-node' if has_items? && @collapsing}", id: id && "#{id}_label")
         end)
         if has_items?
-          concat(content_tag('ul', class: "pivot-facet flex-column list-unstyled ps-4 #{'collapse' if @collapsing} #{'show' if expanded?}", id: id, role: 'group') do
+          concat(content_tag('ul', class: "list-unstyled ps-3 #{'collapse' if @collapsing} #{'show' if expanded?}", id: id, role: 'group') do
             render(
               self.class.with_collection(
                 @facet_item.facet_item_presenters.to_a
@@ -64,7 +64,7 @@ module Blacklight
     end
 
     def facet_toggle_button(id)
-      content_tag 'button', class: %w[btn facet-toggle-handle] + [('collapsed' unless expanded?)],
+      content_tag 'button', class: %w[btn focus-ring facet-toggle-handle] + [('collapsed' unless expanded?)],
                             data: { toggle: 'collapse', 'bs-toggle': 'collapse', target: "##{id}", 'bs-target': "##{id}" },
                             aria: { expanded: expanded?, controls: id, describedby: "#{id}_label" } do
         concat toggle_icon(:show)

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

@@ -7,13 +7,13 @@
     <ul class="facet-values list-unstyled blacklight-facet-checkboxes">
       <% presenters.each_with_index do |presenter, idx| -%>
         <li>
-          <span class="facet-checkbox">
+          <span class="facet-checkbox flex-shrink-0">
             <%= check_box_tag "f_inclusive[#{@facet_field.key}][]", presenter.value, presenter.selected?, id: "f_inclusive_#{@facet_field.key}_#{idx}"%>
           </span>
 
-          <span>
-            <%= label_tag "f_inclusive_#{@facet_field.key}_#{idx}" do %>
-              <span class="facet-label"><%= presenter.label %></span>
+          <span class="facet-label-and-count flex-grow-1">
+            <%= label_tag "f_inclusive_#{@facet_field.key}_#{idx}", class: 'd-flex' do %>
+              <span class="facet-label flex-grow-1"><%= presenter.label %></span>
               <span class="facet-count"><%= t('blacklight.search.facets.count', number: number_with_delimiter(presenter.hits)) %></span>
             <% end %>
           </span>

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

@@ -3,9 +3,7 @@
     <button
       type="button"
       class="btn accordion-button <%= "collapsed" if @facet_field.collapsed? %>"
-      data-toggle="collapse"
       data-bs-toggle="collapse"
-      data-target="#<%= html_id %>"
       data-bs-target="#<%= html_id %>"
       aria-expanded="<%= @facet_field.collapsed? ? 'false' : 'true' %>"
       aria-controls="<%= html_id %>"

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

@@ -4,7 +4,7 @@
   <% end %>
   <% component.with_body do %>
     <%= render(Blacklight::Facets::InclusiveConstraintComponent.new(facet_field: @facet_field)) %>
-    <%= content_tag :ul, class: 'facet-values list-unstyled', role: @role do %>
+    <%= content_tag :ul, class: @classes, role: @role do %>
       <%= render facet_items %>
     <% end %>
   <% end %>

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

@@ -3,13 +3,18 @@
 module Blacklight
   module Facets
     class ListComponent < Blacklight::Component
-      def initialize(facet_field:, role: nil, layout: nil)
+      # @param [Blacklight::FacetFieldPresenter] facet_field
+      def initialize(facet_field:,
+                     classes: %w[facet-values list-unstyled],
+                     role: nil,
+                     layout: nil)
         @facet_field = facet_field
+        @classes = classes
         @role = role
         @layout = layout == false ? Blacklight::Facets::NoLayoutComponent : Blacklight::Facets::FieldComponent
       end
 
-      attr_accessor :layout, :role
+      attr_accessor :layout, :classes, :role
 
       def facet_items(wrapping_element: :li, **item_args)
         facet_item_component_class.with_collection(facet_item_presenters, wrapping_element: wrapping_element, **item_args)
@@ -26,7 +31,7 @@ module Blacklight
       end
 
       def facet_item_presenter(facet_item)
-        facet_config.item_presenter.new(facet_item, facet_config, helpers, @facet_field.key)
+        @facet_field.item_presenter(facet_item)
       end
 
       def facet_item_component_class

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

@@ -3,7 +3,10 @@
 module Blacklight
   module Facets
     class PivotListComponent < Blacklight::Facets::ListComponent
-      def initialize(facet_field:, role: 'tree', layout: nil)
+      def initialize(facet_field:,
+                     classes: %w[pivot-facet facet-values list-unstyled],
+                     role: 'tree',
+                     layout: nil)
         super
       end
     end

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

@@ -1,4 +1,4 @@
-<label for="facet_suggest_<%= key %>">
+<label class="form-label" for="facet_suggest_<%= key %>">
   <%= I18n.t('blacklight.search.facets.suggest.label', field_label: label) %>
 </label>
 <%= text_field_tag "facet_suggest_#{key}",

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 %>

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

@@ -1,7 +1,7 @@
 <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/catalog.rb

@@ -23,7 +23,7 @@ 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 }
@@ -143,6 +143,11 @@ module Blacklight::Catalog
 
   private
 
+  # This method may be overridden to customize search behavior.
+  def retrieve_search_results
+    search_service.search_results
+  end
+
   #
   # non-routable methods ->
   #

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

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -15,18 +15,4 @@ module Blacklight::FacetsHelperBehavior
            .except(:page)
     url_for opts
   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)
-  end
 end

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

@@ -2,7 +2,7 @@ const ButtonFocus = (e) => {
   // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
   // Safari both do not set focus to a button on button click.
   // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
-  if (e.target.matches('[data-toggle="collapse"]') || e.target.matches('[data-bs-toggle="collapse"]')) {
+  if (e.target.matches('[data-bs-toggle="collapse"]')) {
     e.target.focus()
   }
 }

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

@@ -44,8 +44,8 @@ export default class CheckboxSubmit {
         counter.innerHTML = json.bookmarks.count;
       });
 
-      var e = new CustomEvent('bookmark.blacklight', { detail: { checked: this.checked } });
-      window.dispatchEvent(e)
+      var e = new CustomEvent('bookmark.blacklight', { detail: { checked: this.checked }, bubbles: true });
+      this.formTarget.dispatchEvent(e)
     }).catch((error) => {
       this.handleError(error)
     })

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

@@ -32,7 +32,7 @@
 
     <div data-blacklight-modal="container">
       <div class="modal-header">
-        <button type="button" class="close" data-bl-dismiss="modal" aria-hidden="true">×</button>
+        <button type="button" class="btn-close" data-bl-dismiss="modal" aria-hidden="true">×</button>
         <h3 class="modal-title">Request Placed</h3>
       </div>
 
@@ -157,6 +157,14 @@ const Modal = (() => {
       else if (e.target.matches(`${modal.modalSelector}`) || e.target.closest('[data-bl-dismiss="modal"]'))
         modal.hide()
     })
+
+    // Make sure user-agent dismissal of html 'dialog', etc `esc` key, triggers
+    // our hide logic, including events and scroll restoration.
+    modal.target().addEventListener('cancel', (e) => {
+      e.preventDefault(); // 'hide' will close the modal unless cancelled
+
+      modal.hide();
+    });
   };
 
   modal.hide = function (el) {

data/app/presenters/blacklight/facet_field_presenter.rb

@@ -7,6 +7,10 @@ module Blacklight
     delegate :key, :suggest, to: :facet_field
     delegate :field_name, to: :display_facet
 
+    # @param [Blacklight::Configuration::FacetField] facet_field
+    # @param [Blacklight::Solr::Response::Facets::FacetField] display_facet
+    # @param [#search_action_path,#facet_field_presenter] view_context
+    # @param [Blacklight::SearchState] search_state
     def initialize(facet_field, display_facet, view_context, search_state = view_context.search_state)
       @facet_field = facet_field
       @display_facet = display_facet
@@ -14,6 +18,11 @@ module Blacklight
       @search_state = search_state
     end
 
+    # @param [Blacklight::Solr::Response::Facets::FacetItem, String] facet_item
+    def item_presenter(facet_item)
+      facet_field.item_presenter.new(facet_item, facet_field, view_context, key, search_state)
+    end
+
     def collapsed?
       !active? && facet_field.collapse
     end

data/app/presenters/blacklight/facet_grouped_item_presenter.rb

@@ -6,6 +6,12 @@ module Blacklight
 
     delegate :key, to: :facet_config
 
+    # @param [Array<String>] group
+    # @param [String] facet_item
+    # @param [Blacklight::Configuration::FacetField] facet_config
+    # @param [#search_action_path] view_context
+    # @param [String] facet_field
+    # @param [Blacklight::SearchState] search_state
     def initialize(group, facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
       super(facet_item, facet_config, view_context, facet_field, search_state)
       @group = group

data/app/presenters/blacklight/facet_item_pivot_presenter.rb

@@ -25,7 +25,7 @@ module Blacklight
     end
 
     def facet_item_presenter(facet_item)
-      facet_config.item_presenter.new(facet_item, facet_config, view_context, facet_field, search_state)
+      facet_field_presenter.item_presenter(facet_item)
     end
 
     ##

data/app/presenters/blacklight/facet_item_presenter.rb

@@ -6,6 +6,11 @@ module Blacklight
 
     delegate :key, to: :facet_config
 
+    # @param [Blacklight::Solr::Response::Facets::FacetItem, String] facet_item
+    # @param [Blacklight::Configuration::FacetField] facet_config
+    # @param [#search_action_path,#facet_field_presenter] view_context
+    # @param [String] facet_field the name of the facet field. Same as facet_config.key
+    # @param [Blacklight::SearchState] search_state
     def initialize(facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
       @facet_item = facet_item
       @facet_config = facet_config

data/app/views/catalog/_email_form.html.erb

@@ -6,8 +6,8 @@
 
   <div class="modal-body">
     <%= render '/shared/flash_msg' %>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="to">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="to">
         <%= t('blacklight.email.form.to') %>
       </label>
       <div class="col-sm-10">
@@ -15,8 +15,8 @@
       </div>
     </div>
 
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="message">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="message">
         <%= t('blacklight.email.form.message') %>
       </label>
       <div class="col-sm-10">

data/app/views/catalog/_sms_form.html.erb

@@ -5,16 +5,16 @@
              method: :post do %>
 <div class="modal-body">
   <%= render '/shared/flash_msg' %>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="to">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="to">
         <%= t('blacklight.sms.form.to') %>
       </label>
       <div class="col-sm-10">
         <%= telephone_field_tag :to, params[:to], class: 'form-control', required: true %>
       </div>
     </div>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="carrier">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="carrier">
         <%= t('blacklight.sms.form.carrier') %>
       </label>
       <div class="col-sm-10">

data/app/views/catalog/advanced_search.html.erb

@@ -1,7 +1,7 @@
 <% @page_title = t('blacklight.advanced_search.page_title', application_name: application_name) %>
 
 <div class="advanced-search-form col-sm-12">
-  <h1 class="advanced page-header">
+  <h1>
       <%= t('blacklight.advanced_search.form.title') %>
   </h1>
 

data/app/views/catalog/index.json.jbuilder

@@ -42,9 +42,11 @@ json.included do
     json.id facet.name
     json.attributes do
       facet_config = facet_configuration_for_field(facet.name)
-      json.label facet_field_label(facet_config.key)
+      facet_presenter = facet_field_presenter(facet_config, facet)
+      json.label facet_presenter.label
       json.items do
         json.array! facet.items do |item|
+          item_presenter = facet_presenter.item_presenter(item)
           json.id
           json.attributes do
             json.label item.label
@@ -52,10 +54,10 @@ json.included do
             json.hits item.hits
           end
           json.links do
-            if search_state.filter(facet_config).include?(facet_value_for_facet_item(item.value))
+            if search_state.filter(facet_config).include?(item.value)
               json.remove search_action_path(search_state.filter(facet.name).remove(item.value))
             else
-              json.self facet_item_presenter(facet_config, item.value, facet.name).href(only_path: false)
+              json.self item_presenter.href(only_path: false)
             end
           end
         end

data/app/views/layouts/blacklight/base.html.erb

@@ -32,7 +32,7 @@
     <main id="main-container" class="<%= container_classes %>" aria-label="<%= t('blacklight.main.aria.main_container') %>">
       <%= content_for(:container_header) %>
 
-      <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
+      <%= render 'shared/flash_msg', layout: 'shared/flash_messages' if flash.any? %>
 
       <div class="row">
         <%= content_for?(:content) ? yield(:content) : yield %>

data/config/locales/blacklight.it.yml

@@ -93,7 +93,7 @@ it:
           open: Mostra sfaccettature
         missing:
           - Mancante
-        more_html: altri <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: altri <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Chiudi
           show: Apri

data/lib/blacklight/search_state.rb

@@ -82,6 +82,8 @@ module Blacklight
       blacklight_config.facet_fields.each_value.map { |value| filter(value) }
     end
 
+    # Return the list of filters (i.e. facets) that have been applied in the current search
+    # @return [Array<FilterField>]
     def filters
       @filters ||= filter_fields.select(&:any?)
     end