From 5c08e0de0b1aa517807c52c00f0584a284a9bf35 Mon Sep 17 00:00:00 2001
From: ayush-chauhan233 <ayush.chauhan@brightscout.com>
Date: Thu, 16 Jan 2025 03:54:24 +0530
Subject: [PATCH] [MM-61587]: Added appropriate ARIA attributes in the channel
 header (#29563)

* [MA-8]: Added appropriate ARIA attributes in the channel header

* [MA-8]: Review Fixes: Updated the aria-expanded ternary condition

* [MA-8]: Rebased with master and fixed e2e failing test

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../playbooks/channels/rhs/about_spec.js      |  2 +-
 .../channel_header/channel_header_title.tsx   | 53 ++++++++++---------
 webapp/channels/src/sass/layout/_headers.scss |  1 +
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/about_spec.js b/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/about_spec.js
index 7e6465ee17..64bf07efd7 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/about_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/about_spec.js
@@ -90,7 +90,7 @@ describe('channels > rhs > header', {testIsolation: true}, () => {
             cy.get('#rhsContainer').findByTestId('rendered-run-name').should('be.visible').contains('new run name');
 
             // * make sure the channel name remains unchanged
-            cy.get('#channelHeaderInfo').contains(playbookRunName);
+            cy.get('#channelHeaderInfo').findByRole('heading').contains(playbookRunName);
         });
     });
 
diff --git a/webapp/channels/src/components/channel_header/channel_header_title.tsx b/webapp/channels/src/components/channel_header/channel_header_title.tsx
index 58c496b03e..35538e2669 100644
--- a/webapp/channels/src/components/channel_header/channel_header_title.tsx
+++ b/webapp/channels/src/components/channel_header/channel_header_title.tsx
@@ -103,6 +103,8 @@ const ChannelHeaderTitle = ({
                     size='sm'
                 />
                 <strong
+                    role='heading'
+                    aria-level={2}
                     id='channelHeaderTitle'
                     className='heading'
                 >
@@ -130,44 +132,43 @@ const ChannelHeaderTitle = ({
                 <div
                     id='channelHeaderDropdownButton'
                 >
-                    <button
-                        className={classNames('channel-header__trigger style--none', {active: titleMenuOpen})}
-                        aria-label={intl.formatMessage({id: 'channel_header.menuAriaLabel', defaultMessage: 'Channel Menu'}).toLowerCase()}
+                    <strong
+                        role='heading'
+                        aria-level={2}
+                        id='channelHeaderTitle'
+                        className='heading'
+                        ref={headerItemRef}
                     >
-                        {showTooltip ? (
-                            <WithTooltip
-                                title={channelTitle as string}
-                            >
-                                <strong
-                                    id='channelHeaderTitle'
-                                    className='heading'
-                                    ref={headerItemRef}
+                        <button
+                            id='channel_header.menuAriaLabel'
+                            className={classNames('channel-header__trigger style--none', {active: titleMenuOpen})}
+                            aria-label={intl.formatMessage({id: 'channel_header.menuAriaLabel', defaultMessage: 'Channel Menu'}).toLowerCase()}
+                            aria-expanded={titleMenuOpen}
+                            aria-controls='channelHeaderDropdownMenu'
+                        >
+                            {showTooltip ? (
+                                <WithTooltip
+                                    title={channelTitle as string}
                                 >
                                     <span>
                                         {archivedIcon}
                                         {channelTitle}
                                         {sharedIcon}
                                     </span>
-                                </strong>
-                            </WithTooltip>
-                        ) : (
-                            <strong
-                                id='channelHeaderTitle'
-                                className='heading'
-                                ref={headerItemRef}
-                            >
+                                </WithTooltip>
+                            ) : (
                                 <span>
                                     {archivedIcon}
                                     {channelTitle}
                                     {sharedIcon}
                                 </span>
-                            </strong>
-                        )}
-                        <span
-                            id='channelHeaderDropdownIcon'
-                            className='icon icon-chevron-down header-dropdown-chevron-icon'
-                        />
-                    </button>
+                            )}
+                            <span
+                                id='channelHeaderDropdownIcon'
+                                className='icon icon-chevron-down header-dropdown-chevron-icon'
+                            />
+                        </button>
+                    </strong>
                 </div>
                 <ChannelHeaderDropdown/>
             </MenuWrapper>
diff --git a/webapp/channels/src/sass/layout/_headers.scss b/webapp/channels/src/sass/layout/_headers.scss
index e6d7e18adb..aed38b3d3c 100644
--- a/webapp/channels/src/sass/layout/_headers.scss
+++ b/webapp/channels/src/sass/layout/_headers.scss
@@ -209,6 +209,7 @@
     .heading {
         overflow: hidden;
         align-self: center;
+        padding: 4px;
         margin: 0 0 0 2px;
         color: var(--center-channel-color);
         font-family: Metropolis, sans-serif;