Skip to content

Commit 36c381b

Browse files
GoodDayForSurfGoodDayForSurf
committed
Merge branch '25_1_demos_vue_ts_check' of https://github.com/GoodDayForSurf/DevExtreme into 25_1_vue_ts_check
2 parents 4a3e2b6 + 015d4f9 commit 36c381b

81 files changed

Lines changed: 283 additions & 308 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.

‎e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,6 +1825,32 @@ test('DataGrid - Scrolling position is reset to far right on an attempt to scrol
18251825
},
18261826
}));
18271827

1828+
// T1280020
1829+
test('DataGrid - The "row" parameter in the FocusedRowChanged event refers to a non-focused row if the grid height is small', async (t) => {
1830+
const dataGrid = new DataGrid('#container');
1831+
const otherContainer = Selector('#otherContainer');
1832+
1833+
await dataGrid.apiOption('focusedRowKey', '2');
1834+
await t.expect(otherContainer.innerText).eql('2');
1835+
1836+
await dataGrid.apiOption('focusedRowKey', '0');
1837+
await t.expect(otherContainer.innerText).eql('0');
1838+
}).before(async () => createWidget('dxDataGrid', {
1839+
height: 70,
1840+
dataSource: [
1841+
{ id: '0' },
1842+
{ id: '1' },
1843+
{ id: '2' },
1844+
],
1845+
scrolling: { mode: 'virtual' },
1846+
keyExpr: 'id',
1847+
focusedRowEnabled: true,
1848+
onFocusedRowChanged(e) {
1849+
const data = e.row?.data;
1850+
$('#otherContainer').text(data.id);
1851+
},
1852+
}));
1853+
18281854
[true, false].forEach((nativeScroll) => {
18291855
type TestCaseWindow = typeof window & { dataGridScrollableEventValues?: number[] };
18301856

‎packages/devextreme-react/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"type": "git",
88
"url": "https://github.com/DevExpress/devextreme-react.git"
99
},
10+
"sideEffects": false,
1011
"main": "./cjs/index.js",
1112
"module": "./esm/index.js",
1213
"types": "./cjs/index.d.ts",

‎packages/devextreme-react/src/autocomplete.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ type IDropDownOptionsProps = React.PropsWithChildren<{
238238
hide?: AnimationConfig;
239239
show?: AnimationConfig;
240240
};
241-
bindingOptions?: Record<string, any>;
242241
container?: any | string | undefined;
243242
contentTemplate?: ((contentElement: any) => string | any) | template;
244243
deferRendering?: boolean;
@@ -461,7 +460,6 @@ const Offset = Object.assign<typeof _componentOffset, NestedComponentMeta>(_comp
461460
type IOptionsProps = React.PropsWithChildren<{
462461
accessKey?: string | undefined;
463462
activeStateEnabled?: boolean;
464-
bindingOptions?: Record<string, any>;
465463
disabled?: boolean;
466464
elementAttr?: Record<string, any>;
467465
focusStateEnabled?: boolean;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ const ButtonItem = Object.assign<typeof _componentButtonItem, NestedComponentMet
290290
type IButtonOptionsProps = React.PropsWithChildren<{
291291
accessKey?: string | undefined;
292292
activeStateEnabled?: boolean;
293-
bindingOptions?: Record<string, any>;
294293
disabled?: boolean;
295294
elementAttr?: Record<string, any>;
296295
focusStateEnabled?: boolean;
@@ -1118,7 +1117,6 @@ type IFilterBuilderProps = React.PropsWithChildren<{
11181117
accessKey?: string | undefined;
11191118
activeStateEnabled?: boolean;
11201119
allowHierarchicalFields?: boolean;
1121-
bindingOptions?: Record<string, any>;
11221120
customOperations?: Array<dxFilterBuilderCustomOperation>;
11231121
disabled?: boolean;
11241122
elementAttr?: Record<string, any>;
@@ -1274,7 +1272,6 @@ type IFormProps = React.PropsWithChildren<{
12741272
activeStateEnabled?: boolean;
12751273
alignItemLabels?: boolean;
12761274
alignItemLabelsInAllGroups?: boolean;
1277-
bindingOptions?: Record<string, any>;
12781275
colCount?: Mode | number;
12791276
colCountByScreen?: Record<string, any> | {
12801277
lg?: number | undefined;
@@ -1802,7 +1799,6 @@ type ILoadPanelProps = React.PropsWithChildren<{
18021799
hide?: AnimationConfig;
18031800
show?: AnimationConfig;
18041801
};
1805-
bindingOptions?: Record<string, any>;
18061802
container?: any | string | undefined;
18071803
deferRendering?: boolean;
18081804
delay?: number;
@@ -2497,7 +2493,6 @@ type ITabPanelOptionsProps = React.PropsWithChildren<{
24972493
accessKey?: string | undefined;
24982494
activeStateEnabled?: boolean;
24992495
animationEnabled?: boolean;
2500-
bindingOptions?: Record<string, any>;
25012496
dataSource?: Array<any | dxTabPanelItem | string> | DataSource | DataSourceOptions | null | Store | string;
25022497
deferRendering?: boolean;
25032498
disabled?: boolean;

‎packages/devextreme-react/src/color-box.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ type IDropDownOptionsProps = React.PropsWithChildren<{
228228
hide?: AnimationConfig;
229229
show?: AnimationConfig;
230230
};
231-
bindingOptions?: Record<string, any>;
232231
container?: any | string | undefined;
233232
contentTemplate?: ((contentElement: any) => string | any) | template;
234233
deferRendering?: boolean;
@@ -421,7 +420,6 @@ const Offset = Object.assign<typeof _componentOffset, NestedComponentMeta>(_comp
421420
type IOptionsProps = React.PropsWithChildren<{
422421
accessKey?: string | undefined;
423422
activeStateEnabled?: boolean;
424-
bindingOptions?: Record<string, any>;
425423
disabled?: boolean;
426424
elementAttr?: Record<string, any>;
427425
focusStateEnabled?: boolean;

‎packages/devextreme-react/src/data-grid.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,6 @@ type IFilterBuilderProps = React.PropsWithChildren<{
11941194
accessKey?: string | undefined;
11951195
activeStateEnabled?: boolean;
11961196
allowHierarchicalFields?: boolean;
1197-
bindingOptions?: Record<string, any>;
11981197
customOperations?: Array<dxFilterBuilderCustomOperation>;
11991198
disabled?: boolean;
12001199
elementAttr?: Record<string, any>;
@@ -1271,7 +1270,6 @@ type IFilterBuilderPopupProps = React.PropsWithChildren<{
12711270
hide?: AnimationConfig;
12721271
show?: AnimationConfig;
12731272
};
1274-
bindingOptions?: Record<string, any>;
12751273
container?: any | string | undefined;
12761274
contentTemplate?: ((contentElement: any) => string | any) | template;
12771275
deferRendering?: boolean;
@@ -1492,7 +1490,6 @@ type IFormProps = React.PropsWithChildren<{
14921490
activeStateEnabled?: boolean;
14931491
alignItemLabels?: boolean;
14941492
alignItemLabelsInAllGroups?: boolean;
1495-
bindingOptions?: Record<string, any>;
14961493
colCount?: Mode | number;
14971494
colCountByScreen?: Record<string, any> | {
14981495
lg?: number | undefined;
@@ -2231,7 +2228,6 @@ type IPopupProps = React.PropsWithChildren<{
22312228
hide?: AnimationConfig;
22322229
show?: AnimationConfig;
22332230
};
2234-
bindingOptions?: Record<string, any>;
22352231
container?: any | string | undefined;
22362232
contentTemplate?: ((contentElement: any) => string | any) | template;
22372233
deferRendering?: boolean;

‎packages/devextreme-react/src/date-box.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ const Button = Object.assign<typeof _componentButton, NestedComponentMeta>(_comp
204204
type ICalendarOptionsProps = React.PropsWithChildren<{
205205
accessKey?: string | undefined;
206206
activeStateEnabled?: boolean;
207-
bindingOptions?: Record<string, any>;
208207
cellTemplate?: ((itemData: { date: Date, text: string, view: string }, itemIndex: number, itemElement: any) => string | any) | template;
209208
dateSerializationFormat?: string | undefined;
210209
disabled?: boolean;
@@ -322,7 +321,6 @@ type IDropDownOptionsProps = React.PropsWithChildren<{
322321
hide?: AnimationConfig;
323322
show?: AnimationConfig;
324323
};
325-
bindingOptions?: Record<string, any>;
326324
container?: any | string | undefined;
327325
contentTemplate?: ((contentElement: any) => string | any) | template;
328326
deferRendering?: boolean;
@@ -515,7 +513,6 @@ const Offset = Object.assign<typeof _componentOffset, NestedComponentMeta>(_comp
515513
type IOptionsProps = React.PropsWithChildren<{
516514
accessKey?: string | undefined;
517515
activeStateEnabled?: boolean;
518-
bindingOptions?: Record<string, any>;
519516
disabled?: boolean;
520517
elementAttr?: Record<string, any>;
521518
focusStateEnabled?: boolean;

‎packages/devextreme-react/src/date-range-box.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ const Button = Object.assign<typeof _componentButton, NestedComponentMeta>(_comp
209209
type ICalendarOptionsProps = React.PropsWithChildren<{
210210
accessKey?: string | undefined;
211211
activeStateEnabled?: boolean;
212-
bindingOptions?: Record<string, any>;
213212
cellTemplate?: ((itemData: { date: Date, text: string, view: string }, itemIndex: number, itemElement: any) => string | any) | template;
214213
dateSerializationFormat?: string | undefined;
215214
disabled?: boolean;
@@ -327,7 +326,6 @@ type IDropDownOptionsProps = React.PropsWithChildren<{
327326
hide?: AnimationConfig;
328327
show?: AnimationConfig;
329328
};
330-
bindingOptions?: Record<string, any>;
331329
container?: any | string | undefined;
332330
contentTemplate?: ((contentElement: any) => string | any) | template;
333331
deferRendering?: boolean;
@@ -520,7 +518,6 @@ const Offset = Object.assign<typeof _componentOffset, NestedComponentMeta>(_comp
520518
type IOptionsProps = React.PropsWithChildren<{
521519
accessKey?: string | undefined;
522520
activeStateEnabled?: boolean;
523-
bindingOptions?: Record<string, any>;
524521
disabled?: boolean;
525522
elementAttr?: Record<string, any>;
526523
focusStateEnabled?: boolean;

‎packages/devextreme-react/src/drop-down-box.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ type IDropDownOptionsProps = React.PropsWithChildren<{
232232
hide?: AnimationConfig;
233233
show?: AnimationConfig;
234234
};
235-
bindingOptions?: Record<string, any>;
236235
container?: any | string | undefined;
237236
contentTemplate?: ((contentElement: any) => string | any) | template;
238237
deferRendering?: boolean;
@@ -425,7 +424,6 @@ const Offset = Object.assign<typeof _componentOffset, NestedComponentMeta>(_comp
425424
type IOptionsProps = React.PropsWithChildren<{
426425
accessKey?: string | undefined;
427426
activeStateEnabled?: boolean;
428-
bindingOptions?: Record<string, any>;
429427
disabled?: boolean;
430428
elementAttr?: Record<string, any>;
431429
focusStateEnabled?: boolean;

‎packages/devextreme-react/src/drop-down-button.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ type IDropDownOptionsProps = React.PropsWithChildren<{
188188
hide?: AnimationConfig;
189189
show?: AnimationConfig;
190190
};
191-
bindingOptions?: Record<string, any>;
192191
container?: any | string | undefined;
193192
contentTemplate?: ((contentElement: any) => string | any) | template;
194193
deferRendering?: boolean;

0 commit comments

Comments
 (0)