From 7747a8c4e2c05a569e6c8db94d2ddd627f94835d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 30 Sep 2021 17:11:34 -0500
Subject: [PATCH] Attempt to stop scroll to bottom of page when clicking
 spacebar

---
 .../expandable-navbar-section.component.html                    | 2 +-
 .../expandable-navbar-section.component.ts                      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 171530ecde..fe31c73066 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,7 +1,7 @@
 <div class="nav-item dropdown expandable-navbar-section"
     *ngVar="(active | async) as isActive"
     (keyup.enter)="isActive ? deactivateSection($event) : activateSection($event)"
-    (keyup.space)="isActive ? deactivateSection($event) : activateSection($event)"
+    (keyup.space)="$event.stopPropagation(); isActive ? deactivateSection($event) : activateSection($event)"
     (mouseenter)="activateSection($event)"
     (mouseleave)="deactivateSection($event)">
     <a href="#" class="nav-link dropdown-toggle" routerLinkActive="active"
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index a0c0240159..cebfa083ff 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -42,6 +42,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    * @param {Event} event The user event that triggered this function
    */
   activateSection(event): void {
+    event.preventDefault();
     this.windowService.isXsOrSm().pipe(
       first()
     ).subscribe((isMobile) => {
@@ -57,6 +58,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    * @param {Event} event The user event that triggered this function
    */
   deactivateSection(event): void {
+    event.preventDefault();
     this.windowService.isXsOrSm().pipe(
       first()
     ).subscribe((isMobile) => {