From e829cb690f7dade18ea2fe316a3e3665b1895ab0 Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Tue, 17 Dec 2024 14:22:25 -0700
Subject: [PATCH 1/8] having skip links inherit completely, with one CSS
 override

---
 app/assets/stylesheets/modules/spotlight_overrides.scss | 6 ++++++
 app/components/skip_link_component.rb                   | 9 ---------
 app/controllers/catalog_controller.rb                   | 1 -
 3 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 app/components/skip_link_component.rb

diff --git a/app/assets/stylesheets/modules/spotlight_overrides.scss b/app/assets/stylesheets/modules/spotlight_overrides.scss
index 9f4d8d2a6..598f1f9cb 100644
--- a/app/assets/stylesheets/modules/spotlight_overrides.scss
+++ b/app/assets/stylesheets/modules/spotlight_overrides.scss
@@ -220,3 +220,9 @@ h5,
     z-index: 1;
   }
 }
+
+// This allows for the skip links to appear above the header
+// instead of overlapping with the header. 
+#skip-link {
+  position: relative !important;
+}
diff --git a/app/components/skip_link_component.rb b/app/components/skip_link_component.rb
deleted file mode 100644
index c1126d50c..000000000
--- a/app/components/skip_link_component.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# Draws the skip links for screen readers
-class SkipLinkComponent < Blacklight::SkipLinkComponent
-  # This is only needed until we are using https://github.com/projectblacklight/blacklight/pull/3461
-  def link_classes
-    'visually-hidden-focusable rounded-bottom py-2 px-3'
-  end
-end
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index 9ad8dbdc7..d856ccf1e 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -39,7 +39,6 @@ class CatalogController < ApplicationController
     # For browse category search to work it must be nil
     config.json_solr_path = nil
     config.header_component = HeaderComponent
-    config.skip_link_component = SkipLinkComponent
     config.exhibit_navbar_component = ExhibitNavbarComponent
     config.index.search_bar_component = ExhibitSearchBarComponent
     config.index.dropdown_component = DropdownComponent

From 428c18a7a19de417a432edb999c1bee1a7844c05 Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Tue, 17 Dec 2024 14:31:06 -0700
Subject: [PATCH 2/8] removing unneeded test

---
 spec/components/skip_link_component_spec.rb | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 spec/components/skip_link_component_spec.rb

diff --git a/spec/components/skip_link_component_spec.rb b/spec/components/skip_link_component_spec.rb
deleted file mode 100644
index 464b6a64b..000000000
--- a/spec/components/skip_link_component_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe SkipLinkComponent, type: :component do
-  pending "add some examples to (or delete) #{__FILE__}"
-
-  # it "renders something useful" do
-  #   expect(
-  #     render_inline(described_class.new(attr: "value")) { "Hello, components!" }.css("p").to_html
-  #   ).to include(
-  #     "Hello, components!"
-  #   )
-  # end
-end

From 8bfb6210f06282e3fec33ef992c0ef1ce54751e2 Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Wed, 18 Dec 2024 16:10:30 -0700
Subject: [PATCH 3/8] reverting

---
 app/components/skip_link_component          | 5 +++++
 app/components/skip_link_component.html.erb | 8 ++++++++
 app/controllers/catalog_controller.rb       | 1 +
 3 files changed, 14 insertions(+)
 create mode 100644 app/components/skip_link_component

diff --git a/app/components/skip_link_component b/app/components/skip_link_component
new file mode 100644
index 000000000..dec18deb3
--- /dev/null
+++ b/app/components/skip_link_component
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Overriding the skip link component to use the component library classes
+class SkipLinkComponent < Blacklight::SkipLinkComponent
+end
diff --git a/app/components/skip_link_component.html.erb b/app/components/skip_link_component.html.erb
index 195b2e778..2462628fc 100644
--- a/app/components/skip_link_component.html.erb
+++ b/app/components/skip_link_component.html.erb
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 <nav id="skip" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
     <%= link_to_main %>
     <%= link_to_search %>
     <%= content %>
 </nav>
+=======
+<nav id="skip" aria-label="<%= t('blacklight.skip_links.label') %>">
+    <%= link_to_main %>
+    <%= link_to_search %>
+    <%= content %>
+</nav>
+>>>>>>> 8ffccd0e (reverting)
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index d856ccf1e..9ad8dbdc7 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -39,6 +39,7 @@ class CatalogController < ApplicationController
     # For browse category search to work it must be nil
     config.json_solr_path = nil
     config.header_component = HeaderComponent
+    config.skip_link_component = SkipLinkComponent
     config.exhibit_navbar_component = ExhibitNavbarComponent
     config.index.search_bar_component = ExhibitSearchBarComponent
     config.index.dropdown_component = DropdownComponent

From b282109506975552ed9704b920a876ce2ff81d49 Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Wed, 18 Dec 2024 16:19:52 -0700
Subject: [PATCH 4/8] no overriding of link classes needed

