Skip to content

feat: Add custom ARIA labels to built-in block dropdown field options #9880

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
mikeharv merged 1 commit into from
May 15, 2026
Merged

feat: Add custom ARIA labels to built-in block dropdown field options #9880

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions packages/blockly/blocks/logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'type': 'field_dropdown',
'name': 'OP',
'options': [
['=', 'EQ'],
['\u2260', 'NEQ'],
['\u200F<', 'LT'],
['\u200F\u2264', 'LTE'],
['\u200F>', 'GT'],
['\u200F\u2265', 'GTE'],
['=', 'EQ', '%{BKY_LOGIC_COMPARE_EQ_ARIA}'],
['\u2260', 'NEQ', '%{BKY_LOGIC_COMPARE_NEQ_ARIA}'],
['\u200F<', 'LT', '%{BKY_LOGIC_COMPARE_LT_ARIA}'],
['\u200F\u2264', 'LTE', '%{BKY_LOGIC_COMPARE_LTE_ARIA}'],
['\u200F>', 'GT', '%{BKY_LOGIC_COMPARE_GT_ARIA}'],
['\u200F\u2265', 'GTE', '%{BKY_LOGIC_COMPARE_GTE_ARIA}'],
],
},
{
Expand Down
82 changes: 57 additions & 25 deletions packages/blockly/blocks/math.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,31 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'type': 'field_dropdown',
'name': 'OP',
'options': [
['%{BKY_MATH_ADDITION_SYMBOL}', 'ADD'],
['%{BKY_MATH_SUBTRACTION_SYMBOL}', 'MINUS'],
['%{BKY_MATH_MULTIPLICATION_SYMBOL}', 'MULTIPLY'],
['%{BKY_MATH_DIVISION_SYMBOL}', 'DIVIDE'],
['%{BKY_MATH_POWER_SYMBOL}', 'POWER'],
[
'%{BKY_MATH_ADDITION_SYMBOL}',
'ADD',
'%{BKY_MATH_ADDITION_SYMBOL_ARIA}',
],
[
'%{BKY_MATH_SUBTRACTION_SYMBOL}',
'MINUS',
'%{BKY_MATH_SUBTRACTION_SYMBOL_ARIA}',
],
[
'%{BKY_MATH_MULTIPLICATION_SYMBOL}',
'MULTIPLY',
'%{BKY_MATH_MULTIPLICATION_SYMBOL_ARIA}',
],
[
'%{BKY_MATH_DIVISION_SYMBOL}',
'DIVIDE',
'%{BKY_MATH_DIVISION_SYMBOL_ARIA}',
],
[
'%{BKY_MATH_POWER_SYMBOL}',
'POWER',
'%{BKY_MATH_POWER_SYMBOL_ARIA}',
],
],
},
{
Expand All @@ -85,12 +105,16 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'name': 'OP',
'options': [
['%{BKY_MATH_SINGLE_OP_ROOT}', 'ROOT'],
['%{BKY_MATH_SINGLE_OP_ABSOLUTE}', 'ABS'],
['-', 'NEG'],
['ln', 'LN'],
['log10', 'LOG10'],
['e^', 'EXP'],
['10^', 'POW10'],
[
'%{BKY_MATH_SINGLE_OP_ABSOLUTE}',
'ABS',
'%{BKY_MATH_SINGLE_OP_ABSOLUTE_ARIA}',
],
['-', 'NEG', '%{BKY_MATH_SINGLE_OP_NEG_ARIA}'],
['ln', 'LN', '%{BKY_MATH_SINGLE_OP_LN_ARIA}'],
['log10', 'LOG10', '%{BKY_MATH_SINGLE_OP_LOG10_ARIA}'],
['e^', 'EXP', '%{BKY_MATH_SINGLE_OP_EXP_ARIA}'],
['10^', 'POW10', '%{BKY_MATH_SINGLE_OP_POW10_ARIA}'],
],
},
{
Expand All @@ -114,12 +138,12 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'type': 'field_dropdown',
'name': 'OP',
'options': [
['%{BKY_MATH_TRIG_SIN}', 'SIN'],
['%{BKY_MATH_TRIG_COS}', 'COS'],
['%{BKY_MATH_TRIG_TAN}', 'TAN'],
['%{BKY_MATH_TRIG_ASIN}', 'ASIN'],
['%{BKY_MATH_TRIG_ACOS}', 'ACOS'],
['%{BKY_MATH_TRIG_ATAN}', 'ATAN'],
['%{BKY_MATH_TRIG_SIN}', 'SIN', '%{BKY_MATH_TRIG_SIN_ARIA}'],
['%{BKY_MATH_TRIG_COS}', 'COS', '%{BKY_MATH_TRIG_COS_ARIA}'],
['%{BKY_MATH_TRIG_TAN}', 'TAN', '%{BKY_MATH_TRIG_TAN_ARIA}'],
['%{BKY_MATH_TRIG_ASIN}', 'ASIN', '%{BKY_MATH_TRIG_ASIN_ARIA}'],
['%{BKY_MATH_TRIG_ACOS}', 'ACOS', '%{BKY_MATH_TRIG_ACOS_ARIA}'],
['%{BKY_MATH_TRIG_ATAN}', 'ATAN', '%{BKY_MATH_TRIG_ATAN_ARIA}'],
],
},
{
Expand All @@ -143,12 +167,12 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'type': 'field_dropdown',
'name': 'CONSTANT',
'options': [
['\u03c0', 'PI'],
['e', 'E'],
['\u03c6', 'GOLDEN_RATIO'],
['sqrt(2)', 'SQRT2'],
['sqrt(\u00bd)', 'SQRT1_2'],
['\u221e', 'INFINITY'],
['\u03c0', 'PI', '%{BKY_MATH_CONSTANT_PI_ARIA}'],
['e', 'E', '%{BKY_MATH_CONSTANT_E_ARIA}'],
['\u03c6', 'GOLDEN_RATIO', '%{BKY_MATH_CONSTANT_GOLDEN_RATIO_ARIA}'],
['sqrt(2)', 'SQRT2', '%{BKY_MATH_CONSTANT_SQRT2_ARIA}'],
['sqrt(\u00bd)', 'SQRT1_2', '%{BKY_MATH_CONSTANT_SQRT1_2_ARIA}'],
['\u221e', 'INFINITY', '%{BKY_MATH_CONSTANT_INFINITY_ARIA}'],
],
},
],
Expand Down Expand Up @@ -250,8 +274,16 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'name': 'OP',
'options': [
['%{BKY_MATH_ONLIST_OPERATOR_SUM}', 'SUM'],
['%{BKY_MATH_ONLIST_OPERATOR_MIN}', 'MIN'],
['%{BKY_MATH_ONLIST_OPERATOR_MAX}', 'MAX'],
[
'%{BKY_MATH_ONLIST_OPERATOR_MIN}',
'MIN',
'%{BKY_MATH_ONLIST_OPERATOR_MIN_ARIA}',
],
[
'%{BKY_MATH_ONLIST_OPERATOR_MAX}',
'MAX',
'%{BKY_MATH_ONLIST_OPERATOR_MAX_ARIA}',
],
['%{BKY_MATH_ONLIST_OPERATOR_AVERAGE}', 'AVERAGE'],
['%{BKY_MATH_ONLIST_OPERATOR_MEDIAN}', 'MEDIAN'],
['%{BKY_MATH_ONLIST_OPERATOR_MODE}', 'MODE'],
Expand Down
40 changes: 32 additions & 8 deletions packages/blockly/blocks/text.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,16 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'type': 'field_dropdown',
'name': 'WHERE',
'options': [
['%{BKY_TEXT_CHARAT_FROM_START}', 'FROM_START'],
['%{BKY_TEXT_CHARAT_FROM_END}', 'FROM_END'],
[
'%{BKY_TEXT_CHARAT_FROM_START}',
'FROM_START',
'%{BKY_TEXT_FROM_START_ARIA}',
],
[
'%{BKY_TEXT_CHARAT_FROM_END}',
'FROM_END',
'%{BKY_TEXT_FROM_END_ARIA}',
],
['%{BKY_TEXT_CHARAT_FIRST}', 'FIRST'],
['%{BKY_TEXT_CHARAT_LAST}', 'LAST'],
['%{BKY_TEXT_CHARAT_RANDOM}', 'RANDOM'],
Expand All @@ -191,8 +199,8 @@ export const blocks = createBlockDefinitionsFromJsonArray([
/** Type of a 'text_get_substring' block. */
type GetSubstringBlock = Block & GetSubstringMixin;
interface GetSubstringMixin extends GetSubstringType {
WHERE_OPTIONS_1: Array<[string, string]>;
WHERE_OPTIONS_2: Array<[string, string]>;
WHERE_OPTIONS_1: Array<[string, string, string?]>;
WHERE_OPTIONS_2: Array<[string, string, string?]>;
}
type GetSubstringType = typeof GET_SUBSTRING_BLOCK;

Expand All @@ -202,13 +210,29 @@ const GET_SUBSTRING_BLOCK = {
*/
init: function (this: GetSubstringBlock) {
this['WHERE_OPTIONS_1'] = [
[Msg['TEXT_GET_SUBSTRING_START_FROM_START'], 'FROM_START'],
[Msg['TEXT_GET_SUBSTRING_START_FROM_END'], 'FROM_END'],
[
Msg['TEXT_GET_SUBSTRING_START_FROM_START'],
'FROM_START',
Msg['TEXT_FROM_START_ARIA'],
],
[
Msg['TEXT_GET_SUBSTRING_START_FROM_END'],
'FROM_END',
Msg['TEXT_FROM_END_ARIA'],
],
[Msg['TEXT_GET_SUBSTRING_START_FIRST'], 'FIRST'],
];
this['WHERE_OPTIONS_2'] = [
[Msg['TEXT_GET_SUBSTRING_END_FROM_START'], 'FROM_START'],
[Msg['TEXT_GET_SUBSTRING_END_FROM_END'], 'FROM_END'],
[
Msg['TEXT_GET_SUBSTRING_END_FROM_START'],
'FROM_START',
Msg['TEXT_FROM_START_ARIA'],
],
[
Msg['TEXT_GET_SUBSTRING_END_FROM_END'],
'FROM_END',
Msg['TEXT_FROM_END_ARIA'],
],
[Msg['TEXT_GET_SUBSTRING_END_LAST'], 'LAST'],
];
this.setHelpUrl(Msg['TEXT_GET_SUBSTRING_HELPURL']);
Expand Down
4 changes: 2 additions & 2 deletions packages/blockly/core/field_dropdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ export class FieldDropdown extends Field<string> {
value,
];
if (ariaLabel) {
trimmedLabelOption.push(ariaLabel);
trimmedLabelOption.push(parsing.replaceMessageReferences(ariaLabel));
}
return trimmedLabelOption;
}
Expand All @@ -760,7 +760,7 @@ export class FieldDropdown extends Field<string> {
: label;
const imageOptions: MenuOption = [imageLabel, value];
if (ariaLabel) {
imageOptions.push(ariaLabel);
imageOptions.push(parsing.replaceMessageReferences(ariaLabel));
}
return imageOptions;
});
Expand Down
35 changes: 34 additions & 1 deletion packages/blockly/msg/json/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@metadata": {
"author": "Ellen Spertus <ellen.spertus@gmail.com>",
"lastupdated": "2026-05-14 08:47:43.920300",
"lastupdated": "2026-05-15 12:51:08.370549",
"locale": "en",
"messagedocumentation" : "qqq"
},
Expand Down Expand Up @@ -93,11 +93,17 @@
"CONTROLS_IF_ELSEIF_TOOLTIP": "Add a condition to the if block.",
"CONTROLS_IF_ELSE_TOOLTIP": "Add a final, catch-all condition to the if block.",
"LOGIC_COMPARE_HELPURL": "https://en.wikipedia.org/wiki/Inequality_(mathematics)",
"LOGIC_COMPARE_EQ_ARIA": "equals",
"LOGIC_COMPARE_TOOLTIP_EQ": "Return true if both inputs equal each other.",
"LOGIC_COMPARE_NEQ_ARIA": "not equals",
"LOGIC_COMPARE_TOOLTIP_NEQ": "Return true if both inputs are not equal to each other.",
"LOGIC_COMPARE_LT_ARIA": "less than",
"LOGIC_COMPARE_TOOLTIP_LT": "Return true if the first input is smaller than the second input.",
"LOGIC_COMPARE_LTE_ARIA": "less than or equal to",
"LOGIC_COMPARE_TOOLTIP_LTE": "Return true if the first input is smaller than or equal to the second input.",
"LOGIC_COMPARE_GT_ARIA": "greater than",
"LOGIC_COMPARE_TOOLTIP_GT": "Return true if the first input is greater than the second input.",
"LOGIC_COMPARE_GTE_ARIA": "greater than or equal to",
"LOGIC_COMPARE_TOOLTIP_GTE": "Return true if the first input is greater than or equal to the second input.",
"LOGIC_OPERATION_HELPURL": "https://github.com/RaspberryPiFoundation/blockly/wiki/Logic#logical-operations",
"LOGIC_OPERATION_TOOLTIP_AND": "Return true if both inputs are true.",
Expand All @@ -122,16 +128,33 @@
"MATH_NUMBER_HELPURL": "https://en.wikipedia.org/wiki/Number",
"MATH_NUMBER_TOOLTIP": "A number.",
"MATH_ADDITION_SYMBOL": "+",
"MATH_ADDITION_SYMBOL_ARIA": "plus",
"MATH_SUBTRACTION_SYMBOL": "-",
"MATH_SUBTRACTION_SYMBOL_ARIA": "minus",
"MATH_DIVISION_SYMBOL": "÷",
"MATH_DIVISION_SYMBOL_ARIA": "divided by",
"MATH_MULTIPLICATION_SYMBOL": "×",
"MATH_MULTIPLICATION_SYMBOL_ARIA": "times",
"MATH_POWER_SYMBOL": "^",
"MATH_POWER_SYMBOL_ARIA": "to the power of",
"MATH_TRIG_SIN": "sin",
"MATH_TRIG_SIN_ARIA": "sine",
"MATH_TRIG_COS": "cos",
"MATH_TRIG_COS_ARIA": "cosine",
"MATH_TRIG_TAN": "tan",
"MATH_TRIG_TAN_ARIA": "tangent",
"MATH_TRIG_ASIN": "asin",
"MATH_TRIG_ASIN_ARIA": "inverse sine",
"MATH_TRIG_ACOS": "acos",
"MATH_TRIG_ACOS_ARIA": "inverse cosine",
"MATH_TRIG_ATAN": "atan",
"MATH_TRIG_ATAN_ARIA": "inverse tangent",
"MATH_CONSTANT_PI_ARIA": "pi",
"MATH_CONSTANT_E_ARIA": "e",
"MATH_CONSTANT_GOLDEN_RATIO_ARIA": "golden ratio",
"MATH_CONSTANT_SQRT2_ARIA": "square root of 2",
"MATH_CONSTANT_SQRT1_2_ARIA": "square root of 1 over 2",
"MATH_CONSTANT_INFINITY_ARIA": "infinity",
"MATH_ARITHMETIC_HELPURL": "https://en.wikipedia.org/wiki/Arithmetic",
"MATH_ARITHMETIC_TOOLTIP_ADD": "Return the sum of the two numbers.",
"MATH_ARITHMETIC_TOOLTIP_MINUS": "Return the difference of the two numbers.",
Expand All @@ -142,7 +165,13 @@
"MATH_SINGLE_OP_ROOT": "square root",
"MATH_SINGLE_TOOLTIP_ROOT": "Return the square root of a number.",
"MATH_SINGLE_OP_ABSOLUTE": "absolute",
"MATH_SINGLE_OP_ABSOLUTE_ARIA": "absolute value",
"MATH_SINGLE_TOOLTIP_ABS": "Return the absolute value of a number.",
"MATH_SINGLE_OP_NEG_ARIA": "negative",
"MATH_SINGLE_OP_LN_ARIA": "natural logarithm",
"MATH_SINGLE_OP_LOG10_ARIA": "base 10 logarithm",
"MATH_SINGLE_OP_EXP_ARIA": "e to the power of",
"MATH_SINGLE_OP_POW10_ARIA": "10 to the power of",
"MATH_SINGLE_TOOLTIP_NEG": "Return the negation of a number.",
"MATH_SINGLE_TOOLTIP_LN": "Return the natural logarithm of a number.",
"MATH_SINGLE_TOOLTIP_LOG10": "Return the base 10 logarithm of a number.",
Expand Down Expand Up @@ -177,8 +206,10 @@
"MATH_ONLIST_OPERATOR_SUM": "sum of list",
"MATH_ONLIST_TOOLTIP_SUM": "Return the sum of all the numbers in the list.",
"MATH_ONLIST_OPERATOR_MIN": "min of list",
"MATH_ONLIST_OPERATOR_MIN_ARIA": "minimum",
"MATH_ONLIST_TOOLTIP_MIN": "Return the smallest number in the list.",
"MATH_ONLIST_OPERATOR_MAX": "max of list",
"MATH_ONLIST_OPERATOR_MAX_ARIA": "maximum",
"MATH_ONLIST_TOOLTIP_MAX": "Return the largest number in the list.",
"MATH_ONLIST_OPERATOR_AVERAGE": "average of list",
"MATH_ONLIST_TOOLTIP_AVERAGE": "Return the average (arithmetic mean) of the numeric values in the list.",
Expand Down Expand Up @@ -227,6 +258,8 @@
"TEXT_INDEXOF_TITLE": "in text %1 %2 %3",
"TEXT_INDEXOF_OPERATOR_FIRST": "find first occurrence of text",
"TEXT_INDEXOF_OPERATOR_LAST": "find last occurrence of text",
"TEXT_FROM_START_ARIA": "letter number",
"TEXT_FROM_END_ARIA": "letter number from end",
"TEXT_CHARAT_HELPURL": "https://github.com/RaspberryPiFoundation/blockly/wiki/Text#extracting-text",
"TEXT_CHARAT_TITLE": "in text %1 %2",
"TEXT_CHARAT_FROM_START": "get letter #",
Expand Down
Loading
Loading