feat: field label improvements (experimental)

blocks/logic.ts

@@ -35,6 +35,7 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'BOOL',
+        'ariaTypeName': 'Boolean',
         'options': [
           ['%{BKY_LOGIC_BOOLEAN_TRUE}', 'TRUE'],
           ['%{BKY_LOGIC_BOOLEAN_FALSE}', 'FALSE'],
@@ -117,13 +118,14 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'OP',
+        'ariaTypeName': 'Operator',
         'options': [
-          ['=', 'EQ'],
-          ['\u2260', 'NEQ'],
-          ['\u200F<', 'LT'],
-          ['\u200F\u2264', 'LTE'],
-          ['\u200F>', 'GT'],
-          ['\u200F\u2265', 'GTE'],
+          ['=', 'EQ', 'Equals'],
+          ['\u2260', 'NEQ', 'Does not equal'],
+          ['\u200F<', 'LT', 'Less than'],
+          ['\u200F\u2264', 'LTE', 'Less than or equal to'],
+          ['\u200F>', 'GT', 'Greater than'],
+          ['\u200F\u2265', 'GTE', 'Greater than or equal to'],
         ],
       },
       {
@@ -150,9 +152,10 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'OP',
+        'ariaTypeName': 'Boolean operator',
         'options': [
-          ['%{BKY_LOGIC_OPERATION_AND}', 'AND'],
-          ['%{BKY_LOGIC_OPERATION_OR}', 'OR'],
+          ['%{BKY_LOGIC_OPERATION_AND}', 'AND', 'And'],
+          ['%{BKY_LOGIC_OPERATION_OR}', 'OR', 'Or'],
         ],
       },
       {

blocks/loops.ts

@@ -92,9 +92,10 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'MODE',
+        'ariaTypeName': 'Repeat type',
         'options': [
-          ['%{BKY_CONTROLS_WHILEUNTIL_OPERATOR_WHILE}', 'WHILE'],
-          ['%{BKY_CONTROLS_WHILEUNTIL_OPERATOR_UNTIL}', 'UNTIL'],
+          ['%{BKY_CONTROLS_WHILEUNTIL_OPERATOR_WHILE}', 'WHILE', 'While'],
+          ['%{BKY_CONTROLS_WHILEUNTIL_OPERATOR_UNTIL}', 'UNTIL', 'Until'],
         ],
       },
       {
@@ -199,9 +200,18 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'FLOW',
+        'ariaTypeName': 'Continue type',
         'options': [
-          ['%{BKY_CONTROLS_FLOW_STATEMENTS_OPERATOR_BREAK}', 'BREAK'],
-          ['%{BKY_CONTROLS_FLOW_STATEMENTS_OPERATOR_CONTINUE}', 'CONTINUE'],
+          [
+            '%{BKY_CONTROLS_FLOW_STATEMENTS_OPERATOR_BREAK}',
+            'BREAK',
+            'Break loop',
+          ],
+          [
+            '%{BKY_CONTROLS_FLOW_STATEMENTS_OPERATOR_CONTINUE}',
+            'CONTINUE',
+            'Continue loop',
+          ],
         ],
       },
     ],

blocks/math.ts

@@ -55,7 +55,7 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'OP',
-        'ariaTypeName': 'Arithmetic operation',
+        'ariaTypeName': 'Operator',
         'options': [
           ['%{BKY_MATH_ADDITION_SYMBOL}', 'ADD', 'Plus'],
           ['%{BKY_MATH_SUBTRACTION_SYMBOL}', 'MINUS', 'Minus'],
@@ -85,14 +85,15 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'OP',
+        'ariaTypeName': 'Function',
         '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_ROOT}', 'ROOT', 'Square root of '],
+          ['%{BKY_MATH_SINGLE_OP_ABSOLUTE}', 'ABS', 'Absolute value of'],
+          ['-', 'NEG', 'Negative value of'],
+          ['ln', 'LN', 'Natural logarithm of'],
+          ['log10', 'LOG10', 'Logarithm base 10 of'],
+          ['e^', 'EXP', 'e to the power of'],
+          ['10^', 'POW10', '10 to the power of'],
         ],
       },
       {
@@ -115,13 +116,14 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'OP',
+        'ariaTypeName': 'Trigonometry function',
         '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', 'Sine of'],
