blacklight 8.12.2 → 9.0.0.beta1

data/spec/views/catalog/index.html.erb_spec.rb

@@ -19,14 +19,17 @@ RSpec.describe "catalog/index.html.erb" do
   describe "with search parameters" do
     before do
       stub_template "catalog/_results_pagination.html.erb" => ""
-      stub_template "catalog/_search_header.html.erb" => "header_content"
       allow(view).to receive_messages(has_search_parameters?: true, blacklight_config: Blacklight::Configuration.new)
-      @response = instance_double(Blacklight::Solr::Response, empty?: true, total: 11, start: 1, limit_value: 10)
+      allow(controller).to receive_messages(blacklight_config: Blacklight::Configuration.new)
+
+      @response = response
     end
 
+    let(:response) { Blacklight::Solr::Response.new({ response: { numFound: 30 } }, start: 10, rows: 10) }
+
     it "renders the search_header partial" do
       render
-      expect(rendered).to match /header_content/
+      expect(rendered).to match /sortAndPerPage/
     end
   end
 end

data/spec/views/catalog/show.html.erb_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe "catalog/show.html.erb" do
 
   before do
     allow(presenter).to receive(:html_title).and_return('Heading')
+    allow(document).to receive(:more_like_this).and_return([])
     allow(view).to receive_messages(has_user_authentication_provider?: false)
     allow(view).to receive_messages(render_document_sidebar_partial: "Sidebar")
     allow(view).to receive_messages(current_search_session: nil, search_session: {})

data/tasks/blacklight.rake

@@ -3,7 +3,7 @@
 require 'engine_cart/rake_task'
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new(spec: 'blacklight:build_host_assets') do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
@@ -46,15 +46,18 @@ desc "Run test suite"
 task ci: ['build:npm'] do
   with_solr do
     Rake::Task['blacklight:internal:seed'].invoke
-    within_test_app do
-      # Precompiles the assets
-      system "bin/rake spec:prepare"
-    end
     Rake::Task['blacklight:coverage'].invoke
   end
 end
 
 namespace :blacklight do
+  task :build_host_assets do
+    within_test_app do
+      # Precompiles the assets
+      `bin/rails spec:prepare`
+    end
+  end
+
   desc "Run tests with coverage"
   task :coverage do
     ENV['COVERAGE'] = 'true'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 8.12.2
+  version: 9.0.0.beta1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,9 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-18 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +24,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -35,7 +34,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -113,22 +112,16 @@ dependencies:
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.74'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.74'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -167,22 +160,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -422,11 +409,8 @@ files:
 - ".docker/app/entrypoint.sh"
 - ".dockerignore"
 - ".env"
-- ".github/matrix.json"
-- ".github/workflows/build.yml"
-- ".github/workflows/lint.yml"
-- ".github/workflows/main.yml"
-- ".github/workflows/test.yml"
+- ".github/pull_request_template.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".jshintrc"
@@ -441,6 +425,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/builds/blacklight.css
 - app/assets/config/blacklight/manifest.js
 - app/assets/images/blacklight/logo.png
 - app/assets/images/favicon.ico
@@ -448,7 +433,6 @@ files:
 - app/assets/javascripts/blacklight/blacklight.esm.js.map
 - app/assets/javascripts/blacklight/blacklight.js
 - app/assets/javascripts/blacklight/blacklight.js.map
-- app/assets/stylesheets/blacklight/_autocomplete.scss
 - app/assets/stylesheets/blacklight/_balanced_list.scss
 - app/assets/stylesheets/blacklight/_blacklight_base.scss
 - app/assets/stylesheets/blacklight/_bookmark.scss
@@ -460,7 +444,6 @@ files:
 - app/assets/stylesheets/blacklight/_header.scss
 - app/assets/stylesheets/blacklight/_icons.scss
 - app/assets/stylesheets/blacklight/_layout.scss
-- app/assets/stylesheets/blacklight/_mixins.scss
 - app/assets/stylesheets/blacklight/_modal.scss
 - app/assets/stylesheets/blacklight/_pagination.scss
 - app/assets/stylesheets/blacklight/_search_form.scss
@@ -468,6 +451,7 @@ files:
 - app/assets/stylesheets/blacklight/_search_results.scss
 - app/assets/stylesheets/blacklight/blacklight.scss
 - app/assets/stylesheets/blacklight/blacklight_defaults.scss
+- app/assets/stylesheets/blacklight/build.scss
 - app/builders/blacklight/action_builder.rb
 - app/components/blacklight/advanced_search_form_component.html.erb
 - app/components/blacklight/advanced_search_form_component.rb
@@ -524,7 +508,6 @@ files:
 - app/components/blacklight/hidden_search_state_component.rb
 - app/components/blacklight/icons/bookmark_icon_component.rb
 - app/components/blacklight/icons/icon_component.rb