---
 app/components/skip_link_component.html.erb            | 10 +---------
 .../{skip_link_component => skip_link_component.rb}    |  0
 2 files changed, 1 insertion(+), 9 deletions(-)
 rename app/components/{skip_link_component => skip_link_component.rb} (100%)

diff --git a/app/components/skip_link_component.html.erb b/app/components/skip_link_component.html.erb
index 2462628fc..02ff71bcc 100644
--- a/app/components/skip_link_component.html.erb
+++ b/app/components/skip_link_component.html.erb
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
 <nav id="skip" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
     <%= link_to_main %>
     <%= link_to_search %>
     <%= content %>
-</nav>
-=======
-<nav id="skip" aria-label="<%= t('blacklight.skip_links.label') %>">
-    <%= link_to_main %>
-    <%= link_to_search %>
-    <%= content %>
-</nav>
->>>>>>> 8ffccd0e (reverting)
+</nav>
\ No newline at end of file
diff --git a/app/components/skip_link_component b/app/components/skip_link_component.rb
similarity index 100%
rename from app/components/skip_link_component
rename to app/components/skip_link_component.rb

From 7f965152b25eb4f483da2fc6d59a0da9816c6a40 Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Wed, 18 Dec 2024 17:01:31 -0700
Subject: [PATCH 5/8] changing to relative positioning should be sufficient

---
 app/components/skip_link_component.html.erb | 2 +-
 app/components/skip_link_component.rb       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/components/skip_link_component.html.erb b/app/components/skip_link_component.html.erb
index 02ff71bcc..b41f81cc9 100644
--- a/app/components/skip_link_component.html.erb
+++ b/app/components/skip_link_component.html.erb
@@ -1,4 +1,4 @@
-<nav id="skip" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
+<nav id="skip-link" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
     <%= link_to_main %>
     <%= link_to_search %>
     <%= content %>
diff --git a/app/components/skip_link_component.rb b/app/components/skip_link_component.rb
index dec18deb3..df4d304a9 100644
--- a/app/components/skip_link_component.rb
+++ b/app/components/skip_link_component.rb
@@ -2,4 +2,8 @@
 
 # Overriding the skip link component to use the component library classes
 class SkipLinkComponent < Blacklight::SkipLinkComponent
+  # This is only needed until we are using https://github.com/projectblacklight/blacklight/pull/3461
+  def link_classes
+    'visually-hidden-focusable rounded-bottom py-2 px-3'
+  end
 end

From 97106da3146b846457ea8cccce748bc5a97adfef Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Thu, 19 Dec 2024 10:31:37 -0700
Subject: [PATCH 6/8] ensuring the first results skip link appears in toggle
 mode correctly

---
 app/components/skip_link_component.html.erb |  3 ++-
 app/components/skip_link_component.rb       |  6 ++++++
 spec/components/skip_link_component_spec.rb | 10 ++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 spec/components/skip_link_component_spec.rb

diff --git a/app/components/skip_link_component.html.erb b/app/components/skip_link_component.html.erb
index b41f81cc9..f9be00b4f 100644
--- a/app/components/skip_link_component.html.erb
+++ b/app/components/skip_link_component.html.erb
@@ -1,5 +1,6 @@
+<!-- Spotlight has built-in styling for #skip-link -->
 <nav id="skip-link" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
     <%= link_to_main %>
     <%= link_to_search %>
-    <%= content %>
+    <%= link_to_content %>
 </nav>
\ No newline at end of file
diff --git a/app/components/skip_link_component.rb b/app/components/skip_link_component.rb
index df4d304a9..0bc638c11 100644
--- a/app/components/skip_link_component.rb
+++ b/app/components/skip_link_component.rb
@@ -6,4 +6,10 @@ class SkipLinkComponent < Blacklight::SkipLinkComponent
   def link_classes
     'visually-hidden-focusable rounded-bottom py-2 px-3'
   end
+
+  # This overrides the <%= content %> line since the styling of that link
+  # uses the Blacklight styles by default
+  def link_to_content
+    link_to t('blacklight.skip_links.first_result'), '#documents', class: link_classes
+  end
 end
diff --git a/spec/components/skip_link_component_spec.rb b/spec/components/skip_link_component_spec.rb
new file mode 100644
index 000000000..1aa3324d9
--- /dev/null
+++ b/spec/components/skip_link_component_spec.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SkipLinkComponent, type: :component do
+  subject(:rendered) { Capybara::Node::Simple.new(render_inline(described_class.new)) }
+
+  it { expect(rendered).to have_css('#skip-link.visually-hidden-focusable') }
+  it { expect(rendered).to have_css('a.visually-hidden-focusable.rounded-bottom', visible: false, count: 3) }
+end

From 5dd136451fad4558408146b87f05bba6802f13b6 Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Fri, 20 Dec 2024 12:16:14 -0700
Subject: [PATCH 7/8] having display be above the fold

---
 app/components/skip_link_component.html.erb | 5 +++--
 app/components/skip_link_component.rb       | 2 +-
 spec/components/skip_link_component_spec.rb | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/components/skip_link_component.html.erb b/app/components/skip_link_component.html.erb
