Skip to content

Commit d647b84

Browse files
MayaKirovaMayaKirova
committed
chore(*): Fix imports after merge.
1 parent 15a26f1 commit d647b84

7 files changed

Lines changed: 204 additions & 310 deletions

File tree

‎package-lock.json‎

Lines changed: 25 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import { IgxQueryBuilderComponent } from "../../../igniteui-angular/query-builder";
2-
import { IgxGridComponent } from "../../../igniteui-angular/grids/grid";
3-
import { IgxHierarchicalGridComponent } from "../../../igniteui-angular/grids/hierarchical-grid";
42
import {
53
IgxPivotDataSelectorComponent,
64
IgxPivotGridComponent,
75
} from "../../../igniteui-angular/grids/pivot-grid";
8-
import { IgxTreeGridComponent } from "../../../igniteui-angular/grids/tree-grid";
96
import { IgxActionStripComponent } from "../../../igniteui-angular/action-strip/src/action-strip/action-strip.component";
107
import { IgxActionStripToken } from "../../../igniteui-angular/core/src/grid-column-actions/token";
118
import { IgxPaginatorComponent } from "../../../igniteui-angular/paginator/src/paginator/paginator.component";
@@ -30,6 +27,8 @@ import { IgxGridStateComponent } from "../lib/state.component";
3027
import { IgxGridElementsComponent } from "../lib/grids/grid.component";
3128
import { IgxHierarchicalGridElementsComponent } from "../lib/grids/hierarchical-grid.component";
3229
import { IgxTreeGridElementsComponent } from "../lib/grids/tree-grid.component";
30+
import { IgxRowIslandElementsComponent } from '../lib/grids/row-island.component';
31+
import { IgxGridActionsBaseDirective } from '../../../igniteui-angular/grids/core/src/grid-actions/grid-actions-base.directive';
3332

3433
export const registerComponents = [
3534
IgxGridElementsComponent,

‎projects/igniteui-angular-elements/src/lib/grids/events.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ColumnType } from '../../../../igniteui-angular/src/lib/grids/common/grid.interface';
2-
import { IBaseEventArgs } from 'igniteui-angular/src/lib/core/utils';
1+
import { ColumnType } from 'igniteui-angular/core/src/data-operations/grid-types';
2+
import { IBaseEventArgs } from 'igniteui-angular/core/src/core/utils';
33

44
export interface IColumnsAutoGeneratedEventArgs extends IBaseEventArgs {
55
/* blazorTreatAsCollection */

‎projects/igniteui-angular-elements/src/lib/grids/grid.component.ts‎

Lines changed: 85 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,48 @@
1-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChildren, CUSTOM_ELEMENTS_SCHEMA, ElementRef, EnvironmentInjector, EventEmitter, Inject, Injector, IterableDiffers, LOCALE_ID, NgZone, Optional, Output, QueryList, ViewContainerRef } from '@angular/core';
2-
import { IgxGridComponent } from '../../../../igniteui-angular/src/lib/grids/grid/grid.component';
1+
import {
2+
Component, ChangeDetectionStrategy, Output, EventEmitter,
3+
QueryList, ContentChildren, CUSTOM_ELEMENTS_SCHEMA
4+
} from '@angular/core';
5+
import { NgTemplateOutlet, NgClass, NgStyle } from '@angular/common';
6+
import {
7+
IGX_GRID_BASE,
8+
IGX_GRID_SERVICE_BASE,
9+
IgxColumnMovingDropDirective,
10+
IgxColumnResizingService,
11+
IgxFilteringService,
12+
IgxGridAddRowPipe,
13+
IgxGridBodyDirective,
14+
IgxGridColumnResizerComponent,
15+
IgxGridCRUDService,
16+
IgxGridDragSelectDirective,
17+
IgxGridHeaderRowComponent,
18+
IgxGridNavigationService,
19+
IgxGridRowClassesPipe,
20+
IgxGridRowPinningPipe,
21+
IgxGridRowStylesPipe,
22+
IgxGridSelectionService,
23+
IgxGridSummaryService,
24+
IgxGridTransactionPipe,
25+
IgxGridValidationService,
26+
IgxHasVisibleColumnsPipe,
27+
IgxRowEditTabStopDirective,
28+
IgxStringReplacePipe,
29+
IgxSummaryDataPipe,
30+
IgxSummaryRowComponent,
31+
} from 'igniteui-angular/grids/core';
32+
import { IgxGridAPIService } from 'igniteui-angular/grids/grid/src/grid-api.service';
33+
import { IgxGridGroupByRowComponent } from 'igniteui-angular/grids/grid/src/groupby-row.component';
34+
import { IgxGridGroupByAreaComponent } from 'igniteui-angular/grids/grid/src/grouping/grid-group-by-area.component';
35+
import { IgxActionStripToken, IgxOverlayOutletDirective } from 'igniteui-angular/core';
36+
import { IgxGridDetailsPipe } from 'igniteui-angular/grids/grid/src/grid.details.pipe';
37+
import { IgxGridSummaryPipe } from 'igniteui-angular/grids/grid/src/grid.summary.pipe';
38+
import { IgxGridGroupingPipe, IgxGridPagingPipe, IgxGridSortingPipe, IgxGridFilteringPipe, IgxGridCellMergePipe, IgxGridUnmergeActivePipe } from 'igniteui-angular/grids/grid/src/grid.pipes';
39+
import { IgxGridRowComponent } from 'igniteui-angular/grids/grid/src/grid-row.component';
40+
import { IgxButtonDirective, IgxForOfScrollSyncService, IgxForOfSyncService, IgxGridForOfDirective, IgxRippleDirective, IgxScrollInertiaDirective, IgxTemplateOutletDirective, IgxToggleDirective } from 'igniteui-angular/directives';
41+
import { IgxCircularProgressBarComponent } from 'igniteui-angular/progressbar';
42+
import { IgxSnackbarComponent } from 'igniteui-angular/snackbar';
43+
import { IgxIconComponent } from 'igniteui-angular/icon';
344
import { IColumnsAutoGeneratedEventArgs } from './events';
4-
import { IgxGridCRUDService } from '../../../../igniteui-angular/src/lib/grids/common/crud.service';
5-
import { IgxGridNavigationService } from '../../../../igniteui-angular/src/lib/grids/grid-navigation.service';
6-
import { IgxGridSummaryService } from '../../../../igniteui-angular/src/lib/grids/summaries/grid-summary.service';
7-
import { IgxGridSelectionService } from '../../../../igniteui-angular/src/lib/grids/selection/selection.service';
8-
import { IgxGridValidationService } from '../../../../igniteui-angular/src/lib/grids/grid/grid-validation.service';
9-
import { GridServiceType, IGX_GRID_BASE, IGX_GRID_SERVICE_BASE, IgxButtonDirective, IgxCircularProgressBarComponent, IgxColumnComponent, IgxFlatTransactionFactory, IgxGridForOfDirective, IgxGridHeaderRowComponent, IgxGridToolbarComponent, IgxGridTransaction, IgxIconComponent, IgxOverlayOutletDirective, IgxOverlayService, IgxPaginatorComponent, IgxRippleDirective, IgxRowEditTabStopDirective, IgxSnackbarComponent, IgxTemplateOutletDirective, IgxTextHighlightService, IgxToggleDirective, State, Transaction, TransactionService } from 'igniteui-angular';
10-
import { IgxGridAPIService } from '../../../../igniteui-angular/src/lib/grids/grid/grid-api.service';
11-
import { IgxFilteringService } from '../../../../igniteui-angular/src/lib/grids/filtering/grid-filtering.service';
12-
import { IgxColumnResizingService } from '../../../../igniteui-angular/src/lib/grids/resizing/resizing.service';
13-
import { IgxForOfScrollSyncService, IgxForOfSyncService } from '../../../../igniteui-angular/src/lib/directives/for-of/for_of.sync.service';
14-
import { IgxActionStripToken } from '../../../../igniteui-angular/src/lib/action-strip/token';
15-
import { takeUntil } from 'rxjs';
16-
import { DOCUMENT, NgClass, NgFor, NgIf, NgStyle, NgTemplateOutlet } from '@angular/common';
17-
import { PlatformUtil } from '../../../../igniteui-angular/src/lib/core/utils';
18-
import { IgxGridGroupByAreaComponent } from '../../../../igniteui-angular/src/lib/grids/grouping/grid-group-by-area.component';
19-
import { IgxGridBodyDirective } from '../../../../igniteui-angular/src/lib/grids/grid.common';
20-
import { IgxGridDragSelectDirective } from '../../../../igniteui-angular/src/lib/grids/selection/drag-select.directive';
21-
import { IgxColumnMovingDropDirective } from '../../../../igniteui-angular/src/lib/grids/moving/moving.drop.directive';
22-
import { IgxGridRowComponent } from '../../../../igniteui-angular/src/lib/grids/grid/grid-row.component';
23-
import { IgxGridGroupByRowComponent } from '../../../../igniteui-angular/src/lib/grids/grid/groupby-row.component';
24-
import { IgxSummaryRowComponent } from '../../../../igniteui-angular/src/lib/grids/summaries/summary-row.component';
25-
import { IgxGridColumnResizerComponent } from '../../../../igniteui-angular/src/lib/grids/resizing/resizer.component';
26-
import { IgxGridAddRowPipe, IgxGridRowClassesPipe, IgxGridRowPinningPipe, IgxGridRowStylesPipe, IgxGridTransactionPipe, IgxHasVisibleColumnsPipe, IgxStringReplacePipe } from '../../../../igniteui-angular/src/lib/grids/common/pipes';
27-
import { IgxSummaryDataPipe } from '../../../../igniteui-angular/src/lib/grids/summaries/grid-root-summary.pipe';
28-
import { IgxGridFilteringPipe, IgxGridGroupingPipe, IgxGridPagingPipe, IgxGridSortingPipe } from '../../../../igniteui-angular/src/lib/grids/grid/grid.pipes';
29-
import { IgxGridSummaryPipe } from '../../../../igniteui-angular/src/lib/grids/grid/grid.summary.pipe';
30-
import { IgxGridDetailsPipe } from '../../../../igniteui-angular/src/lib/grids/grid/grid.details.pipe';
45+
import { IgxGridComponent } from 'igniteui-angular/grids/grid/src/grid.component';
3146

3247
/* blazorAdditionalDependency: Column */
3348
/* blazorAdditionalDependency: ColumnGroup */
@@ -80,82 +95,52 @@ import { IgxGridDetailsPipe } from '../../../../igniteui-angular/src/lib/grids/g
8095
IgxForOfScrollSyncService,
8196
],
8297
imports: [
83-
NgClass,
84-
NgStyle,
85-
NgTemplateOutlet,
86-
IgxGridGroupByAreaComponent,
87-
IgxGridHeaderRowComponent,
88-
IgxGridBodyDirective,
89-
IgxGridDragSelectDirective,
90-
IgxColumnMovingDropDirective,
91-
IgxGridForOfDirective,
92-
IgxTemplateOutletDirective,
93-
IgxGridRowComponent,
94-
IgxGridGroupByRowComponent,
95-
IgxSummaryRowComponent,
96-
IgxOverlayOutletDirective,
97-
IgxToggleDirective,
98-
IgxCircularProgressBarComponent,
99-
IgxSnackbarComponent,
100-
IgxButtonDirective,
101-
IgxRippleDirective,
102-
IgxIconComponent,
103-
IgxRowEditTabStopDirective,
104-
IgxGridColumnResizerComponent,
105-
IgxGridTransactionPipe,
106-
IgxHasVisibleColumnsPipe,
107-
IgxGridRowPinningPipe,
108-
IgxGridAddRowPipe,
109-
IgxGridRowClassesPipe,
110-
IgxGridRowStylesPipe,
111-
IgxSummaryDataPipe,
112-
IgxGridGroupingPipe,
113-
IgxGridPagingPipe,
114-
IgxGridSortingPipe,
115-
IgxGridFilteringPipe,
116-
IgxGridSummaryPipe,
117-
IgxGridDetailsPipe,
118-
IgxStringReplacePipe,
119-
],
98+
NgClass,
99+
NgStyle,
100+
NgTemplateOutlet,
101+
IgxGridGroupByAreaComponent,
102+
IgxGridHeaderRowComponent,
103+
IgxGridBodyDirective,
104+
IgxGridDragSelectDirective,
105+
IgxColumnMovingDropDirective,
106+
IgxGridForOfDirective,
107+
IgxTemplateOutletDirective,
108+
IgxGridRowComponent,
109+
IgxGridGroupByRowComponent,
110+
IgxSummaryRowComponent,
111+
IgxOverlayOutletDirective,
112+
IgxToggleDirective,
113+
IgxCircularProgressBarComponent,
114+
IgxSnackbarComponent,
115+
IgxButtonDirective,
116+
IgxRippleDirective,
117+
IgxIconComponent,
118+
IgxRowEditTabStopDirective,
119+
IgxGridColumnResizerComponent,
120+
IgxGridTransactionPipe,
121+
IgxHasVisibleColumnsPipe,
122+
IgxGridRowPinningPipe,
123+
IgxGridAddRowPipe,
124+
IgxGridRowClassesPipe,
125+
IgxGridRowStylesPipe,
126+
IgxSummaryDataPipe,
127+
IgxGridGroupingPipe,
128+
IgxGridPagingPipe,
129+
IgxGridSortingPipe,
130+
IgxGridFilteringPipe,
131+
IgxGridSummaryPipe,
132+
IgxGridDetailsPipe,
133+
IgxStringReplacePipe,
134+
IgxGridCellMergePipe,
135+
IgxGridUnmergeActivePipe,
136+
IgxScrollInertiaDirective
137+
],
120138
selector: 'igx-grid',
121-
templateUrl: '../../../../igniteui-angular/src/lib/grids/grid/grid.component.html',
139+
templateUrl: '../../../../igniteui-angular/grids/grid/src/grid.component.html',
122140
schemas: [CUSTOM_ELEMENTS_SCHEMA]
123141
})
124142
export class IgxGridElementsComponent extends IgxGridComponent {
125143

126-
constructor(
127-
public override readonly validation: IgxGridValidationService,
128-
/** @hidden @internal */
129-
public override readonly selectionService: IgxGridSelectionService,
130-
protected override colResizingService: IgxColumnResizingService,
131-
@Inject(IGX_GRID_SERVICE_BASE) public override readonly gridAPI: GridServiceType,
132-
protected override transactionFactory: IgxFlatTransactionFactory,
133-
private elementRef1: ElementRef<HTMLElement>,
134-
protected override zone: NgZone,
135-
/** @hidden @internal */
136-
@Inject(DOCUMENT) public override document: any,
137-
public override readonly cdr: ChangeDetectorRef,
138-
protected override differs: IterableDiffers,
139-
protected override viewRef: ViewContainerRef,
140-
protected override injector: Injector,
141-
protected override envInjector: EnvironmentInjector,
142-
public override navigation: IgxGridNavigationService,
143-
/** @hidden @internal */
144-
public override filteringService: IgxFilteringService,
145-
protected override textHighlightService: IgxTextHighlightService,
146-
@Inject(IgxOverlayService) protected override overlayService: IgxOverlayService,
147-
/** @hidden @internal */
148-
public override summaryService: IgxGridSummaryService,
149-
@Inject(LOCALE_ID) private localeId1: string,
150-
protected override platform: PlatformUtil,
151-
@Optional() @Inject(IgxGridTransaction) protected override _diTransactions?: TransactionService<Transaction, State>,
152-
) {
153-
super(validation, selectionService,colResizingService, gridAPI, transactionFactory, elementRef1, zone,
154-
document, cdr, differs, viewRef,injector, envInjector, navigation, filteringService, textHighlightService, overlayService,
155-
summaryService, localeId1, platform, _diTransactions
156-
);
157-
}
158-
159144
@Output()
160145
public columnsAutogenerated = new EventEmitter<IColumnsAutoGeneratedEventArgs>();
161146

0 commit comments

Comments
 (0)