RubyGems - blacklight - Versions diffs - 8.0.0.beta4 → 8.0.0.beta6 - Mend

blacklight 8.0.0.beta4 → 8.0.0.beta6

Files changed (122) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/.rubocop_todo.yml +3 -1
data/Gemfile +0 -4
data/README.md +1 -1
data/Rakefile +18 -0
data/VERSION +1 -1
data/app/assets/config/blacklight/manifest.js +3 -0
data/app/assets/stylesheets/blacklight/_facets.scss +32 -5
data/app/assets/stylesheets/blacklight/blacklight_defaults.scss +1 -1
data/app/components/blacklight/document_component.rb +44 -18
data/app/components/blacklight/document_metadata_component.html.erb +4 -2
data/app/components/blacklight/document_metadata_component.rb +8 -2
data/app/components/blacklight/metadata_field_layout_component.rb +7 -4
data/app/components/blacklight/metadata_field_plain_text_layout_component.rb +17 -0
data/app/components/blacklight/response/facet_group_component.html.erb +2 -1
data/app/components/blacklight/response/sort_component.rb +1 -1
data/app/components/blacklight/response/spellcheck_component.rb +1 -1
data/app/components/blacklight/response/view_type_button_component.rb +1 -1
data/app/components/blacklight/response/view_type_component.rb +1 -1
data/app/components/blacklight/search_context/server_applied_params_component.html.erb +4 -0
data/app/components/blacklight/search_context/server_applied_params_component.rb +13 -0
data/app/components/blacklight/{search_context_component.html.erb → search_context/server_item_pagination_component.html.erb} +0 -0
data/app/components/blacklight/search_context/server_item_pagination_component.rb +71 -0
data/app/components/blacklight/system/dropdown_component.rb +1 -1
data/app/components/blacklight/system/flash_message_component.rb +1 -1
data/app/components/blacklight/system/modal_component.rb +1 -1
data/app/controllers/concerns/blacklight/bookmarks.rb +1 -1
data/app/controllers/concerns/blacklight/search_context.rb +46 -6
data/app/helpers/blacklight/blacklight_helper_behavior.rb +0 -101
data/app/helpers/blacklight/catalog_helper_behavior.rb +27 -54
data/app/helpers/blacklight/component_helper_behavior.rb +0 -11
data/app/helpers/blacklight/document_helper_behavior.rb +76 -0
data/app/helpers/blacklight/layout_helper_behavior.rb +59 -0
data/app/helpers/blacklight/url_helper_behavior.rb +11 -3
data/app/javascript/blacklight/bookmark_toggle.js +8 -15
data/app/javascript/blacklight/button_focus.js +10 -10
data/app/javascript/blacklight/index.js +5 -5
data/app/javascript/blacklight/modal.js +11 -16
data/app/javascript/blacklight/search_context.js +51 -57
data/app/models/concerns/blacklight/document.rb +11 -0
data/app/models/record_mailer.rb +19 -15
data/app/presenters/blacklight/document_presenter.rb +13 -11
data/app/presenters/blacklight/index_presenter.rb +1 -1
data/app/presenters/blacklight/rendering/abstract_step.rb +4 -0
data/app/presenters/blacklight/rendering/join.rb +7 -1
data/app/presenters/blacklight/rendering/link_to_facet.rb +1 -1
data/app/presenters/blacklight/rendering/microdata.rb +1 -1
data/app/services/blacklight/search_service.rb +2 -1
data/app/views/catalog/_document.atom.builder +1 -1
data/app/views/catalog/_document.html.erb +3 -8
data/app/views/catalog/_document_list.html.erb +2 -1
data/app/views/catalog/_show_main_content.html.erb +3 -9
data/app/views/catalog/index.html.erb +3 -0
data/app/views/catalog/show.html.erb +1 -6
data/app/views/layouts/blacklight/base.html.erb +4 -4
data/app/views/record_mailer/email_record.text.erb +4 -3
data/app/views/record_mailer/sms_record.text.erb +4 -4
data/blacklight.gemspec +1 -1
data/config/importmap.rb +1 -1
data/config/locales/blacklight.ar.yml +209 -232
data/config/locales/blacklight.ca.yml +0 -6
data/config/locales/blacklight.de.yml +197 -215
data/config/locales/blacklight.en.yml +2 -6
data/config/locales/blacklight.es.yml +196 -215
data/config/locales/blacklight.fr.yml +196 -219
data/config/locales/blacklight.hu.yml +193 -212
data/config/locales/blacklight.it.yml +197 -215
data/config/locales/blacklight.nl.yml +193 -212
data/config/locales/blacklight.pt-BR.yml +195 -215
data/config/locales/blacklight.sq.yml +193 -212
data/config/locales/blacklight.zh.yml +194 -213
data/lib/blacklight/configuration/session_tracking_config.rb +45 -0
data/lib/blacklight/configuration/view_config.rb +0 -4
data/lib/blacklight/configuration.rb +8 -4
data/lib/blacklight/engine.rb +6 -7
data/lib/blacklight/routes/searchable.rb +1 -0
data/lib/generators/blacklight/assets/importmap_generator.rb +9 -2
data/lib/generators/blacklight/assets/propshaft_generator.rb +11 -2
data/lib/generators/blacklight/assets/sprockets_generator.rb +2 -0
data/lib/generators/blacklight/templates/solr_document.rb +0 -6
data/package.json +7 -4
data/rollup.config.js +11 -1
data/spec/components/blacklight/document_component_spec.rb +9 -4
data/spec/components/blacklight/search_context/server_applied_params_component_spec.rb +29 -0
data/spec/components/blacklight/{search_context_component_spec.rb → search_context/server_item_pagination_component_spec.rb} +15 -4
data/spec/controllers/bookmarks_controller_spec.rb +1 -1
data/spec/controllers/catalog_controller_spec.rb +17 -5
data/spec/features/component_template_override_spec.rb +8 -0
data/spec/features/modal_spec.rb +12 -0
data/spec/features/sitelinks_search_box_spec.rb +13 -0
data/spec/helpers/blacklight/url_helper_behavior_spec.rb +1 -1
data/spec/helpers/blacklight_helper_spec.rb +0 -56
data/spec/helpers/catalog_helper_spec.rb +56 -0
data/spec/lib/blacklight/configuration/session_tracking_config_spec.rb +38 -0
data/spec/models/blacklight/icon_spec.rb +0 -2
data/spec/models/record_mailer_spec.rb +36 -23
data/spec/presenters/blacklight/document_presenter_spec.rb +1 -0
data/spec/presenters/blacklight/field_presenter_spec.rb +2 -2
data/spec/presenters/blacklight/index_presenter_spec.rb +1 -0
data/spec/presenters/blacklight/show_presenter_spec.rb +1 -0
data/spec/presenters/pipeline_spec.rb +13 -2
data/spec/routing/catalog_routing_spec.rb +4 -0
data/spec/spec_helper.rb +1 -1
data/spec/support/view_component_test_helpers.rb +21 -0
data/spec/test_app_templates/Gemfile.extra +4 -0
data/spec/test_app_templates/lib/generators/test_app_generator.rb +8 -0
data/spec/views/catalog/_document.html.erb_spec.rb +22 -1
data/spec/views/catalog/_document_list.html.erb_spec.rb +7 -2
data/tasks/blacklight.rake +1 -1
metadata +24 -20
data/app/assets/javascripts/blacklight/blacklight.esm.js +0 -390
data/app/assets/javascripts/blacklight/blacklight.esm.js.map +0 -1
data/app/assets/javascripts/blacklight/blacklight.js +0 -398
data/app/assets/javascripts/blacklight/blacklight.js.map +0 -1
data/app/components/blacklight/search_context_component.rb +0 -68
data/app/models/concerns/blacklight/document/email.rb +0 -27
data/app/models/concerns/blacklight/document/sms.rb +0 -25
data/spec/features/sitelinks_search_box.rb +0 -13
data/spec/models/blacklight/document/email_spec.rb +0 -57
data/spec/models/blacklight/document/sms_spec.rb +0 -58
data/spec/support/view_component_capybara_test_helpers.rb +0 -8

