@visactor/vrender-core 1.1.11-alpha.0 → 1.1.11

package/es/graphic/line.js

@@ -39,16 +39,16 @@ export class Line extends Graphic {
         aabbBounds;
     }
     updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic) {
-        const {points: points = lineTheme.points, connectedType: connectedType} = attribute, b = aabbBounds;
+        const {points: points = lineTheme.points} = attribute, b = aabbBounds;
         return points.forEach((p => {
-            !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
+            !1 !== p.defined && b.add(p.x, p.y);
         })), b;
     }
     updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
-        const {segments: segments = lineTheme.segments, connectedType: connectedType} = attribute, b = aabbBounds;
+        const {segments: segments = lineTheme.segments} = attribute, b = aabbBounds;
         return segments.forEach((s => {
             s.points.forEach((p => {
-                !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
+                !1 !== p.defined && b.add(p.x, p.y);
             }));
         })), b;
     }

package/es/graphic/line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import type { IAABBBounds, IPointLike } from '@visactor/vutils';\nimport type { ILine, ILineGraphicAttribute } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { pointsInterpolation } from '../common/utils';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { LINE_NUMBER_TYPE } from './constants';\n\nconst LINE_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', 'curveTension', ...GRAPHIC_UPDATE_TAG_KEY];\n\nexport class Line extends Graphic<ILineGraphicAttribute> implements ILine {\n  type: 'line' = 'line';\n\n  constructor(params: ILineGraphicAttribute = {}) {\n    super(params);\n    this.numberType = LINE_NUMBER_TYPE;\n  }\n\n  static NOWORK_ANIMATE_ATTR = {\n    segments: 1,\n    curveType: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    if (this.pathProxy) {\n      return true;\n    }\n    const { points, segments } = this.attribute;\n    if (segments) {\n      if (segments.length === 0) {\n        return false;\n      }\n      return true;\n    } else if (points) {\n      if (points.length <= 1) {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n\n  protected _interpolate(key: string, ratio: number, lastStepVal: any, nextStepVal: any, nextAttributes: any): void {\n    if (key === 'points') {\n      (nextAttributes as any).points = pointsInterpolation(lastStepVal, nextStepVal, ratio);\n    }\n  }\n\n  getGraphicTheme(): Required<ILineGraphicAttribute> {\n    return getTheme(this).line;\n  }\n\n  protected updateAABBBounds(\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ) {\n    if (!this.updatePathProxyAABBBounds(aabbBounds)) {\n      attribute.segments\n        ? this.updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds)\n        : this.updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds);\n    }\n\n    application.graphicService.updateTempAABBBounds(aabbBounds);\n\n    this.widthWithoutTransform = aabbBounds.x2 - aabbBounds.x1;\n    this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1;\n\n    const { lineJoin = lineTheme.lineJoin } = attribute;\n    application.graphicService.transformAABBBounds(attribute, aabbBounds, lineTheme, lineJoin === 'miter', this);\n    return aabbBounds;\n  }\n\n  protected updateLineAABBBoundsByPoints(\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: ILine\n  ): IAABBBounds {\n    const { points = lineTheme.points, connectedType } = attribute;\n    const b = aabbBounds;\n    points.forEach(p => {\n      if (p.defined !== false || connectedType === 'connect') {\n        b.add(p.x, p.y);\n      }\n    });\n    return b;\n  }\n  protected updateLineAABBBoundsBySegments(\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: ILine\n  ): IAABBBounds {\n    const { segments = lineTheme.segments, connectedType } = attribute;\n    const b = aabbBounds;\n    segments.forEach(s => {\n      s.points.forEach(p => {\n        if (p.defined !== false || connectedType === 'connect') {\n          b.add(p.x, p.y);\n        }\n      });\n    });\n    return b;\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return super.needUpdateTags(keys, LINE_UPDATE_TAG_KEY);\n  }\n  protected needUpdateTag(key: string): boolean {\n    return super.needUpdateTag(key, LINE_UPDATE_TAG_KEY);\n  }\n\n  toCustomPath() {\n    let path = super.toCustomPath();\n    if (path) {\n      return path;\n    }\n    const attribute = this.attribute;\n    path = new CustomPath2D();\n    const segments = attribute.segments;\n\n    const parsePoints = (points: IPointLike[]) => {\n      if (points && points.length) {\n        let isFirst = true;\n        points.forEach(point => {\n          if (point.defined === false) {\n            return;\n          }\n          if (isFirst) {\n            path.moveTo(point.x, point.y);\n          } else {\n            path.lineTo(point.x, point.y);\n          }\n\n          isFirst = false;\n        });\n      }\n    };\n\n    if (segments && segments.length) {\n      segments.forEach(seg => {\n        parsePoints(seg.points);\n      });\n    } else if (attribute.points) {\n      parsePoints(attribute.points);\n    }\n\n    return path;\n  }\n\n  clone() {\n    return new Line({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Line.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createLine(attributes: ILineGraphicAttribute): ILine {\n  return new Line(attributes);\n}\n\n// addAttributeToPrototype(DefaultLineStyle, Line, PURE_STYLE_KEY);\n"]}
+{"version":3,"sources":["../src/graphic/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import type { IAABBBounds, IPointLike } from '@visactor/vutils';\nimport type { ILine, ILineGraphicAttribute } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { pointsInterpolation } from '../common/utils';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { LINE_NUMBER_TYPE } from './constants';\n\nconst LINE_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', 'curveTension', ...GRAPHIC_UPDATE_TAG_KEY];\n\nexport class Line extends Graphic<ILineGraphicAttribute> implements ILine {\n  type: 'line' = 'line';\n\n  constructor(params: ILineGraphicAttribute = {}) {\n    super(params);\n    this.numberType = LINE_NUMBER_TYPE;\n  }\n\n  static NOWORK_ANIMATE_ATTR = {\n    segments: 1,\n    curveType: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    if (this.pathProxy) {\n      return true;\n    }\n    const { points, segments } = this.attribute;\n    if (segments) {\n      if (segments.length === 0) {\n        return false;\n      }\n      return true;\n    } else if (points) {\n      if (points.length <= 1) {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n\n  protected _interpolate(key: string, ratio: number, lastStepVal: any, nextStepVal: any, nextAttributes: any): void {\n    if (key === 'points') {\n      (nextAttributes as any).points = pointsInterpolation(lastStepVal, nextStepVal, ratio);\n    }\n  }\n\n  getGraphicTheme(): Required<ILineGraphicAttribute> {\n    return getTheme(this).line;\n  }\n\n  protected updateAABBBounds(\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ) {\n    if (!this.updatePathProxyAABBBounds(aabbBounds)) {\n      attribute.segments\n        ? this.updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds)\n        : this.updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds);\n    }\n\n    application.graphicService.updateTempAABBBounds(aabbBounds);\n\n    this.widthWithoutTransform = aabbBounds.x2 - aabbBounds.x1;\n    this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1;\n\n    const { lineJoin = lineTheme.lineJoin } = attribute;\n    application.graphicService.transformAABBBounds(attribute, aabbBounds, lineTheme, lineJoin === 'miter', this);\n    return aabbBounds;\n  }\n\n  protected updateLineAABBBoundsByPoints(\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: ILine\n  ): IAABBBounds {\n    const { points = lineTheme.points } = attribute;\n    const b = aabbBounds;\n    points.forEach(p => {\n      if (p.defined !== false) {\n        b.add(p.x, p.y);\n      }\n    });\n    return b;\n  }\n  protected updateLineAABBBoundsBySegments(\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: ILine\n  ): IAABBBounds {\n    const { segments = lineTheme.segments } = attribute;\n    const b = aabbBounds;\n    segments.forEach(s => {\n      s.points.forEach(p => {\n        if (p.defined !== false) {\n          b.add(p.x, p.y);\n        }\n      });\n    });\n    return b;\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return super.needUpdateTags(keys, LINE_UPDATE_TAG_KEY);\n  }\n  protected needUpdateTag(key: string): boolean {\n    return super.needUpdateTag(key, LINE_UPDATE_TAG_KEY);\n  }\n\n  toCustomPath() {\n    let path = super.toCustomPath();\n    if (path) {\n      return path;\n    }\n    const attribute = this.attribute;\n    path = new CustomPath2D();\n    const segments = attribute.segments;\n\n    const parsePoints = (points: IPointLike[]) => {\n      if (points && points.length) {\n        let isFirst = true;\n        points.forEach(point => {\n          if (point.defined === false) {\n            return;\n          }\n          if (isFirst) {\n            path.moveTo(point.x, point.y);\n          } else {\n            path.lineTo(point.x, point.y);\n          }\n\n          isFirst = false;\n        });\n      }\n    };\n\n    if (segments && segments.length) {\n      segments.forEach(seg => {\n        parsePoints(seg.points);\n      });\n    } else if (attribute.points) {\n      parsePoints(attribute.points);\n    }\n\n    return path;\n  }\n\n  clone() {\n    return new Line({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Line.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createLine(attributes: ILineGraphicAttribute): ILine {\n  return new Line(attributes);\n}\n\n// addAttributeToPrototype(DefaultLineStyle, Line, PURE_STYLE_KEY);\n"]}

