From ff4d37d03aa683801711199f774cfd633f858f5d Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sat, 17 Jun 2023 13:51:21 -0400
Subject: [PATCH] fix(a11y): Fix some a11y issues in Site Sidebar and use
 native Bootstrap Collapse and Card classes

---
 .../components/common/banner-icon-header.tsx  |  4 +-
 src/shared/components/home/site-sidebar.tsx   | 49 ++++++++++++-------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/shared/components/common/banner-icon-header.tsx b/src/shared/components/common/banner-icon-header.tsx
index 1df23be..d2fae2e 100644
--- a/src/shared/components/common/banner-icon-header.tsx
+++ b/src/shared/components/common/banner-icon-header.tsx
@@ -14,7 +14,7 @@ export class BannerIconHeader extends Component<BannerIconHeaderProps, any> {
   render() {
     const banner = this.props.banner;
     const icon = this.props.icon;
-    return (
+    return banner || icon ? (
       <div className="position-relative mb-2">
         {banner && <PictrsImage src={banner} banner alt="" />}
         {icon && (
@@ -26,6 +26,6 @@ export class BannerIconHeader extends Component<BannerIconHeaderProps, any> {
           />
         )}
       </div>
-    );
+    ) : null;
   }
 }
diff --git a/src/shared/components/home/site-sidebar.tsx b/src/shared/components/home/site-sidebar.tsx
index 66a48ca..283ddf8 100644
--- a/src/shared/components/home/site-sidebar.tsx
+++ b/src/shared/components/home/site-sidebar.tsx
@@ -29,17 +29,23 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
 
   render() {
     return (
-      <section id="sidebarInfo" className="card border-secondary mb-3">
-        <div className="card-body">
-          <div>
-            <div className="mb-2">{this.siteName()}</div>
-            {!this.state.collapsed && (
-              <>
-                <BannerIconHeader banner={this.props.site.banner} />
-                {this.siteInfo()}
-              </>
-            )}
-          </div>
+      <section
+        id="sidebarInfo"
+        className="card border-secondary mb-3 overflow-hidden"
+      >
+        <header className="card-header" id="sidebarInfoHeader">
+          {this.siteName()}
+          {!this.state.collapsed && (
+            <BannerIconHeader banner={this.props.site.banner} />
+          )}
+        </header>
+
+        <div
+          id="sidebarInfoBody"
+          className="collapse show"
+          aria-labelledby="sidebarInfoHeader"
+        >
+          <div className="card-body">{this.siteInfo()}</div>
         </div>
       </section>
     );
@@ -47,13 +53,22 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
 
   siteName() {
     return (
-      <h5 className="mb-0 d-inline">
-        {this.props.site.name}
+      <div className="d-flex align-items-center">
+        <h5 className="mb-0 d-inline">{this.props.site.name}</h5>
         <button
-          className="btn btn-sm text-muted"
+          type="button"
+          className="btn btn-sm"
           onClick={linkEvent(this, this.handleCollapseSidebar)}
-          aria-label={i18n.t("collapse")}
-          data-tippy-content={i18n.t("collapse")}
+          aria-label={
+            this.state.collapsed ? i18n.t("expand") : i18n.t("collapse")
+          }
+          data-tippy-content={
+            this.state.collapsed ? i18n.t("expand") : i18n.t("collapse")
+          }
+          data-bs-toggle="collapse"
+          data-bs-target="#sidebarInfoBody"
+          aria-expanded="true"
+          aria-controls="sidebarInfoBody"
         >
           {this.state.collapsed ? (
             <Icon icon="plus-square" classes="icon-inline" />
@@ -61,7 +76,7 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
             <Icon icon="minus-square" classes="icon-inline" />
           )}
         </button>
-      </h5>
+      </div>
     );
   }
 
-- 
2.44.1