data/app/helpers/blacklight/blacklight_helper_behavior.rb CHANGED Viewed

@@ -6,8 +6,6 @@ module Blacklight::BlacklightHelperBehavior
   include Blacklight::LayoutHelperBehavior
   include Blacklight::IconHelperBehavior
-  # @!group Layout helpers
   ##
   # Get the name of this application from an i18n string
   # key: blacklight.application_name
@@ -23,63 +21,6 @@ module Blacklight::BlacklightHelperBehavior
     end
   end
-  ##
-  # Get the page's HTML title
-  #
-  # @return [String]
-  def render_page_title
-    (content_for(:page_title) if content_for?(:page_title)) || @page_title || application_name
-  end
-  ##
-  # Create <link rel="alternate"> links from a documents dynamically
-  # provided export formats.
-  #
-  # Returns empty string if no links available.
-  #
-  # @param [SolrDocument] document
-  # @param [Hash] options
-  # @option options [Boolean] :unique ensures only one link is output for every
-  #     content type, e.g. as required by atom
-  # @option options [Array<String>] :exclude array of format shortnames to not include in the output
-  # @return [String]
-  def render_link_rel_alternates(document = @document, options = {})
-    return if document.nil?
-    document_presenter(document).link_rel_alternates(options)
-  end
-  ##
-  # Render classes for the <body> element
-  # @return [String]
-  def render_body_class
-    extra_body_classes.join " "
-  end
-  ##
-  # List of classes to be applied to the <body> element
-  # @see render_body_class
-  # @return [Array<String>]
-  def extra_body_classes
-    @extra_body_classes ||= ["blacklight-#{controller.controller_name}", "blacklight-#{[controller.controller_name, controller.action_name].join('-')}"]
-  end
-  ##
-  # Get the current "view type" (and ensure it is a valid type)
-  #
-  # @param [Hash] query_params the query parameters to check
-  # @return [Symbol]
-  def document_index_view_type query_params = params
-    view_param = query_params[:view]
-    view_param ||= session[:preferred_view]
-    if view_param && document_index_views.key?(view_param.to_sym)
-      view_param.to_sym
-    else
-      default_document_index_view_type
-    end
-  end
-  # @!group Search result helpers
   ##
   # Render a partial of an arbitrary format inside a
   # template of a different format. (e.g. render an HTML
