diff --git a/src/aria/accordion/accordion-panel.ts b/src/aria/accordion/accordion-panel.ts index e7d0749ef5ca..3b965620920e 100644 --- a/src/aria/accordion/accordion-panel.ts +++ b/src/aria/accordion/accordion-panel.ts @@ -51,7 +51,7 @@ import {DeferredContentAware, AccordionPanelPattern, AccordionTriggerPattern} fr host: { 'role': 'region', '[attr.id]': '_pattern.id()', - '[attr.aria-labelledby]': '_pattern.accordionTrigger()?.id()', + '[aria-labelledby]': '_pattern.accordionTrigger()?.id()', '[attr.inert]': '!visible() ? true : null', }, }) diff --git a/src/aria/accordion/accordion-trigger.ts b/src/aria/accordion/accordion-trigger.ts index a2e8fcb5527c..4d56c869d911 100644 --- a/src/aria/accordion/accordion-trigger.ts +++ b/src/aria/accordion/accordion-trigger.ts @@ -46,9 +46,9 @@ import {ACCORDION_GROUP} from './accordion-tokens'; '[attr.data-active]': 'active()', 'role': 'button', '[id]': '_pattern.id()', - '[attr.aria-expanded]': 'expanded()', - '[attr.aria-controls]': '_pattern.controls()', - '[attr.aria-disabled]': '_pattern.disabled()', + '[aria-expanded]': 'expanded()', + '[aria-controls]': '_pattern.controls()', + '[aria-disabled]': '_pattern.disabled()', '[attr.disabled]': '_pattern.hardDisabled() ? true : null', '[attr.tabindex]': '_pattern.tabIndex()', }, diff --git a/src/aria/combobox/combobox-input.ts b/src/aria/combobox/combobox-input.ts index 3a79ba895b77..c41a7bd5557f 100644 --- a/src/aria/combobox/combobox-input.ts +++ b/src/aria/combobox/combobox-input.ts @@ -47,12 +47,12 @@ import {Combobox} from './combobox'; host: { 'role': 'combobox', '[value]': 'value()', - '[attr.aria-disabled]': 'combobox._pattern.disabled()', - '[attr.aria-expanded]': 'combobox._pattern.expanded()', - '[attr.aria-activedescendant]': 'combobox._pattern.activeDescendant()', - '[attr.aria-controls]': 'combobox._pattern.popupId()', - '[attr.aria-haspopup]': 'combobox._pattern.hasPopup()', - '[attr.aria-autocomplete]': 'combobox._pattern.autocomplete()', + '[aria-disabled]': 'combobox._pattern.disabled()', + '[aria-expanded]': 'combobox._pattern.expanded()', + '[aria-activedescendant]': 'combobox._pattern.activeDescendant()', + '[aria-controls]': 'combobox._pattern.popupId()', + '[aria-haspopup]': 'combobox._pattern.hasPopup()', + '[aria-autocomplete]': 'combobox._pattern.autocomplete()', '[attr.readonly]': 'combobox._pattern.readonly()', }, }) diff --git a/src/aria/grid/grid-cell.ts b/src/aria/grid/grid-cell.ts index 7235fd8b7495..f5bb93140ee1 100644 --- a/src/aria/grid/grid-cell.ts +++ b/src/aria/grid/grid-cell.ts @@ -48,12 +48,12 @@ import {GRID_CELL, GRID_ROW} from './grid-tokens'; '[attr.colspan]': '_pattern.colSpan()', '[attr.data-active]': 'active()', '[attr.data-anchor]': '_pattern.anchor()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-rowspan]': '_pattern.rowSpan()', - '[attr.aria-colspan]': '_pattern.colSpan()', - '[attr.aria-rowindex]': '_pattern.ariaRowIndex()', - '[attr.aria-colindex]': '_pattern.ariaColIndex()', - '[attr.aria-selected]': '_pattern.ariaSelected()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-rowspan]': '_pattern.rowSpan()', + '[aria-colspan]': '_pattern.colSpan()', + '[aria-rowindex]': '_pattern.ariaRowIndex()', + '[aria-colindex]': '_pattern.ariaColIndex()', + '[aria-selected]': '_pattern.ariaSelected()', '[tabindex]': '_tabIndex()', }, providers: [{provide: GRID_CELL, useExisting: GridCell}], diff --git a/src/aria/grid/grid-row.ts b/src/aria/grid/grid-row.ts index 07c9753acd4a..a42a8d798fbb 100644 --- a/src/aria/grid/grid-row.ts +++ b/src/aria/grid/grid-row.ts @@ -37,7 +37,7 @@ import {GRID_CELL, GRID_ROW} from './grid-tokens'; exportAs: 'ngGridRow', host: { 'role': 'row', - '[attr.aria-rowindex]': '_pattern.rowIndex()', + '[aria-rowindex]': '_pattern.rowIndex()', }, providers: [{provide: GRID_ROW, useExisting: GridRow}], }) diff --git a/src/aria/grid/grid.ts b/src/aria/grid/grid.ts index f3e8633a48f8..509bef60030b 100644 --- a/src/aria/grid/grid.ts +++ b/src/aria/grid/grid.ts @@ -50,8 +50,8 @@ import {GRID_ROW} from './grid-tokens'; host: { 'role': 'grid', '[tabindex]': '_pattern.tabIndex()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-activedescendant]': '_pattern.activeDescendant()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-activedescendant]': '_pattern.activeDescendant()', '(keydown)': '_pattern.onKeydown($event)', '(pointerdown)': '_pattern.onPointerdown($event)', '(pointermove)': '_pattern.onPointermove($event)', diff --git a/src/aria/listbox/listbox.ts b/src/aria/listbox/listbox.ts index f1eef7ff83ea..7f22c5007461 100644 --- a/src/aria/listbox/listbox.ts +++ b/src/aria/listbox/listbox.ts @@ -57,11 +57,11 @@ import {LISTBOX} from './tokens'; 'role': 'listbox', '[attr.id]': 'id()', '[attr.tabindex]': '_pattern.tabIndex()', - '[attr.aria-readonly]': '_pattern.readonly()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-orientation]': '_pattern.orientation()', - '[attr.aria-multiselectable]': '_pattern.multi()', - '[attr.aria-activedescendant]': '_pattern.activeDescendant()', + '[aria-readonly]': '_pattern.readonly()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-orientation]': '_pattern.orientation()', + '[aria-multiselectable]': '_pattern.multi()', + '[aria-activedescendant]': '_pattern.activeDescendant()', '(keydown)': '_pattern.onKeydown($event)', '(pointerdown)': '_pattern.onPointerdown($event)', '(focusin)': '_onFocus()', diff --git a/src/aria/listbox/option.ts b/src/aria/listbox/option.ts index b14205678fe9..dd7512bf7a2f 100644 --- a/src/aria/listbox/option.ts +++ b/src/aria/listbox/option.ts @@ -39,8 +39,8 @@ import {LISTBOX} from './tokens'; '[attr.data-active]': 'active()', '[attr.id]': '_pattern.id()', '[attr.tabindex]': '_pattern.tabIndex()', - '[attr.aria-selected]': '_pattern.selected()', - '[attr.aria-disabled]': '_pattern.disabled()', + '[aria-selected]': '_pattern.selected()', + '[aria-disabled]': '_pattern.disabled()', }, }) export class Option { diff --git a/src/aria/menu/menu-bar.ts b/src/aria/menu/menu-bar.ts index cd3662f19e68..d0888e57d938 100644 --- a/src/aria/menu/menu-bar.ts +++ b/src/aria/menu/menu-bar.ts @@ -59,7 +59,7 @@ import {MENU_COMPONENT} from './menu-tokens'; host: { 'role': 'menubar', '[attr.disabled]': '!softDisabled() && _pattern.disabled() ? true : null', - '[attr.aria-disabled]': '_pattern.disabled()', + '[aria-disabled]': '_pattern.disabled()', '[attr.tabindex]': '_pattern.tabIndex()', '(keydown)': '_pattern.onKeydown($event)', '(mouseover)': '_pattern.onMouseOver($event)', diff --git a/src/aria/menu/menu-item.ts b/src/aria/menu/menu-item.ts index 7fb9a83bf1ab..5b5280ac5c4b 100644 --- a/src/aria/menu/menu-item.ts +++ b/src/aria/menu/menu-item.ts @@ -38,10 +38,10 @@ import type {MenuBar} from './menu-bar'; '(focusin)': '_pattern.onFocusIn()', '[attr.tabindex]': '_pattern.tabIndex()', '[attr.data-active]': 'active()', - '[attr.aria-haspopup]': 'hasPopup()', - '[attr.aria-expanded]': 'expanded()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-controls]': '_pattern.submenu()?.id()', + '[aria-haspopup]': 'hasPopup()', + '[aria-expanded]': 'expanded()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-controls]': '_pattern.submenu()?.id()', }, }) export class MenuItem { diff --git a/src/aria/menu/menu-trigger.ts b/src/aria/menu/menu-trigger.ts index bf0e7892c9b4..97ada0073cf2 100644 --- a/src/aria/menu/menu-trigger.ts +++ b/src/aria/menu/menu-trigger.ts @@ -46,10 +46,10 @@ import type {Menu} from './menu'; host: { '[attr.tabindex]': '_pattern.tabIndex()', '[attr.disabled]': '!softDisabled() && _pattern.disabled() ? true : null', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-haspopup]': 'hasPopup()', - '[attr.aria-expanded]': 'expanded()', - '[attr.aria-controls]': '_pattern.menu()?.id()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-haspopup]': 'hasPopup()', + '[aria-expanded]': 'expanded()', + '[aria-controls]': '_pattern.menu()?.id()', '(click)': '_pattern.onClick()', '(keydown)': '_pattern.onKeydown($event)', '(focusout)': '_pattern.onFocusOut($event)', diff --git a/src/aria/menu/menu.ts b/src/aria/menu/menu.ts index aae13874e837..5d28854b3cb0 100644 --- a/src/aria/menu/menu.ts +++ b/src/aria/menu/menu.ts @@ -61,7 +61,7 @@ import {MENU_COMPONENT} from './menu-tokens'; host: { 'role': 'menu', '[attr.id]': '_pattern.id()', - '[attr.aria-disabled]': '_pattern.disabled()', + '[aria-disabled]': '_pattern.disabled()', '[attr.tabindex]': 'tabIndex()', '[attr.data-visible]': 'visible()', '(keydown)': '_pattern.onKeydown($event)', diff --git a/src/aria/tabs/tab-list.ts b/src/aria/tabs/tab-list.ts index 992685520f0b..5a5c72b16ea6 100644 --- a/src/aria/tabs/tab-list.ts +++ b/src/aria/tabs/tab-list.ts @@ -48,9 +48,9 @@ import type {Tab} from './tab'; host: { 'role': 'tablist', '[attr.tabindex]': '_pattern.tabIndex()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-orientation]': '_pattern.orientation()', - '[attr.aria-activedescendant]': '_pattern.activeDescendant()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-orientation]': '_pattern.orientation()', + '[aria-activedescendant]': '_pattern.activeDescendant()', '(keydown)': '_pattern.onKeydown($event)', '(pointerdown)': '_pattern.onPointerdown($event)', '(focusin)': '_onFocus()', diff --git a/src/aria/tabs/tab-panel.ts b/src/aria/tabs/tab-panel.ts index 31f594e7443c..1d835c2aac0b 100644 --- a/src/aria/tabs/tab-panel.ts +++ b/src/aria/tabs/tab-panel.ts @@ -47,7 +47,7 @@ import {TABS} from './utils'; '[attr.id]': '_pattern.id()', '[attr.tabindex]': '_pattern.tabIndex()', '[attr.inert]': '!visible() ? true : null', - '[attr.aria-labelledby]': '_pattern.labelledBy()', + '[aria-labelledby]': '_pattern.labelledBy()', }, hostDirectives: [ { diff --git a/src/aria/tabs/tab.ts b/src/aria/tabs/tab.ts index fcc6c07a5763..be1051f5fe69 100644 --- a/src/aria/tabs/tab.ts +++ b/src/aria/tabs/tab.ts @@ -46,9 +46,9 @@ import {HasElement, TABS} from './utils'; '[attr.data-active]': 'active()', '[attr.id]': '_pattern.id()', '[attr.tabindex]': '_pattern.tabIndex()', - '[attr.aria-selected]': 'selected()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-controls]': '_pattern.controls()', + '[aria-selected]': 'selected()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-controls]': '_pattern.controls()', }, }) export class Tab implements HasElement, OnInit, OnDestroy { diff --git a/src/aria/toolbar/toolbar-widget.ts b/src/aria/toolbar/toolbar-widget.ts index c01976e8f51b..48ed91f63df8 100644 --- a/src/aria/toolbar/toolbar-widget.ts +++ b/src/aria/toolbar/toolbar-widget.ts @@ -47,7 +47,7 @@ import type {ToolbarWidgetGroup} from './toolbar-widget-group'; '[attr.tabindex]': '_pattern.tabIndex()', '[attr.inert]': 'hardDisabled() ? true : null', '[attr.disabled]': 'hardDisabled() ? true : null', - '[attr.aria-disabled]': '_pattern.disabled()', + '[aria-disabled]': '_pattern.disabled()', '[id]': '_pattern.id()', }, }) diff --git a/src/aria/toolbar/toolbar.ts b/src/aria/toolbar/toolbar.ts index afbe8bc51c44..478095579cb3 100644 --- a/src/aria/toolbar/toolbar.ts +++ b/src/aria/toolbar/toolbar.ts @@ -50,8 +50,8 @@ import {sortDirectives} from './utils'; host: { 'role': 'toolbar', '[attr.tabindex]': '_pattern.tabIndex()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-orientation]': '_pattern.orientation()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-orientation]': '_pattern.orientation()', '(keydown)': '_pattern.onKeydown($event)', '(click)': '_pattern.onClick($event)', '(pointerdown)': '_pattern.onPointerdown($event)', diff --git a/src/aria/tree/tree-item.ts b/src/aria/tree/tree-item.ts index 728ec42701d5..e9154adda005 100644 --- a/src/aria/tree/tree-item.ts +++ b/src/aria/tree/tree-item.ts @@ -49,13 +49,13 @@ import {HasElement} from './utils'; '[attr.data-active]': 'active()', 'role': 'treeitem', '[id]': '_pattern.id()', - '[attr.aria-expanded]': '_expanded()', - '[attr.aria-selected]': 'selected()', - '[attr.aria-current]': '_pattern.current()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-level]': 'level()', - '[attr.aria-setsize]': '_pattern.setsize()', - '[attr.aria-posinset]': '_pattern.posinset()', + '[aria-expanded]': '_expanded()', + '[aria-selected]': 'selected()', + '[aria-current]': '_pattern.current()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-level]': 'level()', + '[aria-setsize]': '_pattern.setsize()', + '[aria-posinset]': '_pattern.posinset()', '[attr.tabindex]': '_pattern.tabIndex()', }, }) diff --git a/src/aria/tree/tree.ts b/src/aria/tree/tree.ts index 837031088499..b778a9346797 100644 --- a/src/aria/tree/tree.ts +++ b/src/aria/tree/tree.ts @@ -67,10 +67,10 @@ import {sortDirectives} from './utils'; host: { 'role': 'tree', '[attr.id]': 'id()', - '[attr.aria-orientation]': '_pattern.orientation()', - '[attr.aria-multiselectable]': '_pattern.multi()', - '[attr.aria-disabled]': '_pattern.disabled()', - '[attr.aria-activedescendant]': '_pattern.activeDescendant()', + '[aria-orientation]': '_pattern.orientation()', + '[aria-multiselectable]': '_pattern.multi()', + '[aria-disabled]': '_pattern.disabled()', + '[aria-activedescendant]': '_pattern.activeDescendant()', '[tabindex]': '_pattern.tabIndex()', '(keydown)': '_pattern.onKeydown($event)', '(pointerdown)': '_pattern.onPointerdown($event)',