@amcharts/amcharts5 5.1.7 → 5.1.8
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/flow/ChordLink.d.ts +12 -0
- package/.internal/charts/flow/ChordLink.d.ts.map +1 -1
- package/.internal/charts/flow/ChordLink.js.map +1 -1
- package/.internal/charts/flow/Flow.d.ts +2 -0
- package/.internal/charts/flow/Flow.d.ts.map +1 -1
- package/.internal/charts/flow/Flow.js +17 -0
- package/.internal/charts/flow/Flow.js.map +1 -1
- package/.internal/charts/flow/FlowNodes.d.ts +7 -0
- package/.internal/charts/flow/FlowNodes.d.ts.map +1 -1
- package/.internal/charts/flow/FlowNodes.js +7 -0
- package/.internal/charts/flow/FlowNodes.js.map +1 -1
- package/.internal/charts/flow/Sankey.d.ts.map +1 -1
- package/.internal/charts/flow/Sankey.js +59 -57
- package/.internal/charts/flow/Sankey.js.map +1 -1
- package/.internal/charts/funnel/FunnelSeries.d.ts +9 -0
- package/.internal/charts/funnel/FunnelSeries.d.ts.map +1 -1
- package/.internal/charts/funnel/FunnelSeries.js.map +1 -1
- package/.internal/charts/hierarchy/Hierarchy.d.ts +36 -0
- package/.internal/charts/hierarchy/Hierarchy.d.ts.map +1 -1
- package/.internal/charts/hierarchy/Hierarchy.js.map +1 -1
- package/.internal/charts/map/MapChart.d.ts +2 -0
- package/.internal/charts/map/MapChart.d.ts.map +1 -1
- package/.internal/charts/map/MapChart.js +30 -3
- package/.internal/charts/map/MapChart.js.map +1 -1
- package/.internal/charts/map/MapPointSeries.d.ts +6 -0
- package/.internal/charts/map/MapPointSeries.d.ts.map +1 -1
- package/.internal/charts/map/MapPointSeries.js.map +1 -1
- package/.internal/charts/percent/PercentSeries.d.ts +18 -0
- package/.internal/charts/percent/PercentSeries.d.ts.map +1 -1
- package/.internal/charts/percent/PercentSeries.js.map +1 -1
- package/.internal/charts/pie/PieSeries.d.ts +3 -0
- package/.internal/charts/pie/PieSeries.d.ts.map +1 -1
- package/.internal/charts/pie/PieSeries.js.map +1 -1
- package/.internal/charts/radar/AxisRendererCircular.d.ts +12 -0
- package/.internal/charts/radar/AxisRendererCircular.d.ts.map +1 -1
- package/.internal/charts/radar/AxisRendererCircular.js.map +1 -1
- package/.internal/charts/radar/AxisRendererRadial.d.ts +12 -0
- package/.internal/charts/radar/AxisRendererRadial.d.ts.map +1 -1
- package/.internal/charts/radar/AxisRendererRadial.js.map +1 -1
- package/.internal/charts/radar/RadarChart.d.ts +1 -0
- package/.internal/charts/radar/RadarChart.d.ts.map +1 -1
- package/.internal/charts/radar/RadarChart.js +7 -0
- package/.internal/charts/radar/RadarChart.js.map +1 -1
- package/.internal/charts/radar/RadarColumnSeries.d.ts +15 -0
- package/.internal/charts/radar/RadarColumnSeries.d.ts.map +1 -1
- package/.internal/charts/radar/RadarColumnSeries.js.map +1 -1
- package/.internal/charts/radar/RadarCursor.d.ts +12 -0
- package/.internal/charts/radar/RadarCursor.d.ts.map +1 -1
- package/.internal/charts/radar/RadarCursor.js.map +1 -1
- package/.internal/charts/wordcloud/WordCloud.d.ts +3 -0
- package/.internal/charts/wordcloud/WordCloud.d.ts.map +1 -1
- package/.internal/charts/wordcloud/WordCloud.js.map +1 -1
- package/.internal/charts/xy/XYChart.d.ts +42 -0
- package/.internal/charts/xy/XYChart.d.ts.map +1 -1
- package/.internal/charts/xy/XYChart.js +163 -9
- package/.internal/charts/xy/XYChart.js.map +1 -1
- package/.internal/charts/xy/XYChartDefaultTheme.d.ts.map +1 -1
- package/.internal/charts/xy/XYChartDefaultTheme.js +3 -1
- package/.internal/charts/xy/XYChartDefaultTheme.js.map +1 -1
- package/.internal/charts/xy/XYCursor.d.ts.map +1 -1
- package/.internal/charts/xy/XYCursor.js +8 -1
- package/.internal/charts/xy/XYCursor.js.map +1 -1
- package/.internal/charts/xy/axes/AxisLabel.d.ts.map +1 -1
- package/.internal/charts/xy/axes/AxisLabel.js.map +1 -1
- package/.internal/charts/xy/axes/AxisRenderer.d.ts +3 -0
- package/.internal/charts/xy/axes/AxisRenderer.d.ts.map +1 -1
- package/.internal/charts/xy/axes/AxisRenderer.js.map +1 -1
- package/.internal/charts/xy/axes/DurationAxis.d.ts +5 -0
- package/.internal/charts/xy/axes/DurationAxis.d.ts.map +1 -1
- package/.internal/charts/xy/axes/DurationAxis.js.map +1 -1
- package/.internal/charts/xy/axes/GaplessDateAxis.d.ts +3 -0
- package/.internal/charts/xy/axes/GaplessDateAxis.d.ts.map +1 -1
- package/.internal/charts/xy/axes/GaplessDateAxis.js.map +1 -1
- package/.internal/charts/xy/axes/ValueAxis.d.ts +74 -0
- package/.internal/charts/xy/axes/ValueAxis.d.ts.map +1 -1
- package/.internal/charts/xy/axes/ValueAxis.js +1 -0
- package/.internal/charts/xy/axes/ValueAxis.js.map +1 -1
- package/.internal/charts/xy/series/Candlestick.d.ts +27 -0
- package/.internal/charts/xy/series/Candlestick.d.ts.map +1 -1
- package/.internal/charts/xy/series/Candlestick.js.map +1 -1
- package/.internal/charts/xy/series/CandlestickSeries.d.ts +6 -1
- package/.internal/charts/xy/series/CandlestickSeries.d.ts.map +1 -1
- package/.internal/charts/xy/series/CandlestickSeries.js.map +1 -1
- package/.internal/charts/xy/series/ColumnSeries.d.ts +3 -0
- package/.internal/charts/xy/series/ColumnSeries.d.ts.map +1 -1
- package/.internal/charts/xy/series/ColumnSeries.js.map +1 -1
- package/.internal/charts/xy/series/OHLCSeries.d.ts +3 -0
- package/.internal/charts/xy/series/OHLCSeries.d.ts.map +1 -1
- package/.internal/charts/xy/series/OHLCSeries.js.map +1 -1
- package/.internal/core/render/Graphics.d.ts +2 -0
- package/.internal/core/render/Graphics.d.ts.map +1 -1
- package/.internal/core/render/Graphics.js.map +1 -1
- package/.internal/core/render/Sprite.d.ts.map +1 -1
- package/.internal/core/render/Sprite.js +15 -1
- package/.internal/core/render/Sprite.js.map +1 -1
- package/.internal/core/render/VerticalLayout.js +1 -1
- package/.internal/core/render/VerticalLayout.js.map +1 -1
- package/.internal/core/render/backend/CanvasRenderer.d.ts +0 -2
- package/.internal/core/render/backend/CanvasRenderer.d.ts.map +1 -1
- package/.internal/core/render/backend/CanvasRenderer.js +17 -11
- package/.internal/core/render/backend/CanvasRenderer.js.map +1 -1
- package/.internal/core/util/Benchmark.js +1 -1
- package/.internal/core/util/Benchmark.js.map +1 -1
- package/.internal/core/util/Entity.d.ts +1 -1
- package/.internal/core/util/Entity.d.ts.map +1 -1
- package/.internal/core/util/Entity.js +1 -1
- package/.internal/core/util/Entity.js.map +1 -1
- package/.internal/core/util/Language.js +3 -3
- package/.internal/core/util/Language.js.map +1 -1
- package/.internal/core/util/ResizeSensor.d.ts.map +1 -1
- package/.internal/core/util/ResizeSensor.js +1 -2
- package/.internal/core/util/ResizeSensor.js.map +1 -1
- package/.internal/core/util/Template.d.ts +1 -1
- package/.internal/core/util/Template.d.ts.map +1 -1
- package/.internal/core/util/Template.js.map +1 -1
- package/.internal/core/util/Utils.js +1 -1
- package/.internal/core/util/Utils.js.map +1 -1
- package/.internal/plugins/exporting/Exporting.d.ts +0 -4
- package/.internal/plugins/exporting/Exporting.d.ts.map +1 -1
- package/.internal/plugins/exporting/Exporting.js +4 -49
- package/.internal/plugins/exporting/Exporting.js.map +1 -1
- package/CHANGELOG.md +19 -0
- 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 +2 -1
|
@@ -82,12 +82,38 @@ export interface IXYChartSettings extends ISerialChartSettings {
|
|
|
82
82
|
* @default true
|
|
83
83
|
*/
|
|
84
84
|
arrangeTooltips?: boolean;
|
|
85
|
+
/**
|
|
86
|
+
* If set to `true`, using pinch gesture on the chart's plot area will zoom
|
|
87
|
+
* chart horizontally.
|
|
88
|
+
*
|
|
89
|
+
* NOTE: this setting is not supported in a [[RadarChart]].
|
|
90
|
+
*
|
|
91
|
+
* @see {@link https://www.amcharts.com/docs/v5/charts/xy-chart/zoom-and-pan/#Pinch_zoom} for more info
|
|
92
|
+
* @since 5.1.8
|
|
93
|
+
* @default false
|
|
94
|
+
*/
|
|
95
|
+
pinchZoomX?: boolean;
|
|
96
|
+
/**
|
|
97
|
+
* If set to `true`, using pinch gesture on the chart's plot area will zoom
|
|
98
|
+
* chart vertically.
|
|
99
|
+
*
|
|
100
|
+
* NOTE: this setting is not supported in a [[RadarChart]].
|
|
101
|
+
*
|
|
102
|
+
* @see {@link https://www.amcharts.com/docs/v5/charts/xy-chart/zoom-and-pan/#Pinch_zoom} for more info
|
|
103
|
+
* @since 5.1.8
|
|
104
|
+
* @default false
|
|
105
|
+
*/
|
|
106
|
+
pinchZoomY?: boolean;
|
|
85
107
|
}
|
|
86
108
|
export interface IXYChartPrivate extends ISerialChartPrivate {
|
|
87
109
|
/**
|
|
88
110
|
* A list of [[Series]] that currently have their tooltip being displayed.
|
|
89
111
|
*/
|
|
90
112
|
tooltipSeries?: Array<XYSeries>;
|
|
113
|
+
/**
|
|
114
|
+
* @ignore
|
|
115
|
+
*/
|
|
116
|
+
otherCharts?: Array<XYChart>;
|
|
91
117
|
}
|
|
92
118
|
export interface IXYChartEvents extends ISerialChartEvents {
|
|
93
119
|
/**
|
|
@@ -174,6 +200,14 @@ export declare class XYChart extends SerialChart {
|
|
|
174
200
|
* @default Container.new()
|
|
175
201
|
*/
|
|
176
202
|
readonly plotContainer: Container;
|
|
203
|
+
/**
|
|
204
|
+
* A [[Container]] used for any elements that need to be displayed over
|
|
205
|
+
* regular `plotContainer`.
|
|
206
|
+
*
|
|
207
|
+
* @see {@link https://www.amcharts.com/docs/v5/charts/xy-chart/xy-chart-containers/} for more info
|
|
208
|
+
* @default Container.new()
|
|
209
|
+
*/
|
|
210
|
+
readonly topPlotContainer: Container;
|
|
177
211
|
/**
|
|
178
212
|
* A [[Container]] axis grid elements are stored in.
|
|
179
213
|
*
|
|
@@ -213,6 +247,13 @@ export declare class XYChart extends SerialChart {
|
|
|
213
247
|
_movePoint: IPoint;
|
|
214
248
|
protected _wheelDp: IDisposer | undefined;
|
|
215
249
|
_otherCharts?: Array<XYChart>;
|
|
250
|
+
protected _movePoints: {
|
|
251
|
+
[index: number]: IPoint;
|
|
252
|
+
};
|
|
253
|
+
protected _downStartX?: number;
|
|
254
|
+
protected _downEndX?: number;
|
|
255
|
+
protected _downStartY?: number;
|
|
256
|
+
protected _downEndY?: number;
|
|
216
257
|
protected _afterNew(): void;
|
|
217
258
|
protected _removeSeries(series: this["_seriesType"]): void;
|
|
218
259
|
protected _handleSetWheel(): void;
|
|
@@ -221,6 +262,7 @@ export declare class XYChart extends SerialChart {
|
|
|
221
262
|
protected _dispatchWheelAnimation(): void;
|
|
222
263
|
protected _handlePlotUp(_event: IPointerEvent): void;
|
|
223
264
|
protected _handlePlotMove(event: IPointerEvent): void;
|
|
265
|
+
protected _handlePinch(): void;
|
|
224
266
|
_handleCursorPosition(): void;
|
|
225
267
|
_updateCursor(): void;
|
|
226
268
|
protected _addCursor(cursor: XYCursor): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XYChart.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/charts/xy/XYChart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAqB,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAC3H,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"XYChart.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/charts/xy/XYChart.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { Percent } from "../../core/util/Percent";
|
|
|
12
12
|
import * as $array from "../../core/util/Array";
|
|
13
13
|
import * as $type from "../../core/util/Type";
|
|
14
14
|
import * as $order from "../../core/util/Order";
|
|
15
|
+
import * as $object from "../../core/util/Object";
|
|
15
16
|
/**
|
|
16
17
|
* Creates an XY chart.
|
|
17
18
|
*
|
|
@@ -109,6 +110,19 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
109
110
|
writable: true,
|
|
110
111
|
value: _this.yAxesAndPlotContainer.children.push(Container.new(_this._root, { width: p100, height: p100, maskContent: false }))
|
|
111
112
|
});
|
|
113
|
+
/**
|
|
114
|
+
* A [[Container]] used for any elements that need to be displayed over
|
|
115
|
+
* regular `plotContainer`.
|
|
116
|
+
*
|
|
117
|
+
* @see {@link https://www.amcharts.com/docs/v5/charts/xy-chart/xy-chart-containers/} for more info
|
|
118
|
+
* @default Container.new()
|
|
119
|
+
*/
|
|
120
|
+
Object.defineProperty(_this, "topPlotContainer", {
|
|
121
|
+
enumerable: true,
|
|
122
|
+
configurable: true,
|
|
123
|
+
writable: true,
|
|
124
|
+
value: _this.yAxesAndPlotContainer.children.push(Container.new(_this._root, { width: p100, height: p100, isMeasured: false, position: "absolute" }))
|
|
125
|
+
});
|
|
112
126
|
/**
|
|
113
127
|
* A [[Container]] axis grid elements are stored in.
|
|
114
128
|
*
|
|
@@ -193,6 +207,36 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
193
207
|
writable: true,
|
|
194
208
|
value: void 0
|
|
195
209
|
});
|
|
210
|
+
Object.defineProperty(_this, "_movePoints", {
|
|
211
|
+
enumerable: true,
|
|
212
|
+
configurable: true,
|
|
213
|
+
writable: true,
|
|
214
|
+
value: {}
|
|
215
|
+
});
|
|
216
|
+
Object.defineProperty(_this, "_downStartX", {
|
|
217
|
+
enumerable: true,
|
|
218
|
+
configurable: true,
|
|
219
|
+
writable: true,
|
|
220
|
+
value: void 0
|
|
221
|
+
});
|
|
222
|
+
Object.defineProperty(_this, "_downEndX", {
|
|
223
|
+
enumerable: true,
|
|
224
|
+
configurable: true,
|
|
225
|
+
writable: true,
|
|
226
|
+
value: void 0
|
|
227
|
+
});
|
|
228
|
+
Object.defineProperty(_this, "_downStartY", {
|
|
229
|
+
enumerable: true,
|
|
230
|
+
configurable: true,
|
|
231
|
+
writable: true,
|
|
232
|
+
value: void 0
|
|
233
|
+
});
|
|
234
|
+
Object.defineProperty(_this, "_downEndY", {
|
|
235
|
+
enumerable: true,
|
|
236
|
+
configurable: true,
|
|
237
|
+
writable: true,
|
|
238
|
+
value: void 0
|
|
239
|
+
});
|
|
196
240
|
return _this;
|
|
197
241
|
}
|
|
198
242
|
Object.defineProperty(XYChart.prototype, "_afterNew", {
|
|
@@ -397,10 +441,27 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
397
441
|
configurable: true,
|
|
398
442
|
writable: true,
|
|
399
443
|
value: function (event) {
|
|
400
|
-
|
|
444
|
+
var plotContainer = this.plotContainer;
|
|
445
|
+
var local = plotContainer.toLocal(this._root.documentPointToRoot({ x: event.clientX, y: event.clientY }));
|
|
446
|
+
if (this.get("pinchZoomX") || this.get("pinchZoomY")) {
|
|
447
|
+
var touchEvent = event;
|
|
448
|
+
var pointerId = touchEvent.pointerId;
|
|
449
|
+
if (pointerId) {
|
|
450
|
+
if ($object.keys(plotContainer._downPoints).length > 0) {
|
|
451
|
+
var xAxis = this.xAxes.getIndex(0);
|
|
452
|
+
var yAxis = this.yAxes.getIndex(0);
|
|
453
|
+
if (xAxis) {
|
|
454
|
+
this._downStartX = xAxis.get("start", 0);
|
|
455
|
+
this._downEndX = xAxis.get("end", 1);
|
|
456
|
+
}
|
|
457
|
+
if (yAxis) {
|
|
458
|
+
this._downStartY = yAxis.get("start", 0);
|
|
459
|
+
this._downEndY = yAxis.get("end", 1);
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
}
|
|
463
|
+
}
|
|
401
464
|
if (this.get("panX") || this.get("panY")) {
|
|
402
|
-
var plotContainer = this.plotContainer;
|
|
403
|
-
var local = plotContainer.toLocal(this._root.documentPointToRoot({ x: event.clientX, y: event.clientY }));
|
|
404
465
|
if (local.x >= 0 && local.y >= 0 && local.x <= plotContainer.width() && local.y <= this.height()) {
|
|
405
466
|
this._downPoint = local;
|
|
406
467
|
var panX = this.get("panX");
|
|
@@ -480,11 +541,21 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
480
541
|
configurable: true,
|
|
481
542
|
writable: true,
|
|
482
543
|
value: function (event) {
|
|
483
|
-
|
|
544
|
+
var plotContainer = this.plotContainer;
|
|
545
|
+
if (this.get("pinchZoomX") || this.get("pinchZoomY")) {
|
|
546
|
+
var touchEvent = event;
|
|
547
|
+
var pointerId = touchEvent.pointerId;
|
|
548
|
+
if (pointerId) {
|
|
549
|
+
this._movePoints[pointerId] = this._root.documentPointToRoot({ x: event.clientX, y: event.clientY });
|
|
550
|
+
if ($object.keys(plotContainer._downPoints).length > 1) {
|
|
551
|
+
this._handlePinch();
|
|
552
|
+
return;
|
|
553
|
+
}
|
|
554
|
+
}
|
|
555
|
+
}
|
|
484
556
|
var downPoint = this._downPoint;
|
|
485
557
|
if (downPoint) {
|
|
486
|
-
var
|
|
487
|
-
var local_1 = plotContainer_1.toLocal(this._root.documentPointToRoot({ x: event.clientX, y: event.clientY }));
|
|
558
|
+
var local_1 = plotContainer.toLocal(this._root.documentPointToRoot({ x: event.clientX, y: event.clientY }));
|
|
488
559
|
var panX = this.get("panX");
|
|
489
560
|
var panY = this.get("panY");
|
|
490
561
|
if (panX) {
|
|
@@ -499,7 +570,7 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
499
570
|
var panStart = axis._panStart;
|
|
500
571
|
var panEnd = axis._panEnd;
|
|
501
572
|
var difference = (panEnd - panStart);
|
|
502
|
-
var deltaX = difference * (downPoint.x - local_1.x) /
|
|
573
|
+
var deltaX = difference * (downPoint.x - local_1.x) / plotContainer.width();
|
|
503
574
|
if (axis.get("renderer").get("inversed")) {
|
|
504
575
|
deltaX *= -1;
|
|
505
576
|
}
|
|
@@ -527,7 +598,7 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
527
598
|
var panStart = axis._panStart;
|
|
528
599
|
var panEnd = axis._panEnd;
|
|
529
600
|
var difference = (panEnd - panStart);
|
|
530
|
-
var deltaY = difference * (downPoint.y - local_1.y) /
|
|
601
|
+
var deltaY = difference * (downPoint.y - local_1.y) / plotContainer.height();
|
|
531
602
|
if (axis.get("renderer").get("inversed")) {
|
|
532
603
|
deltaY *= -1;
|
|
533
604
|
}
|
|
@@ -546,6 +617,89 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
546
617
|
}
|
|
547
618
|
}
|
|
548
619
|
});
|
|
620
|
+
Object.defineProperty(XYChart.prototype, "_handlePinch", {
|
|
621
|
+
enumerable: false,
|
|
622
|
+
configurable: true,
|
|
623
|
+
writable: true,
|
|
624
|
+
value: function () {
|
|
625
|
+
var _a, _b, _c, _d;
|
|
626
|
+
var _this = this;
|
|
627
|
+
var plotContainer = this.plotContainer;
|
|
628
|
+
var i = 0;
|
|
629
|
+
var downPoints = [];
|
|
630
|
+
var movePoints = [];
|
|
631
|
+
$object.each(plotContainer._downPoints, function (k, point) {
|
|
632
|
+
downPoints[i] = point;
|
|
633
|
+
var movePoint = _this._movePoints[k];
|
|
634
|
+
if (movePoint) {
|
|
635
|
+
movePoints[i] = movePoint;
|
|
636
|
+
}
|
|
637
|
+
i++;
|
|
638
|
+
});
|
|
639
|
+
if (downPoints.length > 1 && movePoints.length > 1) {
|
|
640
|
+
var w = plotContainer.width();
|
|
641
|
+
var h = plotContainer.height();
|
|
642
|
+
var downPoint0 = downPoints[0];
|
|
643
|
+
var downPoint1 = downPoints[1];
|
|
644
|
+
var movePoint0 = movePoints[0];
|
|
645
|
+
var movePoint1 = movePoints[1];
|
|
646
|
+
if (downPoint0 && downPoint1 && movePoint0 && movePoint1) {
|
|
647
|
+
movePoint0 = plotContainer.toLocal(movePoint0);
|
|
648
|
+
movePoint1 = plotContainer.toLocal(movePoint1);
|
|
649
|
+
downPoint0 = plotContainer.toLocal(downPoint0);
|
|
650
|
+
downPoint1 = plotContainer.toLocal(downPoint1);
|
|
651
|
+
if (this.get("pinchZoomX")) {
|
|
652
|
+
var downStartX = this._downStartX;
|
|
653
|
+
var downEndX = this._downEndX;
|
|
654
|
+
if (downStartX != null && downEndX != null) {
|
|
655
|
+
if (downPoint0.x > downPoint1.x) {
|
|
656
|
+
_a = __read([downPoint1, downPoint0], 2), downPoint0 = _a[0], downPoint1 = _a[1];
|
|
657
|
+
_b = __read([movePoint1, movePoint0], 2), movePoint0 = _b[0], movePoint1 = _b[1];
|
|
658
|
+
}
|
|
659
|
+
var downPos0 = downStartX + (downPoint0.x / w) * (downEndX - downStartX);
|
|
660
|
+
var downPos1 = downStartX + (downPoint1.x / w) * (downEndX - downStartX);
|
|
661
|
+
var movePos0 = downStartX + (movePoint0.x / w) * (downEndX - downStartX);
|
|
662
|
+
var movePos1 = downStartX + (movePoint1.x / w) * (downEndX - downStartX);
|
|
663
|
+
var initialDistance = Math.max(0.001, downPos1 - downPos0);
|
|
664
|
+
var currentDistance = Math.max(0.001, movePos1 - movePos0);
|
|
665
|
+
var d = initialDistance / currentDistance;
|
|
666
|
+
var s_1 = downStartX * d + downPos0 - movePos0 * d;
|
|
667
|
+
var e_1 = downEndX * d + downPos1 - movePos1 * d;
|
|
668
|
+
this.xAxes.each(function (xAxis) {
|
|
669
|
+
var sa = xAxis.fixPosition(s_1);
|
|
670
|
+
var ea = xAxis.fixPosition(e_1);
|
|
671
|
+
xAxis.zoom(sa, ea, 0);
|
|
672
|
+
});
|
|
673
|
+
}
|
|
674
|
+
}
|
|
675
|
+
if (this.get("pinchZoomY")) {
|
|
676
|
+
var downStartY = this._downStartY;
|
|
677
|
+
var downEndY = this._downEndY;
|
|
678
|
+
if (downStartY != null && downEndY != null) {
|
|
679
|
+
if (downPoint0.y < downPoint1.y) {
|
|
680
|
+
_c = __read([downPoint1, downPoint0], 2), downPoint0 = _c[0], downPoint1 = _c[1];
|
|
681
|
+
_d = __read([movePoint1, movePoint0], 2), movePoint0 = _d[0], movePoint1 = _d[1];
|
|
682
|
+
}
|
|
683
|
+
var downPos0 = downStartY + (1 - downPoint0.y / h) * (downEndY - downStartY);
|
|
684
|
+
var downPos1 = downStartY + (1 - downPoint1.y / h) * (downEndY - downStartY);
|
|
685
|
+
var movePos0 = downStartY + (1 - movePoint0.y / h) * (downEndY - downStartY);
|
|
686
|
+
var movePos1 = downStartY + (1 - movePoint1.y / h) * (downEndY - downStartY);
|
|
687
|
+
var initialDistance = Math.max(0.001, downPos1 - downPos0);
|
|
688
|
+
var currentDistance = Math.max(0.001, movePos1 - movePos0);
|
|
689
|
+
var d = initialDistance / currentDistance;
|
|
690
|
+
var s_2 = downStartY * d + downPos0 - movePos0 * d;
|
|
691
|
+
var e_2 = downEndY * d + downPos1 - movePos1 * d;
|
|
692
|
+
this.yAxes.each(function (yAxis) {
|
|
693
|
+
var sa = yAxis.fixPosition(s_2);
|
|
694
|
+
var ea = yAxis.fixPosition(e_2);
|
|
695
|
+
yAxis.zoom(sa, ea, 0);
|
|
696
|
+
});
|
|
697
|
+
}
|
|
698
|
+
}
|
|
699
|
+
}
|
|
700
|
+
}
|
|
701
|
+
}
|
|
702
|
+
});
|
|
549
703
|
Object.defineProperty(XYChart.prototype, "_handleCursorPosition", {
|
|
550
704
|
enumerable: false,
|
|
551
705
|
configurable: true,
|
|
@@ -954,7 +1108,7 @@ var XYChart = /** @class */ (function (_super) {
|
|
|
954
1108
|
writable: true,
|
|
955
1109
|
value: function (point) {
|
|
956
1110
|
var plotContainer = this.plotContainer;
|
|
957
|
-
var otherCharts = this._otherCharts;
|
|
1111
|
+
var otherCharts = this.getPrivate("otherCharts", this._otherCharts);
|
|
958
1112
|
var global = plotContainer.toGlobal(point);
|
|
959
1113
|
if (point.x >= -0.1 && point.y >= -0.1 && point.x <= plotContainer.width() + 0.1 && point.y <= plotContainer.height() + 0.1) {
|
|
960
1114
|
return true;
|