@@ -96,46 +37,4 @@ module Blacklight::BlacklightHelperBehavior
     self.formats = old_formats
     nil
   end
-  ##
-  # Should we render a grouped response (because the response
-  # contains a grouped response instead of the normal response)
-  #
-  # Default to false if there's no response object available (sometimes the case
-  #   for tests, but might happen in other circumstances too..)
-  # @return [Boolean]
-  def render_grouped_response? response = @response
-    response&.grouped?
-  end
-  ##
-  # Returns a document presenter for the given document
-  def document_presenter(document)
-    document_presenter_class(document).new(document, self)
-  end
-  ##
-  # Override this method if you want to use a differnet presenter for your documents
-  # @param [Blacklight::Document] _document optional, here for extension + backwards compatibility only
-  def document_presenter_class(_document = nil)
-    case action_name
-    when 'show', 'citation'
-      blacklight_config.view_config(:show, action_name: action_name).document_presenter_class
-    else
-      blacklight_config.view_config(document_index_view_type, action_name: action_name).document_presenter_class
-    end
-  end
-  # @return [Class]
-  def search_bar_presenter_class
-    blacklight_config.view_config(action_name: :index).search_bar_presenter_class
-  end
-  # @!group Layout helpers
-  ##
-  # Open Search discovery tag for HTML <head> links
-  # @return [String]
-  def opensearch_description_tag title, href
-    tag :link, href: href, title: title, type: "application/opensearchdescription+xml", rel: "search"
-  end
 end

