blacklight 8.2.2 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b852f9b5c0e06c9c807400bb9449ced0e192137d62bdabfcb09b7eed2314262
-  data.tar.gz: b3a1f6285c858b9acdb74d7200da29dd426ef61b1cdf0a843424c6670f5fca80
+  metadata.gz: b1e6e672e07634c504da353b57fe4f15f41d56f3bc6656aedc03f7b312f1531e
+  data.tar.gz: 0cc0c2d92c0622e27889eb49b08b5f2d39e455e725076c59ef119f45606a1e4e
 SHA512:
-  metadata.gz: f8059481dee8d4a30b3497cccde70d195112840870f08e8a732e11ca22e0fe985e8cfb52d202e5d2ecce06289710bff4ed2a7c98cef97ae32977c2064a8361b2
-  data.tar.gz: d5b6d82af1332ccdf0e18cbe7ceb66bdb9a189db77ad7885cb4e16b8c05a82a52e16b9499ab018a9d43681bc02144f010f4bd343926363a5e093d0bac3ad477c
+  metadata.gz: b5847ccdf59e00a4c34e36081626cead1263475e517c9ea79b23ebd6e0c656b0e272eff35c0da02cbc500c0c8b119a2454e397ce323ce64eb473bdc1dc897a44
+  data.tar.gz: 90db3e0bd7e6a24d782832a0967f5af56c0f3b803f8d4debeef669040e98077829e5c49dd03449719d1de9ed19e26a33b060a231d173e5d1e00d2d31ed2f6764

data/.env

@@ -1,6 +1,6 @@
 ALPINE_RUBY_VERSION=3.0.3
 RAILS_VERSION=6.1.4.6
-VIEW_COMPONENT_VERSION=2.66.0
+VIEW_COMPONENT_VERSION=3.12.1
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/workflows/ruby.yml

@@ -11,69 +11,63 @@ on:
   push:
     branches:
       - main
-      - 'release-*'
+      - "release-*"
   pull_request:
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.2
-        bundler: 'latest'
-    - name: Install dependencies
-      run: bundle install
-    - name: Run linter
-      run: bundle exec rake rubocop
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+          bundler: "latest"
+      - name: Install dependencies
+        run: bundle install
+      - name: Run linter
+        run: bundle exec rake rubocop
   test:
     runs-on: ubuntu-latest
     name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} ${{ matrix.additional_name }})
     strategy:
       matrix:
-        ruby: ['3.0']
-        rails_version: ['6.1.7', '7.0.4']
+        ruby: ["3.3"]
+        rails_version: ["7.0.8.4", "7.1.3.4"]
         bootstrap_version: [null]
-        view_component_version: ['~> 2.66']
+        view_component_version: ["~> 3.12"]
         api: [null]
-        additional_engine_cart_rails_options: ['']
-        additional_name: ['']
+        additional_engine_cart_rails_options: [""]
+        additional_name: [""]
         include:
-        - ruby: '3.3.0'
-          rails_version: '7.1.1'
-        - ruby: '3.2.2'
-          rails_version: '7.1.1'
-        - ruby: '3.2.2'
-          rails_version: '7.0.4'
-        - ruby: '3.2.2'
-          rails_version: '7.0.4'
-          solr_version: '9.3.0'
-          additional_name: 'Solr 9.3.0'
-        - ruby: '3.2.2'
-          rails_version: '7.0.4'
-          solr_version: '8.11.2'
-          additional_name: 'Solr 8.11.2'
-        - ruby: '3.1'
-          rails_version: '7.0.4'
-        - ruby: '3.1'
-          rails_version: '7.0.4'
-          view_component_version: '~> 3.0.0.rc1'
-          additional_name: '/ ViewComponent 3'
-        - ruby: '3.1'
-          rails_version: '7.0.4'
-          additional_name: '/ Propshaft'
-          additional_engine_cart_rails_options: -a propshaft --css=bootstrap
-        - ruby: '3.0'
-          rails_version: '7.0.4'
-          bootstrap_version: '~> 4.0'
-          additional_name: '/ Bootstrap 4'
-        - ruby: '3.0'
-          rails_version: '7.0.4'
-          api: 'true'
-          additional_engine_cart_rails_options: --api --skip-yarn
-          additional_name: '/ API'
+          - ruby: "3.2"
+            rails_version: "6.1.7.8"
+          - ruby: "3.2"
+            rails_version: "7.0.8.4"
+          - ruby: "3.2"
+            rails_version: "7.1.3.4"
+            solr_version: "8.11.2"
+            additional_name: "Solr 8.11.2"
+          - ruby: "3.1"
+            rails_version: "7.1.3.4"
+          - ruby: "3.1"
+            rails_version: "7.1.3.4"
+            view_component_version: "~> 2.66"
+            additional_name: "/ ViewComponent 2"
+          - ruby: "3.1"
+            rails_version: "7.0.8.4"
+            additional_name: "/ Propshaft"
+            additional_engine_cart_rails_options: -a propshaft --css=bootstrap
+          - ruby: "3.1"
+            rails_version: "7.0.8.4"
+            bootstrap_version: "~> 4.0"
+            additional_name: "/ Bootstrap 4"
+          - ruby: "3.3"
+            rails_version: "7.1.3.4"
+            api: "true"
+            additional_engine_cart_rails_options: --api --skip-yarn
+            additional_name: "/ API"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
@@ -82,19 +76,19 @@ jobs:
       BLACKLIGHT_API_TEST: ${{ matrix.api }}
       ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler: 'latest'
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler: "latest"
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake ci
   docker_build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Build docker image
