Skip to content

Commit 7dccecc

Browse files
authored
fix(multiple): account for shadow dom in aria directives (#33691)
Fixes that the Aria directives were reading `target` directly off the event which can break if the app is using shadow DOM.
1 parent 8134529 commit 7dccecc

19 files changed

Lines changed: 47 additions & 25 deletions

File tree

‎src/aria/private/accordion/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ts_project(
1414
"//src/aria/private/behaviors/list-navigation",
1515
"//src/aria/private/behaviors/list-selection",
1616
"//src/aria/private/behaviors/signal-like",
17+
"//src/cdk/platform",
1718
],
1819
)
1920

‎src/aria/private/accordion/accordion.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9+
import {_getEventTarget} from '@angular/cdk/platform';
910
import {KeyboardEventManager, ClickEventManager} from '../behaviors/event-manager';
1011
import {ExpansionItem, ListExpansion, ListExpansionInputs} from '../behaviors/expansion/expansion';
1112
import {ListFocus, ListFocusInputs, ListFocusItem} from '../behaviors/list-focus/list-focus';
@@ -82,7 +83,7 @@ export class AccordionGroupPattern {
8283
/** The click event manager for the accordion trigger. */
8384
readonly click = computed(() => {
8485
return new ClickEventManager<PointerEvent>().on((e: PointerEvent) => {
85-
const item = this._findTriggerPattern(e.target as Element);
86+
const item = this._findTriggerPattern(_getEventTarget(e));
8687
if (!item) return;
8788

8889
this.navigationBehavior.goto(item);
@@ -102,7 +103,7 @@ export class AccordionGroupPattern {
102103

103104
/** Handles focus events on the trigger. This ensures the tabbing changes the active index. */
104105
onFocus(event: FocusEvent): void {
105-
const item = this._findTriggerPattern(event.target as Element);
106+
const item = this._findTriggerPattern(_getEventTarget(event));
106107
if (!item) return;
107108
if (!this.focusBehavior.isFocusable(item)) return;
108109

‎src/aria/private/combobox/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ts_project(
1414
"//src/aria/private/behaviors/expansion",
1515
"//src/aria/private/behaviors/list",
1616
"//src/aria/private/behaviors/signal-like",
17+
"//src/cdk/platform",
1718
],
1819
)
1920

‎src/aria/private/combobox/combobox.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ describe('ComboboxPattern', () => {
154154

155155
const deleteEvent = new InputEvent('input', {inputType: 'deleteContentBackward'});
156156
Object.defineProperty(deleteEvent, 'target', {value: element});
157+
Object.defineProperty(deleteEvent, 'composedPath', {value: null});
157158
pattern.onInput(deleteEvent as Event);
158159

159160
expect(pattern.isDeleting()).toBe(true);

‎src/aria/private/combobox/combobox.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {KeyboardEventManager, ClickEventManager, Modifier} from '../behaviors/event-manager';
109
import {computed, signal, untracked} from '@angular/core';
10+
import {_getEventTarget} from '@angular/cdk/platform';
11+
import {KeyboardEventManager, ClickEventManager, Modifier} from '../behaviors/event-manager';
1112
import {SignalLike, WritableSignalLike} from '../behaviors/signal-like/signal-like';
1213
import {ExpansionItem} from '../behaviors/expansion/expansion';
1314

@@ -231,11 +232,11 @@ export class ComboboxPattern {
231232

232233
/** Handles input events for the combobox. */
233234
onInput(event: Event) {
234-
if (!(event.target instanceof HTMLInputElement)) return;
235-
if (this.disabled() || this.readonly()) return;
235+
const target = _getEventTarget(event);
236+
if (!(target instanceof HTMLInputElement) || this.disabled() || this.readonly()) return;
236237

237238
this.inputs.expanded.set(true);
238-
this.value.set(event.target.value);
239+
this.value.set(target.value);
239240
this.isDeleting.set(event instanceof InputEvent && !!event.inputType.match(/^delete/));
240241
}
241242

‎src/aria/private/grid/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ts_project(
1818
"//src/aria/private/behaviors/list-navigation",
1919
"//src/aria/private/behaviors/signal-like",
2020
"//src/aria/private/utils",
21+
"//src/cdk/platform",
2122
],
2223
)
2324

‎src/aria/private/grid/cell.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9+
import {_getEventTarget} from '@angular/cdk/platform';
910
import {
1011
computed,
1112
signal,
@@ -125,7 +126,7 @@ export class GridCellPattern implements GridCell {
125126
onFocusIn(event: FocusEvent): void {
126127
this.isFocused.set(true);
127128

128-
const focusTarget = event.target as Element | null;
129+
const focusTarget = _getEventTarget<Element>(event);
129130
const widget = this.inputs.getWidget(focusTarget);
130131
if (!widget) return;
131132

@@ -135,7 +136,7 @@ export class GridCellPattern implements GridCell {
135136

136137
/** Handles focusout events for the cell. */
137138
onFocusOut(event: FocusEvent): void {
138-
const blurTarget = event.target as Element | null;
139+
const blurTarget = _getEventTarget<Element>(event);
139140
const widget = this.inputs.getWidget(blurTarget);
140141

141142
// Pass down focusout event to the widget.

‎src/aria/private/grid/grid.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9+
import {_getEventTarget} from '@angular/cdk/platform';
910
import {SignalLike, computed, signal, untracked} from '../behaviors/signal-like/signal-like';
1011
import {KeyboardEventManager, ClickEventManager, Modifier} from '../behaviors/event-manager';
1112
import {NavOptions, Grid, GridInputs as GridBehaviorInputs} from '../behaviors/grid';
@@ -146,7 +147,7 @@ export class GridPattern {
146147
// Navigation without selection.
147148
if (!this.inputs.enableSelection()) {
148149
manager.on(e => {
149-
const cell = this.inputs.getCell(e.target as Element);
150+
const cell = this.inputs.getCell(_getEventTarget(e));
150151
if (!cell || !this.gridBehavior.focusBehavior.isFocusable(cell)) return;
151152

152153
this.gridBehavior.gotoCell(cell);
@@ -156,7 +157,7 @@ export class GridPattern {
156157
// Navigation with selection.
157158
if (this.inputs.enableSelection()) {
158159
manager.on(e => {
159-
const cell = this.inputs.getCell(e.target as Element);
160+
const cell = this.inputs.getCell(_getEventTarget(e));
160161
if (!cell || !this.gridBehavior.focusBehavior.isFocusable(cell)) return;
161162

162163
this.gridBehavior.gotoCell(cell, {
@@ -169,7 +170,7 @@ export class GridPattern {
169170
// Selection with modifier keys.
170171
if (this.inputs.multi()) {
171172
manager.on([Modifier.Ctrl, Modifier.Meta], e => {
172-
const cell = this.inputs.getCell(e.target as Element);
173+
const cell = this.inputs.getCell(_getEventTarget(e));
173174
if (!cell || !this.gridBehavior.focusBehavior.isFocusable(cell)) return;
174175

175176
this.gridBehavior.gotoCell(cell, {toggle: true});
@@ -233,7 +234,7 @@ export class GridPattern {
233234
this.hasBeenInteracted.set(true);
234235

235236
// Cell that receives focus.
236-
const cell = this.inputs.getCell(event.target as Element | null);
237+
const cell = this.inputs.getCell(_getEventTarget(event));
237238
if (!cell || !this.gridBehavior.focusBehavior.isFocusable(cell)) return;
238239

239240
// Pass down the focusin event to the cell.
@@ -249,7 +250,7 @@ export class GridPattern {
249250
/** Handles focusout events on the grid. */
250251
onFocusOut(event: FocusEvent) {
251252
// Pass down focusout event to the cell that loses focus.
252-
const blurTarget = event.target as Element | null;
253+
const blurTarget = _getEventTarget<Element>(event);
253254
const cell = this.inputs.getCell(blurTarget);
254255

255256
// Pass down the focusout event to the cell.

‎src/aria/private/grid/widget.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9+
import {_getEventTarget} from '@angular/cdk/platform';
910
import {KeyboardEventManager, Modifier} from '../behaviors/event-manager';
1011
import {
1112
SignalLike,
@@ -133,7 +134,7 @@ export class GridCellWidgetPattern {
133134
if (this.inputs.widgetType() === 'simple') return;
134135

135136
// Set activate state if the focus is inside of widget.
136-
const focusTarget = event.target as Element;
137+
const focusTarget = _getEventTarget<Element>(event);
137138
if (this.widgetHost().contains(focusTarget) && this.widgetHost() !== focusTarget) {
138139
this.activate(event);
139140
}

‎src/aria/private/listbox/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ts_project(
1313
"//src/aria/private/behaviors/event-manager",
1414
"//src/aria/private/behaviors/list",
1515
"//src/aria/private/behaviors/signal-like",
16+
"//src/cdk/platform",
1617
],
1718
)
1819

0 commit comments

Comments
 (0)