data/app/helpers/blacklight/catalog_helper_behavior.rb CHANGED Viewed

@@ -4,6 +4,7 @@
 module Blacklight::CatalogHelperBehavior
   include Blacklight::ConfigurationHelperBehavior
   include Blacklight::ComponentHelperBehavior
+  include Blacklight::DocumentHelperBehavior
   include Blacklight::FacetsHelperBehavior
   include Blacklight::RenderPartialsHelperBehavior
@@ -113,40 +114,6 @@ module Blacklight::CatalogHelperBehavior
     (@response.rows if @response && @response.rows > 0) || params.fetch(:per_page, blacklight_config.default_per_page).to_i
   end
-  ##
-  # Get the classes to add to a document's div
-  #
-  # @param [Blacklight::Document] document
-  # @return [String]
-  def render_document_class(document = @document)
-    types = document_presenter(document).display_type
-    return if types.blank?
-    Array(types).compact.map do |t|
-      "#{document_class_prefix}#{t.try(:parameterize) || t}"
-    end.join(' ')
-  end
-  ##
-  # Return a prefix for the document classes infered from the document
-  # @see #render_document_class
-  # @return [String]
-  def document_class_prefix
-    'blacklight-'
-  end
-  ##
-  # Render the sidebar partial for a document
-  # This is used as an integration point by downstream apps to add to the
-  # default sidebar.
-  # See: https://github.com/geoblacklight/geoblacklight/blob/7d3c31c7af3362879b97e2c1351a2496c728c59c/app/helpers/blacklight_helper.rb#L7
-  #
-  # @param [SolrDocument] document
-  # @return [String]
-  def render_document_sidebar_partial(document)
-    render 'show_sidebar', document: document
-  end
   ##
   # Should we display the sort and per page widget?
   #
@@ -167,26 +134,6 @@ module Blacklight::CatalogHelperBehavior
     response.limit_value > 0
   end
-  ##
-  # return the Bookmarks on a set of documents (all bookmarks on the page)
-  # @private
-  # @return [Enumerable<Bookmark>]
-  def current_bookmarks
-    @current_bookmarks ||= begin
-      documents = @document.presence || @response.documents
-      current_or_guest_user.bookmarks_for_documents(Array(documents)).to_a
-    end
-  end
-  private :current_bookmarks
-  ##
-  # Check if the document is in the user's bookmarks
-  # @param [Blacklight::Document] document
-  # @return [Boolean]
-  def bookmarked? document
-    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type == document.class }
-  end
   # Render an html <title> appropriate string for a selected facet field and values
   #
   # @see #render_search_to_page_title
@@ -233,6 +180,32 @@ module Blacklight::CatalogHelperBehavior
     constraints.join(' / ')
   end
+  ##
+  # Should we render a grouped response (because the response
+  # contains a grouped response instead of the normal response)
+  #
+  # Default to false if there's no response object available (sometimes the case
+  #   for tests, but might happen in other circumstances too..)
+  # @return [Boolean]
+  def render_grouped_response? response = @response
+    response&.grouped?
+  end
+  ##
+  # Get the current "view type" (and ensure it is a valid type)
+  #
+  # @param [Hash] query_params the query parameters to check
+  # @return [Symbol]
+  def document_index_view_type query_params = params || {}
+    view_param = query_params[:view]
+    view_param ||= session[:preferred_view] if respond_to?(:session)
+    if view_param && document_index_views.key?(view_param.to_sym)
+      view_param.to_sym
+    else
+      default_document_index_view_type
+    end
+  end
   private
   # @param [String] format

