Skip to content

Commit 264db85

Browse files
committed
fix(grid-actions): grid editing and pinning actions fixed
1 parent 6e8062b commit 264db85

File tree

15 files changed

+45
-24
lines changed

15 files changed

+45
-24
lines changed

projects/igniteui-angular-elements/src/analyzer/elements.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { IgxColumnComponent, IgxColumnGroupComponent, IgxColumnLayoutComponent, IgxGridActionsBaseDirective, IgxGridComponent, IgxGridEditingActionsComponent, IgxGridPinningActionsComponent, IgxGridToolbarActionsComponent, IgxGridToolbarAdvancedFilteringComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarTitleComponent, IgxHierarchicalGridComponent, IgxPivotDataSelectorComponent, IgxPivotGridComponent, IgxRowIslandComponent, IgxToolbarToken, IgxTreeGridComponent } from 'igniteui-angular/grids';
22
import { IgxGridStateComponent } from "../lib/state.component";
3-
import { IgxActionStripComponent, IgxActionStripToken } from 'igniteui-angular/action-strip';
3+
import { IgxActionStripComponent } from 'igniteui-angular/action-strip';
44
import { IgxPaginatorComponent, IgxPaginatorToken } from 'igniteui-angular/paginator';
5+
import { IgxActionStripToken } from 'igniteui-angular/core';
56

67
export const registerComponents = [
78
IgxGridComponent,

projects/igniteui-angular/action-strip/src/action-strip/action-strip.component.ts

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ import {
1212
ChangeDetectorRef,
1313
AfterViewInit,
1414
ElementRef,
15-
booleanAttribute
15+
booleanAttribute,
16+
AfterContentInit
1617
} from '@angular/core';
1718

1819

19-
import { ActionStripResourceStringsEN, CloseScrollStrategy, getCurrentResourceStrings, IActionStripResourceStrings, OverlaySettings } from 'igniteui-angular/core';
20+
import { ActionStripResourceStringsEN, CloseScrollStrategy, getCurrentResourceStrings, IActionStripResourceStrings, IgxActionStripActionsToken, IgxActionStripToken, OverlaySettings } from 'igniteui-angular/core';
2021
import { IgxIconComponent } from 'igniteui-angular/icon';
2122
import { IgxToggleActionDirective } from 'igniteui-angular/directives';
2223
import { IgxRippleDirective } from 'igniteui-angular/directives';
2324
import { NgTemplateOutlet } from '@angular/common';
2425
import { IgxIconButtonDirective } from 'igniteui-angular/directives';
25-
import { IgxActionStripToken, IgxActionStripActionsToken } from './token';
2626
import { trackByIdentity } from 'igniteui-angular/core';
2727
import { IgxDropDownComponent, IgxDropDownItemComponent, IgxDropDownItemNavigationDirective } from 'igniteui-angular/drop-down';
2828

@@ -81,7 +81,7 @@ export class IgxActionStripMenuItemDirective {
8181
],
8282
providers: [{ provide: IgxActionStripToken, useExisting: IgxActionStripComponent }]
8383
})
84-
export class IgxActionStripComponent implements IgxActionStripToken, AfterViewInit {
84+
export class IgxActionStripComponent implements IgxActionStripToken, AfterViewInit, AfterContentInit {
8585

8686
/* blazorSuppress */
8787
/**
@@ -228,6 +228,21 @@ export class IgxActionStripComponent implements IgxActionStripToken, AfterViewIn
228228
@HostBinding('class.igx-action-strip')
229229
protected hostClass = 'igx-action-strip';
230230

231+
/**
232+
* @hidden
233+
* @internal
234+
*/
235+
public ngAfterContentInit() {
236+
this.actionButtons.forEach(button => {
237+
button.strip = this;
238+
});
239+
this.actionButtons.changes.subscribe(() => {
240+
this.actionButtons.forEach(button => {
241+
button.strip = this;
242+
});
243+
});
244+
}
245+
231246
/**
232247
* @hidden
233248
* @internal

projects/igniteui-angular/action-strip/src/action-strip/public_api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { IgxActionStripComponent, IgxActionStripMenuItemDirective } from './action-strip.component';
22

33
export { IgxActionStripComponent, IgxActionStripMenuItemDirective } from './action-strip.component';
4-
export { IgxActionStripToken } from './token';
54

65
/* Action-strip outside of grid directives collection for ease-of-use import in standalone components scenario */
76
export const IGX_ACTION_STRIP_DIRECTIVES = [

projects/igniteui-angular/action-strip/src/action-strip/token.ts renamed to projects/igniteui-angular/core/src/grid-column-actions/token.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { OverlaySettings } from 'igniteui-angular/core';
2-
import { QueryList } from '@angular/core';
1+
import { ChangeDetectorRef, QueryList } from '@angular/core';
2+
import { OverlaySettings } from '../services/overlay/utilities';
33

44
/* csSuppress */
55
/** @hidden @internal */
66
export abstract class IgxActionStripToken {
7+
public abstract cdr: ChangeDetectorRef
78
public abstract context: any;
89
public abstract menuOverlaySettings: OverlaySettings;
910
public abstract get hideOnRowLeave(): boolean;

projects/igniteui-angular/core/src/public_api.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ export * from './core/edit-provider';
99
export * from './core/touch';
1010
export * from './core/touch-annotations';
1111

12+
// Grid actions tokens
13+
export * from './grid-column-actions/token';
14+
1215
// Date common
1316
export * from './date-common/public_api';
1417

projects/igniteui-angular/grids/src/grids/grid-actions/grid-actions-base.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { IgxGridActionButtonComponent } from './grid-action-button.component';
22
import { Directive, Input, AfterViewInit, QueryList, ViewChildren, IterableDiffers, booleanAttribute } from '@angular/core';
33
import { IgxIconService } from 'igniteui-angular/icon';
44
import { IgxRowDirective } from '../row.directive';
5-
import { IgxActionStripComponent } from 'igniteui-angular/action-strip';
5+
import { IgxActionStripToken } from 'igniteui-angular/core';
66

77
/* blazorElement */
88
/* contentParent: ActionStrip */
@@ -31,7 +31,7 @@ export class IgxGridActionsBaseDirective implements AfterViewInit {
3131
public asMenuItems = false;
3232

3333
/** @hidden @internal **/
34-
public strip: IgxActionStripComponent;
34+
public strip: IgxActionStripToken;
3535

3636
/**
3737
* @hidden

projects/igniteui-angular/grids/src/grids/grid-actions/grid-editing-actions.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Component, HostBinding, Input, booleanAttribute } from '@angular/core';
22
import { IgxGridActionsBaseDirective } from './grid-actions-base.directive';
33
import { addRow, addChild } from '@igniteui/material-icons-extended';
44
import { IgxGridActionButtonComponent } from './grid-action-button.component';
5-
import { showMessage } from 'igniteui-angular/core';
5+
import { IgxActionStripActionsToken, showMessage } from 'igniteui-angular/core';
66

77

88
/* blazorElement */
@@ -17,10 +17,9 @@ import { showMessage } from 'igniteui-angular/core';
1717
@Component({
1818
selector: 'igx-grid-editing-actions',
1919
templateUrl: 'grid-editing-actions.component.html',
20-
providers: [{ provide: IgxGridActionsBaseDirective, useExisting: IgxGridEditingActionsComponent }],
20+
providers: [{ provide: IgxActionStripActionsToken, useExisting: IgxGridEditingActionsComponent }],
2121
imports: [IgxGridActionButtonComponent]
2222
})
23-
2423
export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective {
2524

2625
/**

projects/igniteui-angular/grids/src/grids/grid-actions/grid-pinning-actions.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Component, HostBinding } from '@angular/core';
22
import { IgxGridActionsBaseDirective } from './grid-actions-base.directive';
33
import { pinLeft, unpinLeft, jumpDown, jumpUp } from '@igniteui/material-icons-extended';
44
import { IgxGridActionButtonComponent } from './grid-action-button.component';
5+
import { IgxActionStripActionsToken } from 'igniteui-angular/core';
56

67
/* blazorElement */
78
/* wcElementTag: igc-grid-pinning-actions */
@@ -15,7 +16,7 @@ import { IgxGridActionButtonComponent } from './grid-action-button.component';
1516
@Component({
1617
selector: 'igx-grid-pinning-actions',
1718
templateUrl: 'grid-pinning-actions.component.html',
18-
providers: [{ provide: IgxGridActionsBaseDirective, useExisting: IgxGridPinningActionsComponent }],
19+
providers: [{ provide: IgxActionStripActionsToken, useExisting: IgxGridPinningActionsComponent }],
1920
imports: [IgxGridActionButtonComponent]
2021
})
2122

projects/igniteui-angular/grids/src/grids/grid-base.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ import {
8888
EntityType,
8989
ISortingOptions,
9090
ISummaryExpression,
91-
GridSummaryCalculationMode
91+
GridSummaryCalculationMode,
92+
IgxActionStripToken
9293
} from 'igniteui-angular/core';
9394
import { IgcTrialWatermark } from 'igniteui-trial-watermark';
9495
import { Subject, pipe, fromEvent, animationFrameScheduler, merge } from 'rxjs';
@@ -214,7 +215,6 @@ import { IgxGridCellComponent } from './cell.component';
214215
import { IgxGridValidationService } from './grid/grid-validation.service';
215216
import { getUUID } from './common/random';
216217
import { IgxSnackbarComponent } from 'igniteui-angular/snackbar';
217-
import { IgxActionStripToken } from 'igniteui-angular/action-strip';
218218

219219
interface IMatchInfoCache {
220220
row: any;

projects/igniteui-angular/grids/src/grids/hierarchical-grid/hierarchical-grid.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ import { IgxButtonDirective, IgxForOfScrollSyncService, IgxForOfSyncService, Igx
5959
import { IgxCircularProgressBarComponent } from 'igniteui-angular/progressbar';
6060
import { IgxSnackbarComponent } from 'igniteui-angular/snackbar';
6161
import { IgxIconComponent } from 'igniteui-angular/icon';
62-
import { EntityType, FieldType, IFilteringExpressionsTree, flatten } from 'igniteui-angular/core';
63-
import { IgxActionStripToken } from 'igniteui-angular/action-strip';
62+
import { EntityType, FieldType, IFilteringExpressionsTree, IgxActionStripToken, flatten } from 'igniteui-angular/core';
6463
import { IgxPaginatorToken } from 'igniteui-angular/paginator';
6564

6665
let NEXT_ID = 0;

0 commit comments

Comments
 (0)