Skip to content

Commit acb6de5

Browse files
committed
chore(action-strip): Disable editing actions for ghost rows
1 parent 6f3f7fe commit acb6de5

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<ng-container *ngIf="isRowContext && !disabled">
2-
<button igxButton="icon" igxRipple (click)="startEdit()">
1+
<ng-container *ngIf="isRowContext">
2+
<button igxButton="icon" [disabled]="disabled" igxRipple (click)="startEdit()">
33
<igx-icon>edit</igx-icon>
44
</button>
5-
<button igxButton="icon" class="igx-action-strip__delete" igxRipple (click)="deleteRow()">
5+
<button igxButton="icon" [disabled]="disabled" class="igx-action-strip__delete" igxRipple (click)="deleteRow()">
66
<igx-icon >delete</igx-icon>
77
</button>
88
</ng-container>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,18 @@ describe('igxGridEditingActions #grid ', () => {
6464
actionStrip = fixture.componentInstance.actionStrip;
6565
grid = fixture.componentInstance.grid;
6666
});
67-
it('should allow editing actions on disabled rows', () => {
67+
it('should disable editing actions on disabled rows', () => {
6868
grid.rowList.first.pin();
6969
fixture.detectChanges();
7070
actionStrip.show(grid.rowList.toArray()[1]);
7171
fixture.detectChanges();
72-
const editingIcons = fixture.debugElement.queryAll(By.css(`igx-grid-editing-actions igx-icon`));
73-
const pinningIcons = fixture.debugElement.queryAll(By.css(`igx-grid-pinning-actions igx-icon`));
74-
expect(editingIcons.length).toBe(0);
72+
const editingIcons = fixture.debugElement.queryAll(By.css(`igx-grid-editing-actions button`));
73+
const pinningIcons = fixture.debugElement.queryAll(By.css(`igx-grid-pinning-actions button`));
74+
expect(editingIcons.length).toBe(2);
75+
expect(editingIcons[0].nativeElement.className.indexOf('igx-button--disabled') !== -1).toBeTruthy();
76+
expect(editingIcons[1].nativeElement.className.indexOf('igx-button--disabled') !== -1).toBeTruthy();
7577
expect(pinningIcons.length).toBe(1);
78+
expect(pinningIcons[0].nativeElement.className.indexOf('igx-button--disabled') === -1).toBeTruthy();
7679
});
7780
});
7881
});

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h4>Display Density</h4>
3434
<article>
3535
<div class="sample-column">
3636
<h5>Grid Pinning Action</h5>
37-
<igx-grid #grid1 [data]="data" [width]="'800px'" [height]="'500px'" [rowSelectable]="false"
37+
<igx-grid #grid1 [data]="data" [width]="'800px'" [height]="'500px'"
3838
[rowEditable]="true" [primaryKey]="'ID'" [(displayDensity)]="displayDensity"
3939
(mouseleave)="onMouseLeave(actionstrip1)" (mouseover)="onMouseOver($event, grid1, actionstrip1)">
4040
<igx-column *ngFor="let c of columns" [sortable]="true" [field]="c.field" [header]="c.field"
@@ -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'" [rowSelectable]="false"
54+
<igx-grid #grid2 [data]="data" [width]="'800px'" [height]="'500px'"
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'" [rowSelectable]="false"
77+
<igx-grid #grid3 [data]="data" [width]="'800px'" [height]="'500px'"
7878
[rowEditable]="true" [primaryKey]="'ID'" [(displayDensity)]="displayDensity"
7979
(mouseleave)="onMouseLeave(actionstrip3, $event)"
8080
(mouseover)="onMouseOver($event, grid3, actionstrip3)">

0 commit comments

Comments
 (0)