data/app/helpers/blacklight/component_helper_behavior.rb CHANGED Viewed

@@ -2,17 +2,6 @@
 module Blacklight
   module ComponentHelperBehavior
-    ##
-    # Render "document actions" area for navigation header
-    # (normally renders "Saved Searches", "History", "Bookmarks")
-    # These things are added by add_nav_action
-    #
-    # @param [Hash] options
-    # @return [String]
-    def render_nav_actions(options = {}, &block)
-      render_filtered_partials(blacklight_config.navbar.partials, options, &block)
-    end
     ##
     # Render "document actions" area for search results view
     # (normally renders next to title in the list view)

data/app/helpers/blacklight/document_helper_behavior.rb ADDED Viewed

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+# Helper methods for catalog-like controllers that work with documents
+module Blacklight::DocumentHelperBehavior
+  ##
+  # Get the classes to add to a document's div
+  #
+  # @param [Blacklight::Document] document
+  # @return [String]
+  def render_document_class(document = @document)
+    types = document_presenter(document).display_type
+    return if types.blank?
+    Array(types).compact.map do |t|
+      "#{document_class_prefix}#{t.try(:parameterize) || t}"
+    end.join(' ')
+  end
+  ##
+  # Return a prefix for the document classes infered from the document
+  # @see #render_document_class
+  # @return [String]
+  def document_class_prefix
+    'blacklight-'
+  end
+  ##
+  # Render the sidebar partial for a document
+  # This is used as an integration point by downstream apps to add to the
+  # default sidebar.
+  # See: https://github.com/geoblacklight/geoblacklight/blob/7d3c31c7af3362879b97e2c1351a2496c728c59c/app/helpers/blacklight_helper.rb#L7
+  #
+  # @param [SolrDocument] document
+  # @return [String]
+  def render_document_sidebar_partial(document)
+    render 'show_sidebar', document: document
+  end
+  ##
+  # return the Bookmarks on a set of documents (all bookmarks on the page)
+  # @private
+  # @return [Enumerable<Bookmark>]
+  def current_bookmarks
+    @current_bookmarks ||= begin
+      documents = @document.presence || @response.documents
+      current_or_guest_user.bookmarks_for_documents(Array(documents)).to_a
+    end
+  end
+  private :current_bookmarks
+  ##
+  # Check if the document is in the user's bookmarks
+  # @param [Blacklight::Document] document
+  # @return [Boolean]
+  def bookmarked? document
+    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type == document.class }
+  end
+  ##
+  # Returns a document presenter for the given document
+  def document_presenter(document)
+    document_presenter_class(document).new(document, self)
+  end
+  ##
+  # Override this method if you want to use a differnet presenter for your documents
+  # @param [Blacklight::Document] _document optional, here for extension + backwards compatibility only
+  def document_presenter_class(_document = nil)
+    case action_name
+    when 'show', 'citation'
+      blacklight_config.view_config(:show, action_name: action_name).document_presenter_class
+    else
+      blacklight_config.view_config(document_index_view_type, action_name: action_name).document_presenter_class
+    end
+  end
+end

data/app/helpers/blacklight/layout_helper_behavior.rb CHANGED Viewed

@@ -47,5 +47,64 @@ module Blacklight
     def container_classes
       'container'
     end
