Skip to content

Commit 0f0944f

Browse files
authored
Merge pull request #33 from ishythefishy/accessibility-fixes
Accessibility fixes for scale info toggle
2 parents 5e6e438 + 5bb4aa3 commit 0f0944f

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

apps/fretonator-web/src/app/common/fretonator/scale-map/scale-map.component.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ <h4 class="scaleMap__title">Degrees</h4>
1111
</div>
1212
<button class="scaleDegrees__toggle"
1313
aria-label="Scale Degrees Info Toggle"
14-
aria-controls="scaleMapInfo"
1514
type="button"
16-
[attr.aria-expanded]="showScaleMapInfo"
1715
(click)="toggleScaleMapInfo()">{{scaleDegreesToggleText}}
1816
</button>
1917
</div>
@@ -32,12 +30,11 @@ <h5 class="scaleDisplay__note">
3230
</div>
3331

3432
<div class="scaleMapInfo"
35-
id="scaleMapInfo"
33+
[attr.aria-expanded]="showScaleMapInfo"
3634
*ngIf="showScaleMapInfo">
3735
<h2 class="scaleMapInfo__title">About Scale Degrees
3836
<button class="scaleMapInfo__close"
39-
aria-label="Scale Degrees Info Toggle"
40-
aria-controls="scaleMapInfo"
37+
aria-label="Scale Degrees Info Close"
4138
type="button"
4239
(click)="toggleScaleMapInfo()">
4340
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14">

apps/fretonator-web/src/app/pages/home/home-index/__snapshots__/home-index.component.spec.ts.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,8 +1057,6 @@ exports[`HomeIndexComponent should create 1`] = `
10571057
</span>
10581058
</div>
10591059
<button
1060-
aria-controls="scaleMapInfo"
1061-
aria-expanded="false"
10621060
aria-label="Scale Degrees Info Toggle"
10631061
class="scaleDegrees__toggle"
10641062
type="button"

0 commit comments

Comments
 (0)