@amcharts/amcharts5 5.0.13 → 5.0.17
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/.internal/charts/hierarchy/Hierarchy.js +1 -1
- package/.internal/charts/hierarchy/Hierarchy.js.map +1 -1
- package/.internal/charts/hierarchy/HierarchyDefaultTheme.d.ts.map +1 -1
- package/.internal/charts/hierarchy/HierarchyDefaultTheme.js +3 -0
- package/.internal/charts/hierarchy/HierarchyDefaultTheme.js.map +1 -1
- package/.internal/charts/map/MapChart.d.ts +9 -2
- package/.internal/charts/map/MapChart.d.ts.map +1 -1
- package/.internal/charts/map/MapChart.js +9 -2
- package/.internal/charts/map/MapChart.js.map +1 -1
- package/.internal/charts/map/MapPointSeries.d.ts.map +1 -1
- package/.internal/charts/map/MapPointSeries.js +1 -2
- package/.internal/charts/map/MapPointSeries.js.map +1 -1
- package/.internal/charts/map/MapUtils.js +2 -2
- package/.internal/charts/map/MapUtils.js.map +1 -1
- package/.internal/charts/percent/PercentSeries.d.ts.map +1 -1
- package/.internal/charts/percent/PercentSeries.js +3 -1
- package/.internal/charts/percent/PercentSeries.js.map +1 -1
- package/.internal/charts/wordcloud/WordCloud.d.ts.map +1 -1
- package/.internal/charts/wordcloud/WordCloud.js +6 -1
- package/.internal/charts/wordcloud/WordCloud.js.map +1 -1
- package/.internal/charts/xy/XYChart.d.ts.map +1 -1
- package/.internal/charts/xy/XYChart.js +6 -2
- package/.internal/charts/xy/XYChart.js.map +1 -1
- package/.internal/charts/xy/XYCursor.d.ts.map +1 -1
- package/.internal/charts/xy/XYCursor.js +4 -1
- package/.internal/charts/xy/XYCursor.js.map +1 -1
- package/.internal/charts/xy/axes/Axis.d.ts.map +1 -1
- package/.internal/charts/xy/axes/Axis.js +3 -0
- package/.internal/charts/xy/axes/Axis.js.map +1 -1
- package/.internal/charts/xy/axes/ValueAxis.js +4 -4
- package/.internal/charts/xy/axes/ValueAxis.js.map +1 -1
- package/.internal/charts/xy/series/BaseColumnSeries.d.ts +2 -0
- package/.internal/charts/xy/series/BaseColumnSeries.d.ts.map +1 -1
- package/.internal/charts/xy/series/BaseColumnSeries.js +36 -4
- package/.internal/charts/xy/series/BaseColumnSeries.js.map +1 -1
- package/.internal/charts/xy/series/LineSeries.js +2 -2
- package/.internal/charts/xy/series/LineSeries.js.map +1 -1
- package/.internal/charts/xy/series/XYSeries.d.ts +16 -1
- package/.internal/charts/xy/series/XYSeries.d.ts.map +1 -1
- package/.internal/charts/xy/series/XYSeries.js +69 -33
- package/.internal/charts/xy/series/XYSeries.js.map +1 -1
- package/.internal/core/Root.d.ts.map +1 -1
- package/.internal/core/Root.js +43 -14
- package/.internal/core/Root.js.map +1 -1
- package/.internal/core/render/Component.d.ts.map +1 -1
- package/.internal/core/render/Component.js +5 -1
- package/.internal/core/render/Component.js.map +1 -1
- package/.internal/core/render/Container.d.ts.map +1 -1
- package/.internal/core/render/Container.js +6 -0
- package/.internal/core/render/Container.js.map +1 -1
- package/.internal/core/render/Label.d.ts +8 -0
- package/.internal/core/render/Label.d.ts.map +1 -1
- package/.internal/core/render/Label.js +1 -0
- package/.internal/core/render/Label.js.map +1 -1
- package/.internal/core/render/Legend.d.ts +7 -1
- package/.internal/core/render/Legend.d.ts.map +1 -1
- package/.internal/core/render/Legend.js +5 -0
- package/.internal/core/render/Legend.js.map +1 -1
- package/.internal/core/render/Scrollbar.d.ts.map +1 -1
- package/.internal/core/render/Scrollbar.js +12 -2
- package/.internal/core/render/Scrollbar.js.map +1 -1
- package/.internal/core/render/SerialChart.d.ts.map +1 -1
- package/.internal/core/render/SerialChart.js +4 -0
- package/.internal/core/render/SerialChart.js.map +1 -1
- package/.internal/core/render/Series.d.ts +2 -0
- package/.internal/core/render/Series.d.ts.map +1 -1
- package/.internal/core/render/Series.js +48 -29
- package/.internal/core/render/Series.js.map +1 -1
- package/.internal/core/render/Sprite.d.ts +17 -4
- package/.internal/core/render/Sprite.d.ts.map +1 -1
- package/.internal/core/render/Sprite.js +24 -10
- package/.internal/core/render/Sprite.js.map +1 -1
- package/.internal/core/render/Text.d.ts +1 -0
- package/.internal/core/render/Text.d.ts.map +1 -1
- package/.internal/core/render/Text.js +1 -0
- package/.internal/core/render/Text.js.map +1 -1
- package/.internal/core/render/backend/CanvasRenderer.d.ts +4 -2
- package/.internal/core/render/backend/CanvasRenderer.d.ts.map +1 -1
- package/.internal/core/render/backend/CanvasRenderer.js +85 -17
- package/.internal/core/render/backend/CanvasRenderer.js.map +1 -1
- package/.internal/core/render/backend/Renderer.d.ts +2 -0
- package/.internal/core/render/backend/Renderer.d.ts.map +1 -1
- package/.internal/core/render/backend/Renderer.js.map +1 -1
- package/.internal/core/util/Accessibility.d.ts +12 -0
- package/.internal/core/util/Accessibility.d.ts.map +1 -1
- package/.internal/core/util/Accessibility.js.map +1 -1
- package/.internal/core/util/Children.d.ts.map +1 -1
- package/.internal/core/util/Children.js +4 -0
- package/.internal/core/util/Children.js.map +1 -1
- package/.internal/core/util/Disposer.d.ts +9 -0
- package/.internal/core/util/Disposer.d.ts.map +1 -1
- package/.internal/core/util/Disposer.js +24 -0
- package/.internal/core/util/Disposer.js.map +1 -1
- package/.internal/core/util/List.d.ts +6 -0
- package/.internal/core/util/List.d.ts.map +1 -1
- package/.internal/core/util/List.js +26 -3
- package/.internal/core/util/List.js.map +1 -1
- package/.internal/core/util/TextFormatter.d.ts.map +1 -1
- package/.internal/core/util/TextFormatter.js +3 -0
- package/.internal/core/util/TextFormatter.js.map +1 -1
- package/.internal/plugins/exporting/Annotator.d.ts +3 -1
- package/.internal/plugins/exporting/Annotator.d.ts.map +1 -1
- package/.internal/plugins/exporting/Annotator.js +46 -16
- package/.internal/plugins/exporting/Annotator.js.map +1 -1
- package/.internal/plugins/exporting/Exporting.d.ts +29 -0
- package/.internal/plugins/exporting/Exporting.d.ts.map +1 -1
- package/.internal/plugins/exporting/Exporting.js +15 -0
- package/.internal/plugins/exporting/Exporting.js.map +1 -1
- package/.internal/plugins/exporting/ExportingMenu.d.ts +2 -0
- package/.internal/plugins/exporting/ExportingMenu.d.ts.map +1 -1
- package/.internal/plugins/exporting/ExportingMenu.js +35 -14
- package/.internal/plugins/exporting/ExportingMenu.js.map +1 -1
- package/.internal/themes/DefaultTheme.d.ts.map +1 -1
- package/.internal/themes/DefaultTheme.js +2 -0
- package/.internal/themes/DefaultTheme.js.map +1 -1
- package/CHANGELOG.md +59 -1
- package/examples/javascript/flow-chord/package.json +1 -1
- package/examples/javascript/flow-chord-directed/package.json +1 -1
- package/examples/javascript/flow-chord-non-ribbon/package.json +1 -1
- package/examples/javascript/flow-sankey/package.json +1 -1
- package/examples/javascript/gauge/package.json +1 -1
- package/examples/javascript/gauge-bands/package.json +1 -1
- package/examples/javascript/hierarchy-force-directed/package.json +1 -1
- package/examples/javascript/hierarchy-pack/package.json +1 -1
- package/examples/javascript/hierarchy-partition/package.json +1 -1
- package/examples/javascript/hierarchy-sunburst/package.json +1 -1
- package/examples/javascript/hierarchy-tree/package.json +1 -1
- package/examples/javascript/hierarchy-treemap/package.json +1 -1
- package/examples/javascript/map-animating-along-lines/package.json +1 -1
- package/examples/javascript/map-day-and-night/package.json +1 -1
- package/examples/javascript/map-globe-rotate-to-country/package.json +1 -1
- package/examples/javascript/map-globe-with-projected-circles/package.json +1 -1
- package/examples/javascript/map-with-bubbles/package.json +1 -1
- package/examples/javascript/map-zoom-to-country/package.json +1 -1
- package/examples/javascript/misc-40-charts/package.json +1 -1
- package/examples/javascript/misc-microchart-grid/package.json +1 -1
- package/examples/javascript/pie-chart/package.json +1 -1
- package/examples/javascript/pie-donut-chart/package.json +1 -1
- package/examples/javascript/pie-variable-radius/package.json +1 -1
- package/examples/javascript/radar-column-iwatch-style/package.json +1 -1
- package/examples/javascript/radar-heat-map/package.json +1 -1
- package/examples/javascript/radar-line/package.json +1 -1
- package/examples/javascript/radar-time-line/package.json +1 -1
- package/examples/javascript/sliced-funnel/package.json +1 -1
- package/examples/javascript/sliced-pictorial-stacked/package.json +1 -1
- package/examples/javascript/sliced-pyramid/package.json +1 -1
- package/examples/javascript/venn-diagram/package.json +1 -1
- package/examples/javascript/wordcloud-with-data/package.json +1 -1
- package/examples/javascript/wordcloud-with-text/package.json +1 -1
- package/examples/javascript/xy-100-percent-stacked-column/package.json +1 -1
- package/examples/javascript/xy-animated-bullet-at-the-end-of-the-series/package.json +1 -1
- package/examples/javascript/xy-bubble/package.json +1 -1
- package/examples/javascript/xy-candlestick/package.json +1 -1
- package/examples/javascript/xy-clustered-column/package.json +1 -1
- package/examples/javascript/xy-column/package.json +1 -1
- package/examples/javascript/xy-comparing-series-google-analytics-style/package.json +1 -1
- package/examples/javascript/xy-data-grouping/package.json +1 -1
- package/examples/javascript/xy-draggable-range/package.json +1 -1
- package/examples/javascript/xy-drawing-series-with-mouse-or-touch/package.json +1 -1
- package/examples/javascript/xy-dumbbell plot/package.json +1 -1
- package/examples/javascript/xy-evenly-spaced-date-axis/package.json +1 -1
- package/examples/javascript/xy-line/package.json +1 -1
- package/examples/javascript/xy-line-highlight-on-legend-hover/package.json +1 -1
- package/examples/javascript/xy-live-data/package.json +1 -1
- package/examples/javascript/xy-multiple-synced-value-axes/package.json +1 -1
- package/examples/javascript/xy-ohlc/package.json +1 -1
- package/examples/javascript/xy-real-time-data-sorting/package.json +1 -1
- package/examples/javascript/xy-smoothed-line/package.json +1 -1
- package/examples/javascript/xy-stacked-and-clustered-column/package.json +1 -1
- package/examples/javascript/xy-stacked-column/package.json +1 -1
- package/examples/javascript/xy-stacked-step/package.json +1 -1
- package/examples/javascript/xy-stock/package.json +1 -1
- package/examples/javascript/xy-stock-comparing/package.json +1 -1
- package/examples/typescript/flow-chord/package.json +1 -1
- package/examples/typescript/flow-chord-directed/package.json +1 -1
- package/examples/typescript/flow-chord-non-ribbon/package.json +1 -1
- package/examples/typescript/flow-sankey/package.json +1 -1
- package/examples/typescript/gauge/package.json +1 -1
- package/examples/typescript/gauge-bands/package.json +1 -1
- package/examples/typescript/hierarchy-force-directed/package.json +1 -1
- package/examples/typescript/hierarchy-pack/package.json +1 -1
- package/examples/typescript/hierarchy-partition/package.json +1 -1
- package/examples/typescript/hierarchy-sunburst/package.json +1 -1
- package/examples/typescript/hierarchy-tree/package.json +1 -1
- package/examples/typescript/hierarchy-treemap/package.json +1 -1
- package/examples/typescript/map-animating-along-lines/package.json +1 -1
- package/examples/typescript/map-day-and-night/package.json +1 -1
- package/examples/typescript/map-globe-rotate-to-country/package.json +1 -1
- package/examples/typescript/map-globe-with-projected-circles/package.json +1 -1
- package/examples/typescript/map-with-bubbles/package.json +1 -1
- package/examples/typescript/map-zoom-to-country/package.json +1 -1
- package/examples/typescript/misc-40-charts/package.json +1 -1
- package/examples/typescript/misc-microchart-grid/package.json +1 -1
- package/examples/typescript/pie-chart/package.json +1 -1
- package/examples/typescript/pie-donut-chart/package.json +1 -1
- package/examples/typescript/pie-variable-radius/package.json +1 -1
- package/examples/typescript/radar-column-iwatch-style/package.json +1 -1
- package/examples/typescript/radar-heat-map/package.json +1 -1
- package/examples/typescript/radar-line/package.json +1 -1
- package/examples/typescript/radar-time-line/package.json +1 -1
- package/examples/typescript/sliced-funnel/package.json +1 -1
- package/examples/typescript/sliced-pictorial-stacked/package.json +1 -1
- package/examples/typescript/sliced-pyramid/package.json +1 -1
- package/examples/typescript/venn-diagram/package.json +1 -1
- package/examples/typescript/wordcloud-with-data/package.json +1 -1
- package/examples/typescript/wordcloud-with-text/package.json +1 -1
- package/examples/typescript/xy-100-percent-stacked-column/package.json +1 -1
- package/examples/typescript/xy-animated-bullet-at-the-end-of-the-series/package.json +1 -1
- package/examples/typescript/xy-bubble/package.json +1 -1
- package/examples/typescript/xy-candlestick/package.json +1 -1
- package/examples/typescript/xy-clustered-column/package.json +1 -1
- package/examples/typescript/xy-column/package.json +1 -1
- package/examples/typescript/xy-comparing-series-google-analytics-style/package.json +1 -1
- package/examples/typescript/xy-data-grouping/package.json +1 -1
- package/examples/typescript/xy-draggable-range/package.json +1 -1
- package/examples/typescript/xy-drawing-series-with-mouse-or-touch/package.json +1 -1
- package/examples/typescript/xy-dumbbell plot/package.json +1 -1
- package/examples/typescript/xy-evenly-spaced-date-axis/package.json +1 -1
- package/examples/typescript/xy-line/package.json +1 -1
- package/examples/typescript/xy-line-highlight-on-legend-hover/package.json +1 -1
- package/examples/typescript/xy-live-data/package.json +1 -1
- package/examples/typescript/xy-multiple-synced-value-axes/package.json +1 -1
- package/examples/typescript/xy-ohlc/package.json +1 -1
- package/examples/typescript/xy-real-time-data-sorting/package.json +1 -1
- package/examples/typescript/xy-smoothed-line/package.json +1 -1
- package/examples/typescript/xy-stacked-and-clustered-column/package.json +1 -1
- package/examples/typescript/xy-stacked-column/package.json +1 -1
- package/examples/typescript/xy-stacked-step/package.json +1 -1
- package/examples/typescript/xy-stock/package.json +1 -1
- package/examples/typescript/xy-stock-comparing/package.json +1 -1
- package/package.json +3 -2
|
@@ -29,6 +29,7 @@ export declare class Annotator extends Entity {
|
|
|
29
29
|
private _container?;
|
|
30
30
|
private _picture?;
|
|
31
31
|
private _markerArea?;
|
|
32
|
+
private _skipRender?;
|
|
32
33
|
protected _afterNew(): void;
|
|
33
34
|
_beforeChanged(): void;
|
|
34
35
|
/**
|
|
@@ -36,6 +37,7 @@ export declare class Annotator extends Entity {
|
|
|
36
37
|
* disable all interactions on the chart itself.
|
|
37
38
|
*/
|
|
38
39
|
open(): Promise<void>;
|
|
40
|
+
_renderState(): Promise<void>;
|
|
39
41
|
/**
|
|
40
42
|
* Exists from annotation mode. All annotations remain visible on the chart.
|
|
41
43
|
*/
|
|
@@ -55,7 +57,7 @@ export declare class Annotator extends Entity {
|
|
|
55
57
|
/**
|
|
56
58
|
* @ignore
|
|
57
59
|
*/
|
|
58
|
-
private
|
|
60
|
+
private _getMarkerJS;
|
|
59
61
|
/**
|
|
60
62
|
* An instance of MarkerJS's [[MarkerArea]].
|
|
61
63
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Annotator.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/plugins/exporting/Annotator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"Annotator.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/plugins/exporting/Annotator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAO/F,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IAE1D;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC;CAElB;AAED,MAAM,WAAW,iBAAkB,SAAQ,cAAc;CACxD;AAED,MAAM,WAAW,gBAAiB,SAAQ,aAAa;CACtD;AAID;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,MAAM;IACpC,OAAc,SAAS,EAAE,MAAM,CAAe;IAC9C,OAAc,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAmD;IAE3E,SAAS,EAAE,kBAAkB,CAAC;IAC9B,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,OAAO,EAAE,gBAAgB,CAAC;IAEzC,OAAO,CAAC,UAAU,CAAC,CAAY;IAC/B,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,WAAW,CAAC,CAAM;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAkB;IAKtC,SAAS,CAAC,SAAS;IAMZ,cAAc;IAQrB;;;OAGG;IACU,IAAI;IAeJ,YAAY;IAQzB;;OAEG;IACU,KAAK;IAMlB;;;OAGG;IACU,MAAM;IAOnB;;OAEG;IACI,KAAK;IAOC,MAAM;IAUZ,OAAO,IAAI,IAAI;YAOR,UAAU;IA6CxB;;OAEG;YACW,YAAY;IAI1B;;;;;OAKG;IACU,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC;CAK1C"}
|
|
@@ -2,6 +2,7 @@ import { __awaiter, __extends, __generator } from "tslib";
|
|
|
2
2
|
import { Entity } from "../../core/util/Entity";
|
|
3
3
|
import { Container } from "../../core/render/Container";
|
|
4
4
|
import { Picture } from "../../core/render/Picture";
|
|
5
|
+
import * as $utils from "../../core/util/Utils";
|
|
5
6
|
import { p100 } from "../../core/util/Percent";
|
|
6
7
|
/**
|
|
7
8
|
* A plugin that can be used to annotate charts.
|
|
@@ -30,6 +31,12 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
30
31
|
writable: true,
|
|
31
32
|
value: void 0
|
|
32
33
|
});
|
|
34
|
+
Object.defineProperty(_this, "_skipRender", {
|
|
35
|
+
enumerable: true,
|
|
36
|
+
configurable: true,
|
|
37
|
+
writable: true,
|
|
38
|
+
value: false
|
|
39
|
+
});
|
|
33
40
|
return _this;
|
|
34
41
|
}
|
|
35
42
|
//public extraImages: Array<Root | IAnnotatorImageSource> = [];
|
|
@@ -42,11 +49,6 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
42
49
|
_super.prototype._afterNew.call(this);
|
|
43
50
|
this._setRawDefault("layer", 1000);
|
|
44
51
|
this._root.addDisposer(this);
|
|
45
|
-
if (this.get("markerState")) {
|
|
46
|
-
// Preload image
|
|
47
|
-
this.open();
|
|
48
|
-
this.close();
|
|
49
|
-
}
|
|
50
52
|
}
|
|
51
53
|
});
|
|
52
54
|
Object.defineProperty(Annotator.prototype, "_beforeChanged", {
|
|
@@ -55,6 +57,9 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
55
57
|
writable: true,
|
|
56
58
|
value: function () {
|
|
57
59
|
_super.prototype._beforeChanged.call(this);
|
|
60
|
+
if (this.isDirty("markerState")) {
|
|
61
|
+
this._renderState();
|
|
62
|
+
}
|
|
58
63
|
}
|
|
59
64
|
});
|
|
60
65
|
/**
|
|
@@ -90,6 +95,28 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
90
95
|
});
|
|
91
96
|
}
|
|
92
97
|
});
|
|
98
|
+
Object.defineProperty(Annotator.prototype, "_renderState", {
|
|
99
|
+
enumerable: false,
|
|
100
|
+
configurable: true,
|
|
101
|
+
writable: true,
|
|
102
|
+
value: function () {
|
|
103
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
104
|
+
var markerArea;
|
|
105
|
+
return __generator(this, function (_a) {
|
|
106
|
+
switch (_a.label) {
|
|
107
|
+
case 0: return [4 /*yield*/, this.getMarkerArea()];
|
|
108
|
+
case 1:
|
|
109
|
+
markerArea = _a.sent();
|
|
110
|
+
if (this.get("markerState")) {
|
|
111
|
+
this._skipRender = true;
|
|
112
|
+
markerArea.renderState(this.get("markerState"));
|
|
113
|
+
}
|
|
114
|
+
return [2 /*return*/];
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
});
|
|
93
120
|
/**
|
|
94
121
|
* Exists from annotation mode. All annotations remain visible on the chart.
|
|
95
122
|
*/
|
|
@@ -102,12 +129,9 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
102
129
|
var markerArea;
|
|
103
130
|
return __generator(this, function (_a) {
|
|
104
131
|
switch (_a.label) {
|
|
105
|
-
case 0:
|
|
106
|
-
this._root._renderer.interactionsEnabled = true;
|
|
107
|
-
return [4 /*yield*/, this.getMarkerArea()];
|
|
132
|
+
case 0: return [4 /*yield*/, this.getMarkerArea()];
|
|
108
133
|
case 1:
|
|
109
134
|
markerArea = _a.sent();
|
|
110
|
-
this._picture.show(0);
|
|
111
135
|
markerArea.close();
|
|
112
136
|
return [2 /*return*/];
|
|
113
137
|
}
|
|
@@ -215,7 +239,7 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
215
239
|
}));
|
|
216
240
|
}
|
|
217
241
|
if (!!this._markerArea) return [3 /*break*/, 2];
|
|
218
|
-
return [4 /*yield*/, this.
|
|
242
|
+
return [4 /*yield*/, this._getMarkerJS()];
|
|
219
243
|
case 1:
|
|
220
244
|
markerjs2 = _a.sent();
|
|
221
245
|
canvas = this._container._display.getCanvas();
|
|
@@ -224,12 +248,18 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
224
248
|
markerArea.uiStyleSettings.logoPosition = "right";
|
|
225
249
|
markerArea.uiStyleSettings.zIndex = 20;
|
|
226
250
|
markerArea.targetRoot = canvas.parentElement;
|
|
227
|
-
|
|
251
|
+
this._disposers.push($utils.addEventListener(markerArea, "close", function () {
|
|
252
|
+
_this._root._renderer.interactionsEnabled = true;
|
|
253
|
+
_this._picture.show(0);
|
|
254
|
+
}));
|
|
255
|
+
this._disposers.push($utils.addEventListener(markerArea, "render", function (event) {
|
|
228
256
|
var picture = _this._picture;
|
|
229
|
-
picture.set("src",
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
257
|
+
picture.set("src", event.dataUrl);
|
|
258
|
+
if (!_this._skipRender) {
|
|
259
|
+
_this.set("markerState", event.state);
|
|
260
|
+
}
|
|
261
|
+
_this._skipRender = false;
|
|
262
|
+
}));
|
|
233
263
|
this._markerArea = markerArea;
|
|
234
264
|
_a.label = 2;
|
|
235
265
|
case 2: return [2 /*return*/];
|
|
@@ -241,7 +271,7 @@ var Annotator = /** @class */ (function (_super) {
|
|
|
241
271
|
/**
|
|
242
272
|
* @ignore
|
|
243
273
|
*/
|
|
244
|
-
Object.defineProperty(Annotator.prototype, "
|
|
274
|
+
Object.defineProperty(Annotator.prototype, "_getMarkerJS", {
|
|
245
275
|
enumerable: false,
|
|
246
276
|
configurable: true,
|
|
247
277
|
writable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Annotator.js","sourceRoot":"","sources":["../../../../../src/.internal/plugins/exporting/Annotator.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAkD,MAAM,wBAAwB,CAAA;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Annotator.js","sourceRoot":"","sources":["../../../../../src/.internal/plugins/exporting/Annotator.ts"],"names":[],"mappings":"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","sourcesContent":["import { Entity, IEntitySettings, IEntityPrivate, IEntityEvents } from \"../../core/util/Entity\"\nimport { Container } from \"../../core/render/Container\";\nimport { Picture } from \"../../core/render/Picture\";\nimport * as $utils from \"../../core/util/Utils\";\n\nimport { p100 } from \"../../core/util/Percent\";\n\nexport interface IAnnotatorSettings extends IEntitySettings {\n\n\t/**\n\t * Layer number to use for annotations.\n\t *\n\t * @default 1000\n\t */\n\tlayer?: number;\n\n\t/**\n\t * Raw annotation info saved by MarkerJS.\n\t */\n\tmarkerState?: any;\n\n}\n\nexport interface IAnnotatorPrivate extends IEntityPrivate {\n}\n\nexport interface IAnnotatorEvents extends IEntityEvents {\n}\n\n\n\n/**\n * A plugin that can be used to annotate charts.\n *\n * @see {@link https://www.amcharts.com/docs/v5/concepts/exporting/annotator/} for more info\n */\nexport class Annotator extends Entity {\n\tpublic static className: string = \"Annotator\";\n\tpublic static classNames: Array<string> = Entity.classNames.concat([Annotator.className]);\n\n\tdeclare public _settings: IAnnotatorSettings;\n\tdeclare public _privateSettings: IAnnotatorPrivate;\n\tdeclare public _events: IAnnotatorEvents;\n\n\tprivate _container?: Container;\n\tprivate _picture?: Picture;\n\tprivate _markerArea?: any;\n\tprivate _skipRender?: boolean = false;\n\n\t//public extraImages: Array<Root | IAnnotatorImageSource> = [];\n\t//public dataSources: any[] = [];\n\n\tprotected _afterNew() {\n\t\tsuper._afterNew();\n\t\tthis._setRawDefault(\"layer\", 1000);\n\t\tthis._root.addDisposer(this);\n\t}\n\n\tpublic _beforeChanged() {\n\t\tsuper._beforeChanged();\n\n\t\tif (this.isDirty(\"markerState\")) {\n\t\t\tthis._renderState();\n\t\t}\n\t}\n\n\t/**\n\t * Triggers annotation mode on the chart. This will display UI toolbars and\n\t * disable all interactions on the chart itself.\n\t */\n\tpublic async open() {\n\n\t\t// Delay this so that it's not knocked off by closing of the ExportingMenu\n\t\tthis.setTimeout(() => {\n\t\t\tthis._root._renderer.interactionsEnabled = false;\n\t\t}, 100)\n\n\t\tconst markerArea = await this.getMarkerArea();\n\t\tmarkerArea.show();\n\t\tthis._picture!.hide(0);\n\t\tif (this.get(\"markerState\")) {\n\t\t\tmarkerArea.restoreState(this.get(\"markerState\"));\n\t\t}\n\t}\n\n\tpublic async _renderState() {\n\t\tconst markerArea = await this.getMarkerArea();\n\t\tif (this.get(\"markerState\")) {\n\t\t\tthis._skipRender = true;\n\t\t\tmarkerArea.renderState(this.get(\"markerState\"));\n\t\t}\n\t}\n\n\t/**\n\t * Exists from annotation mode. All annotations remain visible on the chart.\n\t */\n\tpublic async close() {\n\t\t//this._root._renderer.interactionsEnabled = true;\n\t\tconst markerArea = await this.getMarkerArea();\n\t\tmarkerArea!.close();\n\t}\n\n\t/**\n\t * Exits from annotation mode. Any changes made during last session of the\n\t * annotation editing are cancelled.\n\t */\n\tpublic async cancel() {\n\t\tthis._root._renderer.interactionsEnabled = true;\n\t\tconst markerArea = await this.getMarkerArea();\n\t\tthis._picture!.show(0);\n\t\tmarkerArea!.cancel();\n\t}\n\n\t/**\n\t * All annotations are removed.\n\t */\n\tpublic clear() {\n\t\tthis.set(\"markerState\", undefined);\n\t\tif (this._picture) {\n\t\t\tthis._picture.set(\"src\", \"\");\n\t\t}\n\t}\n\n\tpublic async toggle() {\n\t\tconst markerArea = await this.getMarkerArea();\n\t\tif (markerArea.isOpen) {\n\t\t\tthis.close();\n\t\t}\n\t\telse {\n\t\t\tthis.open();\n\t\t}\n\t}\n\n\tpublic dispose(): void {\n\t\tsuper.dispose();\n\t\tif (this._markerArea && this._markerArea.isOpen) {\n\t\t\tthis._markerArea.close();\n\t\t}\n\t}\n\n\tprivate async _maybeInit() {\n\n\t\t// Create layer canvas\n\t\tif (!this._container) {\n\t\t\tthis._container = this._root.container.children.push(Container.new(this._root, {\n\t\t\t\twidth: p100,\n\t\t\t\theight: p100,\n\t\t\t\tlayer: this.get(\"layer\"),\n\t\t\t\tinteractiveChildren: false\n\t\t\t}));\n\n\t\t\tthis._picture = this._container.children.push(Picture.new(this._root, {\n\t\t\t\twidth: p100,\n\t\t\t\theight: p100\n\t\t\t}));\n\t\t}\n\n\t\t// Create MarkerArea\n\t\tif (!this._markerArea) {\n\t\t\tconst markerjs2 = await this._getMarkerJS();\n\t\t\tconst canvas = this._container._display.getCanvas();\n\t\t\tconst markerArea = new markerjs2.MarkerArea(canvas);\n\t\t\t//markerArea.renderTarget = canvas;\n\t\t\tmarkerArea.uiStyleSettings.logoPosition = \"right\";\n\t\t\tmarkerArea.uiStyleSettings.zIndex = 20;\n\t\t\tmarkerArea.targetRoot = canvas.parentElement!;\n\n\t\t\tthis._disposers.push($utils.addEventListener(markerArea, \"close\", () => {\n\t\t\t\tthis._root._renderer.interactionsEnabled = true;\n\t\t\t\tthis._picture!.show(0);\n\t\t\t}));\n\n\t\t\tthis._disposers.push($utils.addEventListener(markerArea, \"render\", (event: any) => {\n\t\t\t\tconst picture = this._picture!;\n\t\t\t\tpicture.set(\"src\", event.dataUrl);\n\t\t\t\tif (!this._skipRender) {\n\t\t\t\t\tthis.set(\"markerState\", event.state);\n\t\t\t\t}\n\t\t\t\tthis._skipRender = false;\n\t\t\t}));\n\n\t\t\tthis._markerArea = markerArea;\n\t\t}\n\t}\n\n\t/**\n\t * @ignore\n\t */\n\tprivate async _getMarkerJS(): Promise<any> {\n\t\treturn await import(/* webpackChunkName: \"markerjs2\" */ \"markerjs2\");\n\t}\n\n\t/**\n\t * An instance of MarkerJS's [[MarkerArea]].\n\t *\n\t * @see {@link https://markerjs.com/docs/getting-started} for more info\n\t * @return MarkerArea\n\t */\n\tpublic async getMarkerArea(): Promise<any> {\n\t\tawait this._maybeInit();\n\t\treturn this._markerArea;\n\t}\n\n}\n"]}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ExportingMenu } from "./ExportingMenu";
|
|
2
|
+
import type { TimeUnit } from "../../core/util/Time";
|
|
2
3
|
import { Entity, IEntitySettings, IEntityPrivate, IEntityEvents } from "../../core/util/Entity";
|
|
3
4
|
import { Color } from "../../core/util/Color";
|
|
4
5
|
import { Root } from "../../core/Root";
|
|
@@ -105,6 +106,30 @@ export interface IExportingSettings extends IEntitySettings {
|
|
|
105
106
|
* Use this date format on date values.
|
|
106
107
|
*/
|
|
107
108
|
dateFormat?: string | Intl.DateTimeFormatOptions;
|
|
109
|
+
/**
|
|
110
|
+
* Fields in data that need to be formatted as "duration" as per `durationFormat`.
|
|
111
|
+
*
|
|
112
|
+
* @since 5.0.16
|
|
113
|
+
*/
|
|
114
|
+
durationFields?: string[];
|
|
115
|
+
/**
|
|
116
|
+
* Format to use when formatting values in `durationFields`.
|
|
117
|
+
*
|
|
118
|
+
* If not set, will use `durationFormat` as set in [[DurationFormatter]] of
|
|
119
|
+
* the root element.
|
|
120
|
+
*
|
|
121
|
+
* @since 5.0.16
|
|
122
|
+
*/
|
|
123
|
+
durationFormat?: string;
|
|
124
|
+
/**
|
|
125
|
+
* Time unit to assume duration values are in.
|
|
126
|
+
*
|
|
127
|
+
* If not set, will use `baseUnit` as set in [[DurationFormatter]] of
|
|
128
|
+
* the root element.
|
|
129
|
+
*
|
|
130
|
+
* @since 5.0.16
|
|
131
|
+
*/
|
|
132
|
+
durationUnit?: TimeUnit;
|
|
108
133
|
/**
|
|
109
134
|
* Include these images or other charts in image exports.
|
|
110
135
|
*/
|
|
@@ -687,6 +712,10 @@ export declare class Exporting extends Entity {
|
|
|
687
712
|
* @ignore
|
|
688
713
|
*/
|
|
689
714
|
isNumericField(field: string): boolean;
|
|
715
|
+
/**
|
|
716
|
+
* @ignore
|
|
717
|
+
*/
|
|
718
|
+
isDurationField(field: string): boolean;
|
|
690
719
|
/**
|
|
691
720
|
* @ignore
|
|
692
721
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Exporting.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/plugins/exporting/Exporting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"Exporting.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/plugins/exporting/Exporting.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,6 +65,7 @@ var Exporting = /** @class */ (function (_super) {
|
|
|
65
65
|
this._setRawDefault("charset", "utf-8");
|
|
66
66
|
this._setRawDefault("numericFields", []);
|
|
67
67
|
this._setRawDefault("dateFields", []);
|
|
68
|
+
this._setRawDefault("durationFields", []);
|
|
68
69
|
this._setRawDefault("extraImages", []);
|
|
69
70
|
this._setRawDefault("pngOptions", { quality: 1, maintainPixelRatio: false });
|
|
70
71
|
this._setRawDefault("jpgOptions", { quality: 0.8, maintainPixelRatio: false });
|
|
@@ -1469,6 +1470,9 @@ var Exporting = /** @class */ (function (_super) {
|
|
|
1469
1470
|
else if (this.isNumericField(field) && this.get("numberFormat")) {
|
|
1470
1471
|
return this._root.numberFormatter.format(value, this.get("numberFormat"));
|
|
1471
1472
|
}
|
|
1473
|
+
else if (this.isDurationField(field)) {
|
|
1474
|
+
return this._root.durationFormatter.format(value, this.get("durationFormat"), this.get("durationUnit"));
|
|
1475
|
+
}
|
|
1472
1476
|
}
|
|
1473
1477
|
if (value instanceof Date) {
|
|
1474
1478
|
if (options.useTimestamps) {
|
|
@@ -1508,6 +1512,17 @@ var Exporting = /** @class */ (function (_super) {
|
|
|
1508
1512
|
return this.get("numericFields").indexOf(field) !== -1;
|
|
1509
1513
|
}
|
|
1510
1514
|
});
|
|
1515
|
+
/**
|
|
1516
|
+
* @ignore
|
|
1517
|
+
*/
|
|
1518
|
+
Object.defineProperty(Exporting.prototype, "isDurationField", {
|
|
1519
|
+
enumerable: false,
|
|
1520
|
+
configurable: true,
|
|
1521
|
+
writable: true,
|
|
1522
|
+
value: function (field) {
|
|
1523
|
+
return this.get("durationFields").indexOf(field) !== -1;
|
|
1524
|
+
}
|
|
1525
|
+
});
|
|
1511
1526
|
/**
|
|
1512
1527
|
* @ignore
|
|
1513
1528
|
*/
|