Skip to content

fix(Drawer): fix A11y warning in Drawer CVR-788 #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2024
Merged

fix(Drawer): fix A11y warning in Drawer CVR-788 #277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 49 additions & 42 deletions components/mdc/Drawer/Drawer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ main {
.main-content-height {
height: var(--mdc-drawer-height);
}
.drawer-menu {
display: flex;
flex-direction: column;
padding: 0;
}
</style>

<svelte:window on:resize={showAppropriateThings} />
Expand All @@ -138,50 +143,52 @@ main {
<slot name="drawer-content-top" />
<!-- override built-in padding so height 100 works correctly without creating a vertical scroller -->
<!-- changing the list to flex causes the margins to not collapse -->
<nav
class="mdc-deprecated-list flex column p-0"
class:h-100={isFullHeightMenu}
on:click={onListClick}
on:keyup={onListClick}
bind:this={listElement}
>
{#each menuItems as { icon, label, url, urlPattern, hide, button, tooltip }, i}
{#if label === '--break--'}
<span class="grow-1" />
{:else if !hide}
<Tooltip.Wrapper ariaDescribedBy={label + '-tooltip'}>
{#if button && isNotMini}
<Button class="m-1" raised prependIcon={icon} {url}>{label}</Button>
{:else if button}
<IconButton class="mdc-theme--primary pl-1" {icon} ariaLabel={label} {url} />
{:else if url}
<a
class="mdc-deprecated-list-item"
class:mdc-deprecated-list-item--activated={isMenuItemActive(currentUrl, url, urlPattern)}
href={url}
aria-current={isMenuItemActive(currentUrl, url, urlPattern) ? 'page' : null}
tabindex={i === 0 ? 0 : undefined}
>
<span class="mdc-deprecated-list-item__ripple" />
{#if icon}
<i class="material-icons mdc-deprecated-list-item__graphic" aria-hidden="true">{icon}</i>
{/if}

{#if label && isNotMini}
<span class="mdc-deprecated-list-item__text">{label}</span>
{/if}
</a>
{:else}
<hr
class="mdc-deprecated-list-divider mdc-deprecated-list-divider--inset-leading mdc-deprecated-list-divider--inset-trailing"
/>
<nav class:h-100={isFullHeightMenu} bind:this={listElement}>
<div
class="drawer-menu mdc-deprecated-list"
role="button"
tabindex="-1"
on:click={onListClick}
on:keyup={onListClick}
>
{#each menuItems as { icon, label, url, urlPattern, hide, button, tooltip }, i}
{#if label === '--break--'}
<span class="grow-1" />
{:else if !hide}
<Tooltip.Wrapper ariaDescribedBy={label + '-tooltip'}>
{#if button && isNotMini}
<Button class="m-1" raised prependIcon={icon} {url}>{label}</Button>
{:else if button}
<IconButton class="mdc-theme--primary pl-1" {icon} ariaLabel={label} {url} />
{:else if url}
<a
class="mdc-deprecated-list-item"
class:mdc-deprecated-list-item--activated={isMenuItemActive(currentUrl, url, urlPattern)}
href={url}
aria-current={isMenuItemActive(currentUrl, url, urlPattern) ? 'page' : null}
tabindex={i === 0 ? 0 : undefined}
>
<span class="mdc-deprecated-list-item__ripple" />
{#if icon}
<i class="material-icons mdc-deprecated-list-item__graphic" aria-hidden="true">{icon}</i>
{/if}

{#if label && isNotMini}
<span class="mdc-deprecated-list-item__text">{label}</span>
{/if}
</a>
{:else}
<hr
class="mdc-deprecated-list-divider mdc-deprecated-list-divider--inset-leading mdc-deprecated-list-divider--inset-trailing"
/>
{/if}
</Tooltip.Wrapper>
{#if tooltip}
<Tooltip tooltipID={label + '-tooltip'}>{tooltip}</Tooltip>
{/if}
</Tooltip.Wrapper>
{#if tooltip}
<Tooltip tooltipID={label + '-tooltip'}>{tooltip}</Tooltip>
{/if}
{/if}
{/each}
{/each}
</div>
</nav>
</div>
</aside>
Expand Down