Skip to content

Commit 31ff7f2

Browse files
crisbetocrisbeto
committed
fix(aria/grid): align output naming with styleguide
Removes the `on` prefixs from outputs in the grid to align it with the styleguide. Fixes #32727.
1 parent bfd792f commit 31ff7f2

3 files changed

Lines changed: 14 additions & 16 deletions

File tree

‎goldens/aria/grid/index.api.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ export class GridCell {
6060
export class GridCellWidget {
6161
constructor();
6262
activate(): void;
63+
readonly activated: _angular_core.OutputEmitterRef<FocusEvent | KeyboardEvent | undefined>;
6364
readonly active: Signal<boolean>;
6465
deactivate(): void;
66+
readonly deactivated: _angular_core.OutputEmitterRef<FocusEvent | KeyboardEvent | undefined>;
6567
readonly disabled: _angular_core.InputSignalWithTransform<boolean, unknown>;
6668
readonly element: HTMLElement;
6769
readonly focusTarget: _angular_core.InputSignal<ElementRef<any> | HTMLElement | undefined>;
6870
readonly id: _angular_core.InputSignal<string>;
6971
get isActivated(): Signal<boolean>;
70-
readonly onActivate: _angular_core.OutputEmitterRef<FocusEvent | KeyboardEvent | undefined>;
71-
readonly onDeactivate: _angular_core.OutputEmitterRef<FocusEvent | KeyboardEvent | undefined>;
7272
readonly _pattern: GridCellWidgetPattern;
7373
protected readonly _tabIndex: Signal<number>;
7474
readonly tabindex: _angular_core.InputSignal<number | undefined>;
7575
readonly widgetType: _angular_core.InputSignal<"simple" | "complex" | "editable">;
7676
// (undocumented)
77-
static ɵdir: _angular_core.ɵɵDirectiveDeclaration<GridCellWidget, "[ngGridCellWidget]", ["ngGridCellWidget"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "widgetType": { "alias": "widgetType"; "required": false; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; "focusTarget": { "alias": "focusTarget"; "required": false; "isSignal": true; }; "tabindex": { "alias": "tabindex"; "required": false; "isSignal": true; }; }, { "onActivate": "onActivate"; "onDeactivate": "onDeactivate"; }, never, never, true, never>;
77+
static ɵdir: _angular_core.ɵɵDirectiveDeclaration<GridCellWidget, "[ngGridCellWidget]", ["ngGridCellWidget"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "widgetType": { "alias": "widgetType"; "required": false; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; "focusTarget": { "alias": "focusTarget"; "required": false; "isSignal": true; }; "tabindex": { "alias": "tabindex"; "required": false; "isSignal": true; }; }, { "activated": "activated"; "deactivated": "deactivated"; }, never, never, true, never>;
7878
// (undocumented)
7979
static ɵfac: _angular_core.ɵɵFactoryDeclaration<GridCellWidget, never>;
8080
}

‎src/aria/grid/grid-cell-widget.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ export class GridCellWidget {
7474
readonly focusTarget = input<ElementRef | HTMLElement | undefined>();
7575

7676
/** Emits when the widget is activated. */
77-
readonly onActivate = output<KeyboardEvent | FocusEvent | undefined>();
77+
readonly activated = output<KeyboardEvent | FocusEvent | undefined>();
7878

7979
/** Emits when the widget is deactivated. */
80-
readonly onDeactivate = output<KeyboardEvent | FocusEvent | undefined>();
80+
readonly deactivated = output<KeyboardEvent | FocusEvent | undefined>();
8181

8282
/** The tabindex override. */
8383
readonly tabindex = input<number | undefined>();
@@ -96,10 +96,8 @@ export class GridCellWidget {
9696
element: () => this.element,
9797
cell: () => this._cell._pattern,
9898
focusTarget: computed(() => {
99-
if (this.focusTarget() instanceof ElementRef) {
100-
return (this.focusTarget() as ElementRef).nativeElement;
101-
}
102-
return this.focusTarget();
99+
const target = this.focusTarget();
100+
return target instanceof ElementRef ? target.nativeElement : target;
103101
}),
104102
});
105103

@@ -112,14 +110,14 @@ export class GridCellWidget {
112110
afterRenderEffect(() => {
113111
const activateEvent = this._pattern.lastActivateEvent();
114112
if (activateEvent) {
115-
this.onActivate.emit(activateEvent);
113+
this.activated.emit(activateEvent);
116114
}
117115
});
118116

119117
afterRenderEffect(() => {
120118
const deactivateEvent = this._pattern.lastDeactivateEvent();
121119
if (deactivateEvent) {
122-
this.onDeactivate.emit(deactivateEvent);
120+
this.deactivated.emit(deactivateEvent);
123121
}
124122
});
125123
}

‎src/components-examples/aria/grid/grid-table/grid-table-example.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
role="button"
3535
ngGridCellWidget
3636
widgetType="editable"
37-
(onActivate)="startEdit($event, task, summaryInput)"
38-
(onDeactivate)="completeEdit($event, task)"
37+
(activated)="startEdit($event, task, summaryInput)"
38+
(deactivated)="completeEdit($event, task)"
3939
(click)="onClickEdit(widget, task, summaryInput)"
4040
#widget="ngGridCellWidget"
4141
>
@@ -59,7 +59,7 @@
5959
role="button"
6060
ngGridCellWidget
6161
widgetType="complex"
62-
(onActivate)="select.focus()"
62+
(activated)="select.focus()"
6363
#widget="ngGridCellWidget"
6464
>
6565
<mat-form-field subscriptSizing="dynamic">
@@ -77,7 +77,7 @@
7777
role="button"
7878
ngGridCellWidget
7979
widgetType="complex"
80-
(onActivate)="chips.focus()"
80+
(activated)="chips.focus()"
8181
#widget="ngGridCellWidget"
8282
>
8383
<grid-chips [(values)]="task.tags" [tabindex]="-1" #chips />
@@ -89,7 +89,7 @@
8989
ngGridCellWidget
9090
widgetType="editable"
9191
placeholder="add new tag"
92-
(onDeactivate)="addTag($event, task, tagInput)"
92+
(deactivated)="addTag($event, task, tagInput)"
9393
#tagInput
9494
/>
9595
</div>

0 commit comments

Comments
 (0)