tvcharts 0.9.19 → 0.9.20

package/lib/chart/candlePlot/CandlePlotView.js

@@ -72,6 +72,7 @@ var CandlePlotView = /** @class */function (_super) {
     var group = this.group;
     group.removeAll();
     var emphasisState = seriesModel.get('emphasis').emphasisState;
+    var info = seriesModel.get('info');
     var groupId = seriesModel.get('groupId');
     // const emphasisStyle = emphasis.itemStyle || {};
     var isSimpleBox = data.getLayout('isSimpleBox');
@@ -91,6 +92,7 @@ var CandlePlotView = /** @class */function (_super) {
         }
       });
       el.states.emphasis = emphasisState;
+      el.info = info;
       group.add(el);
     });
     zrUtil.each(bodyPointsByColor, function (points, key) {
@@ -114,6 +116,7 @@ var CandlePlotView = /** @class */function (_super) {
       });
       group.add(el);
       el.states.emphasis = emphasisState;
+      el.info = info;
     });
     // const coordSys = seriesModel.coordinateSystem;
     var clipPath = seriesModel.get('clip', true) ? createClipPath(seriesModel.coordinateSystem, false, seriesModel) : null;

package/lib/chart/candlePlot/candlePlotLayout.js

@@ -225,20 +225,28 @@ function calculateCandleWidth(seriesModel, data) {
 }
 
 function optimalCandlestickWidth(barSpacing, pixelRatio) {
-  var barSpacingSpecialCaseFrom = 2.5;
-  var barSpacingSpecialCaseTo = 4;
-  var barSpacingSpecialCaseCoeff = 3;
-  if (barSpacing >= barSpacingSpecialCaseFrom && barSpacing <= barSpacingSpecialCaseTo) {
-    return Math.floor(barSpacingSpecialCaseCoeff * pixelRatio) - 1;
-  }
-  // coeff should be 1 on small barspacing and go to 0.8 while groing bar spacing
-  var barSpacingReducingCoeff = 0.2;
-  var coeff = 1 - barSpacingReducingCoeff * Math.atan(Math.max(barSpacingSpecialCaseTo, barSpacing) - barSpacingSpecialCaseTo) / (Math.PI * 0.5);
-  var res = Math.floor(barSpacing * coeff * pixelRatio);
-  var scaledBarSpacing = Math.floor(barSpacing * pixelRatio);
-  var optimal = Math.min(res, scaledBarSpacing) - 2;
-  return Math.max(Math.floor(pixelRatio), optimal);
+  if (barSpacing >= 2.5 && barSpacing <= 4) return Math.floor(3 * pixelRatio) - 1;
+  var n = 1 - .2 * Math.atan(Math.max(4, barSpacing) - 4) / (.5 * Math.PI),
+    i = Math.floor(barSpacing * n * pixelRatio),
+    s = Math.floor(barSpacing * pixelRatio),
+    r = Math.min(i, s - 1);
+  return Math.max(Math.floor(pixelRatio), r);
 }
+// function optimalCandlestickWidth(barSpacing: number, pixelRatio: number): number {
+// 	const barSpacingSpecialCaseFrom = 2.5;
+// 	const barSpacingSpecialCaseTo = 4;
+// 	const barSpacingSpecialCaseCoeff = 3;
+// 	if (barSpacing >= barSpacingSpecialCaseFrom && barSpacing <= barSpacingSpecialCaseTo) {
+// 		return Math.floor(barSpacingSpecialCaseCoeff * pixelRatio) - 1;
+// 	}
+// 	// coeff should be 1 on small barspacing and go to 0.8 while groing bar spacing
+// 	const barSpacingReducingCoeff = 0.2;
+// 	const coeff = 1 - barSpacingReducingCoeff * Math.atan(Math.max(barSpacingSpecialCaseTo, barSpacing) - barSpacingSpecialCaseTo) / (Math.PI * 0.5);
+// 	const res = Math.floor(barSpacing * coeff * pixelRatio);
+// 	const scaledBarSpacing = Math.floor(barSpacing * pixelRatio);
+// 	const optimal = Math.min(res, scaledBarSpacing) - 2;
+// 	return Math.max(Math.floor(pixelRatio), optimal);
+// }
 export function getRenderIndexX(bandWidth, x) {
   return subPixelOptimize(x - bandWidth / 2, 1, false);
 }

package/lib/chart/line/LineView.js

@@ -619,6 +619,7 @@ var LineView = /** @class */function (_super) {
     var blurScope = emphasisModel.get('blurScope');
     var emphasisDisabled = emphasisModel.get('disabled');
     var groupId = seriesModel.get('groupId');
+    var info = seriesModel.get('info');
     polyline.useStyle(zrUtil.defaults(
     // Use color in lineStyle first
     lineStyleModel.getLineStyle(), {
@@ -628,6 +629,7 @@ var LineView = /** @class */function (_super) {
     }));
     if (groupId) {
       polyline.states.emphasis = emphasisModel.get('emphasisState');
+      polyline.info = info;
     } else {
       setStatesStylesFromModel(polyline, seriesModel, 'lineStyle');
       if (polyline.style.lineWidth > 0 && seriesModel.get(['emphasis', 'lineStyle', 'width']) === 'bolder') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.9.19",
+  "version": "0.9.20",
   "main": "dist/echarts.js",
   "module": "index.js",
   "jsdelivr": "dist/echarts.min.js",

package/types/dist/echarts.d.ts

@@ -7893,6 +7893,7 @@ interface SeriesOption<StateOption = unknown, StatesMixin extends StatesMixinBas
     isMain?: boolean;
     histbase?: number;
     isMobile?: boolean;
+    info?: any;
 }
 interface SeriesOnCartesianOptionMixin {
     xAxisIndex?: number;

package/types/dist/shared.d.ts

@@ -7894,6 +7894,7 @@ interface SeriesOption<StateOption = unknown, StatesMixin extends StatesMixinBas
     isMain?: boolean;
     histbase?: number;
     isMobile?: boolean;
+    info?: any;
 }
 interface SeriesOnCartesianOptionMixin {
     xAxisIndex?: number;

package/types/src/util/types.d.ts

@@ -1270,6 +1270,7 @@ export interface SeriesOption<StateOption = unknown, StatesMixin extends StatesM
     isMain?: boolean;
     histbase?: number;
     isMobile?: boolean;
+    info?: any;
 }
 export interface SeriesOnCartesianOptionMixin {
     xAxisIndex?: number;