Skip to content

Commit 8e78d38

Browse files
Improve screen reader experience for field_note (#11187)
Co-authored-by: Richard Knoll <riknoll@users.noreply.github.com>
1 parent 594c1c8 commit 8e78d38

1 file changed

Lines changed: 22 additions & 21 deletions

File tree

pxtblocks/fields/field_note.ts

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ export class FieldNote extends Blockly.FieldNumber implements FieldCustom {
305305
);
306306
pianoDiv.appendChild(this.noteLabel);
307307
this.noteLabel.textContent = "-";
308+
this.noteLabel.ariaLive = "polite";
308309

309310
let startingPage = 0;
310311
for (let i = 0; i < this.nKeys_; i++) {
@@ -336,7 +337,7 @@ export class FieldNote extends Blockly.FieldNumber implements FieldCustom {
336337
Blockly.DropDownDiv.setColour(this.primaryColour, this.borderColour);
337338
Blockly.DropDownDiv.showPositionedByBlock(this, this.sourceBlock_ as Blockly.BlockSvg, () => this.onHide(), undefined, false);
338339

339-
340+
this.htmlInput_.ariaLabel = lf("Press the up and down arrow keys to select the next or previous note, or enter a value in hertz");
340341
this.htmlInput_.addEventListener("keydown", this.keyHandler);
341342
}
342343

@@ -641,55 +642,55 @@ export class FieldNote extends Blockly.FieldNumber implements FieldCustom {
641642
if (!FieldNote.Notes) {
642643
FieldNote.Notes = {
643644
28: { name: lf("{id:note}C"), prefixedName: lf("Low C"), freq: 131 },
644-
29: { name: lf("C#"), prefixedName: lf("Low C#"), freq: 139 },
645+
29: { name: lf("C"), prefixedName: lf("Low C"), freq: 139 },
645646
30: { name: lf("{id:note}D"), prefixedName: lf("Low D"), freq: 147 },
646-
31: { name: lf("D#"), prefixedName: lf("Low D#"), freq: 156 },
647+
31: { name: lf("D"), prefixedName: lf("Low D"), freq: 156 },
647648
32: { name: lf("{id:note}E"), prefixedName: lf("Low E"), freq: 165 },
648649
33: { name: lf("{id:note}F"), prefixedName: lf("Low F"), freq: 175 },
649-
34: { name: lf("F#"), prefixedName: lf("Low F#"), freq: 185 },
650+
34: { name: lf("F"), prefixedName: lf("Low F"), freq: 185 },
650651
35: { name: lf("{id:note}G"), prefixedName: lf("Low G"), freq: 196 },
651-
36: { name: lf("G#"), prefixedName: lf("Low G#"), freq: 208 },
652+
36: { name: lf("G"), prefixedName: lf("Low G"), freq: 208 },
652653
37: { name: lf("{id:note}A"), prefixedName: lf("Low A"), freq: 220 },
653-
38: { name: lf("A#"), prefixedName: lf("Low A#"), freq: 233 },
654+
38: { name: lf("A"), prefixedName: lf("Low A"), freq: 233 },
654655
39: { name: lf("{id:note}B"), prefixedName: lf("Low B"), freq: 247 },
655656

656657
40: { name: lf("{id:note}C"), prefixedName: lf("Middle C"), freq: 262 },
657-
41: { name: lf("C#"), prefixedName: lf("Middle C#"), freq: 277 },
658+
41: { name: lf("C"), prefixedName: lf("Middle C"), freq: 277 },
658659
42: { name: lf("{id:note}D"), prefixedName: lf("Middle D"), freq: 294 },
659-
43: { name: lf("D#"), prefixedName: lf("Middle D#"), freq: 311 },
660+
43: { name: lf("D"), prefixedName: lf("Middle D"), freq: 311 },
660661
44: { name: lf("{id:note}E"), prefixedName: lf("Middle E"), freq: 330 },
661662
45: { name: lf("{id:note}F"), prefixedName: lf("Middle F"), freq: 349 },
662-
46: { name: lf("F#"), prefixedName: lf("Middle F#"), freq: 370 },
663+
46: { name: lf("F"), prefixedName: lf("Middle F"), freq: 370 },
663664
47: { name: lf("{id:note}G"), prefixedName: lf("Middle G"), freq: 392 },
664-
48: { name: lf("G#"), prefixedName: lf("Middle G#"), freq: 415 },
665+
48: { name: lf("G"), prefixedName: lf("Middle G"), freq: 415 },
665666
49: { name: lf("{id:note}A"), prefixedName: lf("Middle A"), freq: 440 },
666-
50: { name: lf("A#"), prefixedName: lf("Middle A#"), freq: 466 },
667+
50: { name: lf("A"), prefixedName: lf("Middle A"), freq: 466 },
667668
51: { name: lf("{id:note}B"), prefixedName: lf("Middle B"), freq: 494 },
668669

669670
52: { name: lf("{id:note}C"), prefixedName: lf("Tenor C"), altPrefixedName: lf("High C"), freq: 523 },
670-
53: { name: lf("C#"), prefixedName: lf("Tenor C#"), altPrefixedName: lf("High C#"), freq: 554 },
671+
53: { name: lf("C"), prefixedName: lf("Tenor C"), altPrefixedName: lf("High C"), freq: 554 },
671672
54: { name: lf("{id:note}D"), prefixedName: lf("Tenor D"), altPrefixedName: lf("High D"), freq: 587 },
672-
55: { name: lf("D#"), prefixedName: lf("Tenor D#"), altPrefixedName: lf("High D#"), freq: 622 },
673+
55: { name: lf("D"), prefixedName: lf("Tenor D"), altPrefixedName: lf("High D"), freq: 622 },
673674
56: { name: lf("{id:note}E"), prefixedName: lf("Tenor E"), altPrefixedName: lf("High E"), freq: 659 },
674675
57: { name: lf("{id:note}F"), prefixedName: lf("Tenor F"), altPrefixedName: lf("High F"), freq: 698 },
675-
58: { name: lf("F#"), prefixedName: lf("Tenor F#"), altPrefixedName: lf("High F#"), freq: 740 },
676+
58: { name: lf("F"), prefixedName: lf("Tenor F"), altPrefixedName: lf("High F"), freq: 740 },
676677
59: { name: lf("{id:note}G"), prefixedName: lf("Tenor G"), altPrefixedName: lf("High G"), freq: 784 },
677-
60: { name: lf("G#"), prefixedName: lf("Tenor G#"), altPrefixedName: lf("High G#"), freq: 831 },
678+
60: { name: lf("G"), prefixedName: lf("Tenor G"), altPrefixedName: lf("High G"), freq: 831 },
678679
61: { name: lf("{id:note}A"), prefixedName: lf("Tenor A"), altPrefixedName: lf("High A"), freq: 880 },
679-
62: { name: lf("A#"), prefixedName: lf("Tenor A#"), altPrefixedName: lf("High A#"), freq: 932 },
680+
62: { name: lf("A"), prefixedName: lf("Tenor A"), altPrefixedName: lf("High A"), freq: 932 },
680681
63: { name: lf("{id:note}B"), prefixedName: lf("Tenor B"), altPrefixedName: lf("High B"), freq: 988 },
681682

682683
64: { name: lf("{id:note}C"), prefixedName: lf("High C"), freq: 1046 },
683-
65: { name: lf("C#"), prefixedName: lf("High C#"), freq: 1109 },
684+
65: { name: lf("C"), prefixedName: lf("High C"), freq: 1109 },
684685
66: { name: lf("{id:note}D"), prefixedName: lf("High D"), freq: 1175 },
685-
67: { name: lf("D#"), prefixedName: lf("High D#"), freq: 1245 },
686+
67: { name: lf("D"), prefixedName: lf("High D"), freq: 1245 },
686687
68: { name: lf("{id:note}E"), prefixedName: lf("High E"), freq: 1319 },
687688
69: { name: lf("{id:note}F"), prefixedName: lf("High F"), freq: 1397 },
688-
70: { name: lf("F#"), prefixedName: lf("High F#"), freq: 1478 },
689+
70: { name: lf("F"), prefixedName: lf("High F"), freq: 1478 },
689690
71: { name: lf("{id:note}G"), prefixedName: lf("High G"), freq: 1568 },
690-
72: { name: lf("G#"), prefixedName: lf("High G#"), freq: 1661 },
691+
72: { name: lf("G"), prefixedName: lf("High G"), freq: 1661 },
691692
73: { name: lf("{id:note}A"), prefixedName: lf("High A"), freq: 1760 },
692-
74: { name: lf("A#"), prefixedName: lf("High A#"), freq: 1865 },
693+
74: { name: lf("A"), prefixedName: lf("High A"), freq: 1865 },
693694
75: { name: lf("{id:note}B"), prefixedName: lf("High B"), freq: 1976 }
694695
}
695696
}

0 commit comments

Comments
 (0)