Skip to content

Commit 45df002

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Extract tree grid elements members into elements.
1 parent f3b3821 commit 45df002

File tree

12 files changed

+221
-38
lines changed

12 files changed

+221
-38
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import {
22
IgxPivotDataSelectorComponent,
3-
IgxPivotGridComponent,
4-
IgxTreeGridComponent
3+
IgxPivotGridComponent
54
} from '../../../igniteui-angular/src/public_api';
65
import { IgxGridElementsComponent } from '../lib/grids/grid.component';
76
import { IgxHierarchicalGridElementsComponent } from '../lib/grids/hierarchical-grid.component';
7+
import { IgxTreeGridElementsComponent } from '../lib/grids/tree-grid.component';
88

99
export const registerComponents = [
1010
IgxGridElementsComponent,
1111
IgxHierarchicalGridElementsComponent,
12-
IgxTreeGridComponent,
12+
IgxTreeGridElementsComponent,
1313
IgxPivotGridComponent,
1414
IgxPivotDataSelectorComponent
1515
];

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {
22
IgxPivotDataSelectorComponent,
33
IgxPivotGridComponent,
4-
IgxTreeGridComponent,
54
} from "../../../igniteui-angular/src/public_api";
65
import { IgxGridElementsComponent } from "../lib/grids/grid.component";
76
import { IgxHierarchicalGridElementsComponent } from "../lib/grids/hierarchical-grid.component";
7+
import { IgxTreeGridElementsComponent } from "../lib/grids/tree-grid.component";
88
import { IgxPaginatorComponent } from "../../../igniteui-angular/src/lib/paginator/paginator.component";
99
import { IgxPaginatorToken } from "../../../igniteui-angular/src/lib/paginator/token";
1010
import { IgxActionStripComponent } from "../../../igniteui-angular/src/lib/action-strip/action-strip.component";
@@ -30,7 +30,7 @@ import { IgxGridStateComponent } from "../lib/state.component";
3030
export const registerComponents = [
3131
IgxGridElementsComponent,
3232
IgxHierarchicalGridElementsComponent,
33-
IgxTreeGridComponent,
33+
IgxTreeGridElementsComponent,
3434
IgxPivotGridComponent,
3535
IgxPivotDataSelectorComponent,
3636
];
@@ -43,7 +43,7 @@ export var registerConfig = [
4343
parents: [
4444
IgxGridElementsComponent,
4545
IgxHierarchicalGridElementsComponent,
46-
IgxTreeGridComponent,
46+
IgxTreeGridElementsComponent,
4747
IgxRowIslandElementsComponent,
4848
],
4949
contentQueries: [
@@ -64,7 +64,7 @@ export var registerConfig = [
6464
parents: [
6565
IgxGridElementsComponent,
6666
IgxHierarchicalGridElementsComponent,
67-
IgxTreeGridComponent,
67+
IgxTreeGridElementsComponent,
6868
IgxPivotGridComponent,
6969
IgxRowIslandElementsComponent,
7070
IgxColumnGroupComponent,
@@ -120,7 +120,7 @@ export var registerConfig = [
120120
parents: [
121121
IgxGridElementsComponent,
122122
IgxHierarchicalGridElementsComponent,
123-
IgxTreeGridComponent,
123+
IgxTreeGridElementsComponent,
124124
IgxColumnGroupComponent,
125125
IgxRowIslandElementsComponent,
126126
],
@@ -426,7 +426,7 @@ export var registerConfig = [
426426
selector: "igc-grid-state",
427427
parents: [
428428
IgxGridElementsComponent,
429-
IgxTreeGridComponent,
429+
IgxTreeGridElementsComponent,
430430
IgxHierarchicalGridElementsComponent,
431431
IgxPivotGridComponent,
432432
],
@@ -461,7 +461,7 @@ export var registerConfig = [
461461
parents: [
462462
IgxGridElementsComponent,
463463
IgxHierarchicalGridElementsComponent,
464-
IgxTreeGridComponent,
464+
IgxTreeGridElementsComponent,
465465
IgxPivotGridComponent,
466466
],
467467
contentQueries: [
@@ -555,6 +555,7 @@ export var registerConfig = [
555555
{ name: "gridAPI" },
556556
{ name: "cdr" },
557557
{ name: "navigation", writable: true },
558+
{ name: "childLayoutList", writable: true },
558559
{ name: "actionStripComponents", writable: true },
559560
{ name: "foreignKey" },
560561
{ name: "selectedCells" },
@@ -690,7 +691,7 @@ export var registerConfig = [
690691
parents: [
691692
IgxGridElementsComponent,
692693
IgxHierarchicalGridElementsComponent,
693-
IgxTreeGridComponent,
694+
IgxTreeGridElementsComponent,
694695
IgxPivotGridComponent,
695696
],
696697
contentQueries: [],
@@ -996,6 +997,7 @@ export var registerConfig = [
996997
],
997998
additionalProperties: [
998999
{ name: "rowIslandAPI", writable: true },
1000+
{ name: "childLayoutList", writable: true },
9991001
{ name: "gridAPI", writable: true },
10001002
{ name: "shouldGenerate", writable: true },
10011003
{ name: "rowList" },
@@ -1112,10 +1114,15 @@ export var registerConfig = [
11121114
],
11131115
},
11141116
{
1115-
component: IgxTreeGridComponent,
1117+
component: IgxTreeGridElementsComponent,
11161118
selector: "igc-tree-grid",
11171119
parents: [],
11181120
contentQueries: [
1121+
{
1122+
property: "actionStripComponents",
1123+
childType: IgxActionStripToken,
1124+
isQueryList: true,
1125+
},
11191126
{
11201127
property: "columnList",
11211128
childType: IgxColumnComponent,
@@ -1131,6 +1138,7 @@ export var registerConfig = [
11311138
},
11321139
],
11331140
additionalProperties: [
1141+
{ name: "actionStripComponents", writable: true },
11341142
{ name: "rootRecords", writable: true },
11351143
{ name: "records", writable: true },
11361144
{ name: "processedRootRecords", writable: true },

projects/igniteui-angular-elements/src/app/components.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
IgxGridToolbarTitleComponent,
1616
IgxPaginatorComponent,
1717
IgxPivotGridComponent,
18-
IgxTreeGridComponent,
1918
IgxPivotDataSelectorComponent
2019
} from 'igniteui-angular';
2120
import { GridType } from 'projects/igniteui-angular/src/lib/grids/common/grid.interface';
@@ -29,14 +28,15 @@ import { injector } from '../utils/injector-ref';
2928
import { registerComponent } from '../utils/register';
3029
import { IgxHierarchicalGridElementsComponent } from '../lib/grids/hierarchical-grid.component';
3130
import { IgxRowIslandElementsComponent } from '../lib/grids/row-island.component';
31+
import { IgxTreeGridElementsComponent } from '../lib/grids/tree-grid.component';
3232

3333
// force-create icon service, TODO: move to initializer or register/define mechanic to avoid side-effect?
3434
const _iconBroadcast: IgxIconBroadcastService = injector.get(IgxIconBroadcastService);
3535

3636
const grid = createIgxCustomElement(IgxGridElementsComponent, { injector, registerConfig });
3737
const IgcGridComponent = withRegister(grid, () => { registerComponent(IgcGridComponent) });
3838

39-
const treeGrid = createIgxCustomElement(IgxTreeGridComponent, { injector, registerConfig });
39+
const treeGrid = createIgxCustomElement(IgxTreeGridElementsComponent, { injector, registerConfig });
4040
const IgcTreeGridComponent = withRegister(treeGrid, () => { registerComponent(IgcTreeGridComponent) });
4141

4242
const hGrid = createIgxCustomElement(IgxHierarchicalGridElementsComponent, { injector, registerConfig });
@@ -122,7 +122,7 @@ export {
122122
// TODO: Custom elements JSON as well
123123
declare global {
124124
type IgxGridElement = NgElement & WithProperties<GridType>;
125-
type IgxTreeGridElement = NgElement & WithProperties<IgxTreeGridComponent>;
125+
type IgxTreeGridElement = NgElement & WithProperties<IgxTreeGridElementsComponent>;
126126
interface HTMLElementTagNameMap {
127127
'igc-grid': NgElement & WithProperties<GridType>;
128128
'igc-tree-grid': NgElement & WithProperties<IgxTreeGridElement>;

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,10 @@ export class IgxHierarchicalGridElementsComponent extends IgxHierarchicalGridCom
147147
});
148148
}
149149

150-
151-
//childLayoutList
152-
//allLayoutList
153-
154150
/* contentChildren */
155-
/* blazorInclude */
156151
/* blazorTreatAsCollection */
157152
/* blazorCollectionName: RowIslandCollection */
158153
/* ngQueryListName: childLayoutList */
159-
/**
160-
* @hidden
161-
*/
162154
@ContentChildren(IgxRowIslandElementsComponent, { read: IgxRowIslandElementsComponent, descendants: false })
163155
public override childLayoutList: QueryList<IgxRowIslandElementsComponent>;
164156

projects/igniteui-angular-elements/src/lib/grids/row-island.component.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,10 @@ export class IgxRowIslandElementsComponent extends IgxRowIslandComponent {
9898
});
9999
}
100100

101-
//children
102-
// childLayoutList
103-
104101
/* contentChildren */
105-
/* blazorInclude */
106102
/* blazorTreatAsCollection */
107103
/* blazorCollectionName: RowIslandCollection */
108104
/* ngQueryListName: childLayoutList */
109-
/**
110-
* @hidden
111-
*/
112105
@ContentChildren(IgxRowIslandElementsComponent, { read: IgxRowIslandElementsComponent, descendants: false })
113106
public override childLayoutList: QueryList<IgxRowIslandElementsComponent>;
114107

@@ -126,12 +119,10 @@ export class IgxRowIslandElementsComponent extends IgxRowIslandComponent {
126119

127120
// TODO(api-analyzer): Shouldn't need all tags to copy from base or hidden/internal due to include tag
128121
/* contentChildren */
129-
/* blazorInclude */
130122
/* blazorTreatAsCollection */
131123
/* blazorCollectionName: ActionStripCollection */
132124
/* blazorCollectionItemName: ActionStrip */
133125
/* ngQueryListName: actionStripComponents */
134-
/** @hidden @internal */
135126
@ContentChildren(IgxActionStripToken, { read: IgxActionStripToken, descendants: false })
136127
protected actionStripComponents: QueryList<IgxActionStripToken>;
137128

0 commit comments

Comments
 (0)