index f9be00b4f..b28cfef9d 100644
--- a/app/components/skip_link_component.html.erb
+++ b/app/components/skip_link_component.html.erb
@@ -1,6 +1,7 @@
-<!-- Spotlight has built-in styling for #skip-link -->
-<nav id="skip-link" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
+<nav id="skip-link-exhibits" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
+    <div class="container-xl">
     <%= link_to_main %>
     <%= link_to_search %>
     <%= link_to_content %>
+    </div>
 </nav>
\ No newline at end of file
diff --git a/app/components/skip_link_component.rb b/app/components/skip_link_component.rb
index 0bc638c11..7ecc2495f 100644
--- a/app/components/skip_link_component.rb
+++ b/app/components/skip_link_component.rb
@@ -4,7 +4,7 @@
 class SkipLinkComponent < Blacklight::SkipLinkComponent
   # This is only needed until we are using https://github.com/projectblacklight/blacklight/pull/3461
   def link_classes
-    'visually-hidden-focusable rounded-bottom py-2 px-3'
+    'd-inline-flex m-1 py-2 px-3'
   end
 
   # This overrides the <%= content %> line since the styling of that link
diff --git a/spec/components/skip_link_component_spec.rb b/spec/components/skip_link_component_spec.rb
index 1aa3324d9..34630b198 100644
--- a/spec/components/skip_link_component_spec.rb
+++ b/spec/components/skip_link_component_spec.rb
@@ -5,6 +5,6 @@
 RSpec.describe SkipLinkComponent, type: :component do
   subject(:rendered) { Capybara::Node::Simple.new(render_inline(described_class.new)) }
 
-  it { expect(rendered).to have_css('#skip-link.visually-hidden-focusable') }
+  it { expect(rendered).to have_css('#skip-link-exhibits.visually-hidden-focusable') }
   it { expect(rendered).to have_css('a.visually-hidden-focusable.rounded-bottom', visible: false, count: 3) }
 end

From 307c1afdb0925be684e5844c9c25cb5d176d3185 Mon Sep 17 00:00:00 2001
From: Huda Khan <hudakhan@stanford.edu>
Date: Fri, 20 Dec 2024 14:45:33 -0700
Subject: [PATCH 8/8] showing link to first document only when content
 available

---
 app/components/skip_link_component.rb       |  2 +-
 spec/components/skip_link_component_spec.rb | 23 ++++++++++++++++++---
 spec/rails_helper.rb                        |  2 ++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/components/skip_link_component.rb b/app/components/skip_link_component.rb
index 7ecc2495f..7c19c4ff0 100644
--- a/app/components/skip_link_component.rb
+++ b/app/components/skip_link_component.rb
@@ -10,6 +10,6 @@ def link_classes
   # This overrides the <%= content %> line since the styling of that link
   # uses the Blacklight styles by default
   def link_to_content
-    link_to t('blacklight.skip_links.first_result'), '#documents', class: link_classes
+    link_to t('blacklight.skip_links.first_result'), '#documents', class: link_classes if content.present?
   end
 end
diff --git a/spec/components/skip_link_component_spec.rb b/spec/components/skip_link_component_spec.rb
index 34630b198..459c1daef 100644
--- a/spec/components/skip_link_component_spec.rb
+++ b/spec/components/skip_link_component_spec.rb
@@ -3,8 +3,25 @@
 require 'rails_helper'
 
 RSpec.describe SkipLinkComponent, type: :component do
-  subject(:rendered) { Capybara::Node::Simple.new(render_inline(described_class.new)) }
+  describe 'no search results' do
+    before do
+      render_inline(described_class.new)
+    end
 
-  it { expect(rendered).to have_css('#skip-link-exhibits.visually-hidden-focusable') }
-  it { expect(rendered).to have_css('a.visually-hidden-focusable.rounded-bottom', visible: false, count: 3) }
+    it { expect(page).to have_css('#skip-link-exhibits.visually-hidden-focusable') }
+    it { expect(page).to have_css('a.d-inline-flex.m-1', visible: false, count: 2) }
+  end
+
+  # If an existing content block is passed to this component,
+  # the component should include the link to the first result
+  describe 'with existing search results' do
+    before do
+      render_inline(described_class.new) do
+        'something'
+      end
+    end
+
+    it { expect(page).to have_css('a.d-inline-flex.m-1', visible: false, count: 3) }
+    it { expect(page).to have_link(href: '#documents') }
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4344b9806..554dca677 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -8,6 +8,7 @@
 require 'factory_bot_rails'
 require 'view_component/test_helpers'
 require 'view_component/system_test_helpers'
+require 'capybara/rspec'
 
 require 'selenium-webdriver'
 
@@ -95,4 +96,5 @@
   config.extend ControllerMacros, type: :controller
   config.include ViewComponent::TestHelpers, type: :component
   config.include ViewComponent::SystemTestHelpers, type: :component
+  config.include Capybara::RSpecMatchers, type: :component
 end