+    ##
+    # Render "document actions" area for navigation header
+    # (normally renders "Saved Searches", "History", "Bookmarks")
+    # These things are added by add_nav_action
+    #
+    # @param [Hash] options
+    # @return [String]
+    def render_nav_actions(options = {}, &block)
+      render_filtered_partials(blacklight_config.navbar.partials, options, &block)
+    end
+    ##
+    # Open Search discovery tag for HTML <head> links
+    # @return [String]
+    def opensearch_description_tag title, href
+      tag :link, href: href, title: title, type: "application/opensearchdescription+xml", rel: "search"
+    end
+    ##
+    # Get the page's HTML title
+    #
+    # @return [String]
+    def render_page_title
+      (content_for(:page_title) if content_for?(:page_title)) || @page_title || application_name
+    end
+    ##
+    # Create <link rel="alternate"> links from a documents dynamically
+    # provided export formats.
+    #
+    # Returns empty string if no links available.
+    #
+    # @param [SolrDocument] document
+    # @param [Hash] options
+    # @option options [Boolean] :unique ensures only one link is output for every
+    #     content type, e.g. as required by atom
+    # @option options [Array<String>] :exclude array of format shortnames to not include in the output
+    # @return [String]
+    def render_link_rel_alternates(document = @document, options = {})
+      return if document.nil?
+      document_presenter(document).link_rel_alternates(options)
+    end
+    ##
+    # Render classes for the <body> element
+    # @return [String]
+    def render_body_class
+      extra_body_classes.join " "
+    end
+    ##
+    # List of classes to be applied to the <body> element
+    # @see render_body_class
+    # @return [Array<String>]
+    def extra_body_classes
+      @extra_body_classes ||= ["blacklight-#{controller.controller_name}", "blacklight-#{[controller.controller_name, controller.action_name].join('-')}"]
+    end
   end
 end

data/app/helpers/blacklight/url_helper_behavior.rb CHANGED Viewed

@@ -43,16 +43,22 @@ module Blacklight::UrlHelperBehavior
   #   session_tracking_params(SolrDocument.new(id: 123), 7)
   #   => { data: { context_href: '/catalog/123/track?counter=7&search_id=999' } }
   def session_tracking_params document, counter, per_page: search_session['per_page'], search_id: current_search_session&.id
-    path = session_tracking_path(document, per_page: params.fetch(:per_page, per_page), counter: counter, search_id: search_id, document_id: document&.id)
+    path_params = { per_page: params.fetch(:per_page, per_page), counter: counter, search_id: search_id }
+    if blacklight_config.track_search_session.storage == 'server'
+      path_params[:document_id] = document&.id
+      path_params[:search_id] = search_id
+    end
+    path = session_tracking_path(document, path_params)
     return {} if path.nil?
-    { data: { context_href: path } }
+    context_method = blacklight_config.track_search_session.storage == 'client' ? 'get' : 'post'
+    { data: { context_href: path, context_method: context_method } }
   end
   ##
   # Get the URL for tracking search sessions across pages using polymorphic routing
   def session_tracking_path document, params = {}
-    return if document.nil? || !blacklight_config&.track_search_session
+    return if document.nil? || !blacklight_config.track_search_session.storage
     if main_app.respond_to?(controller_tracking_method)
       return main_app.public_send(controller_tracking_method, params.merge(id: document))
@@ -63,6 +69,8 @@ module Blacklight::UrlHelperBehavior
   end
   def controller_tracking_method
+    return blacklight_config.track_search_session.url_helper if blacklight_config.track_search_session.url_helper
     "track_#{controller_name}_path"
   end

data/app/javascript/blacklight/bookmark_toggle.js CHANGED Viewed

@@ -1,19 +1,12 @@
-import Blacklight from './core'
-import CheckboxSubmit from './checkbox_submit'
+import CheckboxSubmit from 'blacklight/checkbox_submit'
-const BookmarkToggle = (() => {
-    // change form submit toggle to checkbox
-    Blacklight.doBookmarkToggleBehavior = function() {
-      document.addEventListener('click', (e) => {
-        if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
-          const form = e.target.closest('form')
-          if (form) new CheckboxSubmit(form).clicked(e);
-        }
-      });
-    };
-    Blacklight.doBookmarkToggleBehavior.selector = 'form.bookmark-toggle';
+const BookmarkToggle = (e) => {
+  if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
+    const form = e.target.closest('form')
+    if (form) new CheckboxSubmit(form).clicked(e);
+  }
+};
-    Blacklight.doBookmarkToggleBehavior();
-})()
+document.addEventListener('click', BookmarkToggle);
 export default BookmarkToggle

