Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion goldens/aria/menu/index.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,12 @@ export class MenuItem<V> implements OnInit, OnDestroy {
open(): void;
readonly parent: Menu<V> | MenuBar<V> | null;
readonly _pattern: MenuItemPattern<V>;
readonly role: _angular_core.InputSignal<"menuitem" | "menuitemradio" | "menuitemcheckbox">;
readonly searchTerm: _angular_core.ModelSignal<string>;
readonly submenu: _angular_core.InputSignal<Menu<V> | undefined>;
readonly value: _angular_core.InputSignal<V>;
// (undocumented)
static ɵdir: _angular_core.ɵɵDirectiveDeclaration<MenuItem<any>, "[ngMenuItem]", ["ngMenuItem"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "value": { "alias": "value"; "required": true; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; "searchTerm": { "alias": "searchTerm"; "required": false; "isSignal": true; }; "submenu": { "alias": "submenu"; "required": false; "isSignal": true; }; }, { "searchTerm": "searchTermChange"; }, never, never, true, never>;
static ɵdir: _angular_core.ɵɵDirectiveDeclaration<MenuItem<any>, "[ngMenuItem]", ["ngMenuItem"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "value": { "alias": "value"; "required": true; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; "searchTerm": { "alias": "searchTerm"; "required": false; "isSignal": true; }; "role": { "alias": "role"; "required": false; "isSignal": true; }; "submenu": { "alias": "submenu"; "required": false; "isSignal": true; }; }, { "searchTerm": "searchTermChange"; }, never, never, true, never>;
// (undocumented)
static ɵfac: _angular_core.ɵɵFactoryDeclaration<MenuItem<any>, never>;
}
Expand Down
3 changes: 2 additions & 1 deletion goldens/aria/private/index.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ export interface MenuInputs<V> extends Omit<ListInputs<MenuItemPattern<V>, V>, '
// @public
export interface MenuItemInputs<V> extends Omit<ListItem<V>, 'index' | 'selectable'> {
parent: SignalLike<MenuPattern<V> | MenuBarPattern<V> | undefined>;
role: SignalLike<'menuitem' | 'menuitemradio' | 'menuitemcheckbox'>;
submenu: SignalLike<MenuPattern<V> | undefined>;
}

Expand All @@ -414,7 +415,7 @@ export class MenuItemPattern<V> implements ListItem<V> {
first?: boolean;
last?: boolean;
}): void;
readonly role: () => string;
readonly role: () => "menuitem" | "menuitemradio" | "menuitemcheckbox";
readonly searchTerm: SignalLike<string>;
readonly selectable: SignalLike<boolean>;
readonly submenu: SignalLike<MenuPattern<V> | undefined>;
Expand Down
6 changes: 5 additions & 1 deletion src/aria/menu/menu-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import type {MenuBar} from './menu-bar';
selector: '[ngMenuItem]',
exportAs: 'ngMenuItem',
host: {
'role': 'menuitem',
'[attr.role]': '_pattern.role()',
'(focusin)': '_pattern.onFocusIn()',
'[attr.tabindex]': '_pattern.tabIndex()',
'[attr.data-active]': 'active()',
Expand Down Expand Up @@ -73,6 +73,9 @@ export class MenuItem<V> implements OnInit, OnDestroy {
/** The search term associated with the menu item. */
readonly searchTerm = model<string>('');

/** The role of the menu item. */
readonly role = input<'menuitem' | 'menuitemradio' | 'menuitemcheckbox'>('menuitem');

/** A reference to the parent menu or menubar. */
readonly parent = inject<Menu<V> | MenuBar<V>>(MENU_COMPONENT, {optional: true});

Expand All @@ -97,6 +100,7 @@ export class MenuItem<V> implements OnInit, OnDestroy {
searchTerm: this.searchTerm,
parent: computed(() => this.parent?._pattern),
submenu: computed(() => this.submenu()?._pattern),
role: this.role,
});

constructor() {
Expand Down
36 changes: 36 additions & 0 deletions src/aria/menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,28 @@ describe('Standalone Menu Pattern', () => {
expect(item?.getAttribute('aria-label')).toBe('Apple item label');
});

describe('role override', () => {
it('should allow overriding the default menuitem role', () => {
TestBed.resetTestingModule();
TestBed.configureTestingModule({
imports: [MenuItemRoleOverrideExample],
});
const roleFixture = TestBed.createComponent(MenuItemRoleOverrideExample);
roleFixture.detectChanges();

const items = roleFixture.debugElement
.queryAll(By.directive(MenuItem))
.map(debugEl => debugEl.nativeElement as HTMLElement);

expect(items[0].getAttribute('role')).toBe('menuitemradio');
expect(items[1].getAttribute('role')).toBe('menuitemcheckbox');

roleFixture.componentInstance.customRole.set('menuitem');
roleFixture.detectChanges();
expect(items[1].getAttribute('role')).toBe('menuitem');
});
});

describe('structural validations', () => {
let consoleSpy: jasmine.Spy;

Expand Down Expand Up @@ -1227,3 +1249,17 @@ class MenuWithDuplicateValues {}
changeDetection: ChangeDetectionStrategy.Eager,
})
class MenuItemOutsideMenu {}

@Component({
template: `
<div ngMenu>
<div ngMenuItem value="item0" role="menuitemradio">Item 0</div>
<div ngMenuItem value="item1" [role]="customRole()">Item 1</div>
</div>
`,
imports: [Menu, MenuItem],
changeDetection: ChangeDetectionStrategy.Eager,
})
class MenuItemRoleOverrideExample {
customRole = signal<'menuitem' | 'menuitemradio' | 'menuitemcheckbox'>('menuitemcheckbox');
}
2 changes: 2 additions & 0 deletions src/aria/private/menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function getMenuBarPattern(values: string[], opts?: {textDirection: 'ltr' | 'rtl
parent: signal(menubar),
element: signal(element),
submenu: signal(undefined),
role: signal('menuitem'),
}) as TestMenuItem;
}),
);
Expand Down Expand Up @@ -125,6 +126,7 @@ function getMenuPattern(
parent: signal(menu),
element: signal(element),
submenu: signal(undefined),
role: signal('menuitem'),
}) as TestMenuItem;
}),
);
Expand Down
5 changes: 4 additions & 1 deletion src/aria/private/menu/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export interface MenuItemInputs<V> extends Omit<ListItem<V>, 'index' | 'selectab

/** A reference to the submenu associated with the menu item. */
submenu: SignalLike<MenuPattern<V> | undefined>;

/** The role of the menu item. */
role: SignalLike<'menuitem' | 'menuitemradio' | 'menuitemcheckbox'>;
}

/** The menu ui pattern class. */
Expand Down Expand Up @@ -778,7 +781,7 @@ export class MenuItemPattern<V> implements ListItem<V> {
readonly controls = signal<string | undefined>(undefined);

/** The role of the menu item. */
readonly role = () => 'menuitem';
readonly role = () => this.inputs.role();

/** Whether the menu item has a popup. */
readonly hasPopup = computed(() => !!this.submenu());
Expand Down
Loading