+          ['%{BKY_MATH_TRIG_COS}', 'COS', 'Cosine of'],
+          ['%{BKY_MATH_TRIG_TAN}', 'TAN', 'Tangent of'],
+          ['%{BKY_MATH_TRIG_ASIN}', 'ASIN', 'Arc sine of'],
+          ['%{BKY_MATH_TRIG_ACOS}', 'ACOS', 'Arc cosine of'],
+          ['%{BKY_MATH_TRIG_ATAN}', 'ATAN', 'Arc tangent of'],
         ],
       },
       {
@@ -144,13 +146,14 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'CONSTANT',
+        'ariaTypeName': 'Math constant',
         'options': [
-          ['\u03c0', 'PI'],
-          ['e', 'E'],
-          ['\u03c6', 'GOLDEN_RATIO'],
-          ['sqrt(2)', 'SQRT2'],
-          ['sqrt(\u00bd)', 'SQRT1_2'],
-          ['\u221e', 'INFINITY'],
+          ['\u03c0', 'PI', 'Pi'],
+          ['e', 'E', "Euler's number"],
+          ['\u03c6', 'GOLDEN_RATIO', 'Golden ratio'],
+          ['sqrt(2)', 'SQRT2', 'Square root of 2'],
+          ['sqrt(\u00bd)', 'SQRT1_2', 'Square root of one half'],
+          ['\u221e', 'INFINITY', 'Infinity'],
         ],
       },
     ],
@@ -174,14 +177,15 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'PROPERTY',
+        'ariaTypeName': 'Number comparison',
         'options': [
-          ['%{BKY_MATH_IS_EVEN}', 'EVEN'],
-          ['%{BKY_MATH_IS_ODD}', 'ODD'],
-          ['%{BKY_MATH_IS_PRIME}', 'PRIME'],
-          ['%{BKY_MATH_IS_WHOLE}', 'WHOLE'],
-          ['%{BKY_MATH_IS_POSITIVE}', 'POSITIVE'],
-          ['%{BKY_MATH_IS_NEGATIVE}', 'NEGATIVE'],
-          ['%{BKY_MATH_IS_DIVISIBLE_BY}', 'DIVISIBLE_BY'],
+          ['%{BKY_MATH_IS_EVEN}', 'EVEN', 'Is even'],
+          ['%{BKY_MATH_IS_ODD}', 'ODD', 'Is odd'],
+          ['%{BKY_MATH_IS_PRIME}', 'PRIME', 'Is prime'],
+          ['%{BKY_MATH_IS_WHOLE}', 'WHOLE', 'Is whole number'],
+          ['%{BKY_MATH_IS_POSITIVE}', 'POSITIVE', 'Is positive'],
+          ['%{BKY_MATH_IS_NEGATIVE}', 'NEGATIVE', 'Is negative'],
+          ['%{BKY_MATH_IS_DIVISIBLE_BY}', 'DIVISIBLE_BY', 'Is divisible by'],
         ],
       },
     ],
