@vaadin/charts 23.2.0-alpha1 → 23.2.0-alpha4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +12 -7
- package/src/vaadin-chart-series.d.ts +3 -3
- package/src/vaadin-chart.d.ts +6 -7
- package/src/vaadin-chart.js +19 -37
- package/web-types.json +684 -0
- package/web-types.lit.json +433 -0
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vaadin/charts",
|
|
3
|
-
"version": "23.2.0-
|
|
3
|
+
"version": "23.2.0-alpha4",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
7
|
"description": "vaadin-charts",
|
|
8
|
-
"license": "
|
|
8
|
+
"license": "SEE LICENSE IN LICENSE",
|
|
9
9
|
"cvdlName": "vaadin-chart",
|
|
10
10
|
"repository": {
|
|
11
11
|
"type": "git",
|
|
@@ -24,7 +24,9 @@
|
|
|
24
24
|
"src",
|
|
25
25
|
"theme",
|
|
26
26
|
"vaadin-*.d.ts",
|
|
27
|
-
"vaadin-*.js"
|
|
27
|
+
"vaadin-*.js",
|
|
28
|
+
"web-types.json",
|
|
29
|
+
"web-types.lit.json"
|
|
28
30
|
],
|
|
29
31
|
"keywords": [
|
|
30
32
|
"Vaadin",
|
|
@@ -35,9 +37,8 @@
|
|
|
35
37
|
],
|
|
36
38
|
"dependencies": {
|
|
37
39
|
"@polymer/polymer": "^3.0.0",
|
|
38
|
-
"@vaadin/component-base": "23.2.0-
|
|
39
|
-
"@vaadin/vaadin-
|
|
40
|
-
"@vaadin/vaadin-themable-mixin": "23.2.0-alpha1",
|
|
40
|
+
"@vaadin/component-base": "23.2.0-alpha4",
|
|
41
|
+
"@vaadin/vaadin-themable-mixin": "23.2.0-alpha4",
|
|
41
42
|
"highcharts": "9.2.2"
|
|
42
43
|
},
|
|
43
44
|
"devDependencies": {
|
|
@@ -45,5 +46,9 @@
|
|
|
45
46
|
"@vaadin/testing-helpers": "^0.3.2",
|
|
46
47
|
"sinon": "^13.0.2"
|
|
47
48
|
},
|
|
48
|
-
"
|
|
49
|
+
"web-types": [
|
|
50
|
+
"web-types.json",
|
|
51
|
+
"web-types.lit.json"
|
|
52
|
+
],
|
|
53
|
+
"gitHead": "cbf5f1d0f38ac9b81c65cf9ef5660182e176e598"
|
|
49
54
|
}
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
* Copyright (c) 2015 - 2022 Vaadin Ltd.
|
|
4
4
|
* This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0.
|
|
5
5
|
*/
|
|
6
|
-
import { PointOptionsObject, Series, SeriesOptionsType } from 'highcharts';
|
|
6
|
+
import type { PointOptionsObject, Series, SeriesOptionsType } from 'highcharts';
|
|
7
7
|
|
|
8
|
-
export type ChartSeriesMarkers = '
|
|
8
|
+
export type ChartSeriesMarkers = 'auto' | 'hidden' | 'shown';
|
|
9
9
|
|
|
10
10
|
export interface ChartSeriesConfig {
|
|
11
11
|
data?: ChartSeriesValues;
|
|
@@ -22,7 +22,7 @@ export interface ChartSeriesConfig {
|
|
|
22
22
|
|
|
23
23
|
export type ChartSeriesOptions = ChartSeriesConfig & SeriesOptionsType;
|
|
24
24
|
|
|
25
|
-
export type ChartSeriesValues = Array<number |
|
|
25
|
+
export type ChartSeriesValues = Array<number[] | PointOptionsObject | number>;
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
28
|
* `<vaadin-chart-series>` is a custom element for creating series for Vaadin Charts.
|
package/src/vaadin-chart.d.ts
CHANGED
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
* Copyright (c) 2015 - 2022 Vaadin Ltd.
|
|
4
4
|
* This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0.
|
|
5
5
|
*/
|
|
6
|
-
import { Axis, Chart as HighchartsChart, ExtremesObject, Options, Point, Series } from 'highcharts';
|
|
6
|
+
import type { Axis, Chart as HighchartsChart, ExtremesObject, Options, Point, Series } from 'highcharts';
|
|
7
7
|
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
|
|
8
8
|
import { ResizeMixin } from '@vaadin/component-base/src/resize-mixin.js';
|
|
9
9
|
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
|
|
10
10
|
|
|
11
11
|
export type ChartCategories = string[] | { [key: number]: string };
|
|
12
12
|
|
|
13
|
-
export type ChartCategoryPosition = '
|
|
13
|
+
export type ChartCategoryPosition = 'bottom' | 'left' | 'right' | 'top';
|
|
14
14
|
|
|
15
15
|
export type ChartStacking = 'normal' | 'percent' | null;
|
|
16
16
|
|
|
@@ -245,7 +245,7 @@ export interface ChartCustomEventMap {
|
|
|
245
245
|
'yaxes-extremes-set': ChartYaxesExtremesSetEvent;
|
|
246
246
|
}
|
|
247
247
|
|
|
248
|
-
export type ChartEventMap =
|
|
248
|
+
export type ChartEventMap = ChartCustomEventMap & HTMLElementEventMap;
|
|
249
249
|
|
|
250
250
|
/**
|
|
251
251
|
* `<vaadin-chart>` is a Web Component for creating high quality charts.
|
|
@@ -346,8 +346,7 @@ export type ChartEventMap = HTMLElementEventMap & ChartCustomEventMap;
|
|
|
346
346
|
* A comprehensive list of the supported style classes can be found at
|
|
347
347
|
* https://www.highcharts.com/docs/chart-design-and-style/style-by-css
|
|
348
348
|
*
|
|
349
|
-
* See also the
|
|
350
|
-
* https://vaadin.com/docs/v14/themes/themes-and-styling-overview.html
|
|
349
|
+
* See also the [Chart Styling](https://vaadin.com/docs/latest/components/charts/css-styling) documentation.
|
|
351
350
|
*
|
|
352
351
|
* ### RTL support
|
|
353
352
|
*
|
|
@@ -582,13 +581,13 @@ declare class Chart extends ResizeMixin(ThemableMixin(ElementMixin(HTMLElement))
|
|
|
582
581
|
addEventListener<K extends keyof ChartEventMap>(
|
|
583
582
|
type: K,
|
|
584
583
|
listener: (this: Chart, ev: ChartEventMap[K]) => void,
|
|
585
|
-
options?:
|
|
584
|
+
options?: AddEventListenerOptions | boolean,
|
|
586
585
|
): void;
|
|
587
586
|
|
|
588
587
|
removeEventListener<K extends keyof ChartEventMap>(
|
|
589
588
|
type: K,
|
|
590
589
|
listener: (this: Chart, ev: ChartEventMap[K]) => void,
|
|
591
|
-
options?:
|
|
590
|
+
options?: EventListenerOptions | boolean,
|
|
592
591
|
): void;
|
|
593
592
|
}
|
|
594
593
|
|
package/src/vaadin-chart.js
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
* Copyright (c) 2015 - 2022 Vaadin Ltd.
|
|
4
4
|
* This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0.
|
|
5
5
|
*/
|
|
6
|
-
import '@vaadin/vaadin-license-checker/vaadin-license-checker.js';
|
|
7
6
|
import 'highcharts/es-modules/masters/highstock.src.js';
|
|
8
7
|
import 'highcharts/es-modules/masters/modules/accessibility.src.js';
|
|
9
8
|
import 'highcharts/es-modules/masters/highcharts-more.src.js';
|
|
@@ -35,7 +34,7 @@ export function deepMerge(target, source) {
|
|
|
35
34
|
const isObject = (item) => item && typeof item === 'object' && !Array.isArray(item);
|
|
36
35
|
|
|
37
36
|
if (isObject(source) && isObject(target)) {
|
|
38
|
-
|
|
37
|
+
Object.keys(source).forEach((key) => {
|
|
39
38
|
if (isObject(source[key])) {
|
|
40
39
|
if (!target[key]) {
|
|
41
40
|
Object.assign(target, { [key]: {} });
|
|
@@ -45,7 +44,7 @@ export function deepMerge(target, source) {
|
|
|
45
44
|
} else {
|
|
46
45
|
Object.assign(target, { [key]: source[key] });
|
|
47
46
|
}
|
|
48
|
-
}
|
|
47
|
+
});
|
|
49
48
|
}
|
|
50
49
|
|
|
51
50
|
return target;
|
|
@@ -165,8 +164,7 @@ Highcharts.setOptions({ lang: { noData: '' } });
|
|
|
165
164
|
* A comprehensive list of the supported style classes can be found at
|
|
166
165
|
* https://www.highcharts.com/docs/chart-design-and-style/style-by-css
|
|
167
166
|
*
|
|
168
|
-
* See also the
|
|
169
|
-
* https://vaadin.com/docs/v14/themes/themes-and-styling-overview.html
|
|
167
|
+
* See also the [Chart Styling](https://vaadin.com/docs/latest/components/charts/css-styling) documentation.
|
|
170
168
|
*
|
|
171
169
|
* ### RTL support
|
|
172
170
|
*
|
|
@@ -478,20 +476,6 @@ class Chart extends ResizeMixin(ElementMixin(ThemableMixin(PolymerElement))) {
|
|
|
478
476
|
];
|
|
479
477
|
}
|
|
480
478
|
|
|
481
|
-
/**
|
|
482
|
-
* @protected
|
|
483
|
-
*/
|
|
484
|
-
static _finalizeClass() {
|
|
485
|
-
super._finalizeClass();
|
|
486
|
-
|
|
487
|
-
const devModeCallback = window.Vaadin.developmentModeCallback;
|
|
488
|
-
const licenseChecker = devModeCallback && devModeCallback['vaadin-license-checker'];
|
|
489
|
-
/* c8 ignore next 3 */
|
|
490
|
-
if (typeof licenseChecker === 'function') {
|
|
491
|
-
licenseChecker(Chart);
|
|
492
|
-
}
|
|
493
|
-
}
|
|
494
|
-
|
|
495
479
|
constructor() {
|
|
496
480
|
super();
|
|
497
481
|
|
|
@@ -634,7 +618,9 @@ class Chart extends ResizeMixin(ElementMixin(ThemableMixin(PolymerElement))) {
|
|
|
634
618
|
options.chart.inverted = this.__shouldInvert();
|
|
635
619
|
|
|
636
620
|
if (Array.isArray(options.xAxis)) {
|
|
637
|
-
options.xAxis.forEach((e) =>
|
|
621
|
+
options.xAxis.forEach((e) => {
|
|
622
|
+
e.opposite = this.__shouldFlipOpposite();
|
|
623
|
+
});
|
|
638
624
|
} else if (options.xAxis) {
|
|
639
625
|
options.xAxis.opposite = this.__shouldFlipOpposite();
|
|
640
626
|
}
|
|
@@ -1230,24 +1216,20 @@ class Chart extends ResizeMixin(ElementMixin(ThemableMixin(PolymerElement))) {
|
|
|
1230
1216
|
|
|
1231
1217
|
/** @private */
|
|
1232
1218
|
__inflateFunctions(jsonConfiguration) {
|
|
1233
|
-
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1239
|
-
|
|
1240
|
-
|
|
1241
|
-
} catch (e) {
|
|
1242
|
-
// eslint-disable-next-line no-eval
|
|
1243
|
-
jsonConfiguration[attr.substr(4)] = eval(`(function(){${targetProperty}})`);
|
|
1244
|
-
}
|
|
1245
|
-
delete jsonConfiguration[attr];
|
|
1246
|
-
} else if (targetProperty instanceof Object) {
|
|
1247
|
-
this.__inflateFunctions(targetProperty);
|
|
1219
|
+
Object.entries(jsonConfiguration).forEach(([attr, targetProperty]) => {
|
|
1220
|
+
if (attr.startsWith('_fn_') && (typeof targetProperty === 'string' || targetProperty instanceof String)) {
|
|
1221
|
+
try {
|
|
1222
|
+
// eslint-disable-next-line no-eval
|
|
1223
|
+
jsonConfiguration[attr.substr(4)] = eval(`(${targetProperty})`);
|
|
1224
|
+
} catch (e) {
|
|
1225
|
+
// eslint-disable-next-line no-eval
|
|
1226
|
+
jsonConfiguration[attr.substr(4)] = eval(`(function(){${targetProperty}})`);
|
|
1248
1227
|
}
|
|
1228
|
+
delete jsonConfiguration[attr];
|
|
1229
|
+
} else if (targetProperty instanceof Object) {
|
|
1230
|
+
this.__inflateFunctions(targetProperty);
|
|
1249
1231
|
}
|
|
1250
|
-
}
|
|
1232
|
+
});
|
|
1251
1233
|
}
|
|
1252
1234
|
|
|
1253
1235
|
/** @private */
|
|
@@ -1779,7 +1761,7 @@ class Chart extends ResizeMixin(ElementMixin(ThemableMixin(PolymerElement))) {
|
|
|
1779
1761
|
let style = '';
|
|
1780
1762
|
if (this.hasAttribute('style')) {
|
|
1781
1763
|
style = this.getAttribute('style');
|
|
1782
|
-
if (style.
|
|
1764
|
+
if (!style.endsWith(';')) {
|
|
1783
1765
|
style += ';';
|
|
1784
1766
|
}
|
|
1785
1767
|
}
|