diff --git a/accessible/field.component.js b/accessible/field.component.js index bb6b4cf07..6bc400af9 100644 --- a/accessible/field.component.js +++ b/accessible/field.component.js @@ -30,36 +30,38 @@ blocklyApp.FieldComponent = ng.core template: `
  • - + [attr.aria-level]="level" aria-selected="false"> +
  • + [attr.aria-level]="level" aria-selected="false"> -
      +
      1. -
    1. + [attr.aria-level]="level" aria-selected="false"> // Checkboxes are not currently supported.
    2. + [attr.aria-level]="level" aria-selected="false">
    3. `, - inputs: ['field', 'level', 'index', 'parentId'], + inputs: ['field', 'level', 'index', 'parentId', 'disabled'], pipes: [blocklyApp.TranslatePipe] }) .Class({ diff --git a/accessible/toolbox-tree.component.js b/accessible/toolbox-tree.component.js index 64320458d..c6cc803b8 100644 --- a/accessible/toolbox-tree.component.js +++ b/accessible/toolbox-tree.component.js @@ -34,17 +34,16 @@ blocklyApp.ToolboxTreeComponent = ng.core [attr.aria-selected]="index == 0 && tree.getAttribute('aria-activedescendant') == 'blockly-toolbox-tree-node0'" [attr.aria-level]="level"> -
        +
        1. + aria-selected="false" [attr.aria-level]="level + 1"> -
            +
            1. + [attr.aria-level]="level + 2" aria-selected="false">
            2. + [attr.aria-level]="level + 2" aria-selected="false">
            3. + [attr.aria-level]="level + 2" aria-selected="false">
            4. + [attr.aria-level]="level + 2" aria-selected="false">