blacklight 7.34.0 → 8.0.0.beta1

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

@@ -0,0 +1 @@
+{"version":3,"file":"blacklight.js","sources":["../../../javascript/blacklight/core.js","../../../javascript/blacklight/checkbox_submit.js","../../../javascript/blacklight/bookmark_toggle.js","../../../javascript/blacklight/button_focus.js","../../../javascript/blacklight/modal.js","../../../javascript/blacklight/search_context.js","../../../javascript/blacklight/index.js"],"sourcesContent":["const Blacklight = function() {\n  const buffer = new Array;\n  return {\n    onLoad: function(func) {\n      buffer.push(func);\n    },\n\n    activate: function() {\n      for(let i = 0; i < buffer.length; i++) {\n        buffer[i].call();\n      }\n    },\n\n    listeners: function () {\n      const listeners = [];\n      if (typeof Turbo !== 'undefined') {\n        listeners.push('turbo:load', 'turbo:frame-load');\n      } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {\n        // Turbolinks 5\n        if (Turbolinks.BrowserAdapter) {\n          listeners.push('turbolinks:load');\n        } else {\n          // Turbolinks < 5\n          listeners.push('page:load', 'DOMContentLoaded');\n        }\n      } else {\n        listeners.push('DOMContentLoaded');\n      }\n\n      return listeners;\n    }\n  };\n}();\n\n// turbolinks triggers page:load events on page transition\n// If app isn't using turbolinks, this event will never be triggered, no prob.\nBlacklight.listeners().forEach(function(listener) {\n  document.addEventListener(listener, function() {\n    Blacklight.activate()\n  })\n})\n\nBlacklight.onLoad(function () {\n  const elem = document.querySelector('.no-js');\n\n  // The \"no-js\" class may already have been removed because this function is\n  // run on every turbo:load event, in that case, it won't find an element.\n  if (!elem) return;\n\n  elem.classList.remove('no-js')\n  elem.classList.add('js')\n})\n\n\nexport default Blacklight\n","/* Converts a \"toggle\" form, with single submit button to add/remove\n   something, like used for Bookmarks, into an AJAXy checkbox instead.\n   Apply to a form. Does require certain assumption about the form:\n    1) The same form 'action' href must be used for both ADD and REMOVE\n       actions, with the different being the hidden input name=\"_method\"\n       being set to \"put\" or \"delete\" -- that's the Rails method to pretend\n       to be doing a certain HTTP verb. So same URL, PUT to add, DELETE\n       to remove. This plugin assumes that.\n       Plus, the form this is applied to should provide a data-doc-id\n       attribute (HTML5-style doc-*) that contains the id/primary key\n       of the object in question -- used by plugin for a unique value for\n       DOM id's.\n  Uses HTML for a checkbox compatible with Bootstrap 4.\n   new CheckboxSubmit(document.querySelector('form.something')).render()\n*/\nexport default class CheckboxSubmit {\n  constructor(form) {\n    this.form = form\n  }\n\n  async clicked(evt) {\n    this.spanTarget.innerHTML = this.form.getAttribute('data-inprogress')\n    this.labelTarget.setAttribute('disabled', 'disabled');\n    this.checkboxTarget.setAttribute('disabled', 'disabled');\n    const response = await fetch(this.formTarget.getAttribute('action'), {\n      body: new FormData(this.formTarget),\n      method: this.formTarget.getAttribute('method').toUpperCase(),\n      headers: {\n        'Accept': 'application/json',\n        'X-Requested-With': 'XMLHttpRequest',\n        'X-CSRF-Token': document.querySelector('meta[name=csrf-token]')?.content\n      }\n    })\n    this.labelTarget.removeAttribute('disabled')\n    this.checkboxTarget.removeAttribute('disabled')\n    if (response.ok) {\n      const json = await response.json()\n      this.updateStateFor(!this.checked)\n      document.querySelector('[data-role=bookmark-counter]').innerHTML = json.bookmarks.count\n    } else {\n      alert('Error')\n    }\n  }\n\n  get checked() {\n    return (this.form.querySelectorAll('input[name=_method][value=delete]').length != 0)\n  }\n\n  get formTarget() {\n    return this.form\n  }\n\n  get labelTarget() {\n    return this.form.querySelector('[data-checkboxsubmit-target=\"label\"]')\n  }\n\n  get checkboxTarget() {\n    return this.form.querySelector('[data-checkboxsubmit-target=\"checkbox\"]')\n  }\n\n  get spanTarget() {\n    return this.form.querySelector('[data-checkboxsubmit-target=\"span\"]')\n  }\n\n  updateStateFor(state) {\n    this.checkboxTarget.checked = state\n\n    if (state) {\n      this.labelTarget.classList.add('checked')\n      //Set the Rails hidden field that fakes an HTTP verb\n      //properly for current state action.\n      this.formTarget.querySelector('input[name=_method]').value = 'delete'\n      this.spanTarget.innerHTML = this.form.getAttribute('data-present')\n    } else {\n      this.labelTarget.classList.remove('checked')\n      this.formTarget.querySelector('input[name=_method]').value = 'put'\n      this.spanTarget.innerHTML = this.form.getAttribute('data-absent')\n    }\n  }\n}\n","import Blacklight from './core'\nimport CheckboxSubmit from './checkbox_submit'\n\nconst BookmarkToggle = (() => {\n    // change form submit toggle to checkbox\n    Blacklight.doBookmarkToggleBehavior = function() {\n      document.addEventListener('click', (e) => {\n        if (e.target.matches('[data-checkboxsubmit-target=\"checkbox\"]')) {\n          const form = e.target.closest('form')\n          if (form) new CheckboxSubmit(form).clicked(e);\n        }\n      });\n    };\n    Blacklight.doBookmarkToggleBehavior.selector = 'form.bookmark-toggle';\n\n    Blacklight.doBookmarkToggleBehavior();\n})()\n\nexport default BookmarkToggle\n","const ButtonFocus = (() => {\n  document.addEventListener('click', (e) => {\n    // Button clicks should change focus. As of 10/3/19, Firefox for Mac and\n    // Safari both do not set focus to a button on button click.\n    // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information\n    if (e.target.matches('[data-toggle=\"collapse\"]') || e.target.matches('[data-bs-toggle=\"collapse\"]')) {\n      e.target.focus()\n    }\n  })\n})()\n\nexport default ButtonFocus\n","/*\n  The blacklight modal plugin can display some interactions inside a Bootstrap\n  modal window, including some multi-page interactions.\n\n  It supports unobtrusive Javascript, where a link or form that would have caused\n  a new page load is changed to display it's results inside a modal dialog,\n  by this plugin.  The plugin assumes there is a Bootstrap modal div\n  on the page with id #blacklight-modal to use as the modal -- the standard Blacklight\n  layout provides this.\n\n  To make a link or form have their results display inside a modal, add\n  `data-blacklight-modal=\"trigger\"` to the link or form. (Note, form itself not submit input)\n  With Rails link_to helper, you'd do that like:\n\n      link_to something, link, data: { blacklight_modal: \"trigger\" }\n\n  The results of the link href or form submit will be displayed inside\n  a modal -- they should include the proper HTML markup for a bootstrap modal's\n  contents. Also, you ordinarily won't want the Rails template with wrapping\n  navigational elements to be used.  The Rails controller could suppress\n  the layout when a JS AJAX request is detected, OR the response\n  can include a `<div data-blacklight-modal=\"container\">` -- only the contents\n  of the container will be placed inside the modal, the rest of the\n  page will be ignored.\n\n  Link or forms inside the modal will ordinarily cause page loads\n  when they are triggered. However, if you'd like their results\n  to stay within the modal, just add `data-blacklight-modal=\"preserve\"`\n  to the link or form.\n\n  Here's an example of what might be returned, demonstrating most of the devices available:\n\n    <div data-blacklight-modal=\"container\">\n      <div class=\"modal-header\">\n        <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\">×</button>\n        <h3 class=\"modal-title\">Request Placed</h3>\n      </div>\n\n      <div class=\"modal-body\">\n        <p>Some message</p>\n        <%= link_to \"This result will still be within modal\", some_link, data: { blacklight_modal: \"preserve\" } %>\n      </div>\n\n\n      <div class=\"modal-footer\">\n        <button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Close</button>\n      </div>\n    </div>\n\n\n  One additional feature. If the content returned from the AJAX form submission\n  can be a turbo-stream that defines some HTML fragementsand where on the page to put them:\n  https://turbo.hotwired.dev/handbook/streams\n*/\nimport Blacklight from './core'\nimport ModalForm from './modalForm'\n\nconst Modal = (() => {\n  // We keep all our data in Blacklight.modal object.\n  // Create lazily if someone else created first.\n  if (Blacklight.modal === undefined) {\n    Blacklight.modal = {};\n  }\n\n  const modal = Blacklight.modal\n\n  // a Bootstrap modal div that should be already on the page hidden\n  modal.modalSelector = '#blacklight-modal';\n\n  // Trigger selectors identify forms or hyperlinks that should open\n  // inside a modal dialog.\n  modal.triggerLinkSelector  = 'a[data-blacklight-modal~=trigger]';\n\n  // preserve selectors identify forms or hyperlinks that, if activated already\n  // inside a modal dialog, should have destinations remain inside the modal -- but\n  // won't trigger a modal if not already in one.\n  //\n  // No need to repeat selectors from trigger selectors, those will already\n  // be preserved. MUST be manually prefixed with the modal selector,\n  // so they only apply to things inside a modal.\n  modal.preserveLinkSelector = modal.modalSelector + ' a[data-blacklight-modal~=preserve]';\n\n  modal.containerSelector    = '[data-blacklight-modal~=container]';\n\n  // Called on fatal failure of ajax load, function returns content\n  // to show to user in modal.  Right now called only for extreme\n  // network errors.\n  modal.onFailure = function (jqXHR, textStatus, errorThrown) {\n      console.error('Server error:', this.url, jqXHR.status, errorThrown);\n\n      const contents = `<div class=\"modal-header\">\n        <div class=\"modal-title\">There was a problem with your request.</div>\n        <button type=\"button\" class=\"blacklight-modal-close btn-close close\" data-dismiss=\"modal\" data-bs-dismiss=\"modal\" aria-label=\"Close\">\n          <span aria-hidden=\"true\">&times;</span>\n        </button>\n        </div>\n        <div class=\"modal-body\">\n          <p>Expected a successful response from the server, but got an error</p>\n          <pre>${this.type} ${this.url}\\n${jqXHR.status}: ${errorThrown}</pre>\n        </div>`\n\n      document.querySelector(`${modal.modalSelector} .modal-content`).innerHTML = contents\n\n      modal.show();\n  }\n\n  // Add the passed in contents to the modal and display it.\nmodal.receiveAjax = function (contents) {\n      const domparser = new DOMParser();\n      const dom = domparser.parseFromString(contents, \"text/html\")\n      const elements = dom.querySelectorAll(`${modal.containerSelector} > *`)\n      document.querySelector(`${modal.modalSelector} .modal-content`).replaceChildren(...elements)\n\n      modal.show();\n  };\n\n\n  modal.modalAjaxLinkClick = function(e) {\n    e.preventDefault();\n    const href = e.target.getAttribute('href')\n    fetch(href)\n      .then(response => {\n         if (!response.ok) {\n           throw new TypeError(\"Request failed\");\n         }\n         return response.text();\n       })\n      .then(data => modal.receiveAjax(data))\n      .catch(error => modal.onFailure(error))\n  };\n\n  modal.setupModal = function() {\n    // Register both trigger and preserve selectors in ONE event handler, combining\n    // into one selector with a comma, so if something matches BOTH selectors, it\n    // still only gets the event handler called once.\n    document.addEventListener('click', (e) => {\n      if (e.target.matches(`${modal.triggerLinkSelector}, ${modal.preserveLinkSelector}`))\n        modal.modalAjaxLinkClick(e)\n      else if (e.target.matches('[data-bl-dismiss=\"modal\"]'))\n        modal.hide()\n    })\n  };\n\n  modal.hide = function (el) {\n    const dom = document.querySelector(Blacklight.modal.modalSelector)\n\n    if (!dom.open) return\n    dom.close()\n  }\n\n  modal.show = function(el) {\n    const dom = document.querySelector(Blacklight.modal.modalSelector)\n\n    if (dom.open) return\n    dom.showModal()\n  }\n\n  modal.setupModal()\n})()\n\nexport default Modal\n","import Blacklight from './core'\n\nconst SearchContext = (() => {\n  Blacklight.doSearchContextBehavior = function() {\n    document.addEventListener('click', (e) => {\n      if (e.target.matches('[data-context-href]')) {\n        Blacklight.handleSearchContextMethod.call(e.target, e)\n      }\n    })\n  };\n\n  Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content\n  Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content\n\n  // this is the Rails.handleMethod with a couple adjustments, described inline:\n  // first, we're attaching this directly to the event handler, so we can check for meta-keys\n  Blacklight.handleSearchContextMethod = function(event) {\n    const link = this\n\n    // instead of using the normal href, we need to use the context href instead\n    let href = link.getAttribute('data-context-href')\n    let target = link.getAttribute('target')\n    let csrfToken = Blacklight.csrfToken()\n    let csrfParam = Blacklight.csrfParam()\n    let form = document.createElement('form')\n    form.method = 'post'\n    form.action = href\n\n\n    let formContent = `<input name=\"_method\" value=\"post\" type=\"hidden\" />\n      <input name=\"redirect\" value=\"${link.getAttribute('href')}\" type=\"hidden\" />`\n\n    // check for meta keys.. if set, we should open in a new tab\n    if(event.metaKey || event.ctrlKey) {\n      target = '_blank';\n    }\n\n    if (csrfParam !== undefined && csrfToken !== undefined) {\n      formContent += `<input name=\"${csrfParam}\" value=\"${csrfToken}\" type=\"hidden\" />`\n    }\n\n    // Must trigger submit by click on a button, else \"submit\" event handler won't work!\n    // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit\n    formContent += '<input type=\"submit\" />'\n\n    if (target) { form.setAttribute('target', target); }\n\n    form.style.display = 'none'\n    form.innerHTML = formContent\n    document.body.appendChild(form)\n    form.querySelector('[type=\"submit\"]').click()\n\n    event.preventDefault()\n  };\n\n  Blacklight.doSearchContextBehavior();\n})()\n\nexport default SearchContext\n","import BookmarkToggle from './bookmark_toggle'\nimport ButtonFocus from './button_focus'\nimport Modal from './modal'\nimport SearchContext from './search_context'\nimport Core from './core'\n\nexport default {\n  BookmarkToggle,\n  ButtonFocus,\n  Modal,\n  SearchContext,\n  onLoad: Core.onLoad\n}\n"],"names":["Core"],"mappings":"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"}

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