package/es/graphic/state/attribute-update-classifier.js

@@ -20,6 +20,8 @@ export const ATTRIBUTE_CATEGORY = {
     shadowColor: UpdateCategory.PAINT,
     x: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,
     y: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,
+    dx: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,
+    dy: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,
     scaleX: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,
     scaleY: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,
     angle: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,

package/es/graphic/state/attribute-update-classifier.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/state/attribute-update-classifier.ts"],"names":[],"mappings":"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","file":"attribute-update-classifier.js","sourcesContent":["export enum UpdateCategory {\n  NONE = 0,\n  PAINT = 1 << 0,\n  SHAPE = 1 << 1,\n  BOUNDS = 1 << 2,\n  TRANSFORM = 1 << 3,\n  LAYOUT = 1 << 4,\n  PICK = 1 << 5\n}\n\ntype AttributeDeltaClassifier = (prev: unknown, next: unknown) => UpdateCategory;\n\nexport const ATTRIBUTE_CATEGORY: Record<string, UpdateCategory> = {\n  fill: UpdateCategory.PAINT,\n  opacity: UpdateCategory.PAINT,\n  fillOpacity: UpdateCategory.PAINT,\n  strokeOpacity: UpdateCategory.PAINT,\n  lineDash: UpdateCategory.PAINT,\n  lineDashOffset: UpdateCategory.PAINT,\n  lineCap: UpdateCategory.PAINT,\n  lineJoin: UpdateCategory.PAINT,\n  miterLimit: UpdateCategory.PAINT,\n  shadowColor: UpdateCategory.PAINT,\n  x: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  y: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  scaleX: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  scaleY: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  angle: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  anchor: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  anchor3d: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  postMatrix: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  layout: UpdateCategory.LAYOUT,\n  zIndex: UpdateCategory.PAINT,\n  visible: UpdateCategory.PAINT | UpdateCategory.PICK,\n  lineWidth: UpdateCategory.SHAPE | UpdateCategory.BOUNDS | UpdateCategory.PICK,\n  width: UpdateCategory.SHAPE | UpdateCategory.BOUNDS,\n  height: UpdateCategory.SHAPE | UpdateCategory.BOUNDS\n};\n\nconst ATTRIBUTE_DELTA_CLASSIFIER: Record<string, AttributeDeltaClassifier> = {\n  stroke: (prev, next) => {\n    const prevEnabled = prev != null && prev !== false;\n    const nextEnabled = next != null && next !== false;\n    if (prevEnabled !== nextEnabled) {\n      return UpdateCategory.PAINT | UpdateCategory.BOUNDS | UpdateCategory.PICK;\n    }\n    return UpdateCategory.PAINT;\n  },\n  shadowBlur: (prev, next) => {\n    const prevBlur = Number(prev ?? 0);\n    const nextBlur = Number(next ?? 0);\n    if (prevBlur !== nextBlur && (prevBlur > 0 || nextBlur > 0)) {\n      return UpdateCategory.PAINT | UpdateCategory.BOUNDS;\n    }\n    return UpdateCategory.PAINT;\n  }\n};\n\nexport function classifyAttributeDelta(key: string, prev: unknown, next: unknown): UpdateCategory {\n  const dynamicClassifier = ATTRIBUTE_DELTA_CLASSIFIER[key];\n  if (dynamicClassifier) {\n    return dynamicClassifier(prev, next);\n  }\n\n  return ATTRIBUTE_CATEGORY[key] ?? UpdateCategory.PAINT;\n}\n\nexport function classifyAffectedKeyConservatively(key: string): UpdateCategory {\n  if (key === 'stroke') {\n    return UpdateCategory.PAINT | UpdateCategory.BOUNDS | UpdateCategory.PICK;\n  }\n\n  if (key === 'shadowBlur') {\n    return UpdateCategory.PAINT | UpdateCategory.BOUNDS;\n  }\n\n  return ATTRIBUTE_CATEGORY[key] ?? UpdateCategory.PAINT;\n}\n\nexport function classifyAffectedKeys(keys: Iterable<string>): UpdateCategory {\n  let category = UpdateCategory.NONE;\n  for (const key of keys) {\n    category |= classifyAffectedKeyConservatively(key);\n  }\n  return category;\n}\n"]}
+{"version":3,"sources":["../src/graphic/state/attribute-update-classifier.ts"],"names":[],"mappings":"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","file":"attribute-update-classifier.js","sourcesContent":["export enum UpdateCategory {\n  NONE = 0,\n  PAINT = 1 << 0,\n  SHAPE = 1 << 1,\n  BOUNDS = 1 << 2,\n  TRANSFORM = 1 << 3,\n  LAYOUT = 1 << 4,\n  PICK = 1 << 5\n}\n\ntype AttributeDeltaClassifier = (prev: unknown, next: unknown) => UpdateCategory;\n\nexport const ATTRIBUTE_CATEGORY: Record<string, UpdateCategory> = {\n  fill: UpdateCategory.PAINT,\n  opacity: UpdateCategory.PAINT,\n  fillOpacity: UpdateCategory.PAINT,\n  strokeOpacity: UpdateCategory.PAINT,\n  lineDash: UpdateCategory.PAINT,\n  lineDashOffset: UpdateCategory.PAINT,\n  lineCap: UpdateCategory.PAINT,\n  lineJoin: UpdateCategory.PAINT,\n  miterLimit: UpdateCategory.PAINT,\n  shadowColor: UpdateCategory.PAINT,\n  x: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  y: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  dx: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  dy: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  scaleX: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  scaleY: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  angle: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  anchor: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  anchor3d: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  postMatrix: UpdateCategory.TRANSFORM | UpdateCategory.BOUNDS,\n  layout: UpdateCategory.LAYOUT,\n  zIndex: UpdateCategory.PAINT,\n  visible: UpdateCategory.PAINT | UpdateCategory.PICK,\n  lineWidth: UpdateCategory.SHAPE | UpdateCategory.BOUNDS | UpdateCategory.PICK,\n  width: UpdateCategory.SHAPE | UpdateCategory.BOUNDS,\n  height: UpdateCategory.SHAPE | UpdateCategory.BOUNDS\n};\n\nconst ATTRIBUTE_DELTA_CLASSIFIER: Record<string, AttributeDeltaClassifier> = {\n  stroke: (prev, next) => {\n    const prevEnabled = prev != null && prev !== false;\n    const nextEnabled = next != null && next !== false;\n    if (prevEnabled !== nextEnabled) {\n      return UpdateCategory.PAINT | UpdateCategory.BOUNDS | UpdateCategory.PICK;\n    }\n    return UpdateCategory.PAINT;\n  },\n  shadowBlur: (prev, next) => {\n    const prevBlur = Number(prev ?? 0);\n    const nextBlur = Number(next ?? 0);\n    if (prevBlur !== nextBlur && (prevBlur > 0 || nextBlur > 0)) {\n      return UpdateCategory.PAINT | UpdateCategory.BOUNDS;\n    }\n    return UpdateCategory.PAINT;\n  }\n};\n\nexport function classifyAttributeDelta(key: string, prev: unknown, next: unknown): UpdateCategory {\n  const dynamicClassifier = ATTRIBUTE_DELTA_CLASSIFIER[key];\n  if (dynamicClassifier) {\n    return dynamicClassifier(prev, next);\n  }\n\n  return ATTRIBUTE_CATEGORY[key] ?? UpdateCategory.PAINT;\n}\n\nexport function classifyAffectedKeyConservatively(key: string): UpdateCategory {\n  if (key === 'stroke') {\n    return UpdateCategory.PAINT | UpdateCategory.BOUNDS | UpdateCategory.PICK;\n  }\n\n  if (key === 'shadowBlur') {\n    return UpdateCategory.PAINT | UpdateCategory.BOUNDS;\n  }\n\n  return ATTRIBUTE_CATEGORY[key] ?? UpdateCategory.PAINT;\n}\n\nexport function classifyAffectedKeys(keys: Iterable<string>): UpdateCategory {\n  let category = UpdateCategory.NONE;\n  for (const key of keys) {\n    category |= classifyAffectedKeyConservatively(key);\n  }\n  return category;\n}\n"]}

package/es/render/contributions/render/area-render.js

@@ -1,6 +1,6 @@
-import { abs, isArray, min } from "@visactor/vutils";
+import { isArray, min } from "@visactor/vutils";
 
-import { calcLineCache } from "../../../common/segment";
+import { calcAreaCache } from "../../../common/area-cache";
 
 import { getTheme } from "../../../graphic/theme";
 
@@ -70,93 +70,25 @@ export class DefaultCanvasAreaRender extends BaseRender {
         })();
     }
     drawShape(area, context, x, y, drawContext, params, fillCb, strokeCb) {
-        var _a, _b, _c, _d, _e, _f;
         const areaAttribute = getTheme(area, null == params ? void 0 : params.theme).area, {fill: fill = areaAttribute.fill, stroke: stroke = areaAttribute.stroke, fillOpacity: fillOpacity = areaAttribute.fillOpacity, z: z = areaAttribute.z, strokeOpacity: strokeOpacity = areaAttribute.strokeOpacity, curveTension: curveTension = areaAttribute.curveTension, connectedType: connectedType = areaAttribute.connectedType} = area.attribute, data = this.valid(area, areaAttribute, fillCb, strokeCb);
         if (!data) return;
         const {doFill: doFill} = data, doStroke = data.doStroke && data.sVisible, {clipRange: clipRange = areaAttribute.clipRange, closePath: closePath, points: points, segments: segments} = area.attribute;
         let {curveType: curveType = areaAttribute.curveType} = area.attribute;
-        function parsePoint(points, connectedType) {
-            return "connect" !== connectedType ? points : points.filter((p => !1 !== p.defined));
-        }
         if (closePath && "linear" === curveType && (curveType = "linearClosed"), 1 === clipRange && !segments && !points.some((p => !1 === p.defined)) && "linear" === curveType) return this.drawLinearAreaHighPerformance(area, context, !!fill, doStroke, fillOpacity, strokeOpacity, x, y, areaAttribute, drawContext, params, fillCb, strokeCb);
-        if (area.shouldUpdateShape()) {
-            if (segments && segments.length) {
-                let startPoint, lastTopSeg;
-                const topCaches = segments.map(((seg, index) => {
-                    if (seg.points.length <= 1 && 0 === index) return seg.points[0] && (lastTopSeg = {
-                        endX: seg.points[0].x,
-                        endY: seg.points[0].y
-                    }), null;
-                    1 === index ? startPoint = {
-                        x: lastTopSeg.endX,
-                        y: lastTopSeg.endY
-                    } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
-                    const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
-                        startPoint: startPoint,
-                        curveTension: curveTension
-                    });
-                    return lastTopSeg = data, data;
-                })).filter((item => !!item));
-                let lastBottomSeg;
-                const bottomCaches = [];
-                for (let i = segments.length - 1; i >= 0; i--) {
-                    const points = segments[i].points, bottomPoints = [];
-                    for (let i = points.length - 1; i >= 0; i--) bottomPoints.push({
-                        x: null !== (_a = points[i].x1) && void 0 !== _a ? _a : points[i].x,
-                        y: null !== (_b = points[i].y1) && void 0 !== _b ? _b : points[i].y
-                    });
-                    if (0 !== i) {
-                        const lastSegmentPoints = segments[i - 1].points, endPoint = lastSegmentPoints[lastSegmentPoints.length - 1];
-                        endPoint && bottomPoints.push({
-                            x: null !== (_c = endPoint.x1) && void 0 !== _c ? _c : endPoint.x,
-                            y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
-                        });
-                    }
-                    bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(parsePoint(bottomPoints, connectedType), "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
-                        curveTension: curveTension
-                    }), bottomCaches.unshift(lastBottomSeg));
-                }
-                area.cacheArea = bottomCaches.map(((item, index) => ({
-                    top: topCaches[index],
-                    bottom: item
-                })));
-            } else {
-                if (!points || !points.length) return area.cacheArea = null, void area.clearUpdateShapeTag();
-                {
-                    const topPoints = parsePoint(points, connectedType), bottomPoints = [];
-                    for (let i = topPoints.length - 1; i >= 0; i--) bottomPoints.push({
-                        x: null !== (_e = topPoints[i].x1) && void 0 !== _e ? _e : topPoints[i].x,
-                        y: null !== (_f = topPoints[i].y1) && void 0 !== _f ? _f : topPoints[i].y
-                    });
-                    const topCache = calcLineCache(topPoints, curveType, {
-                        curveTension: curveTension
-                    }), bottomCache = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
-                        curveTension: curveTension
-                    });
-                    area.cacheArea = {
-                        top: topCache,
-                        bottom: bottomCache
-                    };
-                }
-            }
-            area.clearUpdateShapeTag();
-        }
-        if (Array.isArray(area.cacheArea)) {
-            const segments = area.attribute.segments.filter((item => item.points.length));
-            if (1 === segments[0].points.length && segments.shift(), 1 === clipRange) {
-                let skip = !1;
-                area.cacheArea.forEach(((cache, index) => {
-                    skip || (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [ areaAttribute, area.attribute ], clipRange, x, y, z, area, drawContext, fillCb, strokeCb));
-                }));
-            } else {
-                const totalLength = area.cacheArea.reduce(((l, c) => l + c.top.getLength()), 0), totalDrawLength = clipRange * totalLength;
-                let drawedLengthUntilLast = 0, skip = !1;
-                area.cacheArea.forEach(((cache, index) => {
-                    if (skip) return;
-                    const curSegLength = cache.top.getLength(), _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
-                    drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [ areaAttribute, area.attribute ], min(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb));
-                }));
-            }
+        if (area.shouldUpdateShape() && (area.cacheArea = calcAreaCache(points, segments, curveType, connectedType, curveTension), 
+        area.clearUpdateShapeTag()), area.cacheArea) if (Array.isArray(area.cacheArea)) if (1 === clipRange) {
+            let skip = !1;
+            area.cacheArea.forEach((cache => {
+                skip || (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[cache.sourceSegmentIndex], [ areaAttribute, area.attribute ], clipRange, x, y, z, area, drawContext, fillCb, strokeCb));
+            }));
+        } else {
+            const totalLength = area.cacheArea.reduce(((l, c) => l + c.top.getLength()), 0), totalDrawLength = clipRange * totalLength;
+            let drawedLengthUntilLast = 0, skip = !1;
+            area.cacheArea.forEach((cache => {
+                if (skip) return;
+                const curSegLength = cache.top.getLength(), _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
+                drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[cache.sourceSegmentIndex], [ areaAttribute, area.attribute ], min(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb));
+            }));
         } else this.drawSegmentItem(context, area.cacheArea, doFill, fillOpacity, doStroke, strokeOpacity, area.attribute, areaAttribute, clipRange, x, y, z, area, drawContext, fillCb, strokeCb);
     }
     draw(area, renderService, drawContext, params) {
@@ -167,16 +99,10 @@ export class DefaultCanvasAreaRender extends BaseRender {
         return this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb);
     }
     _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