-      run: docker-compose build app
+      - uses: actions/checkout@v3
+      - name: Build docker image
+        run: docker-compose build app

data/.rubocop.yml

@@ -1,6 +1,7 @@
 require:
   - rubocop-capybara
   - rubocop-rspec
+  - rubocop-rspec_rails
   - rubocop-rails
 
 inherit_from:
@@ -8,27 +9,25 @@ inherit_from:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   TargetRailsVersion: 6.1
   Exclude:
-  - "lib/generators/blacklight/templates/**/*"
-  - "blacklight.gemspec"
-
+    - "lib/generators/blacklight/templates/**/*"
+    - "blacklight.gemspec"
 
 Lint/UselessAssignment:
   Exclude:
     - app/presenters/blacklight/facet_item_pivot_presenter.rb # https://github.com/rubocop/rubocop/issues/11124
 
-
 # engine_cart block includes conditional, not duplication
 Bundler/DuplicatedGem:
   Exclude:
-  - 'Gemfile'
+    - "Gemfile"
 
 # engine_cart block is following default Rails order
 Bundler/OrderedGems:
   Exclude:
-  - 'Gemfile'
+    - "Gemfile"
 
 Layout/IndentationConsistency:
   EnforcedStyle: normal
@@ -51,13 +50,13 @@ Metrics/ClassLength:
 Layout/LineLength:
   Max: 200
   Exclude:
-    - 'spec/**/*'
+    - "spec/**/*"
 
 Metrics/ModuleLength:
   Exclude:
-    - 'app/controllers/concerns/blacklight/catalog.rb'
-    - 'lib/blacklight/solr/search_builder_behavior.rb'
-    - 'lib/blacklight/solr/response/facets.rb'
+    - "app/controllers/concerns/blacklight/catalog.rb"
+    - "lib/blacklight/solr/search_builder_behavior.rb"
+    - "lib/blacklight/solr/response/facets.rb"
 
 Metrics/AbcSize:
   Exclude:
@@ -90,7 +89,7 @@ Style/AccessModifierDeclarations:
 
 Style/MissingRespondToMissing:
   Exclude:
-  - 'lib/blacklight/nested_open_struct_with_hash_access.rb'
+    - "lib/blacklight/nested_open_struct_with_hash_access.rb"
 
 Style/StringLiterals:
   Enabled: false
@@ -122,7 +121,7 @@ Style/ExponentialNotation:
 Style/HashEachMethods:
   Enabled: true
   Exclude:
-    - 'spec/services/blacklight/search_service_spec.rb'
+    - "spec/services/blacklight/search_service_spec.rb"
 
 Style/HashTransformKeys:
   Enabled: true
@@ -200,7 +199,7 @@ Style/ArgumentsForwarding: # new in 1.1
   Enabled: true
   Exclude:
     # This cop includes some checks specific to Ruby 3.2
-    - 'lib/blacklight/solr/response/group_response.rb'
+    - "lib/blacklight/solr/response/group_response.rb"
 Style/CollectionCompact: # new in 1.2
   Enabled: true
 Style/DocumentDynamicEvalDefinition: # new in 1.1
@@ -241,18 +240,18 @@ Style/SwapValues: # new in 1.1
   Enabled: true
 RSpec/DescribeClass:
   Exclude:
-    - 'spec/lib/tasks/blacklight_task_spec.rb'
-    - 'spec/features/**/*'
-    - 'spec/requests/**/*'
-    - 'spec/routing/**/*'
-    - 'spec/views/**/*'
+    - "spec/lib/tasks/blacklight_task_spec.rb"
+    - "spec/features/**/*"
+    - "spec/requests/**/*"
+    - "spec/routing/**/*"
+    - "spec/views/**/*"
 RSpec/ExcessiveDocstringSpacing: # new in 2.5
   Enabled: true
 RSpec/IdenticalEqualityAssertion: # new in 2.4
   Enabled: true
 RSpec/SubjectDeclaration: # new in 2.5
   Enabled: true
-RSpec/Rails/AvoidSetupHook: # new in 2.4
+RSpecRails/AvoidSetupHook: # new in 2.4
   Enabled: true
 Rails/ActiveRecordCallbacksOrder: # new in 2.7
   Enabled: true
@@ -320,7 +319,7 @@ RSpec/BeEq: # new in 2.9.0
   Enabled: true
 RSpec/BeNil: # new in 2.9.0
   Enabled: true
-RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
 Rails/ActionControllerTestCase: # new in 2.14
   Enabled: true
@@ -376,3 +375,209 @@ Rails/StripHeredoc: # new in 2.15
   Enabled: true
 Rails/ToFormattedS: # new in 2.15
   Enabled: true
