Skip to content

Commit 638f03d

Browse files
committed
chore(action-strip): stop propagating click event
1 parent acb6de5 commit 638f03d

File tree

6 files changed

+23
-11
lines changed

6 files changed

+23
-11
lines changed

projects/igniteui-angular/src/lib/action-strip/action-strip.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ng-content #content></ng-content>
33
<ng-container *ngIf="menuItems.length > 0">
44
<button igxButton="icon" igxRipple [igxToggleAction]="dropdown"
5-
[overlaySettings]="menuOverlaySettings"
5+
[overlaySettings]="menuOverlaySettings" (click)="$event.stopPropagation()"
66
[igxDropDownItemNavigation]="dropdown">
77
<igx-icon>more_vert</igx-icon>
88
</button>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<ng-container *ngIf="isRowContext">
2-
<button igxButton="icon" [disabled]="disabled" igxRipple (click)="startEdit()">
2+
<button igxButton="icon" [disabled]="disabled" igxRipple (click)="startEdit($event)">
33
<igx-icon>edit</igx-icon>
44
</button>
5-
<button igxButton="icon" [disabled]="disabled" class="igx-action-strip__delete" igxRipple (click)="deleteRow()">
5+
<button igxButton="icon" [disabled]="disabled" class="igx-action-strip__delete" igxRipple (click)="deleteRow($event)">
66
<igx-icon >delete</igx-icon>
77
</button>
88
</ng-container>

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
2323
* this.gridEditingActions.startEdit();
2424
* ```
2525
*/
26-
public startEdit(): void {
26+
public startEdit(event?): void {
27+
if (event) {
28+
event.stopPropagation();
29+
}
2730
if (!this.isRow(this.strip.context)) {
2831
return;
2932
}
@@ -43,7 +46,10 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
4346
* this.gridEditingActions.deleteRow();
4447
* ```
4548
*/
46-
public deleteRow(): void {
49+
public deleteRow(event?): void {
50+
if (event) {
51+
event.stopPropagation();
52+
}
4753
if (!this.isRow(this.strip.context)) {
4854
return;
4955
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<ng-container *ngIf="isRowContext">
2-
<button *ngIf="!pinned" igxRipple igxButton="icon" (click)="pin()">
2+
<button *ngIf="!pinned" igxRipple igxButton="icon" (click)="pin($event)">
33
<igx-icon fontSet="filtering-icons" name="pin"></igx-icon>
44
</button>
5-
<button *ngIf="pinned" igxRipple igxButton="icon" (click)="unpin()">
5+
<button *ngIf="pinned" igxRipple igxButton="icon" (click)="unpin($event)">
66
<igx-icon fontSet="filtering-icons" name="unpin"></igx-icon>
77
</button>
88
</ng-container>

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-pinning-actions.component.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ export class IgxGridPinningActionsComponent extends IgxGridActionsBaseDirective
4242
* this.gridPinningActions.pin();
4343
* ```
4444
*/
45-
public pin(): void {
45+
public pin(event?): void {
46+
if (event) {
47+
event.stopPropagation();
48+
}
4649
if (!this.isRow(this.strip.context)) {
4750
return;
4851
}
@@ -58,7 +61,10 @@ export class IgxGridPinningActionsComponent extends IgxGridActionsBaseDirective
5861
* this.gridPinningActions.unpin();
5962
* ```
6063
*/
61-
public unpin(): void {
64+
public unpin(event?): void {
65+
if (event) {
66+
event.stopPropagation();
67+
}
6268
if (!this.isRow(this.strip.context)) {
6369
return;
6470
}

src/app/action-strip/action-strip.sample.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ <h5>Grid Pinning Action</h5>
5151
<article>
5252
<div class="sample-column">
5353
<h5>Grid Pinning and Editing Actions</h5>
54-
<igx-grid #grid2 [data]="data" [width]="'800px'" [height]="'500px'"
54+
<igx-grid #grid2 [data]="data" [width]="'800px'" [height]="'500px'" [rowSelection]="'multiple'"
5555
[rowEditable]="true" [primaryKey]="'ID'" [(displayDensity)]="displayDensity"
5656
(mouseleave)="onMouseLeave(actionstrip2)">
5757
<igx-column *ngFor="let c of columns" [sortable]="true" [field]="c.field" [header]="c.field"
@@ -74,7 +74,7 @@ <h5>Grid Pinning and Editing Actions</h5>
7474
<article>
7575
<div class="sample-column">
7676
<h5>Actions in menu</h5>
77-
<igx-grid #grid3 [data]="data" [width]="'800px'" [height]="'500px'"
77+
<igx-grid #grid3 [data]="data" [width]="'800px'" [height]="'500px'" [rowSelection]="'multiple'"
7878
[rowEditable]="true" [primaryKey]="'ID'" [(displayDensity)]="displayDensity"
7979
(mouseleave)="onMouseLeave(actionstrip3, $event)"
8080
(mouseover)="onMouseOver($event, grid3, actionstrip3)">

0 commit comments

Comments
 (0)