+        var _a;
         if (!(cache && cache.top && cache.bottom && cache.top.curves && cache.top.curves.length && cache.bottom.curves && cache.bottom.curves.length)) return;
         context.beginPath();
-        const {points: points, segments: segments} = area.attribute;
-        let endP, startP, direction = Direction.ROW;
-        if (segments) {
-            const endSeg = segments[segments.length - 1];
-            startP = segments[0].points[0], endP = endSeg.points[endSeg.points.length - 1];
-        } else startP = points[0], endP = points[points.length - 1];
-        const xTotalLength = abs(endP.x - startP.x), yTotalLength = abs(endP.y - startP.y);
-        direction = null == endP.x1 ? Direction.ROW : null == endP.y1 ? Direction.COLUMN : Number.isFinite(xTotalLength + yTotalLength) ? xTotalLength > yTotalLength ? Direction.ROW : Direction.COLUMN : Direction.ROW, 
+        const direction = null !== (_a = cache.direction) && void 0 !== _a ? _a : cache.top.direction;
         drawAreaSegments(context, cache, clipRange, {
             offsetX: offsetX,
             offsetY: offsetY,

package/es/render/contributions/render/area-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/area-render.ts"],"names":[],"mappings":"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","file":"area-render.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport { abs, isArray, min } from '@visactor/vutils';\nimport type {\n  IArea,\n  IAreaCacheItem,\n  IAreaGraphicAttribute,\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  ISegPath2D,\n  IAreaRenderContribution,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider\n} from '../../../interface';\nimport { calcLineCache } from '../../../common/segment';\n\nimport { getTheme } from '../../../graphic/theme';\nimport { AreaRenderContribution } from './contributions/constants';\nimport { Direction } from '../../../common/enums';\nimport { drawAreaSegments } from '../../../common/render-area';\nimport { AREA_NUMBER_TYPE } from '../../../graphic/constants';\nimport { drawSegments } from '../../../common/render-curve';\nimport { BaseRender } from './base-render';\nimport {\n  defaultAreaBackgroundRenderContribution,\n  defaultAreaTextureRenderContribution\n} from './contributions/area-contribution-render';\n\nexport class DefaultCanvasAreaRender extends BaseRender<IArea> implements IGraphicRender {\n  type: 'area';\n  numberType: number = AREA_NUMBER_TYPE;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<IAreaRenderContribution>) {\n    super();\n    this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution];\n    this.init(graphicRenderContributions);\n  }\n\n  drawLinearAreaHighPerformance(\n    area: IArea,\n    context: IContext2d,\n    fill: boolean,\n    stroke: boolean,\n    fillOpacity: number,\n    strokeOpacity: number,\n    offsetX: number,\n    offsetY: number,\n    areaAttribute: Required<IAreaGraphicAttribute>,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const { points } = area.attribute;\n    if (points.length < 2) {\n      return;\n    }\n    context.beginPath();\n\n    const z = this.z ?? 0;\n    const startP = points[0];\n\n    context.moveTo(startP.x + offsetX, startP.y + offsetY, z);\n    for (let i = 1; i < points.length; i++) {\n      const p = points[i];\n      context.lineTo(p.x + offsetX, p.y + offsetY, z);\n    }\n    for (let i = points.length - 1; i >= 0; i--) {\n      const p = points[i];\n      context.lineTo((p.x1 ?? p.x) + offsetX, (p.y1 ?? p.y) + offsetY, z);\n    }\n    context.closePath();\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(area, area.attribute, areaAttribute);\n\n    this.beforeRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      areaAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute: area.attribute }\n    );\n\n    const { x: originX = 0, x: originY = 0 } = area.attribute;\n    const _runFill = () => {\n      if (fill !== false) {\n        if (fillCb) {\n          fillCb(context, area.attribute, areaAttribute);\n        } else if (fillOpacity) {\n          context.setCommonStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute);\n          context.fill();\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (stroke) {\n        const { stroke = areaAttribute && areaAttribute.stroke } = area.attribute;\n        if (isArray(stroke) && (stroke[0] || stroke[2]) && stroke[1] === false) {\n          context.beginPath();\n          if (stroke[0]) {\n            context.moveTo(startP.x + offsetX, startP.y + offsetY, z);\n            for (let i = 1; i < points.length; i++) {\n              const p = points[i];\n              context.lineTo(p.x + offsetX, p.y + offsetY, z);\n            }\n          } else if (stroke[2]) {\n            const endP = points[points.length - 1];\n            context.moveTo(endP.x + offsetX, endP.y + offsetY, z);\n            for (let i = points.length - 2; i >= 0; i--) {\n              const p = points[i];\n              context.lineTo((p.x1 ?? p.x) + offsetX, (p.y1 ?? p.y) + offsetY, z);\n            }\n          }\n        }\n        if (strokeCb) {\n          strokeCb(context, area.attribute, areaAttribute);\n        } else {\n          context.setStrokeStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    _runFill();\n    this.afterRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      areaAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute: area.attribute }\n    );\n    _runStroke();\n  }\n\n  drawShape(\n    area: IArea,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const areaAttribute = getTheme(area, params?.theme).area;\n    const {\n      fill = areaAttribute.fill,\n      stroke = areaAttribute.stroke,\n      fillOpacity = areaAttribute.fillOpacity,\n      z = areaAttribute.z,\n      strokeOpacity = areaAttribute.strokeOpacity,\n      curveTension = areaAttribute.curveTension,\n      connectedType = areaAttribute.connectedType\n    } = area.attribute;\n\n    const data = this.valid(area, areaAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { doFill } = data;\n    const doStroke = data.doStroke && data.sVisible;\n\n    const { clipRange = areaAttribute.clipRange, closePath, points, segments } = area.attribute;\n    let { curveType = areaAttribute.curveType } = area.attribute;\n    if (closePath && curveType === 'linear') {\n      curveType = 'linearClosed';\n    }\n\n    function parsePoint(points: IPointLike[], connectedType: 'none' | 'connect') {\n      if (connectedType !== 'connect') {\n        return points;\n      }\n      return points.filter(p => p.defined !== false);\n    }\n\n    if (clipRange === 1 && !segments && !points.some(p => p.defined === false) && curveType === 'linear') {\n      return this.drawLinearAreaHighPerformance(\n        area,\n        context,\n        !!fill,\n        doStroke,\n        fillOpacity,\n        strokeOpacity,\n        x,\n        y,\n        areaAttribute,\n        drawContext,\n        params,\n        fillCb,\n        strokeCb\n      );\n    }\n\n    // 更新cache\n    if (area.shouldUpdateShape()) {\n      if (segments && segments.length) {\n        let startPoint: IPointLike;\n        let lastTopSeg: { endX: number; endY: number };\n        const topCaches = segments\n          .map((seg, index) => {\n            if (seg.points.length <= 1) {\n              // 第一个点的话，直接设置lastTopSeg\n              if (index === 0) {\n                seg.points[0] && (lastTopSeg = { endX: seg.points[0].x, endY: seg.points[0].y });\n                return null;\n              }\n            }\n            // 添加上一个segment结束的点作为这个segment的起始点\n            if (index === 1) {\n              startPoint = { x: lastTopSeg.endX, y: lastTopSeg.endY };\n            } else if (index > 1) {\n              startPoint.x = lastTopSeg.endX;\n              startPoint.y = lastTopSeg.endY;\n            }\n            const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {\n              startPoint,\n              curveTension\n            });\n            lastTopSeg = data;\n            return data;\n          })\n          .filter(item => !!item);\n        let lastBottomSeg: ISegPath2D;\n        const bottomCaches = [];\n        for (let i = segments.length - 1; i >= 0; i--) {\n          const points = segments[i].points;\n          const bottomPoints: IPointLike[] = [];\n          for (let i = points.length - 1; i >= 0; i--) {\n            bottomPoints.push({\n              x: points[i].x1 ?? points[i].x,\n              y: points[i].y1 ?? points[i].y\n            });\n          }\n          // 处理一下bottom的segments，bottom的segments需要手动添加endPoints\n          if (i !== 0) {\n            const lastSegmentPoints = segments[i - 1].points;\n            const endPoint = lastSegmentPoints[lastSegmentPoints.length - 1];\n            endPoint &&\n              bottomPoints.push({\n                x: endPoint.x1 ?? endPoint.x,\n                y: endPoint.y1 ?? endPoint.y\n              });\n          }\n          if (bottomPoints.length > 1) {\n            lastBottomSeg = calcLineCache(\n              parsePoint(bottomPoints, connectedType),\n              curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType,\n              { curveTension }\n            );\n            bottomCaches.unshift(lastBottomSeg);\n          }\n        }\n        area.cacheArea = bottomCaches.map((item, index) => ({\n          top: topCaches[index],\n          bottom: item\n        }));\n      } else if (points && points.length) {\n        // 转换points\n        const topPoints = parsePoint(points, connectedType);\n        const bottomPoints: IPointLike[] = [];\n        for (let i = topPoints.length - 1; i >= 0; i--) {\n          bottomPoints.push({\n            x: topPoints[i].x1 ?? topPoints[i].x,\n            y: topPoints[i].y1 ?? topPoints[i].y\n          });\n        }\n        const topCache = calcLineCache(topPoints, curveType, { curveTension });\n        const bottomCache = calcLineCache(\n          bottomPoints,\n          curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType,\n          { curveTension }\n        );\n\n        area.cacheArea = { top: topCache, bottom: bottomCache };\n      } else {\n        area.cacheArea = null;\n        area.clearUpdateShapeTag();\n        return;\n      }\n      area.clearUpdateShapeTag();\n    }\n\n    if (Array.isArray(area.cacheArea)) {\n      const segments = area.attribute.segments.filter(item => item.points.length);\n      // 如果第一个seg只有一个点，那么shift出去\n      if (segments[0].points.length === 1) {\n        segments.shift();\n      }\n      if (clipRange === 1) {\n        let skip = false;\n        // 性能优化，不需要clip的线段不需要计算长度\n        area.cacheArea.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          skip = this.drawSegmentItem(\n            context,\n            cache,\n            doFill,\n            fillOpacity,\n            doStroke,\n            strokeOpacity,\n            segments[index],\n            [areaAttribute, area.attribute],\n            clipRange,\n            x,\n            y,\n            z,\n            area,\n            drawContext,\n            fillCb,\n            strokeCb\n          );\n        });\n      } else {\n        // 如果是segments的话，每个clipRange需要重新计算\n        // 整个线段的总长度\n        const totalLength = area.cacheArea.reduce((l, c) => l + c.top.getLength(), 0);\n        // 总需要绘制的长度\n        const totalDrawLength = clipRange * totalLength;\n        // 直到上次绘制的长度\n        let drawedLengthUntilLast = 0;\n        let skip = false;\n        area.cacheArea.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          const curSegLength = cache.top.getLength();\n          const _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;\n          drawedLengthUntilLast += curSegLength;\n          if (_cr > 0) {\n            skip = this.drawSegmentItem(\n              context,\n              cache,\n              doFill,\n              fillOpacity,\n              doStroke,\n              strokeOpacity,\n              segments[index],\n              [areaAttribute, area.attribute],\n              min(_cr, 1),\n              x,\n              y,\n              z,\n              area,\n              drawContext,\n              fillCb,\n              strokeCb\n            );\n          }\n        });\n      }\n    } else {\n      this.drawSegmentItem(\n        context,\n        area.cacheArea as IAreaCacheItem,\n        doFill,\n        fillOpacity,\n        doStroke,\n        strokeOpacity,\n        area.attribute,\n        areaAttribute,\n        clipRange,\n        x,\n        y,\n        z,\n        area,\n        drawContext,\n        fillCb,\n        strokeCb\n      );\n    }\n  }\n\n  draw(area: IArea, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const areaAttribute = getTheme(area, params?.theme).area;\n    this._draw(area, areaAttribute, false, drawContext, params);\n  }\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: IAreaCacheItem,\n    fill: boolean,\n    fillOpacity: number,\n    stroke: boolean,\n    strokeOpacity: number,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    clipRange: number,\n    offsetX: number,\n    offsetY: number,\n    offsetZ: number,\n    area: IArea,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    return this._drawSegmentItem(\n      context,\n      cache,\n      fill,\n      fillOpacity,\n      stroke,\n      strokeOpacity,\n      attribute,\n      defaultAttribute,\n      clipRange,\n      offsetX,\n      offsetY,\n      offsetZ,\n      area,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  protected _drawSegmentItem(\n    context: IContext2d,\n    cache: IAreaCacheItem,\n    fill: boolean,\n    fillOpacity: number,\n    stroke: boolean,\n    strokeOpacity: number,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    clipRange: number,\n    offsetX: number,\n    offsetY: number,\n    offsetZ: number,\n    area: IArea,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ) {\n    if (\n      !(\n        cache &&\n        cache.top &&\n        cache.bottom &&\n        cache.top.curves &&\n        cache.top.curves.length &&\n        cache.bottom.curves &&\n        cache.bottom.curves.length\n      )\n    ) {\n      return;\n    }\n\n    context.beginPath();\n\n    const ret: boolean = false;\n    const { points, segments } = area.attribute;\n    let direction = Direction.ROW;\n    let endP: IPointLike;\n    let startP: IPointLike;\n    if (segments) {\n      const endSeg = segments[segments.length - 1];\n      const startSeg = segments[0];\n      startP = startSeg.points[0];\n      endP = endSeg.points[endSeg.points.length - 1];\n    } else {\n      startP = points[0];\n      endP = points[points.length - 1];\n    }\n    const xTotalLength = abs(endP.x - startP.x);\n    const yTotalLength = abs(endP.y - startP.y);\n    if (endP.x1 == null) {\n      direction = Direction.ROW;\n    } else if (endP.y1 == null) {\n      direction = Direction.COLUMN;\n    } else if (!Number.isFinite(xTotalLength + yTotalLength)) {\n      direction = Direction.ROW;\n    } else {\n      direction = xTotalLength > yTotalLength ? Direction.ROW : Direction.COLUMN;\n    }\n    drawAreaSegments(context, cache, clipRange, {\n      offsetX,\n      offsetY,\n      offsetZ,\n      direction\n    });\n\n    this.beforeRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      defaultAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute }\n    );\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);\n\n    const { x: originX = 0, x: originY = 0 } = attribute;\n    const _runFill = () => {\n      if (fill !== false) {\n        if (fillCb) {\n          fillCb(context, attribute, defaultAttribute);\n        } else if (fillOpacity) {\n          context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n          context.fill();\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (stroke !== false) {\n        if (strokeCb) {\n          strokeCb(context, attribute, defaultAttribute);\n        } else {\n          const { stroke = defaultAttribute && (defaultAttribute as any)[1] && (defaultAttribute as any)[1].stroke } =\n            attribute;\n          if (isArray(stroke) && (stroke[0] || stroke[2]) && stroke[1] === false) {\n            context.beginPath();\n            drawSegments(\n              context,\n              stroke[0] ? cache.top : cache.bottom,\n              clipRange,\n              direction === Direction.ROW ? 'x' : 'y',\n              {\n                offsetX,\n                offsetY,\n                offsetZ\n              }\n            );\n          }\n          context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    _runFill();\n    this.afterRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      defaultAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute }\n    );\n    _runStroke();\n\n    return ret;\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/area-render.ts"],"names":[],"mappings":"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","file":"area-render.js","sourcesContent":["import { isArray, min } from '@visactor/vutils';\nimport type {\n  IArea,\n  IAreaCacheItem,\n  IAreaGraphicAttribute,\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IAreaRenderContribution,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider\n} from '../../../interface';\nimport { calcAreaCache, type AreaRenderCacheItem } from '../../../common/area-cache';\n\nimport { getTheme } from '../../../graphic/theme';\nimport { AreaRenderContribution } from './contributions/constants';\nimport { Direction } from '../../../common/enums';\nimport { drawAreaSegments } from '../../../common/render-area';\nimport { AREA_NUMBER_TYPE } from '../../../graphic/constants';\nimport { drawSegments } from '../../../common/render-curve';\nimport { BaseRender } from './base-render';\nimport {\n  defaultAreaBackgroundRenderContribution,\n  defaultAreaTextureRenderContribution\n} from './contributions/area-contribution-render';\n\nexport class DefaultCanvasAreaRender extends BaseRender<IArea> implements IGraphicRender {\n  type: 'area';\n  numberType: number = AREA_NUMBER_TYPE;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<IAreaRenderContribution>) {\n    super();\n    this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution];\n    this.init(graphicRenderContributions);\n  }\n\n  drawLinearAreaHighPerformance(\n    area: IArea,\n    context: IContext2d,\n    fill: boolean,\n    stroke: boolean,\n    fillOpacity: number,\n    strokeOpacity: number,\n    offsetX: number,\n    offsetY: number,\n    areaAttribute: Required<IAreaGraphicAttribute>,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const { points } = area.attribute;\n    if (points.length < 2) {\n      return;\n    }\n    context.beginPath();\n\n    const z = this.z ?? 0;\n    const startP = points[0];\n\n    context.moveTo(startP.x + offsetX, startP.y + offsetY, z);\n    for (let i = 1; i < points.length; i++) {\n      const p = points[i];\n      context.lineTo(p.x + offsetX, p.y + offsetY, z);\n    }\n    for (let i = points.length - 1; i >= 0; i--) {\n      const p = points[i];\n      context.lineTo((p.x1 ?? p.x) + offsetX, (p.y1 ?? p.y) + offsetY, z);\n    }\n    context.closePath();\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(area, area.attribute, areaAttribute);\n\n    this.beforeRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      areaAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute: area.attribute }\n    );\n\n    const { x: originX = 0, x: originY = 0 } = area.attribute;\n    const _runFill = () => {\n      if (fill !== false) {\n        if (fillCb) {\n          fillCb(context, area.attribute, areaAttribute);\n        } else if (fillOpacity) {\n          context.setCommonStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute);\n          context.fill();\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (stroke) {\n        const { stroke = areaAttribute && areaAttribute.stroke } = area.attribute;\n        if (isArray(stroke) && (stroke[0] || stroke[2]) && stroke[1] === false) {\n          context.beginPath();\n          if (stroke[0]) {\n            context.moveTo(startP.x + offsetX, startP.y + offsetY, z);\n            for (let i = 1; i < points.length; i++) {\n              const p = points[i];\n              context.lineTo(p.x + offsetX, p.y + offsetY, z);\n            }\n          } else if (stroke[2]) {\n            const endP = points[points.length - 1];\n            context.moveTo(endP.x + offsetX, endP.y + offsetY, z);\n            for (let i = points.length - 2; i >= 0; i--) {\n              const p = points[i];\n              context.lineTo((p.x1 ?? p.x) + offsetX, (p.y1 ?? p.y) + offsetY, z);\n            }\n          }\n        }\n        if (strokeCb) {\n          strokeCb(context, area.attribute, areaAttribute);\n        } else {\n          context.setStrokeStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    _runFill();\n    this.afterRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      areaAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute: area.attribute }\n    );\n    _runStroke();\n  }\n\n  drawShape(\n    area: IArea,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const areaAttribute = getTheme(area, params?.theme).area;\n    const {\n      fill = areaAttribute.fill,\n      stroke = areaAttribute.stroke,\n      fillOpacity = areaAttribute.fillOpacity,\n      z = areaAttribute.z,\n      strokeOpacity = areaAttribute.strokeOpacity,\n      curveTension = areaAttribute.curveTension,\n      connectedType = areaAttribute.connectedType\n    } = area.attribute;\n\n    const data = this.valid(area, areaAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { doFill } = data;\n    const doStroke = data.doStroke && data.sVisible;\n\n    const { clipRange = areaAttribute.clipRange, closePath, points, segments } = area.attribute;\n    let { curveType = areaAttribute.curveType } = area.attribute;\n    if (closePath && curveType === 'linear') {\n      curveType = 'linearClosed';\n    }\n\n    if (clipRange === 1 && !segments && !points.some(p => p.defined === false) && curveType === 'linear') {\n      return this.drawLinearAreaHighPerformance(\n        area,\n        context,\n        !!fill,\n        doStroke,\n        fillOpacity,\n        strokeOpacity,\n        x,\n        y,\n        areaAttribute,\n        drawContext,\n        params,\n        fillCb,\n        strokeCb\n      );\n    }\n\n    if (area.shouldUpdateShape()) {\n      area.cacheArea = calcAreaCache(points, segments, curveType, connectedType, curveTension);\n      area.clearUpdateShapeTag();\n    }\n    if (!area.cacheArea) {\n      return;\n    }\n\n    if (Array.isArray(area.cacheArea)) {\n      if (clipRange === 1) {\n        let skip = false;\n        // 性能优化，不需要clip的线段不需要计算长度\n        area.cacheArea.forEach(cache => {\n          if (skip) {\n            return;\n          }\n          skip = this.drawSegmentItem(\n            context,\n            cache,\n            doFill,\n            fillOpacity,\n            doStroke,\n            strokeOpacity,\n            segments[(cache as AreaRenderCacheItem).sourceSegmentIndex],\n            [areaAttribute, area.attribute],\n            clipRange,\n            x,\n            y,\n            z,\n            area,\n            drawContext,\n            fillCb,\n            strokeCb\n          );\n        });\n      } else {\n        // 如果是segments的话，每个clipRange需要重新计算\n        // 整个线段的总长度\n        const totalLength = area.cacheArea.reduce((l, c) => l + c.top.getLength(), 0);\n        // 总需要绘制的长度\n        const totalDrawLength = clipRange * totalLength;\n        // 直到上次绘制的长度\n        let drawedLengthUntilLast = 0;\n        let skip = false;\n        area.cacheArea.forEach(cache => {\n          if (skip) {\n            return;\n          }\n          const curSegLength = cache.top.getLength();\n          const _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;\n          drawedLengthUntilLast += curSegLength;\n          if (_cr > 0) {\n            skip = this.drawSegmentItem(\n              context,\n              cache,\n              doFill,\n              fillOpacity,\n              doStroke,\n              strokeOpacity,\n              segments[(cache as AreaRenderCacheItem).sourceSegmentIndex],\n              [areaAttribute, area.attribute],\n              min(_cr, 1),\n              x,\n              y,\n              z,\n              area,\n              drawContext,\n              fillCb,\n              strokeCb\n            );\n          }\n        });\n      }\n    } else {\n      this.drawSegmentItem(\n        context,\n        area.cacheArea as IAreaCacheItem,\n        doFill,\n        fillOpacity,\n        doStroke,\n        strokeOpacity,\n        area.attribute,\n        areaAttribute,\n        clipRange,\n        x,\n        y,\n        z,\n        area,\n        drawContext,\n        fillCb,\n        strokeCb\n      );\n    }\n  }\n\n  draw(area: IArea, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const areaAttribute = getTheme(area, params?.theme).area;\n    this._draw(area, areaAttribute, false, drawContext, params);\n  }\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: IAreaCacheItem,\n    fill: boolean,\n    fillOpacity: number,\n    stroke: boolean,\n    strokeOpacity: number,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    clipRange: number,\n    offsetX: number,\n    offsetY: number,\n    offsetZ: number,\n    area: IArea,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    return this._drawSegmentItem(\n      context,\n      cache,\n      fill,\n      fillOpacity,\n      stroke,\n      strokeOpacity,\n      attribute,\n      defaultAttribute,\n      clipRange,\n      offsetX,\n      offsetY,\n      offsetZ,\n      area,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  protected _drawSegmentItem(\n    context: IContext2d,\n    cache: IAreaCacheItem,\n    fill: boolean,\n    fillOpacity: number,\n    stroke: boolean,\n    strokeOpacity: number,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    clipRange: number,\n    offsetX: number,\n    offsetY: number,\n    offsetZ: number,\n    area: IArea,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ) {\n    if (\n      !(\n        cache &&\n        cache.top &&\n        cache.bottom &&\n        cache.top.curves &&\n        cache.top.curves.length &&\n        cache.bottom.curves &&\n        cache.bottom.curves.length\n      )\n    ) {\n      return;\n    }\n\n    context.beginPath();\n\n    const ret: boolean = false;\n    const direction = (cache as AreaRenderCacheItem).direction ?? cache.top.direction;\n    drawAreaSegments(context, cache, clipRange, {\n      offsetX,\n      offsetY,\n      offsetZ,\n      direction\n    });\n\n    this.beforeRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      defaultAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute }\n    );\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);\n\n    const { x: originX = 0, x: originY = 0 } = attribute;\n    const _runFill = () => {\n      if (fill !== false) {\n        if (fillCb) {\n          fillCb(context, attribute, defaultAttribute);\n        } else if (fillOpacity) {\n          context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n          context.fill();\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (stroke !== false) {\n        if (strokeCb) {\n          strokeCb(context, attribute, defaultAttribute);\n        } else {\n          const { stroke = defaultAttribute && (defaultAttribute as any)[1] && (defaultAttribute as any)[1].stroke } =\n            attribute;\n          if (isArray(stroke) && (stroke[0] || stroke[2]) && stroke[1] === false) {\n            context.beginPath();\n            drawSegments(\n              context,\n              stroke[0] ? cache.top : cache.bottom,\n              clipRange,\n              direction === Direction.ROW ? 'x' : 'y',\n              {\n                offsetX,\n                offsetY,\n                offsetZ\n              }\n            );\n          }\n          context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    _runFill();\n    this.afterRenderStep(\n      area,\n      context,\n      offsetX,\n      offsetY,\n      !!fillOpacity,\n      false,\n      fill,\n      false,\n      defaultAttribute as any,\n      drawContext,\n      fillCb,\n      null,\n      { attribute }\n    );\n    _runStroke();\n\n    return ret;\n  }\n}\n"]}

package/es/render/contributions/render/incremental-area-render.d.ts

@@ -1,8 +1,12 @@
+import type { IPointLike } from '@visactor/vutils';
 import type { IArea, IAreaGraphicAttribute, IAreaSegment, IGraphicAttribute, IContext2d, IMarkAttribute, IThemeAttribute, IGraphicRender, IGraphicRenderDrawParams, IDrawContext } from '../../../interface';
 import { DefaultCanvasAreaRender } from './area-render';
 export declare class DefaultIncrementalCanvasAreaRender extends DefaultCanvasAreaRender implements IGraphicRender {
     type: 'area';
     numberType: number;
     drawShape(area: IArea, context: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
-    drawIncreaseSegment(area: IArea, context: IContext2d, lastSeg: IAreaSegment, seg: IAreaSegment, attribute: Partial<IAreaGraphicAttribute>, defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[], offsetX: number, offsetY: number): void;
+    drawIncreaseSegment(area: IArea, context: IContext2d, lastSeg: IAreaSegment, seg: IAreaSegment, attribute: Partial<IAreaGraphicAttribute>, defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[], offsetX: number, offsetY: number, continuity?: {
+        connectedType: 'none' | 'connect';
+        startPoint?: IPointLike;
+    }): void;
 }

package/es/render/contributions/render/incremental-area-render.js

@@ -8,6 +8,19 @@ import { DefaultCanvasAreaRender } from "./area-render";
 
 import { drawIncrementalAreaSegments } from "../../../common/render-curve";
 
+import { getAreaPointRuns } from "../../../common/area-cache";
+
+function previousPoint(segments, index, connectedType) {
+    for (let i = index - 1; i >= 0; i--) {
+        const points = segments[i].points;
+        for (let j = points.length - 1; j >= 0; j--) {
+            const point = points[j];
+            if (!1 !== point.defined) return point;
+            if ("connect" !== connectedType) return;
+        }
+    }
+}
+
 export class DefaultIncrementalCanvasAreaRender extends DefaultCanvasAreaRender {
     constructor() {
         super(...arguments), this.numberType = AREA_NUMBER_TYPE;
@@ -16,19 +29,28 @@ export class DefaultIncrementalCanvasAreaRender extends DefaultCanvasAreaRender
         if (area.incremental && drawContext.multiGraphicOptions) {
             const {startAtIdx: startAtIdx, length: length} = drawContext.multiGraphicOptions, {segments: segments = []} = area.attribute;
             if (startAtIdx > segments.length) return;
-            const areaAttribute = getTheme(area).area, {fill: fill = areaAttribute.fill, fillOpacity: fillOpacity = areaAttribute.fillOpacity, opacity: opacity = areaAttribute.opacity, visible: visible = areaAttribute.visible} = area.attribute, fVisible = fillVisible(opacity, fillOpacity, fill), doFill = runFill(fill);
+            const areaAttribute = getTheme(area).area, {fill: fill = areaAttribute.fill, fillOpacity: fillOpacity = areaAttribute.fillOpacity, opacity: opacity = areaAttribute.opacity, visible: visible = areaAttribute.visible, connectedType: connectedType = areaAttribute.connectedType} = area.attribute, fVisible = fillVisible(opacity, fillOpacity, fill), doFill = runFill(fill);
             if (!area.valid || !visible) return;
             if (!doFill) return;
             if (!fVisible && !fillCb) return;
-            for (let i = startAtIdx; i < startAtIdx + length; i++) this.drawIncreaseSegment(area, context, segments[i - 1], segments[i], area.attribute.segments[i], [ areaAttribute, area.attribute ], x, y);
+            const endIndex = Math.min(startAtIdx + length, segments.length);
+            for (let i = startAtIdx; i < endIndex; i++) segments[i].points.some((p => !1 !== p.defined)) && this.drawIncreaseSegment(area, context, segments[i - 1], segments[i], area.attribute.segments[i], [ areaAttribute, area.attribute ], x, y, {
+                connectedType: connectedType,
+                startPoint: previousPoint(segments, i, connectedType)
+            });
         } else super.drawShape(area, context, x, y, drawContext, params, fillCb);
     }
-    drawIncreaseSegment(area, context, lastSeg, seg, attribute, defaultAttribute, offsetX, offsetY) {
-        seg && (context.beginPath(), drawIncrementalAreaSegments(context.camera ? context : context.nativeContext, lastSeg, seg, {
+    drawIncreaseSegment(area, context, lastSeg, seg, attribute, defaultAttribute, offsetX, offsetY, continuity) {
+        var _a, _b;
+        if (!seg) return;
+        const connectedType = null !== (_b = null !== (_a = null == continuity ? void 0 : continuity.connectedType) && void 0 !== _a ? _a : area.attribute.connectedType) && void 0 !== _b ? _b : getTheme(area).area.connectedType, startPoint = continuity ? continuity.startPoint : lastSeg && getAreaPointRuns(lastSeg.points, connectedType).tail;
+        context.beginPath(), drawIncrementalAreaSegments(context.camera ? context : context.nativeContext, lastSeg, seg, {
             offsetX: offsetX,
-            offsetY: offsetY
+            offsetY: offsetY,
+            connectedType: connectedType,
+            startPoint: startPoint
         }), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute), 
-        context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute), context.fill());
+        context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute), context.fill();
     }
 }
 //# sourceMappingURL=incremental-area-render.js.map

package/es/render/contributions/render/incremental-area-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/incremental-area-render.ts"],"names":[],"mappings":"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","file":"incremental-area-render.js","sourcesContent":["import type {\n  IArea,\n  IAreaGraphicAttribute,\n  IAreaSegment,\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IDrawContext\n} from '../../../interface';\nimport { AREA_NUMBER_TYPE } from '../../../graphic/constants';\nimport { getTheme } from '../../../graphic/theme';\nimport { fillVisible, runFill } from './utils';\nimport { DefaultCanvasAreaRender } from './area-render';\nimport { drawIncrementalAreaSegments } from '../../../common/render-curve';\n\n/**\n * 默认的基于canvas的line渲染器\n * 单例\n */\nexport class DefaultIncrementalCanvasAreaRender extends DefaultCanvasAreaRender implements IGraphicRender {\n  declare type: 'area';\n  numberType: number = AREA_NUMBER_TYPE;\n\n  drawShape(\n    area: IArea,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (area.incremental && drawContext.multiGraphicOptions) {\n      const { startAtIdx, length } = drawContext.multiGraphicOptions;\n      const { segments = [] } = area.attribute;\n      if (startAtIdx > segments.length) {\n        return;\n      }\n      const areaAttribute = getTheme(area).area;\n      const {\n        fill = areaAttribute.fill,\n        fillOpacity = areaAttribute.fillOpacity,\n        opacity = areaAttribute.opacity,\n        visible = areaAttribute.visible\n      } = area.attribute;\n      // 不绘制或者透明\n      const fVisible = fillVisible(opacity, fillOpacity, fill);\n      const doFill = runFill(fill);\n\n      if (!(area.valid && visible)) {\n        return;\n      }\n\n      if (!doFill) {\n        return;\n      }\n\n      // 如果存在fillCb和strokeCb，那就不直接跳过\n      if (!(fVisible || fillCb)) {\n        return;\n      }\n\n      // 不支持clipRange，不支持pick，仅支持最基础的线段绘制\n      for (let i = startAtIdx; i < startAtIdx + length; i++) {\n        this.drawIncreaseSegment(\n          area,\n          context,\n          segments[i - 1],\n          segments[i],\n          area.attribute.segments[i],\n          [areaAttribute, area.attribute],\n          x,\n          y\n        );\n      }\n    } else {\n      super.drawShape(area, context, x, y, drawContext, params, fillCb);\n    }\n  }\n\n  drawIncreaseSegment(\n    area: IArea,\n    context: IContext2d,\n    lastSeg: IAreaSegment,\n    seg: IAreaSegment,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    offsetX: number,\n    offsetY: number\n  ) {\n    if (!seg) {\n      return;\n    }\n\n    context.beginPath();\n    drawIncrementalAreaSegments(context.camera ? context : context.nativeContext, lastSeg, seg, {\n      offsetX,\n      offsetY\n    });\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);\n    context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute);\n    context.fill();\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/incremental-area-render.ts"],"names":[],"mappings":"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","file":"incremental-area-render.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type {\n  IArea,\n  IAreaGraphicAttribute,\n  IAreaSegment,\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IDrawContext\n} from '../../../interface';\nimport { AREA_NUMBER_TYPE } from '../../../graphic/constants';\nimport { getTheme } from '../../../graphic/theme';\nimport { fillVisible, runFill } from './utils';\nimport { DefaultCanvasAreaRender } from './area-render';\nimport { drawIncrementalAreaSegments } from '../../../common/render-curve';\nimport { getAreaPointRuns } from '../../../common/area-cache';\n\nfunction previousPoint(segments: IAreaSegment[], index: number, connectedType: 'none' | 'connect') {\n  for (let i = index - 1; i >= 0; i--) {\n    const points = segments[i].points;\n    for (let j = points.length - 1; j >= 0; j--) {\n      const point = points[j];\n      if (point.defined !== false) {\n        return point;\n      }\n      if (connectedType !== 'connect') {\n        return undefined;\n      }\n    }\n  }\n  return undefined;\n}\n\n/**\n * 默认的基于canvas的line渲染器\n * 单例\n */\nexport class DefaultIncrementalCanvasAreaRender extends DefaultCanvasAreaRender implements IGraphicRender {\n  declare type: 'area';\n  numberType: number = AREA_NUMBER_TYPE;\n\n  drawShape(\n    area: IArea,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (area.incremental && drawContext.multiGraphicOptions) {\n      const { startAtIdx, length } = drawContext.multiGraphicOptions;\n      const { segments = [] } = area.attribute;\n      if (startAtIdx > segments.length) {\n        return;\n      }\n      const areaAttribute = getTheme(area).area;\n      const {\n        fill = areaAttribute.fill,\n        fillOpacity = areaAttribute.fillOpacity,\n        opacity = areaAttribute.opacity,\n        visible = areaAttribute.visible,\n        connectedType = areaAttribute.connectedType\n      } = area.attribute;\n      // 不绘制或者透明\n      const fVisible = fillVisible(opacity, fillOpacity, fill);\n      const doFill = runFill(fill);\n\n      if (!(area.valid && visible)) {\n        return;\n      }\n\n      if (!doFill) {\n        return;\n      }\n\n      // 如果存在fillCb和strokeCb，那就不直接跳过\n      if (!(fVisible || fillCb)) {\n        return;\n      }\n\n      // 不支持clipRange，不支持pick，仅支持最基础的线段绘制\n      const endIndex = Math.min(startAtIdx + length, segments.length);\n      for (let i = startAtIdx; i < endIndex; i++) {\n        // Empty batches draw nothing and must not repeatedly search the same prefix.\n        if (!segments[i].points.some(p => p.defined !== false)) {\n          continue;\n        }\n        this.drawIncreaseSegment(\n          area,\n          context,\n          segments[i - 1],\n          segments[i],\n          area.attribute.segments[i],\n          [areaAttribute, area.attribute],\n          x,\n          y,\n          { connectedType, startPoint: previousPoint(segments, i, connectedType) }\n        );\n      }\n    } else {\n      super.drawShape(area, context, x, y, drawContext, params, fillCb);\n    }\n  }\n\n  drawIncreaseSegment(\n    area: IArea,\n    context: IContext2d,\n    lastSeg: IAreaSegment,\n    seg: IAreaSegment,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    offsetX: number,\n    offsetY: number,\n    continuity?: { connectedType: 'none' | 'connect'; startPoint?: IPointLike }\n  ) {\n    if (!seg) {\n      return;\n    }\n\n    const connectedType =\n      continuity?.connectedType ?? area.attribute.connectedType ?? getTheme(area).area.connectedType;\n    const startPoint = continuity\n      ? continuity.startPoint\n      : lastSeg && getAreaPointRuns(lastSeg.points, connectedType).tail;\n    context.beginPath();\n    drawIncrementalAreaSegments(context.camera ? context : context.nativeContext, lastSeg, seg, {\n      offsetX,\n      offsetY,\n      connectedType,\n      startPoint\n    });\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);\n    context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute);\n    context.fill();\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-core",
-  "version": "1.1.11-alpha.0",
+  "version": "1.1.11",
   "description": "",
   "sideEffects": [
     "./src/modules.ts",
@@ -135,9 +135,9 @@
     "vite": "3.2.6",
     "typescript": "4.9.5",
     "cross-env": "^7.0.3",
-    "@internal/ts-config": "0.0.1",
     "@internal/bundler": "0.0.1",
-    "@internal/eslint-config": "0.0.1"
+    "@internal/eslint-config": "0.0.1",
+    "@internal/ts-config": "0.0.1"
   },
   "keywords": [
     "VisActor",
@@ -334,6 +334,7 @@
     "dev": "cross-env DEBUG='Bundler*' bundle --clean -f es -w",
     "start": "vite ./__tests__/browser",
     "test": "jest -c jest.config.js",
+    "test:artifacts": "jest -c jest.artifacts.config.js",
     "test:electron": "jest -c jest.electron.config.js --runInBand --passWithNoTests --testPathPattern='__tests__/(browser|electron)/'",
     "test-live": "npm run test-watch __tests__/unit/theme/line.test.ts",
     "test-watch": "cross-env DEBUG_MODE=1 jest --watch -c jest.config.js",