@@ -0,0 +1,25 @@
+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/_blacklight_base.scss

@@ -22,5 +22,5 @@
 @import "facets";
 @import "search_history";
 @import "modal";
-@import "twitter_typeahead";
 @import "icons";
+@import "autocomplete";

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

@@ -2,3 +2,19 @@ label.toggle-bookmark {
 	font-weight: inherit;
 	min-width: 8.5em;
 }
+
+.bookmark-toggle {
+	.no-js & {
+		input[type="submit"] {
+			display: inline
+		}
+
+		div.toggle-bookmark {
+			display: none
+		}
+	}
+
+	input[type="submit"] {
+		display: none;
+	}
+}

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

@@ -29,3 +29,11 @@
 .page-link {
   white-space: nowrap;
 }
+
+.modal {
+  // override bootstrap .modal class default display: none
+  // since we aren't using bootstrap JS that sets and unsets the display
+  display: block;
+  background: none;
+  border: none;
+}

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

@@ -82,32 +82,42 @@
 }
 
 .facet-limit-active {
-  @extend .border-success;
+  border-color: $facet-active-border !important;
 
   .card-header {
-    @extend .bg-success;
+    background-color: $facet-active-bg !important;
 
     .btn {
       @if function-exists(color-contrast) {
-        color: color-contrast($success);
+        color: color-contrast($facet-active-bg);
+      }
+
+      @if function-exists(color-yiq) {
+        color: color-yiq($facet-active-bg);
       }
     }
   }
 }
 
 .facet-values {
-  display: table;
-  table-layout: fixed;
-  width: 100%;
   margin-bottom: 0;
 
+  a {
+    text-decoration: none;
+  }
+
   li {
+    display: flex;
+    align-items: flex-start;
+    padding: 3px 0;
 
-    display: table-row;
-    .selected {
-      @extend .text-success;
+    &[role="treeitem"] {
+      display: block;
     }
 
+    .selected {
+      color: $facet-active-item-color !important;
+    }
   }
 
   .remove {
@@ -130,44 +140,28 @@
   }
 
   .facet-label {
-    display: table-cell;
     padding-right: 1em;
     text-indent: -15px;
     padding-left: 15px;
-    padding-bottom: $spacer * .5;
     @include hyphens-auto;
   }
 
   .facet-count {
-    display: table-cell;
-    vertical-align: top;
-    text-align: right;
-    width: 5em;
+    margin-left: auto
   }
 
   .facet-checkbox {
-    display: table-cell;
     width: 1.25rem;
-    vertical-align: top;
-  }
-
-  .label-and-count {
-    display: table;
-    width: 100%;
-  }
-
-  .label-and-count label {
-    display: table-row;
   }
 }
 
 .facet-extended-list {
   .sort-options {
-    text-align:right;
+    text-align: right;
   }
 
   .prev-next-links {
-    float:left;
+    float: left;
   }
 }
 
@@ -191,32 +185,66 @@
   }
 }
 