+Gemspec/DevelopmentDependencies: # new in 1.44
+  Enabled: true
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: true
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: true
+Lint/UselessRescue: # new in 1.43
+  Enabled: true
+Metrics/CollectionLiteralLength: # new in 1.47
+  Enabled: true
+Style/ArrayIntersect: # new in 1.40
+  Enabled: true
+Style/ComparableClamp: # new in 1.44
+  Enabled: true
+Style/ConcatArrayLiterals: # new in 1.41
+  Enabled: true
+Style/DataInheritance: # new in 1.49
+  Enabled: true
+Style/DirEmpty: # new in 1.48
+  Enabled: true
+Style/EmptyHeredoc: # new in 1.32
+  Enabled: true
+Style/ExactRegexpMatch: # new in 1.51
+  Enabled: true
+Style/FileEmpty: # new in 1.48
+  Enabled: true
+Style/MagicCommentFormat: # new in 1.35
+  Enabled: true
+Style/MapIntoArray: # new in 1.63
+  Enabled: true
+Style/MapToSet: # new in 1.42
+  Enabled: true
+Style/MinMaxComparison: # new in 1.42
+  Enabled: true
+Style/OperatorMethodCall: # new in 1.37
+  Enabled: true
+Style/RedundantArrayConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantConstantBase: # new in 1.40
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces: # new in 1.41
+  Enabled: true
+Style/RedundantEach: # new in 1.38
+  Enabled: true
+Style/RedundantFilterChain: # new in 1.52
+  Enabled: true
+Style/RedundantHeredocDelimiterQuotes: # new in 1.45
+  Enabled: true
+Style/RedundantLineContinuation: # new in 1.49
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/RedundantRegexpConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantStringEscape: # new in 1.37
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+Capybara/ClickLinkOrButtonStyle: # new in 2.19
+  Enabled: true
+Capybara/MatchStyle: # new in 2.17
+  Enabled: true
+Capybara/NegationMatcher: # new in 2.14
+  Enabled: true
+  Exclude:
+    - "spec/models/**/*"
+Capybara/RedundantWithinFind: # new in 2.20
+  Enabled: true
+Capybara/SpecificActions: # new in 2.14
+  Enabled: true
+Capybara/SpecificFinders: # new in 2.13
+  Enabled: true
+Capybara/SpecificMatcher: # new in 2.12
+  Enabled: true
+Capybara/RSpec/HaveSelector: # new in 2.19
+  Enabled: true
+Capybara/RSpec/PredicateMatcher: # new in 2.19
+  Enabled: true
+FactoryBot/AssociationStyle: # new in 2.23
+  Enabled: true
+FactoryBot/ConsistentParenthesesStyle: # new in 2.14
+  Enabled: true
+FactoryBot/ExcessiveCreateList: # new in 2.25
+  Enabled: true
+FactoryBot/FactoryAssociationWithStrategy: # new in 2.23
+  Enabled: true
+FactoryBot/FactoryNameStyle: # new in 2.16
+  Enabled: true
+FactoryBot/IdSequence: # new in 2.24
+  Enabled: true
+FactoryBot/RedundantFactoryOption: # new in 2.23
+  Enabled: true
+RSpecRails/HaveHttpStatus: # new in 2.12
+  Enabled: true
+RSpecRails/InferredSpecType: # new in 2.14
+  Enabled: true
+RSpecRails/MinitestAssertions: # new in 2.17
+  Enabled: true
+RSpecRails/NegationBeValid: # new in 2.23
+  Enabled: true
+RSpecRails/TravelAround: # new in 2.19
+  Enabled: true
+RSpec/BeEmpty: # new in 2.20
+  Enabled: true
+RSpec/ContainExactly: # new in 2.19
+  Enabled: true
+RSpec/DuplicatedMetadata: # new in 2.16
+  Enabled: true
+RSpec/EmptyMetadata: # new in 2.24
+  Enabled: true
+RSpec/EmptyOutput: # new in 2.29
+  Enabled: true
+RSpec/Eq: # new in 2.24
+  Enabled: true
+RSpec/ExpectInLet: # new in 2.30
+  Enabled: true
+RSpec/IndexedLet: # new in 2.20
+  Enabled: true
+RSpec/IsExpectedSpecify: # new in 2.27
+  Enabled: true
+RSpec/MatchArray: # new in 2.19
+  Enabled: true
+RSpec/MetadataStyle: # new in 2.24
+  Enabled: true
+RSpec/NoExpectationExample: # new in 2.13
+  Enabled: true
+RSpec/PendingWithoutReason: # new in 2.16
+  Enabled: true
+RSpec/ReceiveMessages: # new in 2.23
+  Enabled: true
+RSpec/RedundantAround: # new in 2.19
+  Enabled: true
+RSpec/RedundantPredicateMatcher: # new in 2.26
+  Enabled: true
+RSpec/RemoveConst: # new in 2.26
+  Enabled: true
+RSpec/RepeatedSubjectCall: # new in 2.27
+  Enabled: true
+RSpec/SkipBlockInsideExample: # new in 2.19
+  Enabled: true
+RSpec/SortMetadata: # new in 2.14
+  Enabled: true
+RSpec/SpecFilePathFormat: # new in 2.24
+  Enabled: true
+RSpec/SpecFilePathSuffix: # new in 2.24
+  Enabled: true
+RSpec/UndescriptiveLiteralsDescription: # new in 2.29
+  Enabled: true
+Rails/ActionControllerFlashBeforeRender: # new in 2.16
+  Enabled: true
+Rails/ActionOrder: # new in 2.17
+  Enabled: true
+Rails/ActiveSupportOnLoad: # new in 2.16
+  Enabled: true
+Rails/DangerousColumnNames: # new in 2.21
+  Enabled: true
+Rails/EnvLocal: # new in 2.22
+  Enabled: true
+Rails/FreezeTime: # new in 2.16
+  Enabled: true
+Rails/IgnoredColumnsAssignment: # new in 2.17
+  Enabled: true
+Rails/RedundantActiveRecordAllMethod: # new in 2.21
+  Enabled: true
+Rails/ResponseParsedBody: # new in 2.18
+  Enabled: true
+Rails/RootPathnameMethods: # new in 2.16
+  Enabled: true
+Rails/SelectMap: # new in 2.21
+  Enabled: true
+Rails/ThreeStateBooleanColumn: # new in 2.19
+  Enabled: true
+Rails/ToSWithArgument: # new in 2.16
+  Enabled: true
+Rails/TopLevelHashWithIndifferentAccess: # new in 2.16
+  Enabled: true
+Rails/UnusedRenderContent: # new in 2.21
+  Enabled: true
+Rails/WhereMissing: # new in 2.16
+  Enabled: true
+Rails/WhereNotWithMultipleConditions: # new in 2.17
+  Enabled: true
+Rails/WhereRange: # new in 2.25
+  Enabled: true

data/VERSION

@@ -1 +1 @@
-8.2.2
+8.3.0

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

@@ -1,19 +1,3 @@
-// Stroke contrast
-// Ripped off from https://github.com/twbs/bootstrap/commit/c31d52499811d5c68d122db806ce27a112b489bd
-@mixin fill-yiq($color) {
-  $r: red($color);
-  $g: green($color);
-  $b: blue($color);
-
-  $yiq: (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
-
-  @if ($yiq >= 150) {
-    fill: #111;
-  } @else {
-    fill: #fff;
-  }
-}
-
 // 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) {
@@ -24,7 +8,8 @@
       }
     }
   }
