blacklight-hierarchy 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0087020faf523fb8671351fa18c62b7d4f2bd09f254b24564a5a5d7aac9d5593'
-  data.tar.gz: 6ffb7349402eea8340d105cc747d95d0089c94a552700f5f1106cb6fb069173a
+  metadata.gz: 653bcfc6322d881f68b3e497d01f83bae1e50a180734511849d5f3e34abc1cde
+  data.tar.gz: eca2782a3f9e8e1573ac4d8ce551bef7c8342e7bc9531d4a75a18da558c180df
 SHA512:
-  metadata.gz: 66d064cea30098266d2276b2806775a348250f8f1eb9bd27958018502589dbd6402bf18273ab1cd034e85a6747ef0fa74aee88e93d0d1bda71552284c656d192
-  data.tar.gz: 685bd238b6bec0f0c41d2b3bbd831111734c3b472f5949e8f27b90f13ffa3c387784d486b617b4cab07ba5b16e490bd6584c94b0c20e557f0c0479a5697107d3
+  metadata.gz: 761b1a427e8ceb7e8839898322469c8d54418308b8d193511570312c7427e6f6e7d15ef4b8afdf78d2bd8b023fc520d4e4204521f7b58988d0a654792d6930c5
+  data.tar.gz: a8b501673443997fa510da6a5cc68b3b62832fa514bd39396498df3b203a45fab11c5bccbbf5df7db6c510ddf1eb6a31cc1c49907a8e2219e58b6e79e4e45ab8

data/.github/workflows/ruby.yml

@@ -28,6 +28,10 @@ jobs:
             rails_version: "7.1.3.4"
             name: "Blacklight 7"
             blacklight_version: "7.38.0"
+          - ruby: "3.4"
+            rails_version: "8.0.2"
+            name: "Blacklight 9 beta"
+            blacklight_version: "9.0.0.beta2"
     env:
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
     steps:

data/README.md

@@ -124,10 +124,6 @@ en:
       toggle_aria_label: Toggle call number section
 ```
 
-### Javascript
-
-The javascript in this project requires jquery, but it's up to you to provide it in a way that best works for your project.  You may consider the jquery-rails gem or if you use webpacker, you could use the jquery npm package.
-
 ## Caveats
 
 This code was ripped out of another project, and is still quite immature as a standalone project. Every effort has been made to make it as plug-and-play as possible, but it may stomp on Blacklight in unintended ways (e.g., ways that made sense in context of its former host app, but which aren't compatible with generic Blacklight). Proceed with caution, and report issues.

data/app/assets/javascripts/blacklight/hierarchy/hierarchy.js

@@ -1,31 +1,31 @@
-Blacklight.onLoad(function(){
-  Blacklight.do_hierarchical_facet_expand_contract_behavior();
-});
+Blacklight.onLoad(() => Blacklight.do_hierarchical_facet_expand_contract_behavior())
 
-(function($) {
-  Blacklight.do_hierarchical_facet_expand_contract_behavior = function() {
-    $( Blacklight.do_hierarchical_facet_expand_contract_behavior.selector ).each (
-        Blacklight.hierarchical_facet_expand_contract
-     );
+(() => {
+  Blacklight.do_hierarchical_facet_expand_contract_behavior = () => {
+    const elements = document.querySelectorAll(Blacklight.do_hierarchical_facet_expand_contract_behavior.selector)
+    elements.forEach(elem => Blacklight.hierarchical_facet_expand_contract(elem))
   }
-  Blacklight.do_hierarchical_facet_expand_contract_behavior.selector = '[data-controller="b-h-collapsible"]';
-  Blacklight.do_hierarchical_facet_expand_contract_behavior.handle = '[data-action="click->b-h-collapsible#toggle"]';
-  Blacklight.do_hierarchical_facet_expand_contract_behavior.list = '[data-b-h-collapsible-target="list"]';
+  Blacklight.do_hierarchical_facet_expand_contract_behavior.selector = '[data-controller="b-h-collapsible"]'
+  Blacklight.do_hierarchical_facet_expand_contract_behavior.handle = '[data-action="click->b-h-collapsible#toggle"]'
+  Blacklight.do_hierarchical_facet_expand_contract_behavior.list = '[data-b-h-collapsible-target="list"]'
 
-  Blacklight.hierarchical_facet_expand_contract = function() {
-    var li = $(this);
-    li.addClass('twiddle');
+  Blacklight.hierarchical_facet_expand_contract = (element) => {
+    element.classList.add('twiddle')
 
-    $(Blacklight.do_hierarchical_facet_expand_contract_behavior.list, this).each(function() {
-      if($('span.selected', this).length != 0){
-        li.addClass('twiddle-open');
-        li.children('.collapse').addClass('show');
+    const lists = element.querySelectorAll(Blacklight.do_hierarchical_facet_expand_contract_behavior.list)
+
+    lists.forEach((list) => {
+      if (list.querySelector('span.selected')) {
+        element.classList.add('twiddle-open')
+        const collapseElement = element.querySelector('.collapse')
+        if (collapseElement) {
+          collapseElement.classList.add('show')
+        }
       }
-    });
+    })
 
     // attach the toggle behavior to the li tag
-    li.children(Blacklight.do_hierarchical_facet_expand_contract_behavior.handle).click(function(e){
-      li.toggleClass('twiddle-open');
-    });
-  };
-})(jQuery);
+    const handle = element.querySelector(Blacklight.do_hierarchical_facet_expand_contract_behavior.handle)
+    handle?.addEventListener('click', () => element.classList.toggle('twiddle-open'))
+  }
+})()

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

@@ -88,6 +88,7 @@ $text-muted: #777 !default;
     display: flex;
     flex-wrap: wrap;
     padding: 3px 0;
+    align-items: center;
   }
 
   .h-leaf {

data/app/components/blacklight/hierarchy/facet_field_list_component.rb

@@ -2,7 +2,8 @@
 
 module Blacklight
   module Hierarchy
-    class FacetFieldListComponent < Blacklight::FacetFieldListComponent
+    superklass = defined?(Blacklight::Facets::ListComponent) ? Blacklight::Facets::ListComponent : Blacklight::FacetFieldListComponent
+    class FacetFieldListComponent < superklass
       DELIMITER = '_'
 
       # @param [Blacklight::Configuration::FacetField] as defined in controller with config.add_facet_field (and with :partial => 'blacklight/hierarchy/facet_hierarchy')

data/lib/blacklight/hierarchy/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Hierarchy
-    VERSION = '6.5.0'.freeze
+    VERSION = '6.6.0'.freeze
   end
 end

data/package.json

@@ -19,7 +19,6 @@
   "homepage": "https://github.com/sul-dlss/blacklight-hierarchy#readme",
   "devDependencies": {},
   "dependencies": {
-    "blacklight-frontend": ">=7.1 || 8.0",
-    "jquery": ">=3.0"
+    "blacklight-frontend": ">=7.1 <10.0.0"
   }
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-hierarchy
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Michael B. Klein
 bindir: exe
 cert_chain: []
-date: 2025-04-04 00:00:00.000000000 Z
+date: 2025-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight