Skip to content

Commit 8b735dd

Browse files
authored
T1330038: TypeError - DataGrid does not accept groupInterval as an array (#34081)
1 parent 6291f51 commit 8b735dd

29 files changed

Lines changed: 508 additions & 90 deletions

File tree

packages/devextreme-angular/src/ui/card-view/nested/column-header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export class DxoCardViewColumnHeaderFilterComponent extends NestedOption impleme
6060
}
6161

6262
@Input()
63-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
63+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6464
return this._getOption('groupInterval');
6565
}
66-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
66+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6767
this._setOption('groupInterval', value);
6868
}
6969

packages/devextreme-angular/src/ui/card-view/nested/header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export class DxoCardViewHeaderFilterComponent extends NestedOption implements On
6060
}
6161

6262
@Input()
63-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
63+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6464
return this._getOption('groupInterval');
6565
}
66-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
66+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6767
this._setOption('groupInterval', value);
6868
}
6969

packages/devextreme-angular/src/ui/data-grid/nested/column-header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export class DxoDataGridColumnHeaderFilterComponent extends NestedOption impleme
6060
}
6161

6262
@Input()
63-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
63+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6464
return this._getOption('groupInterval');
6565
}
66-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
66+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6767
this._setOption('groupInterval', value);
6868
}
6969

packages/devextreme-angular/src/ui/data-grid/nested/header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export class DxoDataGridHeaderFilterComponent extends NestedOption implements On
6060
}
6161

6262
@Input()
63-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
63+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6464
return this._getOption('groupInterval');
6565
}
66-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
66+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6767
this._setOption('groupInterval', value);
6868
}
6969

packages/devextreme-angular/src/ui/gantt/nested/column-header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export class DxoGanttColumnHeaderFilterComponent extends NestedOption implements
6060
}
6161

6262
@Input()
63-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
63+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6464
return this._getOption('groupInterval');
6565
}
66-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
66+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6767
this._setOption('groupInterval', value);
6868
}
6969

packages/devextreme-angular/src/ui/gantt/nested/header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ export class DxoGanttHeaderFilterComponent extends NestedOption implements OnDes
6161
}
6262

6363
@Input()
64-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
64+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6565
return this._getOption('groupInterval');
6666
}
67-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
67+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6868
this._setOption('groupInterval', value);
6969
}
7070

packages/devextreme-angular/src/ui/nested/base/column-header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ export abstract class DxoColumnHeaderFilter extends NestedOption {
3636
this._setOption('dataSource', value);
3737
}
3838

39-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
39+
get groupInterval(): HeaderFilterGroupInterval | number | undefined | Array<string | number> {
4040
return this._getOption('groupInterval');
4141
}
42-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
42+
set groupInterval(value: HeaderFilterGroupInterval | number | undefined | Array<string | number>) {
4343
this._setOption('groupInterval', value);
4444
}
4545

packages/devextreme-angular/src/ui/tree-list/nested/column-header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export class DxoTreeListColumnHeaderFilterComponent extends NestedOption impleme
6060
}
6161

6262
@Input()
63-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
63+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6464
return this._getOption('groupInterval');
6565
}
66-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
66+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6767
this._setOption('groupInterval', value);
6868
}
6969

packages/devextreme-angular/src/ui/tree-list/nested/header-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export class DxoTreeListHeaderFilterComponent extends NestedOption implements On
6060
}
6161

6262
@Input()
63-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
63+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6464
return this._getOption('groupInterval');
6565
}
66-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
66+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6767
this._setOption('groupInterval', value);
6868
}
6969

packages/devextreme-react/src/card-view.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ type IColumnHeaderFilterProps = React.PropsWithChildren<{
796796
allowSearch?: boolean;
797797
allowSelectAll?: boolean;
798798
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
799-
groupInterval?: HeaderFilterGroupInterval | number | undefined;
799+
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
800800
height?: number | string | undefined;
801801
search?: ColumnHeaderFilterSearchConfig;
802802
searchMode?: SearchMode;
@@ -1532,7 +1532,7 @@ type IHeaderFilterProps = React.PropsWithChildren<{
15321532
allowSearch?: boolean;
15331533
allowSelectAll?: boolean;
15341534
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
1535-
groupInterval?: HeaderFilterGroupInterval | number | undefined;
1535+
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
15361536
height?: number | string | undefined;
15371537
search?: ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig;
15381538
searchMode?: SearchMode;

0 commit comments

Comments
 (0)