Skip to content

Commit 98590d2

Browse files
GoodDayForSurfGoodDayForSurf
authored
Merge branch '26_1' into gulp/remove-gulp-from-app-demos
2 parents 8a8d25a + 66e1317 commit 98590d2

43 files changed

Lines changed: 646 additions & 208 deletions

File tree

Some content is hidden

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

‎.mise.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[tools]
22
node = "24.15.0"
3-
pnpm = "11.6.0"
3+
pnpm = "11.7.0"
44

55
[hooks]
66
enter = "mise install"
7-

‎apps/demos/testing/skipped-tests.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,39 @@ export const skippedTests = {
44
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
55

66
// Remote WidgetsGalleryDataService is unstable
7-
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource'],
7+
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource', 'AIColumns'],
8+
9+
// AI answers are not stable
10+
TreeList: ['AIColumns'],
811
},
912
Angular: {
1013
// WebGL initialization error at the provider. There is no point in adding a mask
1114
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
1215

1316
// Remote WidgetsGalleryDataService is unstable
14-
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource'],
17+
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource', 'AIColumns'],
18+
19+
// AI answers are not stable
20+
TreeList: ['AIColumns'],
1521
},
1622
React: {
1723
// WebGL initialization error at the provider. There is no point in adding a mask
1824
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
1925

2026
// Remote WidgetsGalleryDataService is unstable
21-
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource'],
27+
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource', 'AIColumns'],
28+
29+
// AI answers are not stable
30+
TreeList: ['AIColumns'],
2231
},
2332
Vue: {
2433
// WebGL initialization error at the provider. There is no point in adding a mask
2534
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
2635

2736
// Remote WidgetsGalleryDataService is unstable
28-
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource'],
37+
DataGrid: ['RemoteGrouping', 'RemoteVirtualScrolling', 'CustomDataSource', 'AIColumns'],
38+
39+
// AI answers are not stable
40+
TreeList: ['AIColumns'],
2941
},
3042
};

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"lint-staged",
6262
"pre-commit"
6363
],
64-
"packageManager": "pnpm@11.6.0+sha512.9a36518224080c6fe5165afdcfe79bfa118c29be703f3f462b1e32efe1e98e47e8750b148e08286250aad4113cc7993ca413c4e2cd447752708c2ee5751bc95f",
64+
"packageManager": "pnpm@11.7.0+sha512.19cc852c120c7125760f2443ee6be0ca5b40f9f50598de1a09a1f177503e010e57c23c77646e01e761de59bf874fb22a3398c33ab9691fc13eb946b6f0f4d620",
6565
"engines": {
6666
"node": "^24.15.0"
6767
}

‎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
@@ -59,10 +59,10 @@ export class DxoCardViewColumnHeaderFilterComponent extends NestedOption impleme
5959
}
6060

6161
@Input()
62-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
62+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6363
return this._getOption('groupInterval');
6464
}
65-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
65+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6666
this._setOption('groupInterval', value);
6767
}
6868

‎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
@@ -59,10 +59,10 @@ export class DxoCardViewHeaderFilterComponent extends NestedOption implements On
5959
}
6060

6161
@Input()
62-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
62+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6363
return this._getOption('groupInterval');
6464
}
65-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
65+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6666
this._setOption('groupInterval', value);
6767
}
6868

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414

1515

1616

17-
import type { Attachment, User } from 'devextreme/ui/chat';
17+
import type { Attachment, User, MessageType } from 'devextreme/ui/chat';
1818

1919
import {
2020
DxIntegrationModule,
@@ -119,10 +119,10 @@ export class DxiChatChatItemComponent extends CollectionNestedOption {
119119
}
120120

121121
@Input()
122-
get type(): string | undefined {
122+
get type(): MessageType {
123123
return this._getOption('type');
124124
}
125-
set type(value: string | undefined) {
125+
set type(value: MessageType) {
126126
this._setOption('type', value);
127127
}
128128

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import { DOCUMENT } from '@angular/common';
1919

2020

21-
import type { Attachment, User } from 'devextreme/ui/chat';
21+
import type { Attachment, User, MessageType } from 'devextreme/ui/chat';
2222
import type { ButtonType } from 'devextreme/common';
2323

2424
import {
@@ -130,10 +130,10 @@ export class DxiChatItemComponent extends CollectionNestedOption implements Afte
130130
}
131131

132132
@Input()
133-
get type(): string | undefined | ButtonType {
133+
get type(): MessageType | ButtonType | string {
134134
return this._getOption('type');
135135
}
136-
set type(value: string | undefined | ButtonType) {
136+
set type(value: MessageType | ButtonType | string) {
137137
this._setOption('type', value);
138138
}
139139

‎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
@@ -59,10 +59,10 @@ export class DxoDataGridColumnHeaderFilterComponent extends NestedOption impleme
5959
}
6060

6161
@Input()
62-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
62+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6363
return this._getOption('groupInterval');
6464
}
65-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
65+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6666
this._setOption('groupInterval', value);
6767
}
6868

‎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
@@ -59,10 +59,10 @@ export class DxoDataGridHeaderFilterComponent extends NestedOption implements On
5959
}
6060

6161
@Input()
62-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
62+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6363
return this._getOption('groupInterval');
6464
}
65-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
65+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6666
this._setOption('groupInterval', value);
6767
}
6868

‎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
@@ -59,10 +59,10 @@ export class DxoGanttColumnHeaderFilterComponent extends NestedOption implements
5959
}
6060

6161
@Input()
62-
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
62+
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
6363
return this._getOption('groupInterval');
6464
}
65-
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
65+
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
6666
this._setOption('groupInterval', value);
6767
}
6868

0 commit comments

Comments
 (0)