tvcharts 0.9.40 → 0.9.42

package/lib/chart/barPlot/BarPath.js

@@ -40,30 +40,40 @@ var BarPath = /** @class */function (_super) {
     return new BarPathShape();
   };
   BarPath.prototype.buildPath = function (ctx, shape) {
-    var points = shape.points,
+    var typeArray = shape.typeArray,
       isSimpleBox = shape.isSimpleBox,
       candleWidth = shape.candleWidth,
       isWebviewRender = shape.isWebviewRender,
-      stroke = shape.stroke;
+      stroke = shape.stroke,
+      ishlc = shape.ishlc,
+      _a = shape.offset,
+      offset = _a === void 0 ? 0 : _a;
+    var points = typeArray.buffer();
+    var len = typeArray.length();
     var width = Math.floor(candleWidth / 2) + 0.5;
-    for (var index = 0; index < points.length;) {
-      var point1 = points[index++];
-      var point2 = points[index++];
-      var point3 = points[index++];
-      var point4 = points[index++];
+    for (var i = 0; i < len;) {
+      var x1 = points[i++] + offset;
+      var y1 = points[i++];
+      var x2 = points[i++] + offset;
+      var y2 = points[i++];
+      var x3 = points[i++];
+      var y3 = points[i++];
+      var x4 = points[i++];
+      var y4 = points[i++];
       if (isSimpleBox) {
-        var x = point3[0];
-        ctx.moveTo(x, point3[1]);
-        ctx.lineTo(x, point4[1]);
+        ctx.moveTo(x3, y3);
+        ctx.lineTo(x3, y4);
       } else {
-        ctx.moveTo(point3[0], point3[1]);
-        ctx.lineTo(point4[0], point4[1]);
-        ctx.moveTo(point1[0], point1[1]);
-        ctx.lineTo(point1[0] - width, point1[1]);
-        ctx.moveTo(point2[0], point2[1]);
-        ctx.lineTo(point2[0] + width, point2[1]);
+        ctx.moveTo(x3, y3);
+        ctx.lineTo(x4, y4);
+        if (!ishlc) {
+          ctx.moveTo(x1, y1);
+          ctx.lineTo(x1 - width, y1);
+        }
+        ctx.moveTo(x2, y2);
+        ctx.lineTo(x2 + width, y2);
       }
-      if (isWebviewRender && index % 5 === 0 && stroke) {
+      if (isWebviewRender && i % (8 * 5) === 0 && stroke) {
         ctx.strokeStyle(stroke);
         ctx.beginPathFill();
       }

package/lib/chart/barPlot/BarPlotSeries.js

@@ -105,6 +105,7 @@ var BarPlotSeriesModel = /** @class */function (_super) {
     z: 2,
     coordinateSystem: 'cartesian2d',
     legendHoverLink: true,
+    isSmall: true,
     // xAxisIndex: 0,
     // yAxisIndex: 0,
     layout: null,

package/lib/chart/barPlot/BarPlotView.js

@@ -42,7 +42,6 @@
 * under the License.
 */
 import { __extends } from "tslib";
-import * as zrUtil from 'tvrender/lib/core/util.js';
 import ChartView from '../../view/Chart.js';
 import * as graphic from '../../util/graphic.js';
 import { createClipPath } from '../helper/createClipPathFromCoordSys.js';
@@ -78,19 +77,30 @@ var BarPlotView = /** @class */function (_super) {
     var emphasisState = seriesModel.get('emphasis').emphasisState;
     var groupId = seriesModel.get('groupId');
     var isMobile = seriesModel.get('isMobile');
+    var ishlc = seriesModel.get('ishlc');
+    var isSmall = seriesModel.get('isSmall');
+    var lineWidth = 1;
+    if (!isSmall) {
+      var barWidth = Math.max(1, Math.floor(candleWidth / 3));
+      lineWidth = barWidth % 2 === 0 ? barWidth - 1 : barWidth;
+    }
+    var offset = Math.floor(lineWidth / 2);
     var bodyPointsByColor = data.getLayout('bodyPointsByColor');
-    zrUtil.each(bodyPointsByColor, function (points, stroke) {
+    bodyPointsByColor.forEach(function (typeArray, stroke) {
       var el = new BarPath({
         shape: {
-          points: points,
+          typeArray: typeArray,
           isSimpleBox: isSimpleBox,
           candleWidth: candleWidth,
           stroke: stroke,
-          isWebviewRender: isMobile
+          isWebviewRender: isMobile,
+          ishlc: ishlc,
+          offset: offset
         },
         style: {
           stroke: stroke,
-          fill: 'none'
+          fill: 'none',
+          lineWidth: lineWidth
         }
       });
       el.states.emphasis = emphasisState;

package/lib/chart/barPlot/barPlotLayout.js

@@ -43,10 +43,11 @@
 */
 import createRenderPlanner from '../helper/createRenderPlanner.js';
 import { map } from 'tvrender/lib/core/util.js';
+import { DynamicTypedArray } from '../../util/DynamicTypedArray.js';
 var positiveColorQuery = ['itemStyle', 'color'];
 var negativeColorQuery = ['itemStyle', 'color0'];
 function getColor(sign, model) {
-  return model.get(sign > 0 ? positiveColorQuery : negativeColorQuery, true);
+  return model.get(sign > 0 ? positiveColorQuery : negativeColorQuery);
 }
 var barPlotLayout = {
   seriesType: 'barPlot',
@@ -70,13 +71,14 @@ var barPlotLayout = {
     }
     var showLast = seriesModel.get('showLast');
     // const xOffset = seriesModel.get('offset') || 0;
+    var signByPrev = seriesModel.get('signByPrev');
     return {
       progress: normalProgress
     };
     function normalProgress(params, data) {
       var dataIndex;
       var store = data.getStore();
-      var bodyPointsByColor = {};
+      var bodyPointsByColor = new Map();
       var lastIndex = data.count(true) - 1;
       while ((dataIndex = params.next()) != null) {
         if (showLast && lastIndex - data.getRawIndex(dataIndex) >= showLast) {
@@ -87,17 +89,35 @@ var barPlotLayout = {
         var closeVal = store.get(closeDimI, dataIndex);
         var lowestVal = store.get(lowestDimI, dataIndex);
         var highestVal = store.get(highestDimI, dataIndex);
-        var ocLowPoint = getPoint(openVal, axisDimVal, 0.5);
-        var ocHighPoint = getPoint(closeVal, axisDimVal, 0.5);
-        var lowestPoint = getPoint(lowestVal, axisDimVal);
-        var highestPoint = getPoint(highestVal, axisDimVal);
+        var _a = resolvePoint(openVal, axisDimVal, 0.5),
+          ocLowX = _a[0],
+          ocLowY = _a[1];
+        var _b = resolvePoint(closeVal, axisDimVal, 0.5),
+          ocHighX = _b[0],
+          ocHighY = _b[1];
+        var _c = resolvePoint(lowestVal, axisDimVal),
+          lowestX = _c[0],
+          lowestY = _c[1];
+        var _d = resolvePoint(highestVal, axisDimVal),
+          highestX = _d[0],
+          highestY = _d[1];
         var itemModel = data.getItemModel(dataIndex);
-        var sign = getSign(store, dataIndex, openVal, closeVal, closeDimI);
+        var sign = getSign(store, dataIndex, openVal, closeVal, closeDimI, signByPrev);
         var key = getColor(sign, itemModel);
         if (key) {
-          var bodyPoints = bodyPointsByColor[key] || [];
-          bodyPoints.push(ocLowPoint, ocHighPoint, lowestPoint, highestPoint);
-          bodyPointsByColor[key] = bodyPoints;
+          var bodyPoints = bodyPointsByColor.get(key);
+          if (!bodyPoints) {
+            bodyPoints = new DynamicTypedArray();
+            bodyPointsByColor.set(key, bodyPoints);
+          }
+          bodyPoints.push(ocLowX);
+          bodyPoints.push(ocLowY);
+          bodyPoints.push(ocHighX);
+          bodyPoints.push(ocHighY);
+          bodyPoints.push(lowestX);
+          bodyPoints.push(lowestY);
+          bodyPoints.push(highestX);
+          bodyPoints.push(highestY);
         }
       }
       data.setLayout({
@@ -105,21 +125,18 @@ var barPlotLayout = {
         bodyPointsByColor: bodyPointsByColor,
         isSimpleBox: isSimpleBox
       });
-      function getPoint(val, axisDimVal, yOffset) {
+      function resolvePoint(val, axisDimVal, yOffset) {
         if (yOffset === void 0) {
           yOffset = 0;
         }
-        var p = [];
-        p[cDimIdx] = axisDimVal;
-        p[vDimIdx] = val;
-        var points = isNaN(axisDimVal) || isNaN(val) ? [NaN, NaN] : coordSys.dataToPoint(p);
-        if (!isNaN(points[0])) {
-          points[0] = points[0] + 0.5;
+        if (isNaN(axisDimVal) || isNaN(val)) {
+          return [NaN, NaN];
         }
-        if (!isNaN(points[1])) {
-          points[1] = Math.floor(points[1]) + yOffset;
-        }
-        return points;
+        var p = [axisDimVal, val];
+        var point = coordSys.dataToPoint(p);
+        var x = isNaN(point[0]) ? point[0] : point[0] + 0.5;
+        var y = isNaN(point[1]) ? point[1] : Math.floor(point[1]) + yOffset;
+        return [x, y];
       }
     }
   }
@@ -131,11 +148,15 @@ var barPlotLayout = {
  *          1 for positive,
  *          -1 for negative.
  */
-function getSign(store, dataIndex, openVal, closeVal, closeDimI) {
+function getSign(store, dataIndex, openVal, closeVal, closeDimI, signByPrev) {
   var sign;
+  if (signByPrev) {
+    var index = store.getRawIndex(dataIndex);
+    if (index > 0) return store.getByRawIndex(closeDimI, index - 1) <= closeVal ? 1 : -1;
+  }
   if (openVal > closeVal) {
     sign = -1;
-  } else {
+  } else if (openVal <= closeVal) {
     sign = 1;
   }
   return sign;
@@ -144,6 +165,17 @@ function calculateCandleWidth(seriesModel, data) {
   var baseAxis = seriesModel.getBaseAxis();
   var extent;
   var bandWidth = baseAxis.type === 'category' ? baseAxis.getBandWidth() : (extent = baseAxis.getExtent(), Math.abs(extent[1] - extent[0]) / data.count());
-  return Math.max(bandWidth * 0.7, 1);
+  var width = optimalCandlestickWidth(bandWidth, 1);
+  return width >= 2 && width % 2 === 1 ? width - 1 : width;
+  // return Math.floor(Math.max(bandWidth * 0.7, 1));
+}
+
+function optimalCandlestickWidth(barSpacing, pixelRatio) {
+  if (barSpacing >= 2.5 && barSpacing <= 4) return Math.floor(3 * pixelRatio) - 1;
+  var n = 0.9 * 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, Math.round(barSpacing - 2));
+  return Math.max(Math.floor(pixelRatio), r);
 }
 export default barPlotLayout;

package/lib/chart/candlePlot/candlePlotLayout.js

@@ -229,7 +229,7 @@ function optimalCandlestickWidth(barSpacing, pixelRatio) {
   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);
+    r = Math.min(i, s - 1, Math.round(barSpacing - 2));
   return Math.max(Math.floor(pixelRatio), r);
 }
 // function optimalCandlestickWidth(barSpacing: number, pixelRatio: number): number {

package/lib/chart/labels/LabelsView.js

@@ -310,6 +310,7 @@ var LabelsView = /** @class */function (_super) {
     this._textGroup = null;
     this._toolTipGroup && this._toolTipGroup.removeAll();
     this._toolTipGroup = null;
+    this._clearTimer();
     if (this.api) {
       (_a = this.api.getZr()) === null || _a === void 0 ? void 0 : _a.off('mousedown', this._hideTip);
     }

package/lib/component/alarm/AlarmView.js

@@ -383,6 +383,9 @@ var AlarmView = /** @class */function (_super) {
         alarm.value = +formatPrice;
       }
       var labelEl = el.childOfName('label');
+      if (!labelEl) {
+        return;
+      }
       labelEl.attr('style', {
         text: formatPrice
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.9.40",
+  "version": "0.9.42",
   "main": "dist/echarts.js",
   "module": "index.js",
   "jsdelivr": "dist/echarts.min.js",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "tslib": "2.3.0",
-    "tvrender": "^5.6.97"
+    "tvrender": "^5.6.98"
   },
   "devDependencies": {
     "@babel/code-frame": "7.10.4",

package/types/dist/echarts.d.ts

@@ -1229,7 +1229,7 @@ declare type ElementSSRData = HashMap<unknown>;
 declare type ElementSSRDataGetter<T> = (el: Element) => HashMap<T>;
 declare function getElementSSRData(el: Element): ElementSSRData;
 declare function registerSSRDataGetter<T>(getter: ElementSSRDataGetter<T>): void;
-declare const version = "5.6.97";
+declare const version = "5.6.98";
 interface ZRenderType extends ZRender {
 }
 

package/types/dist/shared.d.ts

@@ -1229,7 +1229,7 @@ declare type ElementSSRData = HashMap<unknown>;
 declare type ElementSSRDataGetter<T> = (el: Element) => HashMap<T>;
 declare function getElementSSRData(el: Element): ElementSSRData;
 declare function registerSSRDataGetter<T>(getter: ElementSSRDataGetter<T>): void;
-declare const version = "5.6.97";
+declare const version = "5.6.98";
 interface ZRenderType extends ZRender {
 }
 

package/types/src/chart/barPlot/BarPath.d.ts

@@ -1,11 +1,14 @@
 import Path, { PathProps } from 'tvrender/lib/graphic/Path.js';
 import PathProxy from 'tvrender/lib/core/PathProxy.js';
+import { DynamicTypedArray } from '../../util/DynamicTypedArray.js';
 declare class BarPathShape {
-    points: number[][];
+    typeArray: DynamicTypedArray;
     isSimpleBox: boolean;
     candleWidth: number;
     stroke?: string;
     isWebviewRender?: boolean;
+    ishlc?: boolean;
+    offset?: number;
 }
 interface BarPathProps extends PathProps {
     shape?: Partial<BarPathShape>;

package/types/src/chart/barPlot/BarPlotSeries.d.ts

@@ -23,6 +23,9 @@ interface ExtraStateOption {
 export interface BarPlotSeriesOption extends SeriesOption<BarPlotStateOption, ExtraStateOption>, BarPlotStateOption, SeriesOnCartesianOptionMixin, SeriesLargeOptionMixin, SeriesEncodeOptionMixin {
     type?: 'barPlot';
     coordinateSystem?: 'cartesian2d';
+    signByPrev?: boolean;
+    isSmall?: boolean;
+    ishlc?: boolean;
     layout?: LayoutOrient;
     clip?: boolean;
     barMaxWidth?: number | string;