-
-
 /* style for pivot facet's nested list */
 
-.pivot-facet {
+.facet-values {
   @extend .list-unstyled;
-  @extend .py-1;
-  @extend .px-4;
 }
 
-.facet-leaf-node {
-  margin-left: 1rem;
-  padding-right: 1rem;
-  margin-top: -1.5rem;
+.pivot-facet {
+  &.show {
+    @extend .d-flex;
+  }
 }
 
+$facet-toggle-show-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" /></svg>') !default;
+$facet-toggle-hide-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z" /></svg>') !default;
+$facet-toggle-width: 1em !default;
+$facet-toggle-height: $facet-toggle-width !default;
+
 .facet-toggle-handle {
-  margin: 0;
-  margin-left: -5px;
-  padding: 0;
+  @extend .my-0;
+  @extend .py-0;
+  @extend .px-2;
+
+  // keep the icon span centered in the button, but shift to the left for equal spacing inside row
+  margin-left: -1 * $btn-padding-x;
+
+  .pivot-facet & {
+    // shift pivot values a little more aggressively for better compact display
+    margin-left: -2 * $btn-padding-x;
+  }
 
   &.collapsed {
-    .show { display: block; }
-    .hide { display: none; }
+    .show {
+      display: flex;
+    }
+
+    .hide {
+      display: none;
+    }
   }
 
-  .show { display: none; }
-  .hide { display: block; }
+  .show {
+    display: none;
+  }
+
+  .hide {
+    display: flex;
+  }
+
+  .show .icon,
+  .hide .icon {
+    width: $facet-toggle-width;
+    height: $facet-toggle-height;
+    padding: $btn-padding-y $btn-padding-x;
+  }
+
+  .show .icon {
+    background: transparent escape-svg($facet-toggle-show-icon) center / $facet-toggle-width auto no-repeat;
+  }
+
+  .hide .icon {
+    background: transparent escape-svg($facet-toggle-hide-icon) center / $facet-toggle-width auto no-repeat;
+  }
 }

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

@@ -14,10 +14,7 @@
     background: transparent $logo-image no-repeat top left;
     background-size: $logo-width $logo-height;
   }
-  display: inline-block;
   height: $logo-height;
-  margin-right: 20px;
-  margin-top: -0.4rem;
   overflow: hidden;
   text-indent: 100%;
   white-space: nowrap;
@@ -37,18 +34,6 @@
     @extend .col-lg-8;
     padding-left: 0;
   }
