From 7374b3fd68a5f372a73b7eb3cfadcd6385f702fb Mon Sep 17 00:00:00 2001
From: Camila Belo <camilaibs@gmail.com>
Date: Fri, 9 Jun 2023 13:50:43 +0200
Subject: [PATCH 1/3] fix: remove sidebar item headings

Signed-off-by: Camila Belo <camilaibs@gmail.com>
---
 .../src/layout/Sidebar/Items.tsx              |  6 ++++-
 .../src/layout/Sidebar/SidebarSubmenu.tsx     |  2 +-
 .../src/layout/Sidebar/SidebarSubmenuItem.tsx | 26 +++++++++++++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/core-components/src/layout/Sidebar/Items.tsx b/packages/core-components/src/layout/Sidebar/Items.tsx
index 924182086f..715e0d4af7 100644
--- a/packages/core-components/src/layout/Sidebar/Items.tsx
+++ b/packages/core-components/src/layout/Sidebar/Items.tsx
@@ -411,7 +411,11 @@ const SidebarItemBase = forwardRef<any, SidebarItemProps>((props, ref) => {
         {itemIcon}
       </Box>
       {text && (
-        <Typography variant="subtitle2" className={classes.label}>
+        <Typography
+          variant="subtitle2"
+          component="span"
+          className={classes.label}
+        >
           {text}
         </Typography>
       )}
diff --git a/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx b/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
index 949148d7a1..85ba923672 100644
--- a/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
+++ b/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
@@ -127,7 +127,7 @@ export const SidebarSubmenu = (props: SidebarSubmenuProps) => {
         [classes.drawerOpen]: isSubmenuOpen,
       })}
     >
-      <Typography variant="h5" className={classes.title}>
+      <Typography variant="h5" component="span" className={classes.title}>
         {props.title}
       </Typography>
       {props.children}
diff --git a/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx b/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
index d05ee23636..d1925036bb 100644
--- a/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
+++ b/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
@@ -172,11 +172,19 @@ export const SidebarSubmenuItem = (props: SidebarSubmenuItemProps) => {
             )}
           >
             {Icon && <Icon fontSize="small" />}
-            <Typography variant="subtitle1" className={classes.label}>
+            <Typography
+              variant="subtitle1"
+              component="span"
+              className={classes.label}
+            >
               {title}
               <br />
               {subtitle && (
-                <Typography variant="caption" className={classes.subtitle}>
+                <Typography
+                  variant="caption"
+                  component="span"
+                  className={classes.subtitle}
+                >
                   {subtitle}
                 </Typography>
               )}
@@ -204,7 +212,7 @@ export const SidebarSubmenuItem = (props: SidebarSubmenuItemProps) => {
                   onClick={closeSubmenu}
                   onTouchStart={e => e.stopPropagation()}
                 >
-                  <Typography className={classes.textContent}>
+                  <Typography component="span" className={classes.textContent}>
                     {object.title}
                   </Typography>
                 </Link>
@@ -230,11 +238,19 @@ export const SidebarSubmenuItem = (props: SidebarSubmenuItemProps) => {
           onTouchStart={e => e.stopPropagation()}
         >
           {Icon && <Icon fontSize="small" />}
-          <Typography variant="subtitle1" className={classes.label}>
+          <Typography
+            variant="subtitle1"
+            component="span"
+            className={classes.label}
+          >
             {title}
             <br />
             {subtitle && (
-              <Typography variant="caption" className={classes.subtitle}>
+              <Typography
+                variant="caption"
+                component="span"
+                className={classes.subtitle}
+              >
                 {subtitle}
               </Typography>
             )}

From 25eb82eec147f5b4815dcabb39de57ef95792fc5 Mon Sep 17 00:00:00 2001
From: Camila Belo <camilaibs@gmail.com>
Date: Fri, 9 Jun 2023 14:07:09 +0200
Subject: [PATCH 2/3] fix(explore): tools card header

Signed-off-by: Camila Belo <camilaibs@gmail.com>
---
 plugins/explore/src/components/ToolCard/ToolCard.test.tsx | 8 ++++++--
 plugins/explore/src/components/ToolCard/ToolCard.tsx      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/explore/src/components/ToolCard/ToolCard.test.tsx b/plugins/explore/src/components/ToolCard/ToolCard.test.tsx
index a216f65c5d..20bf6bb594 100644
--- a/plugins/explore/src/components/ToolCard/ToolCard.test.tsx
+++ b/plugins/explore/src/components/ToolCard/ToolCard.test.tsx
@@ -36,8 +36,12 @@ describe('<ToolCard />', () => {
   });
 
   it('renders props correctly', () => {
-    const { getByText } = render(wrapInTestApp(<ToolCard {...minProps} />));
-    expect(getByText(minProps.card.title)).toBeInTheDocument();
+    const { getByRole, getByText } = render(
+      wrapInTestApp(<ToolCard {...minProps} />),
+    );
+    expect(
+      getByRole('heading', { name: minProps.card.title }),
+    ).toBeInTheDocument();
     expect(getByText(minProps.card.description)).toBeInTheDocument();
   });
 
diff --git a/plugins/explore/src/components/ToolCard/ToolCard.tsx b/plugins/explore/src/components/ToolCard/ToolCard.tsx
index f6137d9c01..a39806dceb 100644
--- a/plugins/explore/src/components/ToolCard/ToolCard.tsx
+++ b/plugins/explore/src/components/ToolCard/ToolCard.tsx
@@ -74,7 +74,7 @@ export const ToolCard = ({ card, objectFit }: Props) => {
         })}
       />
       <CardContent>
-        <Typography paragraph variant="h5">
+        <Typography variant="h5">
           {title}{' '}
           {lifecycle && lifecycle.toLocaleLowerCase('en-US') !== 'ga' && (
             <Chip

From 78cbb8ef8aea7bb45cfbe10f0096d4491261ab7f Mon Sep 17 00:00:00 2001
From: Camila Belo <camilaibs@gmail.com>
Date: Fri, 9 Jun 2023 16:47:59 +0200
Subject: [PATCH 3/3] docs: add changeset files

Signed-off-by: Camila Belo <camilaibs@gmail.com>
---
 .changeset/good-sloths-pretend.md | 5 +++++
 .changeset/two-cobras-shake.md    | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 .changeset/good-sloths-pretend.md
 create mode 100644 .changeset/two-cobras-shake.md

diff --git a/.changeset/good-sloths-pretend.md b/.changeset/good-sloths-pretend.md
new file mode 100644
index 0000000000..a0d8859707
--- /dev/null
+++ b/.changeset/good-sloths-pretend.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Enhance the sidebar item accessibility by using appropriate header semantics.
diff --git a/.changeset/two-cobras-shake.md b/.changeset/two-cobras-shake.md
new file mode 100644
index 0000000000..173d68e626
--- /dev/null
+++ b/.changeset/two-cobras-shake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-explore': patch
+---
+
+Enhance the tools card accessibility by using appropriate header semantics.