-- app/components/blacklight/icons/legacy_icon_component.rb
 - app/components/blacklight/icons/list_component.rb
 - app/components/blacklight/icons/remove_component.rb
 - app/components/blacklight/icons/search_component.rb
@@ -535,6 +518,8 @@ files:
 - app/components/blacklight/metadata_field_plain_text_layout_component.rb
 - app/components/blacklight/response/facet_group_component.html.erb
 - app/components/blacklight/response/facet_group_component.rb
+- app/components/blacklight/response/facet_toggle_button_component.html.erb
+- app/components/blacklight/response/facet_toggle_button_component.rb
 - app/components/blacklight/response/pagination_component.html.erb
 - app/components/blacklight/response/pagination_component.rb
 - app/components/blacklight/response/sort_component.html.erb
@@ -598,16 +583,16 @@ files:
 - app/helpers/blacklight/url_helper_behavior.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/catalog_helper.rb
-- app/javascript/blacklight/bookmark_toggle.js
-- app/javascript/blacklight/button_focus.js
-- app/javascript/blacklight/checkbox_submit.js
-- app/javascript/blacklight/core.js
-- app/javascript/blacklight/debounce.js
-- app/javascript/blacklight/facet_suggest.js
-- app/javascript/blacklight/index.js
-- app/javascript/blacklight/modal.js
-- app/javascript/blacklight/modalForm.js
-- app/javascript/blacklight/search_context.js
+- app/javascript/blacklight-frontend/bookmark_toggle.js
+- app/javascript/blacklight-frontend/button_focus.js
+- app/javascript/blacklight-frontend/checkbox_submit.js
+- app/javascript/blacklight-frontend/core.js
+- app/javascript/blacklight-frontend/debounce.js
+- app/javascript/blacklight-frontend/facet_suggest.js
+- app/javascript/blacklight-frontend/index.js
+- app/javascript/blacklight-frontend/modal.js
+- app/javascript/blacklight-frontend/modalForm.js
+- app/javascript/blacklight-frontend/search_context.js
 - app/models/blacklight/facet_paginator.rb
 - app/models/blacklight/icon.rb
 - app/models/blacklight/suggest_search.rb
@@ -664,7 +649,6 @@ files:
 - app/views/catalog/_advanced_search_help.html.erb
 - app/views/catalog/_bookmark_control.html.erb
 - app/views/catalog/_citation.html.erb
-- app/views/catalog/_constraints.html.erb
 - app/views/catalog/_did_you_mean.html.erb
 - app/views/catalog/_document.atom.builder
 - app/views/catalog/_document.html.erb
@@ -675,7 +659,6 @@ files:
 - app/views/catalog/_facet_layout.html.erb
 - app/views/catalog/_facet_pagination.html.erb
 - app/views/catalog/_facet_pivot.html.erb
-- app/views/catalog/_facets.html.erb
 - app/views/catalog/_field.json.jbuilder
 - app/views/catalog/_group.html.erb
 - app/views/catalog/_home.html.erb
@@ -684,19 +667,14 @@ files:
 - app/views/catalog/_paginate_compact.html.erb
 - app/views/catalog/_per_page_widget.html.erb
 - app/views/catalog/_results_pagination.html.erb
-- app/views/catalog/_search_form.html.erb
-- app/views/catalog/_search_header.html.erb
 - app/views/catalog/_search_results.html.erb
 - app/views/catalog/_search_results_header.html.erb
 - app/views/catalog/_search_sidebar.html.erb
 - app/views/catalog/_show_main_content.html.erb
 - app/views/catalog/_show_more_like_this.html.erb
-- app/views/catalog/_show_sidebar.html.erb
-- app/views/catalog/_show_tools.html.erb
 - app/views/catalog/_sms_form.html.erb
 - app/views/catalog/_sort_and_per_page.html.erb
 - app/views/catalog/_sort_widget.html.erb
-- app/views/catalog/_start_over.html.erb
 - app/views/catalog/_view_type_group.html.erb
 - app/views/catalog/_zero_results.html.erb
 - app/views/catalog/advanced_search.html.erb
@@ -737,7 +715,6 @@ files:
 - app/views/shared/_flash_messages.html.erb
 - app/views/shared/_flash_msg.html.erb
 - app/views/shared/_footer.html.erb
-- app/views/shared/_header_navbar.html.erb
 - app/views/shared/_modal.html.erb
 - app/views/shared/_sitelinks_search_box.html.erb
 - app/views/shared/_user_util_links.html.erb
@@ -810,7 +787,6 @@ files:
 - lib/blacklight/version.rb
 - lib/generators/blacklight/assets/importmap_generator.rb
 - lib/generators/blacklight/assets/propshaft_generator.rb
