Skip to content

Commit d7429e0

Browse files
authored
Merge branch '25_2' into issue-724
2 parents 605d6a6 + 64c8a76 commit d7429e0

File tree

62 files changed

+758
-3776
lines changed

Some content is hidden

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

62 files changed

+758
-3776
lines changed

apps/demos/Demos/Charts/PointSelectionAPI/Angular/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[dataSource]="catBreedsData"
44
[rotated]="true"
55
title="Most Popular US Cat Breeds"
6-
(onPointClick)="pointClick($event)"
76
(onDone)="done($event)"
7+
(onPointClick)="pointClick($event)"
88
>
99
<dxi-series valueField="count" name="breeds" color="#a3d6d2">
1010
<dxo-selection-style color="#ec2e7a">

apps/demos/Demos/Charts/PointSelectionAPI/Angular/app/app.component.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule, Component, enableProdMode } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
4-
import { DxChartModule, DxChartTypes } from 'devextreme-angular/ui/chart';
4+
import { DxChartModule, type DxChartTypes } from 'devextreme-angular/ui/chart';
55
import { Service, CatBreed } from './app.service';
66

77
if (!/localhost/.test(document.location.host)) {
@@ -27,17 +27,18 @@ export class AppComponent {
2727
this.catBreedsData = service.getCatBreedsData();
2828
}
2929

30-
pointClick({ target: point }: DxChartTypes.PointClickEvent) {
30+
done(e: DxChartTypes.DoneEvent) {
31+
e.component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
32+
}
33+
34+
pointClick(e: DxChartTypes.PointClickEvent) {
35+
const point = e.target;
3136
if (point.isSelected()) {
3237
point.clearSelection();
3338
} else {
3439
point.select();
3540
}
3641
}
37-
38-
done(e: DxChartTypes.DoneEvent) {
39-
e.component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
40-
}
4142
}
4243

4344
@NgModule({

apps/demos/Demos/Charts/PointSelectionAPI/React/App.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
import React from 'react';
2-
import Chart, {
2+
import {
3+
Chart,
34
CommonSeriesSettings,
45
Series,
56
SelectionStyle,
67
Hatching,
78
Legend,
89
Export,
10+
type ChartTypes,
911
} from 'devextreme-react/chart';
1012
import { catBreedsData } from './data.ts';
1113

12-
function onDone({ component }) {
13-
component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
14+
function onDone(e: ChartTypes.DoneEvent) {
15+
e.component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
1416
}
1517

16-
function onPointClick({ target: point }) {
18+
function onPointClick(e: ChartTypes.PointClickEvent) {
19+
const point = e.target;
1720
if (point.isSelected()) {
1821
point.clearSelection();
1922
} else {
@@ -27,9 +30,9 @@ function App() {
2730
id="chart"
2831
dataSource={catBreedsData}
2932
rotated={true}
33+
title="Most Popular US Cat Breeds"
3034
onDone={onDone}
3135
onPointClick={onPointClick}
32-
title="Most Popular US Cat Breeds"
3336
>
3437
<CommonSeriesSettings
3538
argumentField="breed"

apps/demos/Demos/Charts/PointSelectionAPI/ReactJs/App.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
2-
import Chart, {
2+
import {
3+
Chart,
34
CommonSeriesSettings,
45
Series,
56
SelectionStyle,
@@ -9,10 +10,11 @@ import Chart, {
910
} from 'devextreme-react/chart';
1011
import { catBreedsData } from './data.js';
1112

12-
function onDone({ component }) {
13-
component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
13+
function onDone(e) {
14+
e.component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
1415
}
15-
function onPointClick({ target: point }) {
16+
function onPointClick(e) {
17+
const point = e.target;
1618
if (point.isSelected()) {
1719
point.clearSelection();
1820
} else {
@@ -25,9 +27,9 @@ function App() {
2527
id="chart"
2628
dataSource={catBreedsData}
2729
rotated={true}
30+
title="Most Popular US Cat Breeds"
2831
onDone={onDone}
2932
onPointClick={onPointClick}
30-
title="Most Popular US Cat Breeds"
3133
>
3234
<CommonSeriesSettings
3335
argumentField="breed"

apps/demos/Demos/Charts/PointSelectionAPI/Vue/App.vue

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,23 @@
2525
</DxChart>
2626
</template>
2727
<script setup lang="ts">
28-
import DxChart, {
28+
import {
29+
DxChart,
2930
DxCommonSeriesSettings,
31+
DxSeries,
3032
DxSelectionStyle,
3133
DxHatching,
32-
DxSeries,
3334
DxLegend,
3435
DxExport,
3536
type DxChartTypes,
3637
} from 'devextreme-vue/chart';
3738
import { catBreedsData } from './data.ts';
3839
39-
function onDone({ component }) {
40-
component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
40+
function onDone(e: DxChartTypes.DoneEvent) {
41+
e.component.getSeriesByPos(0).getPointsByArg('Siamese')[0].select();
4142
}
42-
function onPointClick({ target: point }: DxChartTypes.PointClickEvent) {
43+
function onPointClick(e: DxChartTypes.PointClickEvent) {
44+
const point = e.target;
4345
if (point.isSelected()) {
4446
point.clearSelection();
4547
} else {

apps/demos/Demos/Charts/PointSelectionAPI/jQuery/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ $(() => {
22
const chart = $('#chart').dxChart({
33
dataSource,
44
rotated: true,
5+
title: {
6+
text: 'Most Popular US Cat Breeds',
7+
},
58
commonSeriesSettings: {
69
argumentField: 'breed',
710
type: 'bar',
@@ -15,9 +18,6 @@ $(() => {
1518
hatching: { direction: 'none' },
1619
},
1720
},
18-
title: {
19-
text: 'Most Popular US Cat Breeds',
20-
},
2121
legend: {
2222
visible: false,
2323
},
Binary file not shown.

e2e/testcafe-devextreme/tests/scheduler/timezones/globalConfigTimezoneDB.ts

Lines changed: 0 additions & 57 deletions
This file was deleted.

packages/devextreme-angular/src/ui/color-box/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import { DxoMyModule } from 'devextreme-angular/ui/nested';
6060
import { DxoOffsetModule } from 'devextreme-angular/ui/nested';
6161
import { DxoToModule } from 'devextreme-angular/ui/nested';
6262
import { DxoShowModule } from 'devextreme-angular/ui/nested';
63-
import { DxoFieldAddonsModule } from 'devextreme-angular/ui/nested';
6463

6564
import { DxoColorBoxAnimationModule } from 'devextreme-angular/ui/color-box/nested';
6665
import { DxoColorBoxAtModule } from 'devextreme-angular/ui/color-box/nested';
@@ -1307,7 +1306,6 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr
13071306
DxoOffsetModule,
13081307
DxoToModule,
13091308
DxoShowModule,
1310-
DxoFieldAddonsModule,
13111309
DxoColorBoxAnimationModule,
13121310
DxoColorBoxAtModule,
13131311
DxoColorBoxBoundaryOffsetModule,
@@ -1343,7 +1341,6 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr
13431341
DxoOffsetModule,
13441342
DxoToModule,
13451343
DxoShowModule,
1346-
DxoFieldAddonsModule,
13471344
DxoColorBoxAnimationModule,
13481345
DxoColorBoxAtModule,
13491346
DxoColorBoxBoundaryOffsetModule,

packages/devextreme-angular/src/ui/drop-down-box/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ import { DxoMyModule } from 'devextreme-angular/ui/nested';
6363
import { DxoOffsetModule } from 'devextreme-angular/ui/nested';
6464
import { DxoToModule } from 'devextreme-angular/ui/nested';
6565
import { DxoShowModule } from 'devextreme-angular/ui/nested';
66-
import { DxoFieldAddonsModule } from 'devextreme-angular/ui/nested';
6766
import { DxiItemModule } from 'devextreme-angular/ui/nested';
6867

6968
import { DxoDropDownBoxAnimationModule } from 'devextreme-angular/ui/drop-down-box/nested';
@@ -1387,7 +1386,6 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co
13871386
DxoOffsetModule,
13881387
DxoToModule,
13891388
DxoShowModule,
1390-
DxoFieldAddonsModule,
13911389
DxiItemModule,
13921390
DxoDropDownBoxAnimationModule,
13931391
DxoDropDownBoxAtModule,
@@ -1424,7 +1422,6 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co
14241422
DxoOffsetModule,
14251423
DxoToModule,
14261424
DxoShowModule,
1427-
DxoFieldAddonsModule,
14281425
DxiItemModule,
14291426
DxoDropDownBoxAnimationModule,
14301427
DxoDropDownBoxAtModule,

0 commit comments

Comments
 (0)