Skip to content

Commit 7e88163

Browse files
Merge branch '25_2' into 25_2_smart_paste_default_buttons
2 parents db57097 + 64c8a76 commit 7e88163

File tree

93 files changed

+2762
-4732
lines changed

Some content is hidden

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

93 files changed

+2762
-4732
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
},

apps/demos/configs/Angular/config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ window.config = {
9898
experimentalDecorators: true,
9999
},
100100
meta: {
101+
'*': {
102+
'globals': {
103+
'process': 'process',
104+
},
105+
},
101106
'typescript': {
102107
'exports': 'ts',
103108
},
@@ -156,6 +161,7 @@ window.config = {
156161
'externals:': '../../../../bundles/externals/',
157162
},
158163
map: {
164+
'process': '../../../../utils/shared/process.js',
159165
'ts': 'npm:plugin-typescript/lib/plugin.js',
160166
'typescript': 'npm:typescript/lib/typescript.js',
161167
'jszip': 'npm:jszip/dist/jszip.min.js',

apps/demos/configs/React/config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ window.config = {
88
jsx: 'react',
99
},
1010
meta: {
11+
'*': {
12+
'globals': {
13+
'process': 'process',
14+
},
15+
},
1116
'react': {
1217
'esModule': true,
1318
},
@@ -49,6 +54,7 @@ window.config = {
4954
},
5055
defaultExtension: 'js',
5156
map: {
57+
'process': '../../../../utils/shared/process.js',
5258
'ts': 'npm:plugin-typescript/lib/plugin.js',
5359
'typescript': 'npm:typescript/lib/typescript.js',
5460
'jszip': 'npm:jszip/dist/jszip.min.js',

apps/demos/configs/ReactJs/config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ window.config = {
88
jsx: 'react',
99
},
1010
meta: {
11+
'*': {
12+
globals: {
13+
process: 'process',
14+
},
15+
},
1116
'react': {
1217
'esModule': true,
1318
},
@@ -49,6 +54,7 @@ window.config = {
4954
},
5055
defaultExtension: 'js',
5156
map: {
57+
'process': '../../../../utils/shared/process.js',
5258
'ts': 'npm:plugin-typescript/lib/plugin.js',
5359
'typescript': 'npm:typescript/lib/typescript.js',
5460
'jszip': 'npm:jszip/dist/jszip.min.js',

apps/demos/configs/Vue/config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ window.exports = window.exports || {};
22
window.config = {
33
transpiler: 'plugin-babel',
44
meta: {
5+
'*': {
6+
'globals': {
7+
'process': 'process',
8+
},
9+
},
510
'*.vue': {
611
loader: 'vue-loader',
712
},
@@ -46,6 +51,7 @@ window.config = {
4651
'externals:': '../../../../bundles/externals/',
4752
},
4853
map: {
54+
'process': '../../../../utils/shared/process.js',
4955
'vue': 'npm:vue/dist/vue.esm-browser.js',
5056
'@vue/shared': 'npm:@vue/shared/dist/shared.cjs.prod.js',
5157
'vue-loader': 'npm:dx-systemjs-vue-browser/index.js',

0 commit comments

Comments
 (0)