blacklight 7.8.1 → 7.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 797fccb08c32206cbf11ab04efa5b980456a8a1ff2f949940ce68b9b29843720
-  data.tar.gz: 26608839399a44a7f33f4313337a35c5a064578daa0819cc845a601c9d058d3c
+  metadata.gz: bd2196992d71cdb76b3080eb944caa30d0534fd0b8954f641e50ba6287e00c75
+  data.tar.gz: 3d273772786614bae0a216a1be97b038d90f24c1ddea1aee25a3a993613bed97
 SHA512:
-  metadata.gz: 2066cfd8c17650d43b39707f8d73c39745307eff3795875833f0a1e0c794ba92a8aae1aa061db59e5a39154332e0e5addcb3a4d4463894ccc641eee57ed40b7e
-  data.tar.gz: 3403d40968957aadb62eba71caed870704c23bbebf93f98910bba9931ca136b80d79ba411cb1852a2a48bf227e3456fd1d91fc8ecd01b7b8aad852dbb3f4ab8e
+  metadata.gz: 57ea5cb5460c6eff4a4554f73c8da22552984a9860ccb116f251d8f799d057b9b864e15b722319548c390df4fa686a9f46a96be5972b56eef46d9271e3e37368
+  data.tar.gz: b364146ff5cec3708b246b917bf09cd11000e92e6e6d7103b363479c342091d1da759bc952718788476b83abd4b32c95365a52206337118ac8782f257e59376f

data/VERSION

@@ -1 +1 @@
-7.8.1
+7.9.0

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

@@ -150,10 +150,26 @@
 
 .pivot-facet {
   @extend .list-unstyled;
+  @extend .py-1;
+  @extend .px-4;
+}
+
+.facet-leaf-node {
+  margin-left: 1rem;
+  padding-right: 1rem;
+  margin-top: -1.5rem;
+}
 