-- lib/generators/blacklight/assets/sprockets_generator.rb
 - lib/generators/blacklight/assets_generator.rb
 - lib/generators/blacklight/controller_generator.rb
 - lib/generators/blacklight/document_generator.rb
@@ -875,7 +851,6 @@ files:
 - spec/components/blacklight/search_context/server_item_pagination_component_spec.rb
 - spec/components/blacklight/skip_link_component_spec.rb
 - spec/components/blacklight/start_over_button_component_spec.rb
-- spec/components/blacklight/system/dropdown_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
@@ -989,9 +964,6 @@ files:
 - spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
-- spec/views/catalog/_search_header.erb_spec.rb
-- spec/views/catalog/_show_sidebar.erb_spec.rb
-- spec/views/catalog/_show_tools.html.erb_spec.rb
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_sort_widget.html.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
@@ -1012,7 +984,6 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1020,15 +991,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -1060,7 +1030,6 @@ test_files:
 - spec/components/blacklight/search_context/server_item_pagination_component_spec.rb
 - spec/components/blacklight/skip_link_component_spec.rb
 - spec/components/blacklight/start_over_button_component_spec.rb
-- spec/components/blacklight/system/dropdown_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
@@ -1174,9 +1143,6 @@ test_files:
 - spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
-- spec/views/catalog/_search_header.erb_spec.rb
-- spec/views/catalog/_show_sidebar.erb_spec.rb
-- spec/views/catalog/_show_tools.html.erb_spec.rb
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_sort_widget.html.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb

data/.github/matrix.json

@@ -1,92 +0,0 @@
-{
-  "ruby": [
-    "3.3"
-  ],
-  "rails_version": [
-    "7.1.5.1",
-    "7.2.2.1"
-  ],
-  "bootstrap_version": [
-    null
-  ],
-  "view_component_version": [
-    "~> 3.12"
-  ],
-  "api": [
-    null
-  ],
-  "additional_engine_cart_rails_options": [
-    ""
-  ],
-  "additional_name": [
-    ""
-  ],
-  "include": [
-    {
-      "ruby": "3.3",
-      "rails_version": "8.0.1",
-      "additional_engine_cart_rails_options": "--css=bootstrap"
-    },
-    {
-      "ruby": "3.3",
-      "rails_version": "8.0.1",
-      "additional_engine_cart_rails_options": "--css=bootstrap --js=esbuild",
-      "additional_name": "| esbuild"
-    },
-    {
-      "ruby": "3.3",
-      "rails_version": "8.0.1",
-      "view_component_version": "~> 4.0",
-      "additional_engine_cart_rails_options": "--css=bootstrap",
-      "additional_name": "| ViewComponent 4"
-    },
-    {
-      "ruby": "3.3",
-      "rails_version": "8.0.1",
-      "view_component_version": "~> 4.0",
-      "additional_engine_cart_rails_options": "--css=bootstrap --js=esbuild",
-      "additional_name": "| esbuild, ViewComponent 4"
-    },
-    {
-      "ruby": "3.2",
-      "rails_version": "7.1.5.1",
-      "solr_version": "8.11.2",
-      "additional_name": "Solr 8.11.2"
-    },
-    {
-      "ruby": "3.1",
-      "rails_version": "7.1.5.1"
-    },
-    {
-      "ruby": "3.1",
-      "rails_version": "7.1.5.1",
-      "view_component_version": "~> 2.74",
-      "additional_name": "| ViewComponent 2"
-    },
-    {
-      "ruby": "3.1",
-      "rails_version": "7.1.5.1",
-      "additional_name": "| Propshaft",
-      "additional_engine_cart_rails_options": "-a propshaft --css=bootstrap"
-    },
-    {
-      "ruby": "3.1",
-      "rails_version": "7.1.5.1",
-      "bootstrap_version": "~> 4.0",
-      "additional_name": "| Bootstrap 4"
-    },
-    {
-      "ruby": "3.3",
-      "rails_version": "7.1.5.1",
-      "api": "true",
-      "additional_engine_cart_rails_options": "--api --skip-yarn",
-      "additional_name": "| API"
-    },
-    {
-      "ruby": "3.3",
-      "rails_version": "7.2.2.1",
-      "additional_engine_cart_rails_options": "-a propshaft --css=bootstrap --js=esbuild",
-      "additional_name": "| Propshaft, esbuild"
-    }
-  ]
-}

data/.github/workflows/build.yml

@@ -1,16 +0,0 @@
-on:
-  workflow_call:
-    inputs:
-      ref:
-        required: false
-        type: string
-        default: ''
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
-      - name: Build docker image
-        run: docker compose build app