-} @else if mixin-exists(sr-only) {  // Bootstrap 4 version
+} @else if mixin-exists(sr-only) {
+  // Bootstrap 4 version
   @each $infix, $breakpoint in $grid-breakpoints {
     .visually-hidden-#{$infix} {
       @include media-breakpoint-down($breakpoint) {

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -52,13 +52,13 @@ module Blacklight
     private
 
     def has_items?
-      return unless @facet_item.respond_to? :facet_item_presenters
+      return false unless @facet_item.respond_to? :facet_item_presenters
 
       @facet_item.facet_item_presenters.any?
     end
 
     def expanded?
-      return unless @collapsing
+      return false unless @collapsing
 
       @facet_item.shown?
     end

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

@@ -18,7 +18,7 @@ module Blacklight
         @choices = choices
         @search_state = search_state
         @id = id
-        @classes = classes.concat(['btn-group', "#{param.to_s.parameterize}-dropdown"])
+        @classes = classes.push('btn-group', "#{param.to_s.parameterize}-dropdown")
         @selected = selected || default || option_text_and_value(@choices.first)&.first
         @interpolation = interpolation
       end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -53,11 +53,7 @@ module Blacklight::CatalogHelperBehavior
                 collection.limit_value
               end
 
-    end_num = if collection.offset_value + end_num <= collection.total_count
-                collection.offset_value + end_num
-              else
-                collection.total_count
-              end
+    end_num = [collection.offset_value + end_num, collection.total_count].min
 
     case collection.total_count
     when 0

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -41,11 +41,11 @@ module Blacklight
     end
 
     ##
-    # Class used for specifying main layout container classes. Can be
-    # overwritten to return 'container-fluid' for Bootstrap full-width layout
+    # Class used for specifying main layout container classes.
+    # Set config.full_width_layout to true to use a fluid layout.
     # @return [String]
     def container_classes
-      'container'
+      blacklight_config.full_width_layout ? 'container-fluid' : 'container'
     end
 
     ##

data/app/views/shared/_flash_messages.html.erb

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-12">
-    <div id="main-flashes">
+    <div id="main-flashes" class="<%= class_names(container: blacklight_config&.full_width_layout) %>">
       <%= yield %>
     </div>
   </div>

data/lib/blacklight/configuration.rb

@@ -60,6 +60,7 @@ module Blacklight
     default_configuration do
       property :logo_link, default: nil
       property :header_component, default: Blacklight::HeaderComponent
+      property :full_width_layout, default: false
 
       # bootstrap_version may be set to 4 or 5
       bootstrap_version = ENV['BOOTSTRAP_VERSION'].presence || "5"

data/lib/blacklight/nested_open_struct_with_hash_access.rb

@@ -20,7 +20,7 @@ module Blacklight
                end
       end
 
-      super value
+      super(value)
       set_default_proc!
     end
 
@@ -56,7 +56,7 @@ module Blacklight
     # to the internal hash
     def marshal_load x
       @nested_class = x.first
-      super x.last
+      super(x.last)
       set_default_proc!
     end
 

data/lib/blacklight/solr/request.rb

@@ -14,7 +14,7 @@ class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
       super()
       update(constructor)
     else
-      super(constructor)
+      super
     end
   end
 

data/lib/blacklight/solr/response/facets.rb

@@ -102,7 +102,7 @@ module Blacklight::Solr::Response::Facets
 
   class NullFacetField < FacetField
     def initialize name, items = [], response: nil, **kwargs
-      super(name, items, response: response, **kwargs)
+      super
     end
   end
 

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -324,7 +324,7 @@ module Blacklight::Solr
       unless val =~ /^[a-zA-Z0-9$_\-\^]+$/
         val = options[:quote] +
               # Yes, we need crazy escaping here, to deal with regexp esc too!
-              val.gsub("'", "\\\\\'").gsub('"', "\\\\\"") +
+              val.gsub("'", "\\\\'").gsub('"', "\\\\\"") +
               options[:quote]
       end
       val

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "8.2.2",
+  "version": "8.3.0",
   "description": "The frontend code and styles for Blacklight",
   "main": "app/assets/javascripts/blacklight",
   "module": "app/assets/javascripts/blacklight/blacklight.esm.js",