Skip to content

Commit b06d97e

Browse files
authored
Merge pull request #8319 from IgniteUI/dkamburov/fix-8307
fix(action-strip): Do not show grid actions if the row is in edit mode
2 parents 042e102 + 7f0c218 commit b06d97e

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-actions-base.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class IgxGridActionsBaseDirective implements AfterViewInit {
5656
* @internal
5757
*/
5858
get isRowContext(): boolean {
59-
return this.isRow(this.strip.context);
59+
return this.isRow(this.strip.context) && !this.strip.context.inEditMode;
6060
}
6161

6262
/**

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ describe('igxGridEditingActions #grid ', () => {
6060
actionStrip.show(grid.rowList.first);
6161
fixture.detectChanges();
6262
deleteIcon = fixture.debugElement.queryAll(By.css(`igx-grid-editing-actions igx-icon`))[1];
63+
// grid actions should not showing when the row is in edit mode #
64+
expect(deleteIcon).toBeUndefined();
65+
grid.endEdit();
66+
actionStrip.show(grid.rowList.first);
67+
fixture.detectChanges();
68+
deleteIcon = fixture.debugElement.queryAll(By.css(`igx-grid-editing-actions igx-icon`))[1];
6369
expect(deleteIcon.nativeElement.innerText).toBe('delete');
6470
deleteIcon.parent.triggerEventHandler('click', new Event('click'));
6571
actionStrip.hide();
@@ -85,13 +91,19 @@ describe('igxGridEditingActions #grid ', () => {
8591
fixture.detectChanges();
8692
expect(actionStrip.menu.items.length).toBe(2);
8793
const editMenuItem = actionStrip.menu.items[0];
88-
const deleteMenuItem = actionStrip.menu.items[1];
94+
8995
// select edit
9096
actionStrip.menu.selectItem(editMenuItem);
9197
fixture.detectChanges();
9298

9399
expect(row.inEditMode).toBeTrue();
94100

101+
grid.endEdit();
102+
fixture.detectChanges();
103+
actionStrip.menu.open();
104+
fixture.detectChanges();
105+
const deleteMenuItem = actionStrip.menu.items[1];
106+
95107
// select delete
96108
actionStrip.menu.selectItem(deleteMenuItem);
97109
fixture.detectChanges();

0 commit comments

Comments
 (0)