-
-  .submit-search-text {
-    // hide 'search' label at very small screens
-    @media screen and (max-width: breakpoint-max(xs)) {
-      @if mixin-exists(sr-only) {
-        @include sr-only();
-      }
-      @if mixin-exists(visually-hidden) {
-        @include visually-hidden();
-      }
-    }
-  }
 }
 
 #skip-link {

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

@@ -1,17 +1,3 @@
-@each $color, $value in $theme-colors {
-  .btn-#{$color} {
-    .blacklight-icons svg {
-      fill: currentColor;
-    }
-  }
-
-  .btn-outline-#{$color} {
-    .blacklight-icons svg {
-      fill: currentColor;
-    }
-  }
-}
-
 .btn.btn-icon {
   padding: $btn-padding-y;
 

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

@@ -13,3 +13,23 @@
     fill: #fff;
   }
 }
+
+// define a visually-hidden class that applies to a given breakpoint and below
+// https://getbootstrap.com/docs/5.2/helpers/visually-hidden/
+@if mixin-exists(visually-hidden) {
+  @each $infix, $breakpoint in $grid-breakpoints {
+    .visually-hidden-#{$infix} {
+      @include media-breakpoint-down($breakpoint) {
+        @include visually-hidden;
+      }
+    }
+  }
+} @else if mixin-exists(sr-only) {  // Bootstrap 4 version
+  @each $infix, $breakpoint in $grid-breakpoints {
+    .visually-hidden-#{$infix} {
+      @include media-breakpoint-down($breakpoint) {
+        @include sr-only;
+      }
+    }
+  }
+}

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