@@ -223,10 +227,11 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'OP',
+        'ariaTypeName': 'Rounding operation',
         'options': [
-          ['%{BKY_MATH_ROUND_OPERATOR_ROUND}', 'ROUND'],
-          ['%{BKY_MATH_ROUND_OPERATOR_ROUNDUP}', 'ROUNDUP'],
-          ['%{BKY_MATH_ROUND_OPERATOR_ROUNDDOWN}', 'ROUNDDOWN'],
+          ['%{BKY_MATH_ROUND_OPERATOR_ROUND}', 'ROUND', 'Round to nearest'],
+          ['%{BKY_MATH_ROUND_OPERATOR_ROUNDUP}', 'ROUNDUP', 'Round up'],
+          ['%{BKY_MATH_ROUND_OPERATOR_ROUNDDOWN}', 'ROUNDDOWN', 'Round down'],
         ],
       },
       {
@@ -250,15 +255,20 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'OP',
+        'ariaTypeName': 'List operation',
         'options': [
-          ['%{BKY_MATH_ONLIST_OPERATOR_SUM}', 'SUM'],
-          ['%{BKY_MATH_ONLIST_OPERATOR_MIN}', 'MIN'],
-          ['%{BKY_MATH_ONLIST_OPERATOR_MAX}', 'MAX'],
-          ['%{BKY_MATH_ONLIST_OPERATOR_AVERAGE}', 'AVERAGE'],
-          ['%{BKY_MATH_ONLIST_OPERATOR_MEDIAN}', 'MEDIAN'],
-          ['%{BKY_MATH_ONLIST_OPERATOR_MODE}', 'MODE'],
-          ['%{BKY_MATH_ONLIST_OPERATOR_STD_DEV}', 'STD_DEV'],
-          ['%{BKY_MATH_ONLIST_OPERATOR_RANDOM}', 'RANDOM'],
+          ['%{BKY_MATH_ONLIST_OPERATOR_SUM}', 'SUM', 'Sum'],
+          ['%{BKY_MATH_ONLIST_OPERATOR_MIN}', 'MIN', 'Minimum'],
+          ['%{BKY_MATH_ONLIST_OPERATOR_MAX}', 'MAX', 'Maximum'],
+          ['%{BKY_MATH_ONLIST_OPERATOR_AVERAGE}', 'AVERAGE', 'Average'],
+          ['%{BKY_MATH_ONLIST_OPERATOR_MEDIAN}', 'MEDIAN', 'Median'],
+          ['%{BKY_MATH_ONLIST_OPERATOR_MODE}', 'MODE', 'Mode'],
+          [
+            '%{BKY_MATH_ONLIST_OPERATOR_STD_DEV}',
+            'STD_DEV',
+            'Standard deviation',
+          ],
+          ['%{BKY_MATH_ONLIST_OPERATOR_RANDOM}', 'RANDOM', 'Random value'],
         ],
       },
       {

blocks/text.ts

@@ -142,9 +142,10 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'END',
+        'ariaTypeName': 'Search direction',
         'options': [
-          ['%{BKY_TEXT_INDEXOF_OPERATOR_FIRST}', 'FIRST'],
-          ['%{BKY_TEXT_INDEXOF_OPERATOR_LAST}', 'LAST'],
+          ['%{BKY_TEXT_INDEXOF_OPERATOR_FIRST}', 'FIRST', 'First'],
+          ['%{BKY_TEXT_INDEXOF_OPERATOR_LAST}', 'LAST', 'Last'],
         ],
       },
       {
@@ -171,12 +172,13 @@ export const blocks = createBlockDefinitionsFromJsonArray([
       {
         'type': 'field_dropdown',
         'name': 'WHERE',
+        'ariaTypeName': 'Search operation',
         'options': [
-          ['%{BKY_TEXT_CHARAT_FROM_START}', 'FROM_START'],
-          ['%{BKY_TEXT_CHARAT_FROM_END}', 'FROM_END'],
-          ['%{BKY_TEXT_CHARAT_FIRST}', 'FIRST'],
-          ['%{BKY_TEXT_CHARAT_LAST}', 'LAST'],
-          ['%{BKY_TEXT_CHARAT_RANDOM}', 'RANDOM'],
+          ['%{BKY_TEXT_CHARAT_FROM_START}', 'FROM_START', 'From string start'],
+          ['%{BKY_TEXT_CHARAT_FROM_END}', 'FROM_END', 'From string end'],
+          ['%{BKY_TEXT_CHARAT_FIRST}', 'FIRST', 'First character'],
+          ['%{BKY_TEXT_CHARAT_LAST}', 'LAST', 'Last character'],
+          ['%{BKY_TEXT_CHARAT_RANDOM}', 'RANDOM', 'Random character'],
         ],
       },
     ],