data/app/javascript/blacklight/button_focus.js CHANGED Viewed

@@ -1,12 +1,12 @@
-const ButtonFocus = (() => {
-  document.addEventListener('click', (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"]')) {
-      e.target.focus()
-    }
-  })
-})()
+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"]')) {
+    e.target.focus()
+  }
+}
+document.addEventListener('click', ButtonFocus)
 export default ButtonFocus

data/app/javascript/blacklight/index.js CHANGED Viewed

@@ -1,8 +1,8 @@
-import BookmarkToggle from './bookmark_toggle'
-import ButtonFocus from './button_focus'
-import Modal from './modal'
-import SearchContext from './search_context'
-import Core from './core'
+import BookmarkToggle from 'blacklight/bookmark_toggle'
+import ButtonFocus from 'blacklight/button_focus'
+import Modal from 'blacklight/modal'
+import SearchContext from 'blacklight/search_context'
+import Core from 'blacklight/core'
 export default {
   BookmarkToggle,

data/app/javascript/blacklight/modal.js CHANGED Viewed

@@ -32,7 +32,7 @@
     <div data-blacklight-modal="container">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <button type="button" class="close" data-bl-dismiss="modal" aria-hidden="true">×</button>
         <h3 class="modal-title">Request Placed</h3>
       </div>
@@ -43,7 +43,7 @@
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-secondary" data-bl-dismiss="modal">Close</button>
       </div>
     </div>
@@ -52,17 +52,10 @@
   can be a turbo-stream that defines some HTML fragementsand where on the page to put them:
   https://turbo.hotwired.dev/handbook/streams
 */
-import Blacklight from './core'
-import ModalForm from './modalForm'
+import ModalForm from 'blacklight/modalForm'
 const Modal = (() => {
-  // We keep all our data in Blacklight.modal object.
-  // Create lazily if someone else created first.
-  if (Blacklight.modal === undefined) {
-    Blacklight.modal = {};
-  }
-  const modal = Blacklight.modal
+  const modal = {}
   // a Bootstrap modal div that should be already on the page hidden
   modal.modalSelector = '#blacklight-modal';
@@ -89,7 +82,7 @@ const Modal = (() => {
       const contents = `<div class="modal-header">
         <div class="modal-title">There was a problem with your request.</div>
-        <button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close">
+        <button type="button" class="blacklight-modal-close btn-close close" data-bl-dismiss="modal" aria-label="Close">
           <span aria-hidden="true" class="visually-hidden">&times;</span>
         </button>
         </div>
@@ -139,28 +132,30 @@ const Modal = (() => {
     // into one selector with a comma, so if something matches BOTH selectors, it
     // still only gets the event handler called once.
     document.addEventListener('click', (e) => {
-      if (e.target.matches(`${modal.triggerLinkSelector}, ${modal.preserveLinkSelector}`))
+      if (e.target.closest(`${modal.triggerLinkSelector}, ${modal.preserveLinkSelector}`))
         modal.modalAjaxLinkClick(e)
-      else if (e.target.matches('[data-bl-dismiss="modal"]'))
+      else if (e.target.closest('[data-bl-dismiss="modal"]'))
         modal.hide()
     })
   };
   modal.hide = function (el) {
-    const dom = document.querySelector(Blacklight.modal.modalSelector)
+    const dom = document.querySelector(modal.modalSelector)
     if (!dom.open) return
     dom.close()
   }
   modal.show = function(el) {
-    const dom = document.querySelector(Blacklight.modal.modalSelector)
+    const dom = document.querySelector(modal.modalSelector)
     if (dom.open) return
     dom.showModal()
   }
   modal.setupModal()
+  return modal;
 })()
 export default Modal