data/.github/workflows/lint.yml

@@ -1,25 +0,0 @@
-on:
-  workflow_call:
-    inputs:
-      ref:
-        required: false
-        type: string
-        default: ''
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.2
-          bundler: "latest"
-      - name: Change permissions
-        run: "chmod -f -R o-w /opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/gems | :"
-      - name: Install dependencies
-        run: bundle install
-      - name: Run linter
-        run: bundle exec rake rubocop

data/.github/workflows/main.yml

@@ -1,24 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-      - "release-*"
-  pull_request:
-jobs:
-  lint:
-    uses: ./.github/workflows/lint.yml
-  test:
-    uses: ./.github/workflows/test.yml
-    with:
-      ruby: '["3.3"]'
-  docker_build:
-    uses: ./.github/workflows/build.yml

data/.github/workflows/test.yml

@@ -1,58 +0,0 @@
-on:
-  workflow_call:
-    inputs:
-      ref:
-        required: false
-        type: string
-        default: ''
-        description: The branch or reference to run the workflow against
-      ruby:
-        required: false
-        type: string
-        default: ''
-        description: Deprecated - use matrix.json instead
-jobs:
-  set_matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.matrix.outputs.matrix }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.ref }}
-      - name: Echo ./.github/matrix.json
-        id: matrix
-        run: |
-          echo "matrix<<EOF" >> $GITHUB_OUTPUT
-          cat ./.github/matrix.json >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-  test:
-    needs: set_matrix
-    runs-on: ubuntu-latest
-    name: ruby ${{ matrix.ruby }} | rails ${{ matrix.rails_version }} ${{ matrix.additional_name }}
-    strategy:
-      fail-fast: false
-      matrix: ${{fromJson(needs.set_matrix.outputs.matrix)}}
-    env:
-      RAILS_VERSION: ${{ matrix.rails_version }}
-      SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
-      VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
-      BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
-      BLACKLIGHT_API_TEST: ${{ matrix.api }}
-      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-kamal --skip-solid --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler: "latest"
-          ruby-version: ${{ matrix.ruby }}
-      - name: Change permissions
-        run: "chmod -f -R o-w /opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/gems | :"
-      - name: Install dependencies
-        run: bundle install
-      - name: Run tests
-        run: bundle exec rake ci

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

@@ -1,25 +0,0 @@
-auto-complete [aria-selected="true"],
-auto-complete [role="option"]:hover {
-  background-color: $dropdown-link-hover-bg;
-}
-auto-complete {
-  position: relative;
-  flex-grow: 3;
-
-  ul {
-    list-style-type: none;
-    position: absolute;
-    background-color: $dropdown-bg;
-    padding-left: 0;
-    border: 1px solid $dropdown-border-color;
-    border-radius: $dropdown-border-radius;
-  }
-
-  [role="option"]{
-    padding: 0.25rem 1.5rem;
-  }
-}
-
-.no-js #autocomplete-popup {
-  display: none;
-}

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

@@ -1,20 +0,0 @@
-// define a visually-hidden class that applies to a given breakpoint and below
-// https://getbootstrap.com/docs/5.3/helpers/visually-hidden/
-@if mixin-exists(visually-hidden) {
-  @each $breakpoint in map-keys($grid-breakpoints) {
-    .visually-hidden-#{$breakpoint} {
-      @include media-breakpoint-down($breakpoint) {
-        @include visually-hidden;
-      }
-    }
-  }
-} @else if mixin-exists(sr-only) {
-  // Bootstrap 4 version
-  @each $breakpoint in map-keys($grid-breakpoints) {
-    .visually-hidden-#{$breakpoint} {
-      @include media-breakpoint-down($breakpoint) {
-        @include sr-only;
-      }
-    }
-  }
-}

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

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Blacklight
-  module Icons
-    class LegacyIconComponent < ::ViewComponent::Base
-      def initialize(name:, classes: '', aria_hidden: false, label: true, role: 'img', additional_options: {})
-        @name = name
-        @classes = classes
-        @aria_hidden = aria_hidden
-        @icon = Blacklight::Icon.new(name, classes: classes, label: label, role: role, additional_options: additional_options)
-      end
-
-      def call
-        tag.span(svg&.html_safe || default_icon, # rubocop:disable Rails/OutputSafety
-                 class: "blacklight-icons blacklight-icon-#{@name} #{@classes}".strip,
-                 'aria-hidden': (true if @aria_hidden))
-      end
-
-      def svg
-        Rails.cache.fetch([:blacklight_icon_svg, @name]) do
-          @icon.svg if @icon.present?
-        end
-      end
-
-      def default_icon
-        @icon.icon_label
-      end
-    end
-  end
-end