@@ -1,6 +1,8 @@
-.modal-content {
-  @extend .clearfix;
+.modal-dialog {
+  border-radius: 5px;
+}
 
+.modal-content {
   .facet-pagination.top {
   	display: none;
   }
@@ -12,6 +14,10 @@
   .blacklight-modal-close {
     display: block;
   }
+
+  .prev_next_links.btn-group .btn {
+    border: 0;
+  }
 }
 
 // app/views/catalog/facet.html.erb may be rendered as a modal or a whole page.

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

@@ -1,7 +1,34 @@
 // bootstrap does flex-grow: 1 by default which makes the
 // text input roughly the same size as the select in many cases
-.input-group > .form-control {
-  &.search-q {
-    flex-grow: 3;
+.input-group>.search-q {
+  flex-grow: 4;
+}
+
+.input-group > .search-autocomplete-wrapper {
+  @extend .form-control;
+  display: inline-block;
+  flex-grow: 4;
+  padding: 0;
+  position: relative;
+  
+  .search-q {
+    border: 0;
+    height: 100%;
+    width: 100%;
+  }
+  
+  ul {
+    @extend .dropdown-menu;
+    display: block;
+
+    li {
+      @extend .dropdown-item;
+    }
   }
 }
+
+.search-btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  display: flex;
+}

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

@@ -1,7 +1,16 @@
 /* Search History */
 .search-history {
+
+  td {
+    padding: $spacer
+  }
+
+  .constraints-container {
+    @extend .mb-0;
+  }
+
   .constraint {
-    @extend .px-3;
+    @extend .px-4;
     display: block;
     text-indent: -1 * map-get($spacers, 3);
   }

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

@@ -1,7 +1,7 @@
 // the search results on the index view of the catalog
 .documents-list {
   .document {
-    @extend .clearfix;
+    display: flex;
     border-bottom: 1px dotted $table-border-color;
     margin-top: $spacer;
     padding-top: $spacer;
@@ -10,6 +10,10 @@
       @extend h5;
     }
 
+    .document-main-section {
+      flex-grow: 1;
+    }
+
     // bookmarks checkbox on index, give it some
     // lower margin when it collapses
     .index-document-functions {
@@ -21,7 +25,7 @@
     }
 
     .document-thumbnail {
-      float: right;
+      flex-grow: 0;
       margin-bottom: ($spacer * 3);
       padding-left: ($spacer * 3);
     }

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

@@ -6,9 +6,12 @@ $logo-height: 50px !default;
 
 /* label (field names) */
 $field_name_color: $text-muted !default;
-$zindex-typeahead: $zindex-dropdown;
 
 // the default bootstrap font-family list includes "Segoe UI Emoji", which, on windows
 // renders our remove icon as an emoji-sized x instead of what we see on all other platforms...
 // so, for now (until we replace it with an SVG icon or something), we get to override bootstrap:
 $remove-icon-font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif !default;
+
+$facet-active-border: $success !default;
+$facet-active-bg: $success !default;
+$facet-active-item-color: $success !default;

data/app/builders/blacklight/action_builder.rb

@@ -27,19 +27,28 @@ module Blacklight
       validator = opts.fetch(:validator, nil).inspect
       klass.class_eval <<EORUBY, __FILE__, __LINE__ + 1
           def #{name}
-            @response, @documents = action_documents
+            @documents = action_documents
 
-            if request.post? && #{callback} &&
-               (#{validator}.blank? || send(#{validator}))
+            if request.post? && #{callback}
+              if #{validator}.blank? || send(#{validator})
 
-              send(#{callback}, @documents)
+                send(#{callback}, @documents)
 
-              flash.now[:success] ||= I18n.t("blacklight.#{name}.success", default: nil)
+                flash[:success] ||= I18n.t("blacklight.#{name}.success", default: nil)
 
-              respond_to do |format|
-                format.html do
-                  return render "#{name}_success" if request.xhr?
-                  redirect_to action_success_redirect_path
+                respond_to do |format|
+                  format.html do
+                    return render "#{name}_success", layout: false if request.xhr?
+                    redirect_to action_success_redirect_path
+                  end
+                end
+              else
+                # Not valid
+                respond_to do |format|
+                  format.html do
+                    return render layout: false, status: :unprocessable_entity if request.xhr?
+                    # Otherwise draw the full page
+                  end
                 end
               end
             else

data/app/components/blacklight/advanced_search_form_component.html.erb

@@ -8,7 +8,7 @@
 <% end %>
 
 <%= form_tag @url, method: @method, class: @classes.join(' '), role: 'search', 'aria-label' => t('blacklight.search.form.submit') do %>
-  <%= render_hash_as_hidden_fields(@params) %>
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: @params) %>
 
   <div class="input-criteria">
     <div class="query-criteria mb-4">
@@ -40,7 +40,7 @@
 
   <% if sort_fields_select %>
     <div class="form-group row mb-4">
-      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), id: 'advanced-search-sort-label', class: 'col-md-3 col-form-label text-md-right' %>
+      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), class: 'col-md-3 col-form-label text-md-right' %>
       <div class="col">
         <%= sort_fields_select %>
       </div>

data/app/components/blacklight/advanced_search_form_component.rb

@@ -2,13 +2,11 @@
 
 module Blacklight
   class AdvancedSearchFormComponent < SearchBarComponent
-    include Blacklight::ContentAreasShim
-
     renders_many :constraints
     renders_many :search_field_controls
     renders_many :search_filter_controls, (lambda do |config:, display_facet:, presenter: nil, component: nil, **kwargs|
-      presenter ||= (config.presenter || Blacklight::FacetFieldPresenter).new(config, display_facet, helpers)
-      component = component || config.advanced_search_component || Blacklight::FacetFieldCheckboxesComponent
+      presenter ||= config.presenter.new(config, display_facet, helpers)
+      component ||= config.advanced_search_component
 
       component.new(facet_field: presenter, **kwargs)
     end)
@@ -26,23 +24,23 @@ module Blacklight
 
     def default_operator_menu
       options_with_labels = [:must, :should].index_by { |op| t(op, scope: 'blacklight.advanced_search.op') }
-      label_tag(:op, t('blacklight.advanced_search.op.label'), class: 'sr-only visually-hidden') + select_tag(:op, options_for_select(options_with_labels, params[:op]), class: 'input-small')
+      select_tag(:op, options_for_select(options_with_labels, params[:op]), class: 'input-small')
     end
 
     def sort_fields_select
       options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
       return unless options.any?
 
-      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-control sort-select w-auto", aria: { labelledby: 'advanced-search-sort-label' })
+      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select custom-select sort-select w-auto")
     end
 
     private
 
     def initialize_search_field_controls
       search_fields.values.each.with_index do |field, i|
-        with_search_field_control do
+        search_field_control do
           fields_for('clause[]', i, include_id: false) do |f|
-            content_tag(:div, class: 'form-group advanced-search-field row') do
+            content_tag(:div, class: 'form-group advanced-search-field row mb-3') do
               f.label(:query, field.display_label('search'), class: "col-sm-3 col-form-label text-md-right") +
                 content_tag(:div, class: 'col-sm-9') do
                   f.hidden_field(:field, value: field.key) +
@@ -59,7 +57,7 @@ module Blacklight
 
       fields.each do |_k, config|
         display_facet = @response.aggregations[config.field]
-        with_search_filter_control(config: config, display_facet: display_facet)
+        search_filter_control(config: config, display_facet: display_facet)
       end
     end
 
@@ -72,7 +70,7 @@ module Blacklight
 
       return if constraints_text.blank?
 
-      with_constraint do
+      constraint do
         constraints_text
       end
     end