From c9d7f72173d3e142f77e1fcbda15aee6ce9afb77 Mon Sep 17 00:00:00 2001
From: Peter Barnum <peterbarnum@gmail.com>
Date: Tue, 11 Jun 2024 19:01:18 -0600
Subject: [PATCH] maybe fix focus-visible accessibility

---
 next.config.js                                |  9 +++--
 .../NavAccordion/NavAccordionItem.tsx         | 16 ++++++---
 .../NavAccordion/NavAccordionLink.tsx         | 35 +++++++++++++------
 src/components/Navbar/elements/NavLink.tsx    |  4 +--
 src/theme/styled/GlobalStyles.ts              |  3 ++
 5 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/next.config.js b/next.config.js
index e1b2c6da..233eea38 100644
--- a/next.config.js
+++ b/next.config.js
@@ -40,11 +40,14 @@ module.exports = (phase, { defaultConfig }) => {
   /**
    * @type {import('next').NextConfig}
    */
-  return {
+  const config = {
     ...defaultConfig,
     reactStrictMode: true,
     compiler: {
-      styledComponents: true,
+      styledComponents: {
+        pure: true,
+        displayName: true,
+      },
     },
     env: {
       OVERRIDE_NODE_ENV: OVERRIDE_NODE_ENV || '',
@@ -99,6 +102,8 @@ module.exports = (phase, { defaultConfig }) => {
       ].filter(Boolean);
     },
   };
+
+  return config;
 };
 
 function checkEnvVars(requiredVars) {
diff --git a/src/components/Navbar/elements/NavAccordion/NavAccordionItem.tsx b/src/components/Navbar/elements/NavAccordion/NavAccordionItem.tsx
index b5a769a5..f4f923ea 100644
--- a/src/components/Navbar/elements/NavAccordion/NavAccordionItem.tsx
+++ b/src/components/Navbar/elements/NavAccordion/NavAccordionItem.tsx
@@ -1,8 +1,8 @@
+import { AnimatePresence, motion } from 'framer-motion';
 import { useRouter } from 'next/router';
 import { ReactNode, useState } from 'react';
-import styled from 'styled-components';
-import { motion, AnimatePresence } from 'framer-motion';
 import { FiChevronRight } from 'react-icons/fi';
+import styled from 'styled-components';
 
 const NavAccordionItemStyles = styled(motion.div)`
   box-shadow: 0 -3px 3px rgba(25, 25, 25, 0) inset;
@@ -31,8 +31,11 @@ const NavAccordionItemStyles = styled(motion.div)`
     display: flex;
     justify-content: space-between;
     align-items: center;
-
-    :hover {
+    .accordion-item-title {
+      transition: all 250ms;
+    }
+    :hover .accordion-item-title,
+    :focus-visible .accordion-item-title {
       background: linear-gradient(
         90deg,
         ${({ theme }) => theme.primary[800]} 0%,
@@ -40,6 +43,9 @@ const NavAccordionItemStyles = styled(motion.div)`
         ${({ theme }) => theme.primary[600]} 96%,
         ${({ theme }) => theme.primary[800]} 100%
       );
+      box-shadow: 0 0 3px rgba(0, 0, 0, 0.5) inset;
+      border-radius: 0.25rem;
+      padding: 0 0.5rem;
     }
   }
   .sub-links {
@@ -80,7 +86,7 @@ export const NavAccordionItem = ({ title, children, href, link }: NavAccordionIt
       aria-label={title}
     >
       <button className='accordion-item'>
-        <div>{title}</div>
+        <div className='accordion-item-title'>{title}</div>
         <motion.div
           animate={{ rotate: isOpen ? 90 : 0 }}
           transition={{ type: 'tween', duration: 0.1 }}
diff --git a/src/components/Navbar/elements/NavAccordion/NavAccordionLink.tsx b/src/components/Navbar/elements/NavAccordion/NavAccordionLink.tsx
index 09843c45..7b89fcdb 100644
--- a/src/components/Navbar/elements/NavAccordion/NavAccordionLink.tsx
+++ b/src/components/Navbar/elements/NavAccordion/NavAccordionLink.tsx
@@ -5,6 +5,9 @@ import styled from 'styled-components';
 import { checkActiveSubLink } from '@this/src/helpers/navigation';
 
 const NavAccordionLinkStyles = styled.div`
+  a {
+    all: unset;
+  }
   font-family: 'Red Hat Display', sans-serif;
   font-weight: 500;
   cursor: pointer;
@@ -25,6 +28,22 @@ const NavAccordionLinkStyles = styled.div`
   &.sub-link {
     padding-left: 2.5rem;
   }
+  a {
+    transition: all 250ms;
+  }
+  a:focus-visible,
+  a:hover {
+    background: linear-gradient(
+      90deg,
+      ${({ theme }) => theme.primary[800]} 0%,
+      ${({ theme }) => theme.primary[600]} 4%,
+      ${({ theme }) => theme.primary[600]} 96%,
+      ${({ theme }) => theme.primary[800]} 100%
+    );
+    box-shadow: 0 0 3px rgba(0, 0, 0, 0.5) inset;
+    border-radius: 0.25rem;
+    padding: 0.25rem 0.5rem;
+  }
 `;
 
 export const NavAccordionLink = ({
@@ -47,18 +66,12 @@ export const NavAccordionLink = ({
     closeMenu();
   };
   return (
-    <a
-      style={{ all: 'unset' }}
-      href={href}
-      title={linkTitle}
-      aria-label={linkTitle}
-      onClick={handleClick}
+    <NavAccordionLinkStyles
+      className={`${checkActiveSubLink(href, pathname) ? 'active' : ''} ${className || ''}`}
     >
-      <NavAccordionLinkStyles
-        className={`${checkActiveSubLink(href, pathname) ? 'active' : ''} ${className || ''}`}
-      >
+      <a href={href} title={linkTitle} aria-label={linkTitle} onClick={handleClick}>
         {children}
-      </NavAccordionLinkStyles>
-    </a>
+      </a>
+    </NavAccordionLinkStyles>
   );
 };
diff --git a/src/components/Navbar/elements/NavLink.tsx b/src/components/Navbar/elements/NavLink.tsx
index 58c812b4..621589cd 100644
--- a/src/components/Navbar/elements/NavLink.tsx
+++ b/src/components/Navbar/elements/NavLink.tsx
@@ -73,13 +73,11 @@ export const NavLinkStyles = styled.div.attrs(({ color }: { color?: '' | 'yellow
     :focus {
       background: ${({ theme }) => theme.bgHover};
       color: ${({ theme }) => theme.fg};
-
       box-shadow: 0 0 3px 0px ${({ theme }) => theme.alpha.fg} inset;
-
       z-index: 1;
     }
     :focus-visible {
-      outline: 2px solid ${({ theme }) => theme.secondary[800]};
+      outline: 2px solid ${({ theme }) => theme.secondary[800]} !important;
     }
   }
   &.sub-nav.sub-nav-active {
diff --git a/src/theme/styled/GlobalStyles.ts b/src/theme/styled/GlobalStyles.ts
index 8b2c96a2..fc93ecb0 100644
--- a/src/theme/styled/GlobalStyles.ts
+++ b/src/theme/styled/GlobalStyles.ts
@@ -37,6 +37,9 @@ const GlobalStyles = createGlobalStyle`
     color: ${({ theme }) => theme.white};
     font-size: 1rem;
     font-family: 'Red Hat Display', sans-serif;
+    :focus-visible {
+      outline: 2px solid ${({ theme }) => theme.secondary[800]};
+    }
   }
 
   input, textarea, select {