[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>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c3ff2c5129
Коммит
5c08e0de0b
@@ -90,7 +90,7 @@ describe('channels > rhs > header', {testIsolation: true}, () => {
|
|||||||
cy.get('#rhsContainer').findByTestId('rendered-run-name').should('be.visible').contains('new run name');
|
cy.get('#rhsContainer').findByTestId('rendered-run-name').should('be.visible').contains('new run name');
|
||||||
|
|
||||||
// * make sure the channel name remains unchanged
|
// * make sure the channel name remains unchanged
|
||||||
cy.get('#channelHeaderInfo').contains(playbookRunName);
|
cy.get('#channelHeaderInfo').findByRole('heading').contains(playbookRunName);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -103,6 +103,8 @@ const ChannelHeaderTitle = ({
|
|||||||
size='sm'
|
size='sm'
|
||||||
/>
|
/>
|
||||||
<strong
|
<strong
|
||||||
|
role='heading'
|
||||||
|
aria-level={2}
|
||||||
id='channelHeaderTitle'
|
id='channelHeaderTitle'
|
||||||
className='heading'
|
className='heading'
|
||||||
>
|
>
|
||||||
@@ -130,44 +132,43 @@ const ChannelHeaderTitle = ({
|
|||||||
<div
|
<div
|
||||||
id='channelHeaderDropdownButton'
|
id='channelHeaderDropdownButton'
|
||||||
>
|
>
|
||||||
<button
|
<strong
|
||||||
className={classNames('channel-header__trigger style--none', {active: titleMenuOpen})}
|
role='heading'
|
||||||
aria-label={intl.formatMessage({id: 'channel_header.menuAriaLabel', defaultMessage: 'Channel Menu'}).toLowerCase()}
|
aria-level={2}
|
||||||
|
id='channelHeaderTitle'
|
||||||
|
className='heading'
|
||||||
|
ref={headerItemRef}
|
||||||
>
|
>
|
||||||
{showTooltip ? (
|
<button
|
||||||
<WithTooltip
|
id='channel_header.menuAriaLabel'
|
||||||
title={channelTitle as string}
|
className={classNames('channel-header__trigger style--none', {active: titleMenuOpen})}
|
||||||
>
|
aria-label={intl.formatMessage({id: 'channel_header.menuAriaLabel', defaultMessage: 'Channel Menu'}).toLowerCase()}
|
||||||
<strong
|
aria-expanded={titleMenuOpen}
|
||||||
id='channelHeaderTitle'
|
aria-controls='channelHeaderDropdownMenu'
|
||||||
className='heading'
|
>
|
||||||
ref={headerItemRef}
|
{showTooltip ? (
|
||||||
|
<WithTooltip
|
||||||
|
title={channelTitle as string}
|
||||||
>
|
>
|
||||||
<span>
|
<span>
|
||||||
{archivedIcon}
|
{archivedIcon}
|
||||||
{channelTitle}
|
{channelTitle}
|
||||||
{sharedIcon}
|
{sharedIcon}
|
||||||
</span>
|
</span>
|
||||||
</strong>
|
</WithTooltip>
|
||||||
</WithTooltip>
|
) : (
|
||||||
) : (
|
|
||||||
<strong
|
|
||||||
id='channelHeaderTitle'
|
|
||||||
className='heading'
|
|
||||||
ref={headerItemRef}
|
|
||||||
>
|
|
||||||
<span>
|
<span>
|
||||||
{archivedIcon}
|
{archivedIcon}
|
||||||
{channelTitle}
|
{channelTitle}
|
||||||
{sharedIcon}
|
{sharedIcon}
|
||||||
</span>
|
</span>
|
||||||
</strong>
|
)}
|
||||||
)}
|
<span
|
||||||
<span
|
id='channelHeaderDropdownIcon'
|
||||||
id='channelHeaderDropdownIcon'
|
className='icon icon-chevron-down header-dropdown-chevron-icon'
|
||||||
className='icon icon-chevron-down header-dropdown-chevron-icon'
|
/>
|
||||||
/>
|
</button>
|
||||||
</button>
|
</strong>
|
||||||
</div>
|
</div>
|
||||||
<ChannelHeaderDropdown/>
|
<ChannelHeaderDropdown/>
|
||||||
</MenuWrapper>
|
</MenuWrapper>
|
||||||
|
|||||||
@@ -209,6 +209,7 @@
|
|||||||
.heading {
|
.heading {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
align-self: center;
|
align-self: center;
|
||||||
|
padding: 4px;
|
||||||
margin: 0 0 0 2px;
|
margin: 0 0 0 2px;
|
||||||
color: var(--center-channel-color);
|
color: var(--center-channel-color);
|
||||||
font-family: Metropolis, sans-serif;
|
font-family: Metropolis, sans-serif;
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user