@@ -126,6 +126,8 @@ import { DxiDataGridAsyncRuleModule } from 'devextreme-angular/ui/data-grid/nest
126126import { DxoDataGridAtModule } from 'devextreme-angular/ui/data-grid/nested' ;
127127import { DxoDataGridBoundaryOffsetModule } from 'devextreme-angular/ui/data-grid/nested' ;
128128import { DxiDataGridButtonModule } from 'devextreme-angular/ui/data-grid/nested' ;
129+ import { DxiDataGridButtonItemModule } from 'devextreme-angular/ui/data-grid/nested' ;
130+ import { DxoDataGridButtonOptionsModule } from 'devextreme-angular/ui/data-grid/nested' ;
129131import { DxiDataGridChangeModule } from 'devextreme-angular/ui/data-grid/nested' ;
130132import { DxoDataGridColCountByScreenModule } from 'devextreme-angular/ui/data-grid/nested' ;
131133import { DxoDataGridCollisionModule } from 'devextreme-angular/ui/data-grid/nested' ;
@@ -147,11 +149,13 @@ import { DxoDataGridDataGridHeaderFilterModule } from 'devextreme-angular/ui/dat
147149import { DxoDataGridDataGridHeaderFilterSearchModule } from 'devextreme-angular/ui/data-grid/nested' ;
148150import { DxoDataGridDataGridHeaderFilterTextsModule } from 'devextreme-angular/ui/data-grid/nested' ;
149151import { DxoDataGridDataGridSelectionModule } from 'devextreme-angular/ui/data-grid/nested' ;
152+ import { DxiDataGridDataGridToolbarItemModule } from 'devextreme-angular/ui/data-grid/nested' ;
150153import { DxoDataGridEditingModule } from 'devextreme-angular/ui/data-grid/nested' ;
151154import { DxoDataGridEditingTextsModule } from 'devextreme-angular/ui/data-grid/nested' ;
152155import { DxoDataGridEditorOptionsModule } from 'devextreme-angular/ui/data-grid/nested' ;
153156import { DxiDataGridEditorOptionsButtonModule } from 'devextreme-angular/ui/data-grid/nested' ;
154157import { DxiDataGridEmailRuleModule } from 'devextreme-angular/ui/data-grid/nested' ;
158+ import { DxiDataGridEmptyItemModule } from 'devextreme-angular/ui/data-grid/nested' ;
155159import { DxoDataGridExportModule } from 'devextreme-angular/ui/data-grid/nested' ;
156160import { DxoDataGridExportTextsModule } from 'devextreme-angular/ui/data-grid/nested' ;
157161import { DxiDataGridFieldModule } from 'devextreme-angular/ui/data-grid/nested' ;
@@ -200,12 +204,18 @@ import { DxoDataGridSearchModule } from 'devextreme-angular/ui/data-grid/nested'
200204import { DxoDataGridSearchPanelModule } from 'devextreme-angular/ui/data-grid/nested' ;
201205import { DxoDataGridSelectionModule } from 'devextreme-angular/ui/data-grid/nested' ;
202206import { DxoDataGridShowModule } from 'devextreme-angular/ui/data-grid/nested' ;
207+ import { DxiDataGridSimpleItemModule } from 'devextreme-angular/ui/data-grid/nested' ;
203208import { DxiDataGridSortByGroupSummaryInfoModule } from 'devextreme-angular/ui/data-grid/nested' ;
204209import { DxoDataGridSortingModule } from 'devextreme-angular/ui/data-grid/nested' ;
205210import { DxoDataGridStateStoringModule } from 'devextreme-angular/ui/data-grid/nested' ;
206211import { DxiDataGridStringLengthRuleModule } from 'devextreme-angular/ui/data-grid/nested' ;
207212import { DxoDataGridSummaryModule } from 'devextreme-angular/ui/data-grid/nested' ;
213+ import { DxiDataGridSummaryGroupItemModule } from 'devextreme-angular/ui/data-grid/nested' ;
208214import { DxoDataGridSummaryTextsModule } from 'devextreme-angular/ui/data-grid/nested' ;
215+ import { DxiDataGridTabModule } from 'devextreme-angular/ui/data-grid/nested' ;
216+ import { DxiDataGridTabbedItemModule } from 'devextreme-angular/ui/data-grid/nested' ;
217+ import { DxoDataGridTabPanelOptionsModule } from 'devextreme-angular/ui/data-grid/nested' ;
218+ import { DxiDataGridTabPanelOptionsItemModule } from 'devextreme-angular/ui/data-grid/nested' ;
209219import { DxoDataGridTextsModule } from 'devextreme-angular/ui/data-grid/nested' ;
210220import { DxoDataGridToModule } from 'devextreme-angular/ui/data-grid/nested' ;
211221import { DxoDataGridToolbarModule } from 'devextreme-angular/ui/data-grid/nested' ;
@@ -216,13 +226,14 @@ import { DxoDataGridValueFormatModule } from 'devextreme-angular/ui/data-grid/ne
216226import {
217227 PROPERTY_TOKEN_validationRules ,
218228 PROPERTY_TOKEN_buttons ,
229+ PROPERTY_TOKEN_items ,
219230 PROPERTY_TOKEN_changes ,
220231 PROPERTY_TOKEN_columns ,
221232 PROPERTY_TOKEN_customOperations ,
222233 PROPERTY_TOKEN_fields ,
223- PROPERTY_TOKEN_groupItems ,
224- PROPERTY_TOKEN_items ,
225234 PROPERTY_TOKEN_sortByGroupSummaryInfo ,
235+ PROPERTY_TOKEN_groupItems ,
236+ PROPERTY_TOKEN_tabs ,
226237 PROPERTY_TOKEN_toolbarItems ,
227238 PROPERTY_TOKEN_totalItems ,
228239 } from 'devextreme-angular/core/tokens' ;
@@ -257,6 +268,11 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
257268 this . setChildren ( 'buttons' , value ) ;
258269 }
259270
271+ @ContentChildren ( PROPERTY_TOKEN_items )
272+ set _itemsContentChildren ( value : QueryList < CollectionNestedOption > ) {
273+ this . setChildren ( 'items' , value ) ;
274+ }
275+
260276 @ContentChildren ( PROPERTY_TOKEN_changes )
261277 set _changesContentChildren ( value : QueryList < CollectionNestedOption > ) {
262278 this . setChildren ( 'changes' , value ) ;
@@ -277,19 +293,19 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
277293 this . setChildren ( 'fields' , value ) ;
278294 }
279295
296+ @ContentChildren ( PROPERTY_TOKEN_sortByGroupSummaryInfo )
297+ set _sortByGroupSummaryInfoContentChildren ( value : QueryList < CollectionNestedOption > ) {
298+ this . setChildren ( 'sortByGroupSummaryInfo' , value ) ;
299+ }
300+
280301 @ContentChildren ( PROPERTY_TOKEN_groupItems )
281302 set _groupItemsContentChildren ( value : QueryList < CollectionNestedOption > ) {
282303 this . setChildren ( 'groupItems' , value ) ;
283304 }
284305
285- @ContentChildren ( PROPERTY_TOKEN_items )
286- set _itemsContentChildren ( value : QueryList < CollectionNestedOption > ) {
287- this . setChildren ( 'items' , value ) ;
288- }
289-
290- @ContentChildren ( PROPERTY_TOKEN_sortByGroupSummaryInfo )
291- set _sortByGroupSummaryInfoContentChildren ( value : QueryList < CollectionNestedOption > ) {
292- this . setChildren ( 'sortByGroupSummaryInfo' , value ) ;
306+ @ContentChildren ( PROPERTY_TOKEN_tabs )
307+ set _tabsContentChildren ( value : QueryList < CollectionNestedOption > ) {
308+ this . setChildren ( 'tabs' , value ) ;
293309 }
294310
295311 @ContentChildren ( PROPERTY_TOKEN_toolbarItems )
@@ -2422,6 +2438,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
24222438 DxoDataGridAtModule ,
24232439 DxoDataGridBoundaryOffsetModule ,
24242440 DxiDataGridButtonModule ,
2441+ DxiDataGridButtonItemModule ,
2442+ DxoDataGridButtonOptionsModule ,
24252443 DxiDataGridChangeModule ,
24262444 DxoDataGridColCountByScreenModule ,
24272445 DxoDataGridCollisionModule ,
@@ -2443,11 +2461,13 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
24432461 DxoDataGridDataGridHeaderFilterSearchModule ,
24442462 DxoDataGridDataGridHeaderFilterTextsModule ,
24452463 DxoDataGridDataGridSelectionModule ,
2464+ DxiDataGridDataGridToolbarItemModule ,
24462465 DxoDataGridEditingModule ,
24472466 DxoDataGridEditingTextsModule ,
24482467 DxoDataGridEditorOptionsModule ,
24492468 DxiDataGridEditorOptionsButtonModule ,
24502469 DxiDataGridEmailRuleModule ,
2470+ DxiDataGridEmptyItemModule ,
24512471 DxoDataGridExportModule ,
24522472 DxoDataGridExportTextsModule ,
24532473 DxiDataGridFieldModule ,
@@ -2496,12 +2516,18 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
24962516 DxoDataGridSearchPanelModule ,
24972517 DxoDataGridSelectionModule ,
24982518 DxoDataGridShowModule ,
2519+ DxiDataGridSimpleItemModule ,
24992520 DxiDataGridSortByGroupSummaryInfoModule ,
25002521 DxoDataGridSortingModule ,
25012522 DxoDataGridStateStoringModule ,
25022523 DxiDataGridStringLengthRuleModule ,
25032524 DxoDataGridSummaryModule ,
2525+ DxiDataGridSummaryGroupItemModule ,
25042526 DxoDataGridSummaryTextsModule ,
2527+ DxiDataGridTabModule ,
2528+ DxiDataGridTabbedItemModule ,
2529+ DxoDataGridTabPanelOptionsModule ,
2530+ DxiDataGridTabPanelOptionsItemModule ,
25052531 DxoDataGridTextsModule ,
25062532 DxoDataGridToModule ,
25072533 DxoDataGridToolbarModule ,
@@ -2585,6 +2611,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
25852611 DxoDataGridAtModule ,
25862612 DxoDataGridBoundaryOffsetModule ,
25872613 DxiDataGridButtonModule ,
2614+ DxiDataGridButtonItemModule ,
2615+ DxoDataGridButtonOptionsModule ,
25882616 DxiDataGridChangeModule ,
25892617 DxoDataGridColCountByScreenModule ,
25902618 DxoDataGridCollisionModule ,
@@ -2606,11 +2634,13 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
26062634 DxoDataGridDataGridHeaderFilterSearchModule ,
26072635 DxoDataGridDataGridHeaderFilterTextsModule ,
26082636 DxoDataGridDataGridSelectionModule ,
2637+ DxiDataGridDataGridToolbarItemModule ,
26092638 DxoDataGridEditingModule ,
26102639 DxoDataGridEditingTextsModule ,
26112640 DxoDataGridEditorOptionsModule ,
26122641 DxiDataGridEditorOptionsButtonModule ,
26132642 DxiDataGridEmailRuleModule ,
2643+ DxiDataGridEmptyItemModule ,
26142644 DxoDataGridExportModule ,
26152645 DxoDataGridExportTextsModule ,
26162646 DxiDataGridFieldModule ,
@@ -2659,12 +2689,18 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
26592689 DxoDataGridSearchPanelModule ,
26602690 DxoDataGridSelectionModule ,
26612691 DxoDataGridShowModule ,
2692+ DxiDataGridSimpleItemModule ,
26622693 DxiDataGridSortByGroupSummaryInfoModule ,
26632694 DxoDataGridSortingModule ,
26642695 DxoDataGridStateStoringModule ,
26652696 DxiDataGridStringLengthRuleModule ,
26662697 DxoDataGridSummaryModule ,
2698+ DxiDataGridSummaryGroupItemModule ,
26672699 DxoDataGridSummaryTextsModule ,
2700+ DxiDataGridTabModule ,
2701+ DxiDataGridTabbedItemModule ,
2702+ DxoDataGridTabPanelOptionsModule ,
2703+ DxiDataGridTabPanelOptionsItemModule ,
26682704 DxoDataGridTextsModule ,
26692705 DxoDataGridToModule ,
26702706 DxoDataGridToolbarModule ,
0 commit comments