diff --git a/packages/devextreme-angular/src/index.ts b/packages/devextreme-angular/src/index.ts index 2319f8a9b38d..7bc3213a996b 100644 --- a/packages/devextreme-angular/src/index.ts +++ b/packages/devextreme-angular/src/index.ts @@ -84,4 +84,4 @@ export { DxValidationGroupComponent, DxValidationGroupModule } from 'devextreme- export { DxValidationSummaryComponent, DxValidationSummaryModule } from 'devextreme-angular/ui/validation-summary'; export { DxValidatorComponent, DxValidatorModule } from 'devextreme-angular/ui/validator'; export { DxVectorMapComponent, DxVectorMapModule } from 'devextreme-angular/ui/vector-map'; -export * as Common from './common/index'; +export * as Common from './common'; diff --git a/packages/devextreme-angular/src/ui/accordion/index.ts b/packages/devextreme-angular/src/ui/accordion/index.ts index 6dc92455660b..b0b4dec1467f 100644 --- a/packages/devextreme-angular/src/ui/accordion/index.ts +++ b/packages/devextreme-angular/src/ui/accordion/index.ts @@ -714,8 +714,10 @@ export class DxAccordionComponent extends DxComponent i return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiAccordionItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiAccordionItemComponent')) { + this.setContentChildren('items', value, 'DxiAccordionItemComponent'); + this.setChildren('items', value); + } } @@ -725,7 +727,8 @@ export class DxAccordionComponent extends DxComponent i } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/action-sheet/index.ts b/packages/devextreme-angular/src/ui/action-sheet/index.ts index b8124896b9f4..607a13d6d811 100644 --- a/packages/devextreme-angular/src/ui/action-sheet/index.ts +++ b/packages/devextreme-angular/src/ui/action-sheet/index.ts @@ -506,8 +506,10 @@ export class DxActionSheetComponent extends DxComponent return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiActionSheetItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiActionSheetItemComponent')) { + this.setContentChildren('items', value, 'DxiActionSheetItemComponent'); + this.setChildren('items', value); + } } @@ -517,7 +519,8 @@ export class DxActionSheetComponent extends DxComponent } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/autocomplete/index.ts b/packages/devextreme-angular/src/ui/autocomplete/index.ts index 31fee36f04bc..70eda9dbd43a 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/index.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/index.ts @@ -1363,8 +1363,10 @@ export class DxAutocompleteComponent extends DxComponent implements OnDestroy, C return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiAutocompleteButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiAutocompleteButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiAutocompleteButtonComponent'); + this.setChildren('buttons', value); + } } @ContentChildren(DxiAutocompleteItemComponent) @@ -1372,8 +1374,10 @@ export class DxAutocompleteComponent extends DxComponent implements OnDestroy, C return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiAutocompleteItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiAutocompleteItemComponent')) { + this.setContentChildren('items', value, 'DxiAutocompleteItemComponent'); + this.setChildren('items', value); + } } @@ -1383,7 +1387,8 @@ export class DxAutocompleteComponent extends DxComponent implements OnDestroy, C } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } @@ -1393,7 +1398,8 @@ export class DxAutocompleteComponent extends DxComponent implements OnDestroy, C } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/box/index.ts b/packages/devextreme-angular/src/ui/box/index.ts index 0530be2ea9ec..a61577b1c4aa 100644 --- a/packages/devextreme-angular/src/ui/box/index.ts +++ b/packages/devextreme-angular/src/ui/box/index.ts @@ -419,8 +419,10 @@ export class DxBoxComponent extends DxComponent impleme return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiBoxItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiBoxItemComponent')) { + this.setContentChildren('items', value, 'DxiBoxItemComponent'); + this.setChildren('items', value); + } } @@ -430,7 +432,8 @@ export class DxBoxComponent extends DxComponent impleme } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/button-group/index.ts b/packages/devextreme-angular/src/ui/button-group/index.ts index dfc7d66e0db9..767c13c2c1bd 100644 --- a/packages/devextreme-angular/src/ui/button-group/index.ts +++ b/packages/devextreme-angular/src/ui/button-group/index.ts @@ -499,8 +499,10 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiButtonGroupItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiButtonGroupItemComponent')) { + this.setContentChildren('items', value, 'DxiButtonGroupItemComponent'); + this.setChildren('items', value); + } } @@ -510,7 +512,8 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/chart/index.ts b/packages/devextreme-angular/src/ui/chart/index.ts index 6d526b4650a0..0158577824c0 100644 --- a/packages/devextreme-angular/src/ui/chart/index.ts +++ b/packages/devextreme-angular/src/ui/chart/index.ts @@ -1447,8 +1447,10 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange return this._getOption('annotations'); } set annotationsChildren(value) { - this.setContentChildren('annotations', value, 'DxiChartAnnotationComponent'); - this.setChildren('annotations', value); + if (this.checkContentChildren('annotations', value, 'DxiChartAnnotationComponent')) { + this.setContentChildren('annotations', value, 'DxiChartAnnotationComponent'); + this.setChildren('annotations', value); + } } @ContentChildren(DxiChartPaneComponent) @@ -1456,8 +1458,10 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange return this._getOption('panes'); } set panesChildren(value) { - this.setContentChildren('panes', value, 'DxiChartPaneComponent'); - this.setChildren('panes', value); + if (this.checkContentChildren('panes', value, 'DxiChartPaneComponent')) { + this.setContentChildren('panes', value, 'DxiChartPaneComponent'); + this.setChildren('panes', value); + } } @ContentChildren(DxiChartSeriesComponent) @@ -1465,8 +1469,10 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange return this._getOption('series'); } set seriesChildren(value) { - this.setContentChildren('series', value, 'DxiChartSeriesComponent'); - this.setChildren('series', value); + if (this.checkContentChildren('series', value, 'DxiChartSeriesComponent')) { + this.setContentChildren('series', value, 'DxiChartSeriesComponent'); + this.setChildren('series', value); + } } @ContentChildren(DxiChartValueAxisComponent) @@ -1474,8 +1480,10 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange return this._getOption('valueAxis'); } set valueAxesChildren(value) { - this.setContentChildren('valueAxis', value, 'DxiChartValueAxisComponent'); - this.setChildren('valueAxis', value); + if (this.checkContentChildren('valueAxis', value, 'DxiChartValueAxisComponent')) { + this.setContentChildren('valueAxis', value, 'DxiChartValueAxisComponent'); + this.setChildren('valueAxis', value); + } } @@ -1485,7 +1493,8 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange } set annotationsLegacyChildren(value) { if (this.checkContentChildren('annotations', value, 'DxiAnnotationComponent')) { - this.setChildren('annotations', value); + this.setContentChildren('annotations', value, 'DxiAnnotationComponent'); + this.setChildren('annotations', value); } } @@ -1495,7 +1504,8 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange } set panesLegacyChildren(value) { if (this.checkContentChildren('panes', value, 'DxiPaneComponent')) { - this.setChildren('panes', value); + this.setContentChildren('panes', value, 'DxiPaneComponent'); + this.setChildren('panes', value); } } @@ -1505,7 +1515,8 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange } set seriesLegacyChildren(value) { if (this.checkContentChildren('series', value, 'DxiSeriesComponent')) { - this.setChildren('series', value); + this.setContentChildren('series', value, 'DxiSeriesComponent'); + this.setChildren('series', value); } } @@ -1515,7 +1526,8 @@ export class DxChartComponent extends DxComponent implements OnDestroy, OnChange } set valueAxisLegacyChildren(value) { if (this.checkContentChildren('valueAxis', value, 'DxiValueAxisComponent')) { - this.setChildren('valueAxis', value); + this.setContentChildren('valueAxis', value, 'DxiValueAxisComponent'); + this.setChildren('valueAxis', value); } } diff --git a/packages/devextreme-angular/src/ui/chat/index.ts b/packages/devextreme-angular/src/ui/chat/index.ts index 00d47f0e5160..1ab0dd01639d 100644 --- a/packages/devextreme-angular/src/ui/chat/index.ts +++ b/packages/devextreme-angular/src/ui/chat/index.ts @@ -618,8 +618,10 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('alerts'); } set alertsChildren(value) { - this.setContentChildren('alerts', value, 'DxiChatAlertComponent'); - this.setChildren('alerts', value); + if (this.checkContentChildren('alerts', value, 'DxiChatAlertComponent')) { + this.setContentChildren('alerts', value, 'DxiChatAlertComponent'); + this.setChildren('alerts', value); + } } @ContentChildren(DxiChatItemComponent) @@ -627,8 +629,10 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiChatItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiChatItemComponent')) { + this.setContentChildren('items', value, 'DxiChatItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiChatTypingUserComponent) @@ -636,8 +640,10 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('typingUsers'); } set typingUsersChildren(value) { - this.setContentChildren('typingUsers', value, 'DxiChatTypingUserComponent'); - this.setChildren('typingUsers', value); + if (this.checkContentChildren('typingUsers', value, 'DxiChatTypingUserComponent')) { + this.setContentChildren('typingUsers', value, 'DxiChatTypingUserComponent'); + this.setChildren('typingUsers', value); + } } @@ -647,7 +653,8 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges } set alertsLegacyChildren(value) { if (this.checkContentChildren('alerts', value, 'DxiAlertComponent')) { - this.setChildren('alerts', value); + this.setContentChildren('alerts', value, 'DxiAlertComponent'); + this.setChildren('alerts', value); } } @@ -657,7 +664,8 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } @@ -667,7 +675,8 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges } set typingUsersLegacyChildren(value) { if (this.checkContentChildren('typingUsers', value, 'DxiTypingUserComponent')) { - this.setChildren('typingUsers', value); + this.setContentChildren('typingUsers', value, 'DxiTypingUserComponent'); + this.setChildren('typingUsers', value); } } diff --git a/packages/devextreme-angular/src/ui/color-box/index.ts b/packages/devextreme-angular/src/ui/color-box/index.ts index ff58398230a3..31e5cd985cbf 100644 --- a/packages/devextreme-angular/src/ui/color-box/index.ts +++ b/packages/devextreme-angular/src/ui/color-box/index.ts @@ -1111,8 +1111,10 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiColorBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiColorBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiColorBoxButtonComponent'); + this.setChildren('buttons', value); + } } @@ -1122,7 +1124,8 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } diff --git a/packages/devextreme-angular/src/ui/context-menu/index.ts b/packages/devextreme-angular/src/ui/context-menu/index.ts index e5e900a726ff..1829dfa9ee80 100644 --- a/packages/devextreme-angular/src/ui/context-menu/index.ts +++ b/packages/devextreme-angular/src/ui/context-menu/index.ts @@ -831,8 +831,10 @@ export class DxContextMenuComponent extends DxComponent implements O return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiContextMenuItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiContextMenuItemComponent')) { + this.setContentChildren('items', value, 'DxiContextMenuItemComponent'); + this.setChildren('items', value); + } } @@ -842,7 +844,8 @@ export class DxContextMenuComponent extends DxComponent implements O } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/data-grid/index.ts b/packages/devextreme-angular/src/ui/data-grid/index.ts index 6d60f8d17b7b..26a8d3a8215a 100644 --- a/packages/devextreme-angular/src/ui/data-grid/index.ts +++ b/packages/devextreme-angular/src/ui/data-grid/index.ts @@ -2066,8 +2066,10 @@ export class DxDataGridComponent extends DxComponent return this._getOption('columns'); } set columnsChildren(value) { - this.setContentChildren('columns', value, 'DxiDataGridColumnComponent'); - this.setChildren('columns', value); + if (this.checkContentChildren('columns', value, 'DxiDataGridColumnComponent')) { + this.setContentChildren('columns', value, 'DxiDataGridColumnComponent'); + this.setChildren('columns', value); + } } @ContentChildren(DxiDataGridSortByGroupSummaryInfoComponent) @@ -2075,8 +2077,10 @@ export class DxDataGridComponent extends DxComponent return this._getOption('sortByGroupSummaryInfo'); } set sortByGroupSummaryInfosChildren(value) { - this.setContentChildren('sortByGroupSummaryInfo', value, 'DxiDataGridSortByGroupSummaryInfoComponent'); - this.setChildren('sortByGroupSummaryInfo', value); + if (this.checkContentChildren('sortByGroupSummaryInfo', value, 'DxiDataGridSortByGroupSummaryInfoComponent')) { + this.setContentChildren('sortByGroupSummaryInfo', value, 'DxiDataGridSortByGroupSummaryInfoComponent'); + this.setChildren('sortByGroupSummaryInfo', value); + } } @@ -2086,7 +2090,8 @@ export class DxDataGridComponent extends DxComponent } set columnsLegacyChildren(value) { if (this.checkContentChildren('columns', value, 'DxiColumnComponent')) { - this.setChildren('columns', value); + this.setContentChildren('columns', value, 'DxiColumnComponent'); + this.setChildren('columns', value); } } @@ -2096,7 +2101,8 @@ export class DxDataGridComponent extends DxComponent } set sortByGroupSummaryInfoLegacyChildren(value) { if (this.checkContentChildren('sortByGroupSummaryInfo', value, 'DxiSortByGroupSummaryInfoComponent')) { - this.setChildren('sortByGroupSummaryInfo', value); + this.setContentChildren('sortByGroupSummaryInfo', value, 'DxiSortByGroupSummaryInfoComponent'); + this.setChildren('sortByGroupSummaryInfo', value); } } diff --git a/packages/devextreme-angular/src/ui/date-box/index.ts b/packages/devextreme-angular/src/ui/date-box/index.ts index 7c5d2ee31505..b67d216c75c1 100644 --- a/packages/devextreme-angular/src/ui/date-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-box/index.ts @@ -1426,8 +1426,10 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiDateBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiDateBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiDateBoxButtonComponent'); + this.setChildren('buttons', value); + } } @@ -1437,7 +1439,8 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } diff --git a/packages/devextreme-angular/src/ui/date-range-box/index.ts b/packages/devextreme-angular/src/ui/date-range-box/index.ts index a457b2e7525b..2081ecd58f83 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/index.ts @@ -1505,8 +1505,10 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiDateRangeBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiDateRangeBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiDateRangeBoxButtonComponent'); + this.setChildren('buttons', value); + } } @@ -1516,7 +1518,8 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } diff --git a/packages/devextreme-angular/src/ui/diagram/index.ts b/packages/devextreme-angular/src/ui/diagram/index.ts index be4fec2036ed..b740b0ad04b0 100644 --- a/packages/devextreme-angular/src/ui/diagram/index.ts +++ b/packages/devextreme-angular/src/ui/diagram/index.ts @@ -920,8 +920,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan return this._getOption('customShapes'); } set customShapesChildren(value) { - this.setContentChildren('customShapes', value, 'DxiDiagramCustomShapeComponent'); - this.setChildren('customShapes', value); + if (this.checkContentChildren('customShapes', value, 'DxiDiagramCustomShapeComponent')) { + this.setContentChildren('customShapes', value, 'DxiDiagramCustomShapeComponent'); + this.setChildren('customShapes', value); + } } @@ -931,7 +933,8 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan } set customShapesLegacyChildren(value) { if (this.checkContentChildren('customShapes', value, 'DxiCustomShapeComponent')) { - this.setChildren('customShapes', value); + this.setContentChildren('customShapes', value, 'DxiCustomShapeComponent'); + this.setChildren('customShapes', value); } } diff --git a/packages/devextreme-angular/src/ui/drop-down-box/index.ts b/packages/devextreme-angular/src/ui/drop-down-box/index.ts index e7b8e5162ff4..e978cb48e366 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/index.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/index.ts @@ -1176,8 +1176,10 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiDropDownBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiDropDownBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiDropDownBoxButtonComponent'); + this.setChildren('buttons', value); + } } @@ -1187,7 +1189,8 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } @@ -1197,7 +1200,8 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/drop-down-button/index.ts b/packages/devextreme-angular/src/ui/drop-down-button/index.ts index 38dca07540d6..a8be5442f7b4 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/index.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/index.ts @@ -836,8 +836,10 @@ export class DxDropDownButtonComponent extends DxComponent implements OnDestroy, return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiDropDownButtonItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiDropDownButtonItemComponent')) { + this.setContentChildren('items', value, 'DxiDropDownButtonItemComponent'); + this.setChildren('items', value); + } } @@ -847,7 +849,8 @@ export class DxDropDownButtonComponent extends DxComponent implements OnDestroy, } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/filter-builder/index.ts b/packages/devextreme-angular/src/ui/filter-builder/index.ts index e841274bae15..b8ddfff809a2 100644 --- a/packages/devextreme-angular/src/ui/filter-builder/index.ts +++ b/packages/devextreme-angular/src/ui/filter-builder/index.ts @@ -561,8 +561,10 @@ export class DxFilterBuilderComponent extends DxComponent implements OnDestroy, return this._getOption('customOperations'); } set customOperationsChildren(value) { - this.setContentChildren('customOperations', value, 'DxiFilterBuilderCustomOperationComponent'); - this.setChildren('customOperations', value); + if (this.checkContentChildren('customOperations', value, 'DxiFilterBuilderCustomOperationComponent')) { + this.setContentChildren('customOperations', value, 'DxiFilterBuilderCustomOperationComponent'); + this.setChildren('customOperations', value); + } } @ContentChildren(DxiFilterBuilderFieldComponent) @@ -570,8 +572,10 @@ export class DxFilterBuilderComponent extends DxComponent implements OnDestroy, return this._getOption('fields'); } set fieldsChildren(value) { - this.setContentChildren('fields', value, 'DxiFilterBuilderFieldComponent'); - this.setChildren('fields', value); + if (this.checkContentChildren('fields', value, 'DxiFilterBuilderFieldComponent')) { + this.setContentChildren('fields', value, 'DxiFilterBuilderFieldComponent'); + this.setChildren('fields', value); + } } @@ -581,7 +585,8 @@ export class DxFilterBuilderComponent extends DxComponent implements OnDestroy, } set customOperationsLegacyChildren(value) { if (this.checkContentChildren('customOperations', value, 'DxiCustomOperationComponent')) { - this.setChildren('customOperations', value); + this.setContentChildren('customOperations', value, 'DxiCustomOperationComponent'); + this.setChildren('customOperations', value); } } @@ -591,7 +596,8 @@ export class DxFilterBuilderComponent extends DxComponent implements OnDestroy, } set fieldsLegacyChildren(value) { if (this.checkContentChildren('fields', value, 'DxiFieldComponent')) { - this.setChildren('fields', value); + this.setContentChildren('fields', value, 'DxiFieldComponent'); + this.setChildren('fields', value); } } diff --git a/packages/devextreme-angular/src/ui/form/index.ts b/packages/devextreme-angular/src/ui/form/index.ts index 505cdf3b5e6f..c5d5f012dcbb 100644 --- a/packages/devextreme-angular/src/ui/form/index.ts +++ b/packages/devextreme-angular/src/ui/form/index.ts @@ -831,8 +831,10 @@ export class DxFormComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('items'); } set buttonItemsChildren(value) { - this.setContentChildren('items', value, 'DxiFormButtonItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiFormButtonItemComponent')) { + this.setContentChildren('items', value, 'DxiFormButtonItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiFormEmptyItemComponent) @@ -840,8 +842,10 @@ export class DxFormComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('items'); } set emptyItemsChildren(value) { - this.setContentChildren('items', value, 'DxiFormEmptyItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiFormEmptyItemComponent')) { + this.setContentChildren('items', value, 'DxiFormEmptyItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiFormGroupItemComponent) @@ -849,8 +853,10 @@ export class DxFormComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('items'); } set groupItemsChildren(value) { - this.setContentChildren('items', value, 'DxiFormGroupItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiFormGroupItemComponent')) { + this.setContentChildren('items', value, 'DxiFormGroupItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiFormItemComponent) @@ -858,8 +864,10 @@ export class DxFormComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiFormItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiFormItemComponent')) { + this.setContentChildren('items', value, 'DxiFormItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiFormSimpleItemComponent) @@ -867,8 +875,10 @@ export class DxFormComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('items'); } set simpleItemsChildren(value) { - this.setContentChildren('items', value, 'DxiFormSimpleItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiFormSimpleItemComponent')) { + this.setContentChildren('items', value, 'DxiFormSimpleItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiFormTabbedItemComponent) @@ -876,8 +886,10 @@ export class DxFormComponent extends DxComponent implements OnDestroy, OnChanges return this._getOption('items'); } set tabbedItemsChildren(value) { - this.setContentChildren('items', value, 'DxiFormTabbedItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiFormTabbedItemComponent')) { + this.setContentChildren('items', value, 'DxiFormTabbedItemComponent'); + this.setChildren('items', value); + } } @@ -887,7 +899,8 @@ export class DxFormComponent extends DxComponent implements OnDestroy, OnChanges } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/gallery/index.ts b/packages/devextreme-angular/src/ui/gallery/index.ts index 93a21ebd9d68..694af158ef14 100644 --- a/packages/devextreme-angular/src/ui/gallery/index.ts +++ b/packages/devextreme-angular/src/ui/gallery/index.ts @@ -726,8 +726,10 @@ export class DxGalleryComponent extends DxComponent imp return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiGalleryItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiGalleryItemComponent')) { + this.setContentChildren('items', value, 'DxiGalleryItemComponent'); + this.setChildren('items', value); + } } @@ -737,7 +739,8 @@ export class DxGalleryComponent extends DxComponent imp } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/gantt/index.ts b/packages/devextreme-angular/src/ui/gantt/index.ts index ae2633e6fd0f..8d77b8139ff7 100644 --- a/packages/devextreme-angular/src/ui/gantt/index.ts +++ b/packages/devextreme-angular/src/ui/gantt/index.ts @@ -1186,8 +1186,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange return this._getOption('columns'); } set columnsChildren(value) { - this.setContentChildren('columns', value, 'DxiGanttColumnComponent'); - this.setChildren('columns', value); + if (this.checkContentChildren('columns', value, 'DxiGanttColumnComponent')) { + this.setContentChildren('columns', value, 'DxiGanttColumnComponent'); + this.setChildren('columns', value); + } } @ContentChildren(DxiGanttStripLineComponent) @@ -1195,8 +1197,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange return this._getOption('stripLines'); } set stripLinesChildren(value) { - this.setContentChildren('stripLines', value, 'DxiGanttStripLineComponent'); - this.setChildren('stripLines', value); + if (this.checkContentChildren('stripLines', value, 'DxiGanttStripLineComponent')) { + this.setContentChildren('stripLines', value, 'DxiGanttStripLineComponent'); + this.setChildren('stripLines', value); + } } @@ -1206,7 +1210,8 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange } set columnsLegacyChildren(value) { if (this.checkContentChildren('columns', value, 'DxiColumnComponent')) { - this.setChildren('columns', value); + this.setContentChildren('columns', value, 'DxiColumnComponent'); + this.setChildren('columns', value); } } @@ -1216,7 +1221,8 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange } set stripLinesLegacyChildren(value) { if (this.checkContentChildren('stripLines', value, 'DxiStripLineComponent')) { - this.setChildren('stripLines', value); + this.setContentChildren('stripLines', value, 'DxiStripLineComponent'); + this.setChildren('stripLines', value); } } diff --git a/packages/devextreme-angular/src/ui/html-editor/index.ts b/packages/devextreme-angular/src/ui/html-editor/index.ts index 90c0ec1c2e94..3f39e15b307d 100644 --- a/packages/devextreme-angular/src/ui/html-editor/index.ts +++ b/packages/devextreme-angular/src/ui/html-editor/index.ts @@ -852,8 +852,10 @@ export class DxHtmlEditorComponent extends DxComponent implements OnDestroy, Con return this._getOption('mentions'); } set mentionsChildren(value) { - this.setContentChildren('mentions', value, 'DxiHtmlEditorMentionComponent'); - this.setChildren('mentions', value); + if (this.checkContentChildren('mentions', value, 'DxiHtmlEditorMentionComponent')) { + this.setContentChildren('mentions', value, 'DxiHtmlEditorMentionComponent'); + this.setChildren('mentions', value); + } } @@ -863,7 +865,8 @@ export class DxHtmlEditorComponent extends DxComponent implements OnDestroy, Con } set mentionsLegacyChildren(value) { if (this.checkContentChildren('mentions', value, 'DxiMentionComponent')) { - this.setChildren('mentions', value); + this.setContentChildren('mentions', value, 'DxiMentionComponent'); + this.setChildren('mentions', value); } } diff --git a/packages/devextreme-angular/src/ui/list/index.ts b/packages/devextreme-angular/src/ui/list/index.ts index e33195b6ceb5..a0408e8923ce 100644 --- a/packages/devextreme-angular/src/ui/list/index.ts +++ b/packages/devextreme-angular/src/ui/list/index.ts @@ -1343,8 +1343,10 @@ export class DxListComponent extends DxComponent implem return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiListItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiListItemComponent')) { + this.setContentChildren('items', value, 'DxiListItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiListMenuItemComponent) @@ -1352,8 +1354,10 @@ export class DxListComponent extends DxComponent implem return this._getOption('menuItems'); } set menuItemsChildren(value) { - this.setContentChildren('menuItems', value, 'DxiListMenuItemComponent'); - this.setChildren('menuItems', value); + if (this.checkContentChildren('menuItems', value, 'DxiListMenuItemComponent')) { + this.setContentChildren('menuItems', value, 'DxiListMenuItemComponent'); + this.setChildren('menuItems', value); + } } @@ -1363,7 +1367,8 @@ export class DxListComponent extends DxComponent implem } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } @@ -1373,7 +1378,8 @@ export class DxListComponent extends DxComponent implem } set menuItemsLegacyChildren(value) { if (this.checkContentChildren('menuItems', value, 'DxiMenuItemComponent')) { - this.setChildren('menuItems', value); + this.setContentChildren('menuItems', value, 'DxiMenuItemComponent'); + this.setChildren('menuItems', value); } } diff --git a/packages/devextreme-angular/src/ui/lookup/index.ts b/packages/devextreme-angular/src/ui/lookup/index.ts index 38b4de5b29ab..bfe0b1b897ec 100644 --- a/packages/devextreme-angular/src/ui/lookup/index.ts +++ b/packages/devextreme-angular/src/ui/lookup/index.ts @@ -1628,8 +1628,10 @@ export class DxLookupComponent extends DxComponent implements OnDestroy, Control return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiLookupItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiLookupItemComponent')) { + this.setContentChildren('items', value, 'DxiLookupItemComponent'); + this.setChildren('items', value); + } } @@ -1639,7 +1641,8 @@ export class DxLookupComponent extends DxComponent implements OnDestroy, Control } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/map/index.ts b/packages/devextreme-angular/src/ui/map/index.ts index 904488efc7ca..92ec8302484a 100644 --- a/packages/devextreme-angular/src/ui/map/index.ts +++ b/packages/devextreme-angular/src/ui/map/index.ts @@ -618,8 +618,10 @@ export class DxMapComponent extends DxComponent implements OnDestroy, OnChanges, return this._getOption('markers'); } set markersChildren(value) { - this.setContentChildren('markers', value, 'DxiMapMarkerComponent'); - this.setChildren('markers', value); + if (this.checkContentChildren('markers', value, 'DxiMapMarkerComponent')) { + this.setContentChildren('markers', value, 'DxiMapMarkerComponent'); + this.setChildren('markers', value); + } } @ContentChildren(DxiMapRouteComponent) @@ -627,8 +629,10 @@ export class DxMapComponent extends DxComponent implements OnDestroy, OnChanges, return this._getOption('routes'); } set routesChildren(value) { - this.setContentChildren('routes', value, 'DxiMapRouteComponent'); - this.setChildren('routes', value); + if (this.checkContentChildren('routes', value, 'DxiMapRouteComponent')) { + this.setContentChildren('routes', value, 'DxiMapRouteComponent'); + this.setChildren('routes', value); + } } @@ -638,7 +642,8 @@ export class DxMapComponent extends DxComponent implements OnDestroy, OnChanges, } set centerLegacyChildren(value) { if (this.checkContentChildren('center', value, 'DxiCenterComponent')) { - this.setChildren('center', value); + this.setContentChildren('center', value, 'DxiCenterComponent'); + this.setChildren('center', value); } } @@ -648,7 +653,8 @@ export class DxMapComponent extends DxComponent implements OnDestroy, OnChanges, } set markersLegacyChildren(value) { if (this.checkContentChildren('markers', value, 'DxiMarkerComponent')) { - this.setChildren('markers', value); + this.setContentChildren('markers', value, 'DxiMarkerComponent'); + this.setChildren('markers', value); } } @@ -658,7 +664,8 @@ export class DxMapComponent extends DxComponent implements OnDestroy, OnChanges, } set routesLegacyChildren(value) { if (this.checkContentChildren('routes', value, 'DxiRouteComponent')) { - this.setChildren('routes', value); + this.setContentChildren('routes', value, 'DxiRouteComponent'); + this.setChildren('routes', value); } } diff --git a/packages/devextreme-angular/src/ui/menu/index.ts b/packages/devextreme-angular/src/ui/menu/index.ts index cd91855cf623..21c2af7ab62b 100644 --- a/packages/devextreme-angular/src/ui/menu/index.ts +++ b/packages/devextreme-angular/src/ui/menu/index.ts @@ -800,8 +800,10 @@ export class DxMenuComponent extends DxComponent implements OnDestro return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiMenuItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiMenuItemComponent')) { + this.setContentChildren('items', value, 'DxiMenuItemComponent'); + this.setChildren('items', value); + } } @@ -811,7 +813,8 @@ export class DxMenuComponent extends DxComponent implements OnDestro } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/multi-view/index.ts b/packages/devextreme-angular/src/ui/multi-view/index.ts index b586263e14b2..c62bed710cd0 100644 --- a/packages/devextreme-angular/src/ui/multi-view/index.ts +++ b/packages/devextreme-angular/src/ui/multi-view/index.ts @@ -606,8 +606,10 @@ export class DxMultiViewComponent extends DxComponent i return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiMultiViewItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiMultiViewItemComponent')) { + this.setContentChildren('items', value, 'DxiMultiViewItemComponent'); + this.setChildren('items', value); + } } @@ -617,7 +619,8 @@ export class DxMultiViewComponent extends DxComponent i } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/number-box/index.ts b/packages/devextreme-angular/src/ui/number-box/index.ts index da92d1b40943..f97e5d2519df 100644 --- a/packages/devextreme-angular/src/ui/number-box/index.ts +++ b/packages/devextreme-angular/src/ui/number-box/index.ts @@ -999,8 +999,10 @@ export class DxNumberBoxComponent extends DxComponent implements OnDestroy, Cont return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiNumberBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiNumberBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiNumberBoxButtonComponent'); + this.setChildren('buttons', value); + } } @@ -1010,7 +1012,8 @@ export class DxNumberBoxComponent extends DxComponent implements OnDestroy, Cont } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } diff --git a/packages/devextreme-angular/src/ui/pie-chart/index.ts b/packages/devextreme-angular/src/ui/pie-chart/index.ts index 204333de521e..2837e6a11486 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/index.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/index.ts @@ -980,8 +980,10 @@ export class DxPieChartComponent extends DxComponent implements OnDestroy, OnCha return this._getOption('annotations'); } set annotationsChildren(value) { - this.setContentChildren('annotations', value, 'DxiPieChartAnnotationComponent'); - this.setChildren('annotations', value); + if (this.checkContentChildren('annotations', value, 'DxiPieChartAnnotationComponent')) { + this.setContentChildren('annotations', value, 'DxiPieChartAnnotationComponent'); + this.setChildren('annotations', value); + } } @ContentChildren(DxiPieChartSeriesComponent) @@ -989,8 +991,10 @@ export class DxPieChartComponent extends DxComponent implements OnDestroy, OnCha return this._getOption('series'); } set seriesChildren(value) { - this.setContentChildren('series', value, 'DxiPieChartSeriesComponent'); - this.setChildren('series', value); + if (this.checkContentChildren('series', value, 'DxiPieChartSeriesComponent')) { + this.setContentChildren('series', value, 'DxiPieChartSeriesComponent'); + this.setChildren('series', value); + } } @@ -1000,7 +1004,8 @@ export class DxPieChartComponent extends DxComponent implements OnDestroy, OnCha } set annotationsLegacyChildren(value) { if (this.checkContentChildren('annotations', value, 'DxiAnnotationComponent')) { - this.setChildren('annotations', value); + this.setContentChildren('annotations', value, 'DxiAnnotationComponent'); + this.setChildren('annotations', value); } } @@ -1010,7 +1015,8 @@ export class DxPieChartComponent extends DxComponent implements OnDestroy, OnCha } set seriesLegacyChildren(value) { if (this.checkContentChildren('series', value, 'DxiSeriesComponent')) { - this.setChildren('series', value); + this.setContentChildren('series', value, 'DxiSeriesComponent'); + this.setChildren('series', value); } } diff --git a/packages/devextreme-angular/src/ui/polar-chart/index.ts b/packages/devextreme-angular/src/ui/polar-chart/index.ts index 4882b6ca7db3..07fc21aba420 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/index.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/index.ts @@ -1125,8 +1125,10 @@ export class DxPolarChartComponent extends DxComponent implements OnDestroy, OnC return this._getOption('annotations'); } set annotationsChildren(value) { - this.setContentChildren('annotations', value, 'DxiPolarChartAnnotationComponent'); - this.setChildren('annotations', value); + if (this.checkContentChildren('annotations', value, 'DxiPolarChartAnnotationComponent')) { + this.setContentChildren('annotations', value, 'DxiPolarChartAnnotationComponent'); + this.setChildren('annotations', value); + } } @ContentChildren(DxiPolarChartSeriesComponent) @@ -1134,8 +1136,10 @@ export class DxPolarChartComponent extends DxComponent implements OnDestroy, OnC return this._getOption('series'); } set seriesChildren(value) { - this.setContentChildren('series', value, 'DxiPolarChartSeriesComponent'); - this.setChildren('series', value); + if (this.checkContentChildren('series', value, 'DxiPolarChartSeriesComponent')) { + this.setContentChildren('series', value, 'DxiPolarChartSeriesComponent'); + this.setChildren('series', value); + } } @@ -1145,7 +1149,8 @@ export class DxPolarChartComponent extends DxComponent implements OnDestroy, OnC } set annotationsLegacyChildren(value) { if (this.checkContentChildren('annotations', value, 'DxiAnnotationComponent')) { - this.setChildren('annotations', value); + this.setContentChildren('annotations', value, 'DxiAnnotationComponent'); + this.setChildren('annotations', value); } } @@ -1155,7 +1160,8 @@ export class DxPolarChartComponent extends DxComponent implements OnDestroy, OnC } set seriesLegacyChildren(value) { if (this.checkContentChildren('series', value, 'DxiSeriesComponent')) { - this.setChildren('series', value); + this.setContentChildren('series', value, 'DxiSeriesComponent'); + this.setChildren('series', value); } } diff --git a/packages/devextreme-angular/src/ui/popover/index.ts b/packages/devextreme-angular/src/ui/popover/index.ts index ecc68f7f6d96..0c25d6780ae8 100644 --- a/packages/devextreme-angular/src/ui/popover/index.ts +++ b/packages/devextreme-angular/src/ui/popover/index.ts @@ -792,8 +792,10 @@ export class DxPopoverComponent extends DxComponent implements OnDestroy, OnChan return this._getOption('toolbarItems'); } set toolbarItemsChildren(value) { - this.setContentChildren('toolbarItems', value, 'DxiPopoverToolbarItemComponent'); - this.setChildren('toolbarItems', value); + if (this.checkContentChildren('toolbarItems', value, 'DxiPopoverToolbarItemComponent')) { + this.setContentChildren('toolbarItems', value, 'DxiPopoverToolbarItemComponent'); + this.setChildren('toolbarItems', value); + } } diff --git a/packages/devextreme-angular/src/ui/popup/component.ts b/packages/devextreme-angular/src/ui/popup/component.ts index 5605258d13af..4240e231e7d0 100644 --- a/packages/devextreme-angular/src/ui/popup/component.ts +++ b/packages/devextreme-angular/src/ui/popup/component.ts @@ -932,8 +932,10 @@ export class DxPopupComponent extends DxComponent implements OnDestroy, OnChange return this._getOption('toolbarItems'); } set toolbarItemsChildren(value) { - this.setContentChildren('toolbarItems', value, 'DxiPopupToolbarItemComponent'); - this.setChildren('toolbarItems', value); + if (this.checkContentChildren('toolbarItems', value, 'DxiPopupToolbarItemComponent')) { + this.setContentChildren('toolbarItems', value, 'DxiPopupToolbarItemComponent'); + this.setChildren('toolbarItems', value); + } } diff --git a/packages/devextreme-angular/src/ui/radio-group/index.ts b/packages/devextreme-angular/src/ui/radio-group/index.ts index d427bc25e307..074983b4b8f8 100644 --- a/packages/devextreme-angular/src/ui/radio-group/index.ts +++ b/packages/devextreme-angular/src/ui/radio-group/index.ts @@ -698,8 +698,10 @@ export class DxRadioGroupComponent extends DxComponent implements OnDestroy, Con return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiRadioGroupItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiRadioGroupItemComponent')) { + this.setContentChildren('items', value, 'DxiRadioGroupItemComponent'); + this.setChildren('items', value); + } } @@ -709,7 +711,8 @@ export class DxRadioGroupComponent extends DxComponent implements OnDestroy, Con } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/responsive-box/index.ts b/packages/devextreme-angular/src/ui/responsive-box/index.ts index c869137924e5..11a83674f490 100644 --- a/packages/devextreme-angular/src/ui/responsive-box/index.ts +++ b/packages/devextreme-angular/src/ui/responsive-box/index.ts @@ -448,8 +448,10 @@ export class DxResponsiveBoxComponent extends DxCompone return this._getOption('cols'); } set colsChildren(value) { - this.setContentChildren('cols', value, 'DxiResponsiveBoxColComponent'); - this.setChildren('cols', value); + if (this.checkContentChildren('cols', value, 'DxiResponsiveBoxColComponent')) { + this.setContentChildren('cols', value, 'DxiResponsiveBoxColComponent'); + this.setChildren('cols', value); + } } @ContentChildren(DxiResponsiveBoxItemComponent) @@ -457,8 +459,10 @@ export class DxResponsiveBoxComponent extends DxCompone return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiResponsiveBoxItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiResponsiveBoxItemComponent')) { + this.setContentChildren('items', value, 'DxiResponsiveBoxItemComponent'); + this.setChildren('items', value); + } } @ContentChildren(DxiResponsiveBoxRowComponent) @@ -466,8 +470,10 @@ export class DxResponsiveBoxComponent extends DxCompone return this._getOption('rows'); } set rowsChildren(value) { - this.setContentChildren('rows', value, 'DxiResponsiveBoxRowComponent'); - this.setChildren('rows', value); + if (this.checkContentChildren('rows', value, 'DxiResponsiveBoxRowComponent')) { + this.setContentChildren('rows', value, 'DxiResponsiveBoxRowComponent'); + this.setChildren('rows', value); + } } @@ -477,7 +483,8 @@ export class DxResponsiveBoxComponent extends DxCompone } set colsLegacyChildren(value) { if (this.checkContentChildren('cols', value, 'DxiColComponent')) { - this.setChildren('cols', value); + this.setContentChildren('cols', value, 'DxiColComponent'); + this.setChildren('cols', value); } } @@ -487,7 +494,8 @@ export class DxResponsiveBoxComponent extends DxCompone } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } @@ -497,7 +505,8 @@ export class DxResponsiveBoxComponent extends DxCompone } set rowsLegacyChildren(value) { if (this.checkContentChildren('rows', value, 'DxiRowComponent')) { - this.setChildren('rows', value); + this.setContentChildren('rows', value, 'DxiRowComponent'); + this.setChildren('rows', value); } } diff --git a/packages/devextreme-angular/src/ui/scheduler/index.ts b/packages/devextreme-angular/src/ui/scheduler/index.ts index b1ceeb417a34..41916abe1d1e 100644 --- a/packages/devextreme-angular/src/ui/scheduler/index.ts +++ b/packages/devextreme-angular/src/ui/scheduler/index.ts @@ -1434,8 +1434,10 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh return this._getOption('resources'); } set resourcesChildren(value) { - this.setContentChildren('resources', value, 'DxiSchedulerResourceComponent'); - this.setChildren('resources', value); + if (this.checkContentChildren('resources', value, 'DxiSchedulerResourceComponent')) { + this.setContentChildren('resources', value, 'DxiSchedulerResourceComponent'); + this.setChildren('resources', value); + } } @ContentChildren(DxiSchedulerViewComponent) @@ -1443,8 +1445,10 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh return this._getOption('views'); } set viewsChildren(value) { - this.setContentChildren('views', value, 'DxiSchedulerViewComponent'); - this.setChildren('views', value); + if (this.checkContentChildren('views', value, 'DxiSchedulerViewComponent')) { + this.setContentChildren('views', value, 'DxiSchedulerViewComponent'); + this.setChildren('views', value); + } } @@ -1454,7 +1458,8 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh } set resourcesLegacyChildren(value) { if (this.checkContentChildren('resources', value, 'DxiResourceComponent')) { - this.setChildren('resources', value); + this.setContentChildren('resources', value, 'DxiResourceComponent'); + this.setChildren('resources', value); } } @@ -1464,7 +1469,8 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh } set viewsLegacyChildren(value) { if (this.checkContentChildren('views', value, 'DxiViewComponent')) { - this.setChildren('views', value); + this.setContentChildren('views', value, 'DxiViewComponent'); + this.setChildren('views', value); } } diff --git a/packages/devextreme-angular/src/ui/select-box/index.ts b/packages/devextreme-angular/src/ui/select-box/index.ts index 1f924f35bf68..13a3cfec7cb6 100644 --- a/packages/devextreme-angular/src/ui/select-box/index.ts +++ b/packages/devextreme-angular/src/ui/select-box/index.ts @@ -1513,8 +1513,10 @@ export class DxSelectBoxComponent extends DxComponent implements OnDestroy, Cont return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiSelectBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiSelectBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiSelectBoxButtonComponent'); + this.setChildren('buttons', value); + } } @ContentChildren(DxiSelectBoxItemComponent) @@ -1522,8 +1524,10 @@ export class DxSelectBoxComponent extends DxComponent implements OnDestroy, Cont return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiSelectBoxItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiSelectBoxItemComponent')) { + this.setContentChildren('items', value, 'DxiSelectBoxItemComponent'); + this.setChildren('items', value); + } } @@ -1533,7 +1537,8 @@ export class DxSelectBoxComponent extends DxComponent implements OnDestroy, Cont } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } @@ -1543,7 +1548,8 @@ export class DxSelectBoxComponent extends DxComponent implements OnDestroy, Cont } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/splitter/index.ts b/packages/devextreme-angular/src/ui/splitter/index.ts index c700134759db..14d5abd56d16 100644 --- a/packages/devextreme-angular/src/ui/splitter/index.ts +++ b/packages/devextreme-angular/src/ui/splitter/index.ts @@ -432,8 +432,10 @@ export class DxSplitterComponent extends DxComponent im return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiSplitterItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiSplitterItemComponent')) { + this.setContentChildren('items', value, 'DxiSplitterItemComponent'); + this.setChildren('items', value); + } } @@ -443,7 +445,8 @@ export class DxSplitterComponent extends DxComponent im } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/tab-panel/index.ts b/packages/devextreme-angular/src/ui/tab-panel/index.ts index 35b1cad60c16..ac65969855da 100644 --- a/packages/devextreme-angular/src/ui/tab-panel/index.ts +++ b/packages/devextreme-angular/src/ui/tab-panel/index.ts @@ -799,8 +799,10 @@ export class DxTabPanelComponent extends DxComponent im return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiTabPanelItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiTabPanelItemComponent')) { + this.setContentChildren('items', value, 'DxiTabPanelItemComponent'); + this.setChildren('items', value); + } } @@ -810,7 +812,8 @@ export class DxTabPanelComponent extends DxComponent im } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/tabs/index.ts b/packages/devextreme-angular/src/ui/tabs/index.ts index ce5b4da56dbe..ce3c614207bc 100644 --- a/packages/devextreme-angular/src/ui/tabs/index.ts +++ b/packages/devextreme-angular/src/ui/tabs/index.ts @@ -735,8 +735,10 @@ export class DxTabsComponent extends DxComponent implem return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiTabsItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiTabsItemComponent')) { + this.setContentChildren('items', value, 'DxiTabsItemComponent'); + this.setChildren('items', value); + } } @@ -746,7 +748,8 @@ export class DxTabsComponent extends DxComponent implem } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/tag-box/index.ts b/packages/devextreme-angular/src/ui/tag-box/index.ts index 1af6813afe7f..1eb3c72c655e 100644 --- a/packages/devextreme-angular/src/ui/tag-box/index.ts +++ b/packages/devextreme-angular/src/ui/tag-box/index.ts @@ -1645,8 +1645,10 @@ export class DxTagBoxComponent extends DxComponent implements OnDestroy, Control return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiTagBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiTagBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiTagBoxButtonComponent'); + this.setChildren('buttons', value); + } } @ContentChildren(DxiTagBoxItemComponent) @@ -1654,8 +1656,10 @@ export class DxTagBoxComponent extends DxComponent implements OnDestroy, Control return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiTagBoxItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiTagBoxItemComponent')) { + this.setContentChildren('items', value, 'DxiTagBoxItemComponent'); + this.setChildren('items', value); + } } @@ -1665,7 +1669,8 @@ export class DxTagBoxComponent extends DxComponent implements OnDestroy, Control } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } @@ -1675,7 +1680,8 @@ export class DxTagBoxComponent extends DxComponent implements OnDestroy, Control } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/text-box/index.ts b/packages/devextreme-angular/src/ui/text-box/index.ts index bf2abe7ff1e5..a014f83a5d49 100644 --- a/packages/devextreme-angular/src/ui/text-box/index.ts +++ b/packages/devextreme-angular/src/ui/text-box/index.ts @@ -1016,8 +1016,10 @@ export class DxTextBoxComponent extends DxComponent implements OnDestroy, Contro return this._getOption('buttons'); } set buttonsChildren(value) { - this.setContentChildren('buttons', value, 'DxiTextBoxButtonComponent'); - this.setChildren('buttons', value); + if (this.checkContentChildren('buttons', value, 'DxiTextBoxButtonComponent')) { + this.setContentChildren('buttons', value, 'DxiTextBoxButtonComponent'); + this.setChildren('buttons', value); + } } @@ -1027,7 +1029,8 @@ export class DxTextBoxComponent extends DxComponent implements OnDestroy, Contro } set buttonsLegacyChildren(value) { if (this.checkContentChildren('buttons', value, 'DxiButtonComponent')) { - this.setChildren('buttons', value); + this.setContentChildren('buttons', value, 'DxiButtonComponent'); + this.setChildren('buttons', value); } } diff --git a/packages/devextreme-angular/src/ui/tile-view/index.ts b/packages/devextreme-angular/src/ui/tile-view/index.ts index b910b5558da5..b47944570983 100644 --- a/packages/devextreme-angular/src/ui/tile-view/index.ts +++ b/packages/devextreme-angular/src/ui/tile-view/index.ts @@ -579,8 +579,10 @@ export class DxTileViewComponent extends DxComponent im return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiTileViewItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiTileViewItemComponent')) { + this.setContentChildren('items', value, 'DxiTileViewItemComponent'); + this.setChildren('items', value); + } } @@ -590,7 +592,8 @@ export class DxTileViewComponent extends DxComponent im } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/toolbar/index.ts b/packages/devextreme-angular/src/ui/toolbar/index.ts index 86537b50411a..269471f77b41 100644 --- a/packages/devextreme-angular/src/ui/toolbar/index.ts +++ b/packages/devextreme-angular/src/ui/toolbar/index.ts @@ -418,8 +418,10 @@ export class DxToolbarComponent extends DxComponent imp return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiToolbarItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiToolbarItemComponent')) { + this.setContentChildren('items', value, 'DxiToolbarItemComponent'); + this.setChildren('items', value); + } } @@ -429,7 +431,8 @@ export class DxToolbarComponent extends DxComponent imp } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/tree-list/index.ts b/packages/devextreme-angular/src/ui/tree-list/index.ts index c86e64430245..8e9dcc1482b7 100644 --- a/packages/devextreme-angular/src/ui/tree-list/index.ts +++ b/packages/devextreme-angular/src/ui/tree-list/index.ts @@ -2040,8 +2040,10 @@ export class DxTreeListComponent extends DxComponent return this._getOption('columns'); } set columnsChildren(value) { - this.setContentChildren('columns', value, 'DxiTreeListColumnComponent'); - this.setChildren('columns', value); + if (this.checkContentChildren('columns', value, 'DxiTreeListColumnComponent')) { + this.setContentChildren('columns', value, 'DxiTreeListColumnComponent'); + this.setChildren('columns', value); + } } @@ -2051,7 +2053,8 @@ export class DxTreeListComponent extends DxComponent } set columnsLegacyChildren(value) { if (this.checkContentChildren('columns', value, 'DxiColumnComponent')) { - this.setChildren('columns', value); + this.setContentChildren('columns', value, 'DxiColumnComponent'); + this.setChildren('columns', value); } } diff --git a/packages/devextreme-angular/src/ui/tree-view/index.ts b/packages/devextreme-angular/src/ui/tree-view/index.ts index f55cc0577a4f..c6a63ac8871e 100644 --- a/packages/devextreme-angular/src/ui/tree-view/index.ts +++ b/packages/devextreme-angular/src/ui/tree-view/index.ts @@ -1146,8 +1146,10 @@ export class DxTreeViewComponent extends DxComponent implements OnDe return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiTreeViewItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiTreeViewItemComponent')) { + this.setContentChildren('items', value, 'DxiTreeViewItemComponent'); + this.setChildren('items', value); + } } @@ -1157,7 +1159,8 @@ export class DxTreeViewComponent extends DxComponent implements OnDe } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/validation-summary/index.ts b/packages/devextreme-angular/src/ui/validation-summary/index.ts index b60e12402b7b..61679bbca695 100644 --- a/packages/devextreme-angular/src/ui/validation-summary/index.ts +++ b/packages/devextreme-angular/src/ui/validation-summary/index.ts @@ -212,8 +212,10 @@ export class DxValidationSummaryComponent extends DxCom return this._getOption('items'); } set itemsChildren(value) { - this.setContentChildren('items', value, 'DxiValidationSummaryItemComponent'); - this.setChildren('items', value); + if (this.checkContentChildren('items', value, 'DxiValidationSummaryItemComponent')) { + this.setContentChildren('items', value, 'DxiValidationSummaryItemComponent'); + this.setChildren('items', value); + } } @@ -223,7 +225,8 @@ export class DxValidationSummaryComponent extends DxCom } set itemsLegacyChildren(value) { if (this.checkContentChildren('items', value, 'DxiItemComponent')) { - this.setChildren('items', value); + this.setContentChildren('items', value, 'DxiItemComponent'); + this.setChildren('items', value); } } diff --git a/packages/devextreme-angular/src/ui/validator/index.ts b/packages/devextreme-angular/src/ui/validator/index.ts index e2a7c2a6f7db..2018c82e1f69 100644 --- a/packages/devextreme-angular/src/ui/validator/index.ts +++ b/packages/devextreme-angular/src/ui/validator/index.ts @@ -266,8 +266,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set asyncRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorAsyncRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorAsyncRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorAsyncRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorCompareRuleComponent) @@ -275,8 +277,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set compareRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorCompareRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorCompareRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorCompareRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorCustomRuleComponent) @@ -284,8 +288,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set customRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorCustomRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorCustomRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorCustomRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorEmailRuleComponent) @@ -293,8 +299,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set emailRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorEmailRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorEmailRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorEmailRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorNumericRuleComponent) @@ -302,8 +310,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set numericRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorNumericRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorNumericRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorNumericRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorPatternRuleComponent) @@ -311,8 +321,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set patternRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorPatternRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorPatternRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorPatternRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorRangeRuleComponent) @@ -320,8 +332,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set rangeRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorRangeRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorRangeRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorRangeRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorRequiredRuleComponent) @@ -329,8 +343,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set requiredRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorRequiredRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorRequiredRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorRequiredRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorStringLengthRuleComponent) @@ -338,8 +354,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set stringLengthRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorStringLengthRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorStringLengthRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorStringLengthRuleComponent'); + this.setChildren('validationRules', value); + } } @ContentChildren(DxiValidatorValidationRuleComponent) @@ -347,8 +365,10 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest return this._getOption('validationRules'); } set validationRulesChildren(value) { - this.setContentChildren('validationRules', value, 'DxiValidatorValidationRuleComponent'); - this.setChildren('validationRules', value); + if (this.checkContentChildren('validationRules', value, 'DxiValidatorValidationRuleComponent')) { + this.setContentChildren('validationRules', value, 'DxiValidatorValidationRuleComponent'); + this.setChildren('validationRules', value); + } } @@ -358,7 +378,8 @@ export class DxValidatorComponent extends DxComponentExtension implements OnDest } set validationRulesLegacyChildren(value) { if (this.checkContentChildren('validationRules', value, 'DxiValidationRuleComponent')) { - this.setChildren('validationRules', value); + this.setContentChildren('validationRules', value, 'DxiValidationRuleComponent'); + this.setChildren('validationRules', value); } } diff --git a/packages/devextreme-angular/src/ui/vector-map/index.ts b/packages/devextreme-angular/src/ui/vector-map/index.ts index 2261d6215ba7..2d3f8a63ec55 100644 --- a/packages/devextreme-angular/src/ui/vector-map/index.ts +++ b/packages/devextreme-angular/src/ui/vector-map/index.ts @@ -777,8 +777,10 @@ export class DxVectorMapComponent extends DxComponent implements OnDestroy, OnCh return this._getOption('annotations'); } set annotationsChildren(value) { - this.setContentChildren('annotations', value, 'DxiVectorMapAnnotationComponent'); - this.setChildren('annotations', value); + if (this.checkContentChildren('annotations', value, 'DxiVectorMapAnnotationComponent')) { + this.setContentChildren('annotations', value, 'DxiVectorMapAnnotationComponent'); + this.setChildren('annotations', value); + } } @ContentChildren(DxiVectorMapLayerComponent) @@ -786,8 +788,10 @@ export class DxVectorMapComponent extends DxComponent implements OnDestroy, OnCh return this._getOption('layers'); } set layersChildren(value) { - this.setContentChildren('layers', value, 'DxiVectorMapLayerComponent'); - this.setChildren('layers', value); + if (this.checkContentChildren('layers', value, 'DxiVectorMapLayerComponent')) { + this.setContentChildren('layers', value, 'DxiVectorMapLayerComponent'); + this.setChildren('layers', value); + } } @ContentChildren(DxiVectorMapLegendComponent) @@ -795,8 +799,10 @@ export class DxVectorMapComponent extends DxComponent implements OnDestroy, OnCh return this._getOption('legends'); } set legendsChildren(value) { - this.setContentChildren('legends', value, 'DxiVectorMapLegendComponent'); - this.setChildren('legends', value); + if (this.checkContentChildren('legends', value, 'DxiVectorMapLegendComponent')) { + this.setContentChildren('legends', value, 'DxiVectorMapLegendComponent'); + this.setChildren('legends', value); + } } @@ -806,7 +812,8 @@ export class DxVectorMapComponent extends DxComponent implements OnDestroy, OnCh } set annotationsLegacyChildren(value) { if (this.checkContentChildren('annotations', value, 'DxiAnnotationComponent')) { - this.setChildren('annotations', value); + this.setContentChildren('annotations', value, 'DxiAnnotationComponent'); + this.setChildren('annotations', value); } } @@ -816,7 +823,8 @@ export class DxVectorMapComponent extends DxComponent implements OnDestroy, OnCh } set layersLegacyChildren(value) { if (this.checkContentChildren('layers', value, 'DxiLayerComponent')) { - this.setChildren('layers', value); + this.setContentChildren('layers', value, 'DxiLayerComponent'); + this.setChildren('layers', value); } } @@ -826,7 +834,8 @@ export class DxVectorMapComponent extends DxComponent implements OnDestroy, OnCh } set legendsLegacyChildren(value) { if (this.checkContentChildren('legends', value, 'DxiLegendComponent')) { - this.setChildren('legends', value); + this.setContentChildren('legends', value, 'DxiLegendComponent'); + this.setChildren('legends', value); } }