-  ul, .pivot-facet {
-    @extend .list-unstyled;
-    @extend .py-1;
-    @extend .px-3;
+.facet-toggle-handle {
+  margin: 0;
+  margin-left: -5px;
+  padding: 0;
+
+  &.collapsed {
+    .show { display: block; }
+    .hide { display: none; }
   }
+
+  .show { display: none; }
+  .hide { display: block; }
 }

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Blacklight
+  # Render facet items and any subtree
+  class FacetItemPivotComponent < ::ViewComponent::Base
+    # Somewhat arbitrary number; the only important thing is that
+    # it is bigger than the number of leaf nodes in any collapsing
+    # pivot facet on the page.
+    ID_COUNTER_MAX = 2**20 - 1
+
+    # Mint a (sufficiently) unique identifier, so we can associate
+    # the expand/collapse control with labels
+    def self.mint_id
+      @id_counter = ((@id_counter || 0) + 1) % ID_COUNTER_MAX
+
+      # We convert the ID to hex for markup compactness
+      @id_counter.to_s(16)
+    end
+
+    with_collection_parameter :facet_item
+
+    def initialize(facet_item:, wrapping_element: 'li', suppress_link: false, collapsing: nil)
+      @facet_item = facet_item
+      @wrapping_element = wrapping_element
+      @suppress_link = suppress_link
+      @collapsing = collapsing.nil? ? facet_item.facet_config.collapsing : collapsing
+      @icons = { show: '⊞', hide: '⊟' }.merge(facet_item.facet_config.icons || {})
+    end
+
+    def call
+      facet = Blacklight::FacetItemComponent.new(facet_item: @facet_item, wrapping_element: nil, suppress_link: @suppress_link)
+
+      id = "h-#{self.class.mint_id}" if @collapsing && has_items?
+
+      content_tag @wrapping_element, role: 'treeitem' do
+        concat facet_toggle_button(id) if has_items? && @collapsing
+        concat content_tag('span', render_component(facet), class: "facet-values #{'facet-leaf-node' if has_items? && @collapsing}", id: id && "#{id}_label")
+
+        if has_items?
+          concat(content_tag('ul', class: "pivot-facet list-unstyled #{'collapse' if @collapsing}", id: id, role: 'group') do
+            render_component(
+              self.class.with_collection(
+                @facet_item.items.map { |i| facet_item_presenter(i) }
+              )
+            )
+          end)
+        end
+      end
+    end
+
+    private
+
+    def has_items?
+      @facet_item.items.present?
+    end
+
+    def facet_toggle_button(id)
+      content_tag 'button', class: 'btn facet-toggle-handle collapsed',
+                            data: { toggle: 'collapse', target: "##{id}" },
+                            aria: { expanded: false, controls: id, describedby: "#{id}_label" } do
+        concat toggle_icon(:show)
+        concat toggle_icon(:hide)
+      end
+    end
+
+    def toggle_icon(type)
+      content_tag 'span', class: type do
+        concat @icons[type]
+        concat content_tag('span', t(type, scope: 'blacklight.search.facets.pivot'), class: 'sr-only')
+      end
+    end
+
+    # This is a little convoluted in Blacklight 7 in order to maintain backwards-compat
+    # with overrides of deprecated helpers. In 8.x, we can just call Component#render_in
+    # and call it a day
+    def render_component(component)
+      @view_context.render(component)
+    end
+
+    def facet_item_presenter(facet_item)
+      Blacklight::FacetItemPresenter.new(facet_item, @facet_item.facet_config, @view_context, @facet_item.facet_field, @facet_item.search_state)
+    end
+  end
+end

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -81,7 +81,11 @@ module Blacklight::FacetsHelperBehavior
       return unless should_render_facet?(display_facet, field_config)
     end
     options = options.dup
-    options[:partial] ||= facet_partial_name(display_facet)
+
+    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
+      options[:partial] ||= facet_partial_name(display_facet)
+    end
+
     options[:layout] ||= "facet_layout" unless options.key?(:layout)
     options[:locals] ||= {}
     options[:locals][:field_name] ||= display_facet.name
@@ -97,13 +101,12 @@ module Blacklight::FacetsHelperBehavior
   # to filter undesireable facet items so they don't appear in the UI
   def render_facet_limit_list(paginator, facet_field, wrapping_element = :li)
     facet_config ||= facet_configuration_for_field(facet_field)
-    component = facet_config.fetch(:item_component, Blacklight::FacetItemComponent)
 
     collection = paginator.items.map do |item|
       facet_item_presenter(facet_config, item, facet_field)
     end
 
-    render(component.with_collection(collection, wrapping_element: wrapping_element))
+    render(facet_item_component_class(facet_config).with_collection(collection, wrapping_element: wrapping_element))
   end
   deprecation_deprecate :render_facet_limit_list
 
@@ -288,8 +291,12 @@ module Blacklight::FacetsHelperBehavior
   end
 
   def facet_item_component(facet_config, facet_item, facet_field, **args)
-    component = facet_config.fetch(:item_component, Blacklight::FacetItemComponent)
-    component.new(facet_item: facet_item_presenter(facet_config, facet_item, facet_field), **args).with_view_context(self)
+    facet_item_component_class(facet_config).new(facet_item: facet_item_presenter(facet_config, facet_item, facet_field), **args).with_view_context(self)
+  end
+
+  def facet_item_component_class(facet_config)
+    default_component = facet_config.pivot ? Blacklight::FacetItemPivotComponent : Blacklight::FacetItemComponent
+    facet_config.fetch(:item_component, default_component)
   end
 
   # We can't use .deprecation_deprecate here, because the new components need to

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -18,7 +18,7 @@ module Blacklight::RenderConstraintsHelperBehavior
     search_state = convert_to_search_state(params_or_search_state)
     search_state.has_constraints?
   end
-  deprecation_deprecate :query_has_constraints?
+  deprecation_deprecate query_has_constraints?: 'use search_state#has_constraints?'
 
   ##
   # Render the actual constraints, not including header or footer
@@ -50,7 +50,7 @@ module Blacklight::RenderConstraintsHelperBehavior
     return "".html_safe if search_state.query_param.blank?
 
     Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
-      render_constraint_element(constraint_query_label(search_state),
+      render_constraint_element(constraint_query_label(search_state.params),
                                 search_state.query_param,
                                 classes: ["query"],
                                 remove: remove_constraint_url(search_state))

data/app/models/blacklight/icon.rb

@@ -26,17 +26,12 @@ module Blacklight
     def svg
       svg = ng_xml.at_xpath('svg')
       svg['role'] = role
-      svg['aria-labelledby'] = unique_id if label
-      svg.add_child("<title id='#{unique_id}'>#{icon_label}</title>") if label
+      svg.prepend_child("<title>#{icon_label}</title>") if label
       ng_xml.to_xml
     end
 
     def icon_label
-      I18n.translate("blacklight.icon.#{icon_name_context}", default: "#{icon_name} icon")
-    end
-
-    def unique_id
-      @unique_id ||= "bl-icon-#{icon_name_context}-#{SecureRandom.hex(8)}"
+      I18n.translate("blacklight.icon.#{icon_name_context}", default: icon_name.to_s.titleize)
     end
 
     ##
@@ -44,7 +39,8 @@ module Blacklight
     def options
       {
         class: classes,
-        "aria-hidden": (true if aria_hidden)
+        "aria-hidden": (true if aria_hidden),
+        "aria-label": (icon_label if label)
       }
     end
 
@@ -79,7 +75,7 @@ module Blacklight
     end
 
     def classes
-      " blacklight-icons #{@classes} ".strip
+      " blacklight-icons blacklight-icon-#{icon_name} #{@classes} ".strip
     end
   end
 end

data/app/models/concerns/blacklight/document.rb

@@ -16,16 +16,6 @@ require 'globalid'
 # transformation formats.
 #
 module Blacklight::Document
-  autoload :ActiveModelShim, 'blacklight/document/active_model_shim'
-  autoload :SchemaOrg, 'blacklight/document/schema_org'
-  autoload :CacheKey, 'blacklight/document/cache_key'
-  autoload :DublinCore, 'blacklight/document/dublin_core'
-  autoload :Email, 'blacklight/document/email'
-  autoload :SemanticFields, 'blacklight/document/semantic_fields'
-  autoload :Sms, 'blacklight/document/sms'
-  autoload :Extensions, 'blacklight/document/extensions'
-  autoload :Export, 'blacklight/document/export'
-
   extend ActiveSupport::Concern
   include Blacklight::Document::SchemaOrg
   include Blacklight::Document::SemanticFields

data/app/presenters/blacklight/facet_item_presenter.rb

@@ -4,7 +4,7 @@ module Blacklight
   class FacetItemPresenter
     attr_reader :facet_item, :facet_config, :view_context, :search_state, :facet_field
 
-    delegate :hits, to: :facet_item
+    delegate :hits, :items, to: :facet_item
 
     def initialize(facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
       @facet_item = facet_item

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

@@ -1,4 +1,4 @@
-<% if query_has_constraints? %>
+<% if Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) { query_has_constraints? } %>
   <div id="appliedParams" class="clearfix constraints-container">
     <h2 class="sr-only"><%= t('blacklight.search.search_constraints_header') %></h2>
 

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

@@ -1,18 +1,3 @@
-<ul class="pivot-facet list-unstyled">
-  <% display_facet.items.each do |item| -%>
-    <li>
-    <span class="facet-values">
-    <% if facet_in_params?(field_name, item) %>
-        <%= render_selected_facet_value(field_name, item) %>
-      <% else %>
-        <%= render_facet_value(field_name, item) %>
-    <% end -%>
-    </span>
-
-    <% unless item.items.blank? %>
-      <%= render 'facet_pivot', display_facet: item, field_name: field_name %>
-    <% end %>
-    </li>
-  <% end %>
-
-</ul>
+<%= render(Blacklight::FacetFieldListComponent.new(
+      facet_field: facet_field_presenter(facet_field.merge(item_component: Blacklight::FacetItemPivotComponent), display_facet),
+      layout: false)) %>

data/config/locales/blacklight.ar.yml

@@ -214,6 +214,9 @@ ar:
           remove: '[إزالة]'
         missing: "[غير موجود]"
         all: الكل
+        pivot:
+          show: فتح
+          hide: "إغلاق"
       group:
         more: 'المزيد »'
       filters:

data/config/locales/blacklight.de.yml

@@ -194,6 +194,9 @@ de:
         selected:
           remove: '[entfernen]'
         missing: [fehlt]
+        pivot:
+          show: Öffnen
+          hide: Schließen
       group:
         more: 'mehr »'
       filters:

data/config/locales/blacklight.en.yml

@@ -194,6 +194,9 @@ en:
           remove: '[remove]'
         missing: "[Missing]"
         all: All
+        pivot:
+          show: Show
+          hide: Hide
       group:
         more: 'more »'
       filters:

data/config/locales/blacklight.es.yml

@@ -194,6 +194,9 @@ es:
         selected:
           remove: '[borrar]'
         missing: '[Falta]'
+        pivot:
+          show: Abierto
+          hide: Cerrar
       group:
         more: 'más »'
       filters:

data/config/locales/blacklight.fr.yml

@@ -197,6 +197,9 @@ fr:
         selected:
           remove: '[ X ]'
         missing: '[manquante]'
+        pivot:
+          show: Ouvrir
+          hide: Fermer
       group:
         more: 'plus »'
       filters:

data/config/locales/blacklight.hu.yml

@@ -194,6 +194,9 @@ hu:
         selected:
           remove: '[eltávolítás]'
         missing: "[Hiányzó]"
+        pivot:
+          show: Megnyitás
+          hide: Bezárás
       group:
         more: 'több »'
       filters:

data/config/locales/blacklight.it.yml

@@ -194,6 +194,9 @@ it:
         selected:
           remove: '[cancella]'
         missing: [Mancante]
+        pivot:
+          show: Apri
+          hide: Chiudi
       group:
         more: 'altri »'
       filters:

data/config/locales/blacklight.nl.yml

@@ -194,6 +194,9 @@ nl:
         selected:
           remove: '[verwijder]'
         missing: "[Ontbrekend]"
+        pivot:
+          show: Openen
+          hide: Sluiten
       group:
         more: 'meer »'
       filters:

data/config/locales/blacklight.pt-BR.yml

@@ -195,6 +195,9 @@ pt-BR:
         selected:
           remove: '[remover]'
         missing: [Ausência]
+        pivot:
+          show: Abrir
+          hide: Fechar
       group:
         more: 'mais »'
       filters:

data/config/locales/blacklight.sq.yml

@@ -194,6 +194,9 @@ sq:
         selected:
           remove: '[fshije]'
         missing: "[Mungon]"
+        pivot:
+          show: Hape
+          hide: "Mbylle"
       group:
         more: 'më shumë »'
       filters:

data/config/locales/blacklight.zh.yml

@@ -194,6 +194,9 @@ zh:
         selected:
           remove: '[删除]'
         missing: "[未找到]"
+        pivot:
+          show: 打开
+          hide: 关
       group:
         more: '更多 »'
       filters:

data/lib/blacklight/configuration.rb

@@ -282,15 +282,10 @@ module Blacklight
     # Provide a 'deep copy' of Blacklight::Configuration that can be modified without effecting
     # the original Blacklight::Configuration instance.
     #
-    # Rails 4.x provides `#deep_dup`, but it aggressively `#dup`'s class names
-    # too. These model names should not be `#dup`'ed or we might break ActiveModel::Naming.
+    # Note: Rails provides `#deep_dup`, but it aggressively `#dup`'s class names too, turning them
+    # into anonymous class instances.
     def deep_copy
-      deep_dup.tap do |copy|
-        %w(repository_class response_model document_model document_presenter_class search_builder_class facet_paginator_class).each do |klass|
-          # Don't copy if nil, so as not to prematurely autoload default classes
-          copy.send("#{klass}=", send(klass)) unless fetch(klass.to_sym, nil).nil?
-        end
-      end
+      deep_transform_values_in_object(self, &method(:_deep_copy))
     end
 
     # builds a copy for the provided controller class
@@ -402,5 +397,37 @@ module Blacklight
       yield(config) if block_given?
       config_hash[name] = config
     end
+
+    # Provide custom duplication for certain types of configuration (intended for use in e.g. deep_transform_values)
+    def _deep_copy(value)
+      case value
+      when Module then value
+      when NestedOpenStructWithHashAccess then value.class.new(value.nested_class, deep_transform_values_in_object(value.to_h, &method(:_deep_copy)))
+      when OpenStruct then value.class.new(deep_transform_values_in_object(value.to_h, &method(:_deep_copy)))
+      else
+        value.dup
+      end
+    end
+
+    # This is a little shim to support Rails 6 (which has Hash#deep_transform_values) and
+    # earlier versions (which use our backport). Once we drop support for Rails 6, this
+    # can go away.
+    def deep_transform_values_in_object(object, &block)
+      return object.deep_transform_values(&block) if object.respond_to?(:deep_transform_values)
+
+      _deep_transform_values_in_object(object, &block)
+    end
+
+    # Ported from Rails 6
+    def _deep_transform_values_in_object(object, &block)
+      case object
+      when Hash
+        object.transform_values { |value| _deep_transform_values_in_object(value, &block) }
+      when Array
+        object.map { |e| _deep_transform_values_in_object(e, &block) }
+      else
+        yield(object)
+      end
+    end
   end
 end

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -84,7 +84,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     config.add_facet_field 'subject_geo_ssim', label: 'Region'
     config.add_facet_field 'subject_era_ssim', label: 'Era'
 
-    config.add_facet_field 'example_pivot_field', label: 'Pivot Field', :pivot => ['format', 'language_ssim']
+    config.add_facet_field 'example_pivot_field', label: 'Pivot Field', pivot: ['format', 'language_ssim'], collapsing: true
 
     config.add_facet_field 'example_query_facet_field', label: 'Publish Date', :query => {
        :years_5 => { label: 'within 5 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 5 } TO *]" },

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.1.0",
+  "version": "7.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1884,9 +1884,9 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "jquery": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
     },
     "js-tokens": {
       "version": "4.0.0",

data/package.json

@@ -24,7 +24,7 @@
   "dependencies": {
     "bloodhound-js": "^1.2.3",
     "bootstrap": "^4.3.1",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.1",
     "typeahead.js": "^0.11.1"
   }
 }

data/spec/components/blacklight/facet_item_pivot_component_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
+  subject(:render) do
+    render_inline(described_class.new(facet_item: facet_item))
+  end
+
+  let(:rendered) do
+    Capybara::Node::Simple.new(render)
+  end
+
+  let(:search_state) do
+    Blacklight::SearchState.new({}, Blacklight::Configuration.new)
+  end
+
+  let(:facet_item) do
+    instance_double(
+      Blacklight::FacetItemPresenter,
+      facet_config: Blacklight::Configuration::FacetField.new(key: 'z'),
+      facet_field: 'z',
+      label: 'x',
+      hits: 10,
+      href: '/catalog?f[z]=x',
+      selected?: false,
+      search_state: search_state,
+      items: [OpenStruct.new(value: 'x:1', hits: 5)]
+    )
+  end
+
+  it 'links to the facet and shows the number of hits' do
+    expect(rendered).to have_selector 'li'
+    expect(rendered).to have_link 'x', href: '/catalog?f[z]=x'
+    expect(rendered).to have_selector '.facet-count', text: '10'
+  end
+
+  it 'has the facet hierarchy' do
+    puts render
+    expect(rendered).to have_selector 'li ul.pivot-facet'
+    expect(rendered).to have_link 'x:1', href: /f%5Bz%5D%5B%5D=x%3A1/
+  end
+
+  context 'with a selected facet' do
+    let(:facet_item) do
+      instance_double(
+        Blacklight::FacetItemPresenter,
+        facet_config: Blacklight::Configuration::FacetField.new,
+        facet_field: 'z',
+        label: 'x',
+        hits: 10,
+        href: '/catalog',
+        selected?: true,
+        search_state: search_state,
+        items: []
+      )
+    end
+
+    it 'links to the facet and shows the number of hits' do
+      expect(rendered).to have_selector 'li'
+      expect(rendered).to have_selector '.selected', text: 'x'
+      expect(rendered).to have_link '[remove]', href: '/catalog'
+      expect(rendered).to have_selector '.selected.facet-count', text: '10'
+    end
+  end
+end

data/spec/features/facets_spec.rb

@@ -67,6 +67,26 @@ RSpec.describe "Facets" do
     expect(page).to have_css('#facet-format', visible: true) # assert that it didn't re-collapse
   end
 
+  it 'is able to expand pivot facets when javascript is enabled', js: true do
+    visit root_path
+
+    within('#facets .facets-header') do
+      page.find('button.navbar-toggler').click
+    end
+
+    page.find('h3.facet-field-heading button', text: 'Pivot Field').click
+
+    within '#facet-example_pivot_field' do
+      expect(page).to have_css('.facet-leaf-node', text: 'Book 30')
+      expect(page).not_to have_css('.facet-select', text: 'Tibetan')
+      page.find('.facet-toggle-handle').click
+      click_link 'Tibetan'
+    end
+
+    expect(page).to have_css('.constraint-value', text: 'Format Book')
+    expect(page).to have_css('.constraint-value', text: 'Language Tibetan')
+  end
+
   describe 'heading button focus with Firefox' do
     before do
       Capybara.current_driver = :selenium_headless

data/spec/models/blacklight/configuration_spec.rb

@@ -189,14 +189,18 @@ RSpec.describe "Blacklight::Configuration", api: true do
     it "provides cloned copies of mutable data structures" do
       config.a = { value: 1 }
       config.b = [1, 2, 3]
+      config.c = Blacklight::Configuration::Field.new(key: 'c', value: %w[a b])
 
       config_copy.a[:value] = 2
       config_copy.b << 5
+      config_copy.c.value << 'c'
 
       expect(config.a[:value]).to eq 1
       expect(config_copy.a[:value]).to eq 2
       expect(config.b).to match_array [1, 2, 3]
       expect(config_copy.b).to match_array [1, 2, 3, 5]
+      expect(config.c.value).to match_array %w[a b]
+      expect(config_copy.c.value).to match_array %w[a b c]
     end
   end
 

data/spec/models/blacklight/icon_spec.rb

@@ -17,22 +17,14 @@ RSpec.describe Blacklight::Icon do
     end
     it 'adds title' do
       expect(Capybara.string(subject.svg))
-        .to have_css 'title[id^="bl-icon-search-"]', text: 'search icon'
-    end
-    it 'adds aria-labelledby' do
-      expect(Capybara.string(subject.svg))
-        .to have_css 'svg[aria-labelledby^="bl-icon-search-"]'
+        .to have_css 'title', text: 'Search'
     end
     context 'when label is false' do
       subject { described_class.new(:search, classes: 'awesome', aria_hidden: true, label: false) }
 
       it 'does not add title' do
         expect(Capybara.string(subject.svg))
-          .not_to have_css 'title', text: 'search icon'
-      end
-      it 'does not add aria-labelledby' do
-        expect(Capybara.string(subject.svg))
-          .not_to have_css 'svg[aria-labelledby^="bl-icon-search-"]'
+          .not_to have_css 'title', text: 'Search'
       end
     end
 
@@ -41,14 +33,14 @@ RSpec.describe Blacklight::Icon do
 
       it 'adds title' do
         expect(Capybara.string(subject.svg))
-          .to have_css 'title[id^="bl-icon-search_foo-"]', text: 'search icon'
+          .to have_css 'title', text: 'Search'
       end
     end
   end
 
   describe '#options' do
     it 'applies options classes and default class' do
-      expect(subject.options[:class]).to eq 'blacklight-icons awesome'
+      expect(subject.options[:class]).to eq 'blacklight-icons blacklight-icon-search awesome'
     end
     it 'applies options aria-hidden=true' do
       expect(subject.options[:'aria-hidden']).to be true
@@ -57,7 +49,7 @@ RSpec.describe Blacklight::Icon do
       subject { described_class.new(:view) }
 
       it 'applies default class with no options' do
-        expect(subject.options[:class]).to eq 'blacklight-icons'
+        expect(subject.options[:class]).to eq 'blacklight-icons blacklight-icon-view'
       end
 
       it 'has no aria-hidden attribute with no options' do

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ require 'equivalent-xml'
 require 'webdrivers'
 
 Capybara.javascript_driver = :selenium_chrome_headless
+Capybara.disable_animation = true
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.8.1
+  version: 7.9.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -360,6 +360,7 @@ files:
 - app/components/blacklight/facet_field_list_component.rb
 - app/components/blacklight/facet_field_no_layout_component.rb
 - app/components/blacklight/facet_item_component.rb
+- app/components/blacklight/facet_item_pivot_component.rb
 - app/controllers/bookmarks_controller.rb
 - app/controllers/catalog_controller.rb
 - app/controllers/concerns/blacklight/base.rb
@@ -624,6 +625,7 @@ files:
 - spec/components/blacklight/constraint_layout_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
+- spec/components/blacklight/facet_item_pivot_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/blacklight/base_spec.rb
@@ -780,6 +782,7 @@ test_files:
 - spec/components/blacklight/constraint_layout_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
+- spec/components/blacklight/facet_item_pivot_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/blacklight/base_spec.rb