Skip to content

Commit 6533e7a

Browse files
dmalykh-devexpressdmalykh-devexpress
committed
run: pnpm run regenerate-all
1 parent d41944c commit 6533e7a

File tree

512 files changed

+5682
-5086
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

512 files changed

+5682
-5086
lines changed

‎packages/devextreme-angular/src/ui/accordion/index.ts‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ import {
3838
DxTemplateModule,
3939
NestedOptionHost,
4040
IterableDifferHelper,
41-
WatcherHelper,
42-
CollectionNestedOption,
41+
WatcherHelper
4342
} from 'devextreme-angular/core';
4443

4544
import { DxiItemModule } from 'devextreme-angular/ui/nested';
4645

4746
import { DxiAccordionItemModule } from 'devextreme-angular/ui/accordion/nested';
48-
import {
49-
PROPERTY_TOKEN_items,
50-
} from 'devextreme-angular/core/tokens';
47+
48+
import { DxiItemComponent } from 'devextreme-angular/ui/nested';
49+
50+
import { DxiAccordionItemComponent } from 'devextreme-angular/ui/accordion/nested';
5151

5252

5353
/**
@@ -68,12 +68,6 @@ import {
6868
]
6969
})
7070
export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent implements OnDestroy, OnChanges, DoCheck {
71-
72-
@ContentChildren(PROPERTY_TOKEN_items)
73-
set _itemsContentChildren(value: QueryList<CollectionNestedOption>) {
74-
this.setChildren('items', value);
75-
}
76-
7771
instance: DxAccordion<TItem, TKey> = null;
7872

7973
/**
@@ -718,6 +712,26 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
718712

719713

720714

715+
@ContentChildren(DxiAccordionItemComponent)
716+
get itemsChildren(): QueryList<DxiAccordionItemComponent> {
717+
return this._getOption('items');
718+
}
719+
set itemsChildren(value) {
720+
this._setChildren('items', value, 'DxiAccordionItemComponent');
721+
}
722+
723+
724+
@ContentChildren(DxiItemComponent)
725+
get itemsLegacyChildren(): QueryList<DxiItemComponent> {
726+
return this._getOption('items');
727+
}
728+
set itemsLegacyChildren(value) {
729+
this._setChildren('items', value, 'DxiItemComponent');
730+
}
731+
732+
733+
734+
721735
constructor(elementRef: ElementRef, ngZone: NgZone, templateHost: DxTemplateHost,
722736
private _watcherHelper: WatcherHelper,
723737
private _idh: IterableDifferHelper,

‎packages/devextreme-angular/src/ui/accordion/nested/item-dxi.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,18 @@ import {
2323
extractTemplate,
2424
DxTemplateDirective,
2525
IDxTemplateHost,
26-
DxTemplateHost,
26+
DxTemplateHost
2727
} from 'devextreme-angular/core';
2828
import { CollectionNestedOption } from 'devextreme-angular/core';
2929

30-
import { PROPERTY_TOKEN_items } from 'devextreme-angular/core/tokens';
3130

3231
@Component({
3332
selector: 'dxi-accordion-item',
3433
standalone: true,
3534
template: '<ng-content></ng-content>',
3635
styles: [':host { display: block; }'],
3736
imports: [ DxIntegrationModule ],
38-
providers: [
39-
NestedOptionHost,
40-
DxTemplateHost,
41-
{
42-
provide: PROPERTY_TOKEN_items,
43-
useExisting: DxiAccordionItemComponent,
44-
}
45-
]
37+
providers: [NestedOptionHost, DxTemplateHost]
4638
})
4739
export class DxiAccordionItemComponent extends CollectionNestedOption implements AfterViewInit,
4840
IDxTemplateHost {

‎packages/devextreme-angular/src/ui/action-sheet/index.ts‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ import {
3838
DxTemplateModule,
3939
NestedOptionHost,
4040
IterableDifferHelper,
41-
WatcherHelper,
42-
CollectionNestedOption,
41+
WatcherHelper
4342
} from 'devextreme-angular/core';
4443

4544
import { DxiItemModule } from 'devextreme-angular/ui/nested';
4645

4746
import { DxiActionSheetItemModule } from 'devextreme-angular/ui/action-sheet/nested';
48-
import {
49-
PROPERTY_TOKEN_items,
50-
} from 'devextreme-angular/core/tokens';
47+
48+
import { DxiItemComponent } from 'devextreme-angular/ui/nested';
49+
50+
import { DxiActionSheetItemComponent } from 'devextreme-angular/ui/action-sheet/nested';
5151

5252

5353
/**
@@ -68,12 +68,6 @@ import {
6868
]
6969
})
7070
export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent implements OnDestroy, OnChanges, DoCheck {
71-
72-
@ContentChildren(PROPERTY_TOKEN_items)
73-
set _itemsContentChildren(value: QueryList<CollectionNestedOption>) {
74-
this.setChildren('items', value);
75-
}
76-
7771
instance: DxActionSheet<TItem, TKey> = null;
7872

7973
/**
@@ -510,6 +504,26 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
510504

511505

512506

507+
@ContentChildren(DxiActionSheetItemComponent)
508+
get itemsChildren(): QueryList<DxiActionSheetItemComponent> {
509+
return this._getOption('items');
510+
}
511+
set itemsChildren(value) {
512+
this._setChildren('items', value, 'DxiActionSheetItemComponent');
513+
}
514+
515+
516+
@ContentChildren(DxiItemComponent)
517+
get itemsLegacyChildren(): QueryList<DxiItemComponent> {
518+
return this._getOption('items');
519+
}
520+
set itemsLegacyChildren(value) {
521+
this._setChildren('items', value, 'DxiItemComponent');
522+
}
523+
524+
525+
526+
513527
constructor(elementRef: ElementRef, ngZone: NgZone, templateHost: DxTemplateHost,
514528
private _watcherHelper: WatcherHelper,
515529
private _idh: IterableDifferHelper,

‎packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,18 @@ import {
2525
extractTemplate,
2626
DxTemplateDirective,
2727
IDxTemplateHost,
28-
DxTemplateHost,
28+
DxTemplateHost
2929
} from 'devextreme-angular/core';
3030
import { CollectionNestedOption } from 'devextreme-angular/core';
3131

32-
import { PROPERTY_TOKEN_items } from 'devextreme-angular/core/tokens';
3332

3433
@Component({
3534
selector: 'dxi-action-sheet-item',
3635
standalone: true,
3736
template: '<ng-content></ng-content>',
3837
styles: [':host { display: block; }'],
3938
imports: [ DxIntegrationModule ],
40-
providers: [
41-
NestedOptionHost,
42-
DxTemplateHost,
43-
{
44-
provide: PROPERTY_TOKEN_items,
45-
useExisting: DxiActionSheetItemComponent,
46-
}
47-
]
39+
providers: [NestedOptionHost, DxTemplateHost]
4840
})
4941
export class DxiActionSheetItemComponent extends CollectionNestedOption implements AfterViewInit,
5042
IDxTemplateHost {

‎packages/devextreme-angular/src/ui/autocomplete/index.ts‎

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ import {
4747
DxTemplateModule,
4848
NestedOptionHost,
4949
IterableDifferHelper,
50-
WatcherHelper,
51-
CollectionNestedOption,
50+
WatcherHelper
5251
} from 'devextreme-angular/core';
5352

5453
import { DxiButtonModule } from 'devextreme-angular/ui/nested';
@@ -83,11 +82,12 @@ import { DxoAutocompletePositionModule } from 'devextreme-angular/ui/autocomplet
8382
import { DxoAutocompleteShowModule } from 'devextreme-angular/ui/autocomplete/nested';
8483
import { DxoAutocompleteToModule } from 'devextreme-angular/ui/autocomplete/nested';
8584
import { DxiAutocompleteToolbarItemModule } from 'devextreme-angular/ui/autocomplete/nested';
86-
import {
87-
PROPERTY_TOKEN_buttons,
88-
PROPERTY_TOKEN_items,
89-
PROPERTY_TOKEN_toolbarItems,
90-
} from 'devextreme-angular/core/tokens';
85+
86+
import { DxiButtonComponent } from 'devextreme-angular/ui/nested';
87+
import { DxiItemComponent } from 'devextreme-angular/ui/nested';
88+
89+
import { DxiAutocompleteButtonComponent } from 'devextreme-angular/ui/autocomplete/nested';
90+
import { DxiAutocompleteItemComponent } from 'devextreme-angular/ui/autocomplete/nested';
9191

9292

9393

@@ -115,22 +115,6 @@ const CUSTOM_VALUE_ACCESSOR_PROVIDER = {
115115
]
116116
})
117117
export class DxAutocompleteComponent extends DxComponent implements OnDestroy, ControlValueAccessor, OnChanges, DoCheck {
118-
119-
@ContentChildren(PROPERTY_TOKEN_buttons)
120-
set _buttonsContentChildren(value: QueryList<CollectionNestedOption>) {
121-
this.setChildren('buttons', value);
122-
}
123-
124-
@ContentChildren(PROPERTY_TOKEN_items)
125-
set _itemsContentChildren(value: QueryList<CollectionNestedOption>) {
126-
this.setChildren('items', value);
127-
}
128-
129-
@ContentChildren(PROPERTY_TOKEN_toolbarItems)
130-
set _toolbarItemsContentChildren(value: QueryList<CollectionNestedOption>) {
131-
this.setChildren('toolbarItems', value);
132-
}
133-
134118
instance: DxAutocomplete = null;
135119

136120
/**
@@ -1377,6 +1361,42 @@ export class DxAutocompleteComponent extends DxComponent implements OnDestroy, C
13771361
@HostListener('onBlur', ['$event']) touched = (_) => {};
13781362

13791363

1364+
@ContentChildren(DxiAutocompleteButtonComponent)
1365+
get buttonsChildren(): QueryList<DxiAutocompleteButtonComponent> {
1366+
return this._getOption('buttons');
1367+
}
1368+
set buttonsChildren(value) {
1369+
this._setChildren('buttons', value, 'DxiAutocompleteButtonComponent');
1370+
}
1371+
1372+
@ContentChildren(DxiAutocompleteItemComponent)
1373+
get itemsChildren(): QueryList<DxiAutocompleteItemComponent> {
1374+
return this._getOption('items');
1375+
}
1376+
set itemsChildren(value) {
1377+
this._setChildren('items', value, 'DxiAutocompleteItemComponent');
1378+
}
1379+
1380+
1381+
@ContentChildren(DxiButtonComponent)
1382+
get buttonsLegacyChildren(): QueryList<DxiButtonComponent> {
1383+
return this._getOption('buttons');
1384+
}
1385+
set buttonsLegacyChildren(value) {
1386+
this._setChildren('buttons', value, 'DxiButtonComponent');
1387+
}
1388+
1389+
@ContentChildren(DxiItemComponent)
1390+
get itemsLegacyChildren(): QueryList<DxiItemComponent> {
1391+
return this._getOption('items');
1392+
}
1393+
set itemsLegacyChildren(value) {
1394+
this._setChildren('items', value, 'DxiItemComponent');
1395+
}
1396+
1397+
1398+
1399+
13801400
constructor(elementRef: ElementRef, ngZone: NgZone, templateHost: DxTemplateHost,
13811401
private _watcherHelper: WatcherHelper,
13821402
private _idh: IterableDifferHelper,

‎packages/devextreme-angular/src/ui/autocomplete/nested/button-dxi.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,14 @@ import {
2121
} from 'devextreme-angular/core';
2222
import { CollectionNestedOption } from 'devextreme-angular/core';
2323

24-
import { PROPERTY_TOKEN_buttons } from 'devextreme-angular/core/tokens';
2524

2625
@Component({
2726
selector: 'dxi-autocomplete-button',
2827
standalone: true,
2928
template: '',
3029
styles: [''],
3130
imports: [ DxIntegrationModule ],
32-
providers: [
33-
NestedOptionHost,
34-
{
35-
provide: PROPERTY_TOKEN_buttons,
36-
useExisting: DxiAutocompleteButtonComponent,
37-
}
38-
]
31+
providers: [NestedOptionHost]
3932
})
4033
export class DxiAutocompleteButtonComponent extends CollectionNestedOption {
4134
@Input()

‎packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
Output,
1313
EventEmitter,
1414
ContentChildren,
15+
forwardRef,
1516
QueryList
1617
} from '@angular/core';
1718

@@ -31,13 +32,10 @@ import { dxPopupToolbarItem } from 'devextreme/ui/popup';
3132
import {
3233
DxIntegrationModule,
3334
NestedOptionHost,
34-
CollectionNestedOption,
3535
} from 'devextreme-angular/core';
3636
import { NestedOption } from 'devextreme-angular/core';
37+
import { DxiAutocompleteToolbarItemComponent } from './toolbar-item-dxi';
3738

38-
import {
39-
PROPERTY_TOKEN_toolbarItems,
40-
} from 'devextreme-angular/core/tokens';
4139

4240
@Component({
4341
selector: 'dxo-autocomplete-drop-down-options',
@@ -48,11 +46,6 @@ import {
4846
providers: [NestedOptionHost]
4947
})
5048
export class DxoAutocompleteDropDownOptionsComponent extends NestedOption implements OnDestroy, OnInit {
51-
@ContentChildren(PROPERTY_TOKEN_toolbarItems)
52-
set _toolbarItemsContentChildren(value: QueryList<CollectionNestedOption>) {
53-
this.setChildren('toolbarItems', value);
54-
}
55-
5649
@Input()
5750
get accessKey(): string | undefined {
5851
return this._getOption('accessKey');
@@ -470,9 +463,18 @@ export class DxoAutocompleteDropDownOptionsComponent extends NestedOption implem
470463
}
471464

472465

466+
@ContentChildren(forwardRef(() => DxiAutocompleteToolbarItemComponent))
467+
get toolbarItemsChildren(): QueryList<DxiAutocompleteToolbarItemComponent> {
468+
return this._getOption('toolbarItems');
469+
}
470+
set toolbarItemsChildren(value) {
471+
this.setChildren('toolbarItems', value);
472+
}
473+
473474
constructor(@SkipSelf() @Host() parentOptionHost: NestedOptionHost,
474475
@Host() optionHost: NestedOptionHost) {
475476
super();
477+
476478
this._createEventEmitters([
477479
{ emit: 'heightChange' },
478480
{ emit: 'positionChange' },

‎packages/devextreme-angular/src/ui/autocomplete/nested/item-dxi.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,18 @@ import {
2323
extractTemplate,
2424
DxTemplateDirective,
2525
IDxTemplateHost,
26-
DxTemplateHost,
26+
DxTemplateHost
2727
} from 'devextreme-angular/core';
2828
import { CollectionNestedOption } from 'devextreme-angular/core';
2929

30-
import { PROPERTY_TOKEN_items } from 'devextreme-angular/core/tokens';
3130

3231
@Component({
3332
selector: 'dxi-autocomplete-item',
3433
standalone: true,
3534
template: '<ng-content></ng-content>',
3635
styles: [':host { display: block; }'],
3736
imports: [ DxIntegrationModule ],
38-
providers: [
39-
NestedOptionHost,
40-
DxTemplateHost,
41-
{
42-
provide: PROPERTY_TOKEN_items,
43-
useExisting: DxiAutocompleteItemComponent,
44-
}
45-
]
37+
providers: [NestedOptionHost, DxTemplateHost]
4638
})
4739
export class DxiAutocompleteItemComponent extends CollectionNestedOption implements AfterViewInit,
4840
IDxTemplateHost {

‎packages/devextreme-angular/src/ui/autocomplete/nested/options.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
extractTemplate,
2828
DxTemplateDirective,
2929
IDxTemplateHost,
30-
DxTemplateHost,
30+
DxTemplateHost
3131
} from 'devextreme-angular/core';
3232
import { NestedOption } from 'devextreme-angular/core';
3333

0 commit comments

Comments
 (0)