Skip to content

Commit 536452c

Browse files
committed
fixup! feat(aria): add initial menu directives
1 parent e582938 commit 536452c

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/aria/menu/menu.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ export class MenuTrigger<V> {
5757
/** A reference to the menu element. */
5858
readonly element: HTMLButtonElement = this._elementRef.nativeElement;
5959

60+
// TODO(wagnermaciel): See we can remove the need to pass in a submenu.
61+
6062
/** The submenu associated with the menu trigger. */
6163
submenu = input<Menu<V> | undefined>(undefined);
6264

@@ -135,9 +137,6 @@ export class Menu<V> {
135137
/** Whether the menu should wrap its items. */
136138
readonly wrap = input<boolean>(true);
137139

138-
/** Whether the menu should skip disabled items. */
139-
readonly skipDisabled = input<boolean>(false);
140-
141140
/** The delay in seconds before the typeahead buffer is cleared. */
142141
readonly typeaheadDelay = input<number>(0.5); // Picked arbitrarily.
143142

@@ -167,6 +166,7 @@ export class Menu<V> {
167166
...this,
168167
parent: computed(() => this.parent()?.uiPattern),
169168
multi: () => false,
169+
skipDisabled: () => false,
170170
focusMode: () => 'roving',
171171
orientation: () => 'vertical',
172172
selectionMode: () => 'explicit',
@@ -261,9 +261,6 @@ export class MenuBar<V> {
261261
/** Whether the menu should wrap its items. */
262262
readonly wrap = input<boolean>(true);
263263

264-
/** Whether the menu should skip disabled items. */
265-
readonly skipDisabled = input<boolean>(false);
266-
267264
/** The delay in seconds before the typeahead buffer is cleared. */
268265
readonly typeaheadDelay = input<number>(0.5);
269266

@@ -280,6 +277,7 @@ export class MenuBar<V> {
280277
this.uiPattern = new MenuBarPattern({
281278
...this,
282279
multi: () => false,
280+
skipDisabled: () => false,
283281
focusMode: () => 'roving',
284282
orientation: () => 'horizontal',
285283
selectionMode: () => 'explicit',

0 commit comments

Comments
 (0)