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

package/es/common/canvas-utils.d.ts

@@ -1,8 +1,11 @@
 import type { IColor } from '../interface/color';
 import type { IContext2d, ITransform } from '../interface';
-import type { IBoundsLike } from '@visactor/vutils';
+import { type IBoundsLike, type IMatrixLike } from '@visactor/vutils';
+type StrokeScaleMatrix = Pick<IMatrixLike, 'a' | 'b' | 'c' | 'd'>;
+export declare function getScaledStrokeWithMatrix(matrix: StrokeScaleMatrix, width: number, dpr: number): number;
 export declare function getScaledStroke(context: IContext2d, width: number, dpr: number): number;
 export declare function createColor(context: IContext2d, c: string | IColor | Array<string | IColor> | boolean, params: {
     AABBBounds?: IBoundsLike;
     attribute?: Partial<ITransform>;
 }, offsetX?: number, offsetY?: number): string | CanvasGradient;
+export {};

package/es/common/canvas-utils.js

@@ -2,13 +2,17 @@ import { isArray } from "@visactor/vutils";
 
 import { GradientParser } from "./color-utils";
 
-export function getScaledStroke(context, width, dpr) {
+export function getScaledStrokeWithMatrix(matrix, width, dpr) {
     let strokeWidth = width;
-    const {a: a, b: b, c: c, d: d} = context.currentMatrix, scaleX = Math.sign(a) * Math.sqrt(a * a + b * b), scaleY = Math.sign(d) * Math.sqrt(c * c + d * d);
+    const {a: a, b: b, c: c, d: d} = matrix, scaleX = Math.sign(a) * Math.sqrt(a * a + b * b), scaleY = Math.sign(d) * Math.sqrt(c * c + d * d);
     return scaleX + scaleY === 0 ? 0 : (strokeWidth = strokeWidth / Math.abs(scaleX + scaleY) * 2 * dpr, 
     strokeWidth);
 }
 
+export function getScaledStroke(context, width, dpr) {
+    return getScaledStrokeWithMatrix(context.currentMatrix, width, dpr);
+}
+
 export function createColor(context, c, params, offsetX = 0, offsetY = 0) {
     var _a, _b, _c, _d;
     if (!c || !0 === c) return "black";

package/es/common/canvas-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/canvas-utils.ts"],"names":[],"mappings":"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","file":"canvas-utils.js","sourcesContent":["import type { IColor, IConicalGradient, ILinearGradient, IRadialGradient } from '../interface/color';\nimport type { IContext2d, ITransform } from '../interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { isArray } from '@visactor/vutils';\nimport { GradientParser } from './color-utils';\n\nexport function getScaledStroke(context: IContext2d, width: number, dpr: number) {\n  let strokeWidth = width;\n  const { a, b, c, d } = context.currentMatrix;\n  const scaleX = Math.sign(a) * Math.sqrt(a * a + b * b);\n  const scaleY = Math.sign(d) * Math.sqrt(c * c + d * d);\n  // 如果没有scaleX和scaleY，那么认为什么都不用绘制\n  if (scaleX + scaleY === 0) {\n    return 0;\n  }\n  strokeWidth = (strokeWidth / Math.abs(scaleX + scaleY)) * 2 * dpr;\n  return strokeWidth;\n}\n\nexport function createColor(\n  context: IContext2d,\n  c: string | IColor | Array<string | IColor> | boolean,\n  params: { AABBBounds?: IBoundsLike; attribute?: Partial<ITransform> },\n  offsetX: number = 0,\n  offsetY: number = 0\n): string | CanvasGradient {\n  if (!c || c === true) {\n    return 'black';\n  }\n  let result: string | CanvasGradient | undefined;\n  let color: string | IColor;\n  if (isArray(c)) {\n    for (let i = 0; i < c.length; i++) {\n      color = c[i];\n      if (color) {\n        break;\n      }\n    }\n  } else {\n    color = c;\n  }\n  color = GradientParser.Parse(color);\n  if (typeof color === 'string') {\n    return color;\n  }\n  // 如果是渐变色的话，需要根据bounds来计算渐变色的范围\n  if (params.AABBBounds && (!params.attribute || params.attribute.scaleX !== 0 || params.attribute.scaleY !== 0)) {\n    const bounds = params.AABBBounds;\n    let w = bounds.x2 - bounds.x1;\n    let h = bounds.y2 - bounds.y1;\n    let x = bounds.x1 - offsetX;\n    let y = bounds.y1 - offsetY;\n    // 检测是否有angle、scale，如果有的话，说明context有transform。\n    // 需要获取图元原始的bounds宽高，然后设置xy为0才行\n    if (params.attribute) {\n      const { scaleX = 1, scaleY = 1, angle = 0 } = params.attribute;\n      w /= scaleX;\n      h /= scaleY;\n      x /= scaleX;\n      y /= scaleY;\n      if (angle || scaleX !== 1 || scaleY !== 1) {\n        // symbol的时候锚点是在中间的，所以bounds不能按0算\n        x = (params as any).x1WithoutTransform ?? 0;\n        y = (params as any).y1WithoutTransform ?? 0;\n        w = (params as any).widthWithoutTransform ?? w;\n        h = (params as any).heightWithoutTransform ?? h;\n      }\n    }\n    // TODO 不同scaleCenter有问题\n    if (color.gradient === 'linear') {\n      result = createLinearGradient(context, color, x, y, w, h);\n    } else if (color.gradient === 'conical') {\n      result = createConicGradient(context, color, x, y, w, h);\n    } else if (color.gradient === 'radial') {\n      result = createRadialGradient(context, color, x, y, w, h);\n    }\n  }\n  return result || 'orange';\n}\n\nfunction createLinearGradient(context: IContext2d, color: ILinearGradient, x: number, y: number, w: number, h: number) {\n  const canvasGradient = context.createLinearGradient(\n    x + (color.x0 ?? 0) * w,\n    y + (color.y0 ?? 0) * h,\n    x + (color.x1 ?? 1) * w,\n    y + (color.y1 ?? 0) * h\n  );\n  color.stops.forEach(stop => {\n    canvasGradient.addColorStop(stop.offset, stop.color);\n  });\n  return canvasGradient;\n}\n\nfunction createRadialGradient(context: IContext2d, color: IRadialGradient, x: number, y: number, w: number, h: number) {\n  const canvasGradient = context.createRadialGradient(\n    x + (color.x0 ?? 0.5) * w,\n    y + (color.y0 ?? 0.5) * h,\n    Math.max(w, h) * (color.r0 ?? 0),\n    x + (color.x1 ?? 0.5) * w,\n    y + (color.y1 ?? 0.5) * h,\n    Math.max(w, h) * (color.r1 ?? 0.5)\n  );\n  color.stops.forEach(stop => {\n    canvasGradient.addColorStop(stop.offset, stop.color);\n  });\n  return canvasGradient;\n}\n\nfunction createConicGradient(context: IContext2d, color: IConicalGradient, x: number, y: number, w: number, h: number) {\n  const canvasGradient = context.createConicGradient(\n    x + (color.x ?? 0) * w,\n    y + (color.y ?? 0) * h,\n    color.startAngle,\n    color.endAngle\n  );\n  color.stops.forEach(stop => {\n    canvasGradient.addColorStop(stop.offset, stop.color);\n  });\n\n  let deltaAngle;\n  return (canvasGradient as any).GetPattern\n    ? (canvasGradient as any).GetPattern(w + x, h + y, deltaAngle)\n    : canvasGradient;\n}\n"]}
+{"version":3,"sources":["../src/common/canvas-utils.ts"],"names":[],"mappings":"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","file":"canvas-utils.js","sourcesContent":["import type { IColor, IConicalGradient, ILinearGradient, IRadialGradient } from '../interface/color';\nimport type { IContext2d, ITransform } from '../interface';\nimport { isArray, type IBoundsLike, type IMatrixLike } from '@visactor/vutils';\nimport { GradientParser } from './color-utils';\n\ntype StrokeScaleMatrix = Pick<IMatrixLike, 'a' | 'b' | 'c' | 'd'>;\n\nexport function getScaledStrokeWithMatrix(matrix: StrokeScaleMatrix, width: number, dpr: number) {\n  let strokeWidth = width;\n  const { a, b, c, d } = matrix;\n  const scaleX = Math.sign(a) * Math.sqrt(a * a + b * b);\n  const scaleY = Math.sign(d) * Math.sqrt(c * c + d * d);\n  // 如果没有scaleX和scaleY，那么认为什么都不用绘制\n  if (scaleX + scaleY === 0) {\n    return 0;\n  }\n  strokeWidth = (strokeWidth / Math.abs(scaleX + scaleY)) * 2 * dpr;\n  return strokeWidth;\n}\n\nexport function getScaledStroke(context: IContext2d, width: number, dpr: number) {\n  return getScaledStrokeWithMatrix(context.currentMatrix, width, dpr);\n}\n\nexport function createColor(\n  context: IContext2d,\n  c: string | IColor | Array<string | IColor> | boolean,\n  params: { AABBBounds?: IBoundsLike; attribute?: Partial<ITransform> },\n  offsetX: number = 0,\n  offsetY: number = 0\n): string | CanvasGradient {\n  if (!c || c === true) {\n    return 'black';\n  }\n  let result: string | CanvasGradient | undefined;\n  let color: string | IColor;\n  if (isArray(c)) {\n    for (let i = 0; i < c.length; i++) {\n      color = c[i];\n      if (color) {\n        break;\n      }\n    }\n  } else {\n    color = c;\n  }\n  color = GradientParser.Parse(color);\n  if (typeof color === 'string') {\n    return color;\n  }\n  // 如果是渐变色的话，需要根据bounds来计算渐变色的范围\n  if (params.AABBBounds && (!params.attribute || params.attribute.scaleX !== 0 || params.attribute.scaleY !== 0)) {\n    const bounds = params.AABBBounds;\n    let w = bounds.x2 - bounds.x1;\n    let h = bounds.y2 - bounds.y1;\n    let x = bounds.x1 - offsetX;\n    let y = bounds.y1 - offsetY;\n    // 检测是否有angle、scale，如果有的话，说明context有transform。\n    // 需要获取图元原始的bounds宽高，然后设置xy为0才行\n    if (params.attribute) {\n      const { scaleX = 1, scaleY = 1, angle = 0 } = params.attribute;\n      w /= scaleX;\n      h /= scaleY;\n      x /= scaleX;\n      y /= scaleY;\n      if (angle || scaleX !== 1 || scaleY !== 1) {\n        // symbol的时候锚点是在中间的，所以bounds不能按0算\n        x = (params as any).x1WithoutTransform ?? 0;\n        y = (params as any).y1WithoutTransform ?? 0;\n        w = (params as any).widthWithoutTransform ?? w;\n        h = (params as any).heightWithoutTransform ?? h;\n      }\n    }\n    // TODO 不同scaleCenter有问题\n    if (color.gradient === 'linear') {\n      result = createLinearGradient(context, color, x, y, w, h);\n    } else if (color.gradient === 'conical') {\n      result = createConicGradient(context, color, x, y, w, h);\n    } else if (color.gradient === 'radial') {\n      result = createRadialGradient(context, color, x, y, w, h);\n    }\n  }\n  return result || 'orange';\n}\n\nfunction createLinearGradient(context: IContext2d, color: ILinearGradient, x: number, y: number, w: number, h: number) {\n  const canvasGradient = context.createLinearGradient(\n    x + (color.x0 ?? 0) * w,\n    y + (color.y0 ?? 0) * h,\n    x + (color.x1 ?? 1) * w,\n    y + (color.y1 ?? 0) * h\n  );\n  color.stops.forEach(stop => {\n    canvasGradient.addColorStop(stop.offset, stop.color);\n  });\n  return canvasGradient;\n}\n\nfunction createRadialGradient(context: IContext2d, color: IRadialGradient, x: number, y: number, w: number, h: number) {\n  const canvasGradient = context.createRadialGradient(\n    x + (color.x0 ?? 0.5) * w,\n    y + (color.y0 ?? 0.5) * h,\n    Math.max(w, h) * (color.r0 ?? 0),\n    x + (color.x1 ?? 0.5) * w,\n    y + (color.y1 ?? 0.5) * h,\n    Math.max(w, h) * (color.r1 ?? 0.5)\n  );\n  color.stops.forEach(stop => {\n    canvasGradient.addColorStop(stop.offset, stop.color);\n  });\n  return canvasGradient;\n}\n\nfunction createConicGradient(context: IContext2d, color: IConicalGradient, x: number, y: number, w: number, h: number) {\n  const canvasGradient = context.createConicGradient(\n    x + (color.x ?? 0) * w,\n    y + (color.y ?? 0) * h,\n    color.startAngle,\n    color.endAngle\n  );\n  color.stops.forEach(stop => {\n    canvasGradient.addColorStop(stop.offset, stop.color);\n  });\n\n  let deltaAngle;\n  return (canvasGradient as any).GetPattern\n    ? (canvasGradient as any).GetPattern(w + x, h + y, deltaAngle)\n    : canvasGradient;\n}\n"]}

package/es/common/polygon.d.ts

@@ -1,4 +1,12 @@
 import type { IPointLike } from '@visactor/vutils';
 import type { IPath2D } from '../interface';
+type NormalizedPolygonPoints = {
+    points: IPointLike[];
+    cornerRadius: number | number[];
+};
 export declare function drawPolygon(path: IPath2D, points: IPointLike[], x: number, y: number): void;
 export declare function drawRoundedPolygon(path: IPath2D, points: IPointLike[], x: number, y: number, cornerRadius: number | number[], closePath?: boolean): void;
+export declare function normalizePolygonPoints(points: IPointLike[], cornerRadius: number | number[], closePath?: boolean): NormalizedPolygonPoints | null;
+export declare function getPolygonWinding(points: IPointLike[]): 1 | -1;
+export declare function offsetPolygonPoints(points: IPointLike[], distance: number, closePath?: boolean): IPointLike[];
+export {};

package/es/common/polygon.js

@@ -7,6 +7,8 @@ export function drawPolygon(path, points, x, y) {
 
 export function drawRoundedPolygon(path, points, x, y, cornerRadius, closePath = !0) {
     var _a;
+    const normalized = normalizePolygonPoints(points, cornerRadius, closePath);
+    if (normalized) return void drawRoundedPolygon(path, normalized.points, x, y, normalized.cornerRadius, closePath);
     if (points.length < 3) return void drawPolygon(path, points, x, y);
     let startI = 0, endI = points.length - 1;
     closePath || (startI += 1, endI -= 1, path.moveTo(points[0].x + x, points[0].y + y));
@@ -38,4 +40,104 @@ function getProportionPoint(point, segment, length, dx, dy) {
         y: point.y - dy * factor
     };
 }
+
+export function normalizePolygonPoints(points, cornerRadius, closePath = !0) {
+    var _a;
+    let hasDuplicate = !1;
+    for (let i = 1; i < points.length; i++) if (isSamePoint(points[i - 1], points[i])) {
+        hasDuplicate = !0;
+        break;
+    }
+    if (!hasDuplicate && closePath && points.length > 1 && isSamePoint(points[0], points[points.length - 1]) && (hasDuplicate = !0), 
+    !hasDuplicate) return null;
+    const normalizedPoints = [], normalizedCornerRadius = Array.isArray(cornerRadius) ? [] : null;
+    for (let i = 0; i < points.length; i++) normalizedPoints.length && isSamePoint(normalizedPoints[normalizedPoints.length - 1], points[i]) || (normalizedPoints.push(points[i]), 
+    null == normalizedCornerRadius || normalizedCornerRadius.push(null !== (_a = cornerRadius[i]) && void 0 !== _a ? _a : 0));
+    return closePath && normalizedPoints.length > 1 && isSamePoint(normalizedPoints[0], normalizedPoints[normalizedPoints.length - 1]) && (normalizedPoints.pop(), 
+    null == normalizedCornerRadius || normalizedCornerRadius.pop()), {
+        points: normalizedPoints,
+        cornerRadius: null != normalizedCornerRadius ? normalizedCornerRadius : cornerRadius
+    };
+}
+
+function isSamePoint(a, b) {
+    return a.x === b.x && a.y === b.y;
+}
+
+export function getPolygonWinding(points) {
+    let signedArea = 0;
+    for (let i = 0; i < points.length; i++) {
+        const current = points[i], next = points[(i + 1) % points.length];
+        signedArea += current.x * next.y - next.x * current.y;
+    }
+    return signedArea > 0 ? 1 : -1;
+}
+
+export function offsetPolygonPoints(points, distance, closePath = !0) {
+    var _a;
+    const n = null !== (_a = null == points ? void 0 : points.length) && void 0 !== _a ? _a : 0;
+    if (n < 2 || closePath && n < 3 || !distance) return points;
+    const sign = getPolygonWinding(points), edgeCount = closePath ? n : n - 1, lines = [];
+    for (let i = 0; i < edgeCount; i++) {
+        const cur = points[i], next = points[(i + 1) % n], dx = next.x - cur.x, dy = next.y - cur.y, len = Math.sqrt(dx * dx + dy * dy);
+        if (!len) {
+            lines.push(null);
+            continue;
+        }
+        const offsetX = sign * dy * distance / len, offsetY = -sign * dx * distance / len;
+        lines.push({
+            x: cur.x + offsetX,
+            y: cur.y + offsetY,
+            dx: dx,
+            dy: dy,
+            len: len,
+            offsetX: offsetX,
+            offsetY: offsetY
+        });
+    }
+    const prevLines = new Array(n);
+    let prevLine = null;
+    if (closePath) for (let i = edgeCount - 1; i >= 0; i--) if (lines[i]) {
+        prevLine = lines[i];
+        break;
+    }
+    for (let i = 0; i < n; i++) prevLines[i] = prevLine, i < edgeCount && lines[i] && (prevLine = lines[i]);
+    const nextLines = new Array(n);
+    let nextLine = null;
+    if (closePath) for (let count = 0; count < edgeCount; count++) {
+        const line = lines[(n - 1 + count) % edgeCount];
+        if (line) {
+            nextLine = line;
+            break;
+        }
+    }
+    for (let i = n - 1; i >= 0; i--) i < edgeCount && lines[i] && (nextLine = lines[i]), 
+    nextLines[i] = nextLine;
+    const offsetPointByLine = (point, line) => ({
+        x: point.x + line.offsetX,
+        y: point.y + line.offsetY
+    }), result = [];
+    for (let i = 0; i < n; i++) {
+        const prev = prevLines[i], cur = nextLines[i], line = prev || cur;
+        if (!line) {
+            result.push(points[i]);
+            continue;
+        }
+        if (!prev || !cur) {
+            result.push(offsetPointByLine(points[i], line));
+            continue;
+        }
+        const denominator = prev.dx * cur.dy - prev.dy * cur.dx;
+        if (Math.abs(denominator) <= 1e-12 * prev.len * cur.len) {
+            result.push(offsetPointByLine(points[i], cur));
+            continue;
+        }
+        const t = ((cur.x - prev.x) * cur.dy - (cur.y - prev.y) * cur.dx) / denominator, point = {
+            x: prev.x + prev.dx * t,
+            y: prev.y + prev.dy * t
+        };
+        result.push(Number.isFinite(point.x) && Number.isFinite(point.y) ? point : offsetPointByLine(points[i], cur));
+    }
+    return result;
+}
 //# sourceMappingURL=polygon.js.map

package/es/common/polygon.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/polygon.ts"],"names":[],"mappings":"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","file":"polygon.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { IPath2D } from '../interface';\n\n/**\n * 绘制闭合的常规多边形\n * TODO polygon 图元的xy属性没有意义\n * @param path\n * @param points\n * @param x\n * @param y\n */\nexport function drawPolygon(path: IPath2D, points: IPointLike[], x: number, y: number) {\n  if (!points || !points.length) {\n    return;\n  }\n  path.moveTo(points[0].x + x, points[0].y + y);\n  for (let i = 1; i < points.length; i++) {\n    path.lineTo(points[i].x + x, points[i].y + y);\n  }\n}\n\n/**\n * algorithm detail see: https://stackoverflow.com/a/24780108\n */\nexport function drawRoundedPolygon(\n  path: IPath2D,\n  points: IPointLike[],\n  x: number,\n  y: number,\n  cornerRadius: number | number[],\n  closePath: boolean = true\n) {\n  if (points.length < 3) {\n    drawPolygon(path, points, x, y);\n    return;\n  }\n\n  let startI = 0;\n  let endI = points.length - 1;\n  if (!closePath) {\n    startI += 1;\n    endI -= 1;\n    path.moveTo(points[0].x + x, points[0].y + y);\n  }\n  for (let i = startI; i <= endI; i++) {\n    const p1 = points[i === 0 ? endI : (i - 1) % points.length];\n    const angularPoint = points[i % points.length];\n    const p2 = points[(i + 1) % points.length];\n\n    //Vector 1\n    const dx1 = angularPoint.x - p1.x;\n    const dy1 = angularPoint.y - p1.y;\n\n    //Vector 2\n    const dx2 = angularPoint.x - p2.x;\n    const dy2 = angularPoint.y - p2.y;\n\n    //Angle between vector 1 and vector 2 divided by 2\n    const angle = (Math.atan2(dy1, dx1) - Math.atan2(dy2, dx2)) / 2;\n\n    // The length of segment between angular point and the\n    // points of intersection with the circle of a given radius\n    const tan = Math.abs(Math.tan(angle));\n\n    // get config radius\n    let radius = Array.isArray(cornerRadius) ? (cornerRadius[i % points.length] ?? 0) : cornerRadius;\n    let segment = radius / tan;\n\n    //Check the segment\n    const length1 = getLength(dx1, dy1);\n    const length2 = getLength(dx2, dy2);\n\n    const length = Math.min(length1, length2);\n\n    if (segment > length) {\n      segment = length;\n      radius = length * tan;\n    }\n\n    // Points of intersection are calculated by the proportion between\n    // the coordinates of the vector, length of vector and the length of the segment.\n    const p1Cross = getProportionPoint(angularPoint, segment, length1, dx1, dy1);\n    const p2Cross = getProportionPoint(angularPoint, segment, length2, dx2, dy2);\n\n    // Calculation of the coordinates of the circle\n    // center by the addition of angular vectors.\n    const dx = angularPoint.x * 2 - p1Cross.x - p2Cross.x;\n    const dy = angularPoint.y * 2 - p1Cross.y - p2Cross.y;\n\n    const L = getLength(dx, dy);\n    const d = getLength(segment, radius);\n\n    const circlePoint = getProportionPoint(angularPoint, d, L, dx, dy);\n\n    //StartAngle and EndAngle of arc\n    let startAngle = Math.atan2(p1Cross.y - circlePoint.y, p1Cross.x - circlePoint.x);\n    const endAngle = Math.atan2(p2Cross.y - circlePoint.y, p2Cross.x - circlePoint.x);\n\n    //Sweep angle\n    let sweepAngle = endAngle - startAngle;\n\n    //Some additional checks\n    if (sweepAngle < 0) {\n      startAngle = endAngle;\n      sweepAngle = -sweepAngle;\n    }\n\n    if (sweepAngle > Math.PI) {\n      sweepAngle = sweepAngle - Math.PI;\n    }\n\n    if (i === 0) {\n      path.moveTo(p1Cross.x + x, p1Cross.y + y);\n    } else {\n      path.lineTo(p1Cross.x + x, p1Cross.y + y);\n    }\n\n    if (sweepAngle) {\n      path.arcTo(angularPoint.x + x, angularPoint.y + y, p2Cross.x + x, p2Cross.y + y, radius);\n    }\n\n    path.lineTo(p2Cross.x + x, p2Cross.y + y);\n  }\n\n  if (!closePath) {\n    path.lineTo(points[endI + 1].x + x, points[endI + 1].y + y);\n  }\n}\n\nfunction getLength(dx: number, dy: number) {\n  return Math.sqrt(dx * dx + dy * dy);\n}\n\nfunction getProportionPoint(point: IPointLike, segment: number, length: number, dx: number, dy: number) {\n  const factor = segment / length;\n\n  return {\n    x: point.x - dx * factor,\n    y: point.y - dy * factor\n  };\n}\n"]}
+{"version":3,"sources":["../src/common/polygon.ts"],"names":[],"mappings":"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","file":"polygon.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { IPath2D } from '../interface';\n\ntype NormalizedPolygonPoints = {\n  points: IPointLike[];\n  cornerRadius: number | number[];\n};\n\ntype OffsetLine = {\n  x: number;\n  y: number;\n  dx: number;\n  dy: number;\n  len: number;\n  offsetX: number;\n  offsetY: number;\n};\n\n/**\n * 绘制闭合的常规多边形\n * TODO polygon 图元的xy属性没有意义\n * @param path\n * @param points\n * @param x\n * @param y\n */\nexport function drawPolygon(path: IPath2D, points: IPointLike[], x: number, y: number) {\n  if (!points || !points.length) {\n    return;\n  }\n  path.moveTo(points[0].x + x, points[0].y + y);\n  for (let i = 1; i < points.length; i++) {\n    path.lineTo(points[i].x + x, points[i].y + y);\n  }\n}\n\n/**\n * algorithm detail see: https://stackoverflow.com/a/24780108\n */\nexport function drawRoundedPolygon(\n  path: IPath2D,\n  points: IPointLike[],\n  x: number,\n  y: number,\n  cornerRadius: number | number[],\n  closePath: boolean = true\n) {\n  const normalized = normalizePolygonPoints(points, cornerRadius, closePath);\n  if (normalized) {\n    drawRoundedPolygon(path, normalized.points, x, y, normalized.cornerRadius, closePath);\n    return;\n  }\n\n  if (points.length < 3) {\n    drawPolygon(path, points, x, y);\n    return;\n  }\n\n  let startI = 0;\n  let endI = points.length - 1;\n  if (!closePath) {\n    startI += 1;\n    endI -= 1;\n    path.moveTo(points[0].x + x, points[0].y + y);\n  }\n  for (let i = startI; i <= endI; i++) {\n    const p1 = points[i === 0 ? endI : (i - 1) % points.length];\n    const angularPoint = points[i % points.length];\n    const p2 = points[(i + 1) % points.length];\n\n    //Vector 1\n    const dx1 = angularPoint.x - p1.x;\n    const dy1 = angularPoint.y - p1.y;\n\n    //Vector 2\n    const dx2 = angularPoint.x - p2.x;\n    const dy2 = angularPoint.y - p2.y;\n\n    //Angle between vector 1 and vector 2 divided by 2\n    const angle = (Math.atan2(dy1, dx1) - Math.atan2(dy2, dx2)) / 2;\n\n    // The length of segment between angular point and the\n    // points of intersection with the circle of a given radius\n    const tan = Math.abs(Math.tan(angle));\n\n    // get config radius\n    let radius = Array.isArray(cornerRadius) ? cornerRadius[i % points.length] ?? 0 : cornerRadius;\n    let segment = radius / tan;\n\n    //Check the segment\n    const length1 = getLength(dx1, dy1);\n    const length2 = getLength(dx2, dy2);\n\n    const length = Math.min(length1, length2);\n\n    if (segment > length) {\n      segment = length;\n      radius = length * tan;\n    }\n\n    // Points of intersection are calculated by the proportion between\n    // the coordinates of the vector, length of vector and the length of the segment.\n    const p1Cross = getProportionPoint(angularPoint, segment, length1, dx1, dy1);\n    const p2Cross = getProportionPoint(angularPoint, segment, length2, dx2, dy2);\n\n    // Calculation of the coordinates of the circle\n    // center by the addition of angular vectors.\n    const dx = angularPoint.x * 2 - p1Cross.x - p2Cross.x;\n    const dy = angularPoint.y * 2 - p1Cross.y - p2Cross.y;\n\n    const L = getLength(dx, dy);\n    const d = getLength(segment, radius);\n\n    const circlePoint = getProportionPoint(angularPoint, d, L, dx, dy);\n\n    //StartAngle and EndAngle of arc\n    let startAngle = Math.atan2(p1Cross.y - circlePoint.y, p1Cross.x - circlePoint.x);\n    const endAngle = Math.atan2(p2Cross.y - circlePoint.y, p2Cross.x - circlePoint.x);\n\n    //Sweep angle\n    let sweepAngle = endAngle - startAngle;\n\n    //Some additional checks\n    if (sweepAngle < 0) {\n      startAngle = endAngle;\n      sweepAngle = -sweepAngle;\n    }\n\n    if (sweepAngle > Math.PI) {\n      sweepAngle = sweepAngle - Math.PI;\n    }\n\n    if (i === 0) {\n      path.moveTo(p1Cross.x + x, p1Cross.y + y);\n    } else {\n      path.lineTo(p1Cross.x + x, p1Cross.y + y);\n    }\n\n    if (sweepAngle) {\n      path.arcTo(angularPoint.x + x, angularPoint.y + y, p2Cross.x + x, p2Cross.y + y, radius);\n    }\n\n    path.lineTo(p2Cross.x + x, p2Cross.y + y);\n  }\n\n  if (!closePath) {\n    path.lineTo(points[endI + 1].x + x, points[endI + 1].y + y);\n  }\n}\n\nfunction getLength(dx: number, dy: number) {\n  return Math.sqrt(dx * dx + dy * dy);\n}\n\nfunction getProportionPoint(point: IPointLike, segment: number, length: number, dx: number, dy: number) {\n  const factor = segment / length;\n\n  return {\n    x: point.x - dx * factor,\n    y: point.y - dy * factor\n  };\n}\n\n/**\n * 合并连续重复点，避免圆角计算在零长度边上产生 0 / 0。\n * 仅在确实存在退化边时创建新数组，正常绘制路径不增加额外分配。\n */\nexport function normalizePolygonPoints(\n  points: IPointLike[],\n  cornerRadius: number | number[],\n  closePath: boolean = true\n): NormalizedPolygonPoints | null {\n  let hasDuplicate = false;\n\n  for (let i = 1; i < points.length; i++) {\n    if (isSamePoint(points[i - 1], points[i])) {\n      hasDuplicate = true;\n      break;\n    }\n  }\n  if (!hasDuplicate && closePath && points.length > 1 && isSamePoint(points[0], points[points.length - 1])) {\n    hasDuplicate = true;\n  }\n  if (!hasDuplicate) {\n    return null;\n  }\n\n  const normalizedPoints: IPointLike[] = [];\n  const normalizedCornerRadius: number[] | null = Array.isArray(cornerRadius) ? [] : null;\n  for (let i = 0; i < points.length; i++) {\n    if (normalizedPoints.length && isSamePoint(normalizedPoints[normalizedPoints.length - 1], points[i])) {\n      continue;\n    }\n    normalizedPoints.push(points[i]);\n    normalizedCornerRadius?.push((cornerRadius as number[])[i] ?? 0);\n  }\n\n  if (\n    closePath &&\n    normalizedPoints.length > 1 &&\n    isSamePoint(normalizedPoints[0], normalizedPoints[normalizedPoints.length - 1])\n  ) {\n    normalizedPoints.pop();\n    normalizedCornerRadius?.pop();\n  }\n\n  return {\n    points: normalizedPoints,\n    cornerRadius: normalizedCornerRadius ?? cornerRadius\n  };\n}\n\nfunction isSamePoint(a: IPointLike, b: IPointLike) {\n  return a.x === b.x && a.y === b.y;\n}\n\nexport function getPolygonWinding(points: IPointLike[]) {\n  let signedArea = 0;\n  for (let i = 0; i < points.length; i++) {\n    const current = points[i];\n    const next = points[(i + 1) % points.length];\n    signedArea += current.x * next.y - next.x * current.y;\n  }\n  return signedArea > 0 ? 1 : -1;\n}\n\n/**\n * 把多边形的每条边沿法线平移 distance，再用相邻两条平移后的直线求交点得到等距轮廓。\n * distance 为正表示向外扩（outerBorder），为负表示向内缩（innerBorder）。\n * 退化边会被跳过；相邻边共线（求交无解）时使用平移后的原始点，避免边框凹回原轮廓。\n */\nexport function offsetPolygonPoints(points: IPointLike[], distance: number, closePath: boolean = true): IPointLike[] {\n  const n = points?.length ?? 0;\n  if (n < 2 || (closePath && n < 3) || !distance) {\n    return points;\n  }\n\n  // 用带符号面积判断顶点绕向，保证 distance > 0 时法线一致朝外\n  const sign = getPolygonWinding(points);\n\n  // 每条边平移后的直线，用点 + 方向表示；开放路径不创建末点到首点的边\n  const edgeCount = closePath ? n : n - 1;\n  const lines: (OffsetLine | null)[] = [];\n  for (let i = 0; i < edgeCount; i++) {\n    const cur = points[i];\n    const next = points[(i + 1) % n];\n    const dx = next.x - cur.x;\n    const dy = next.y - cur.y;\n    const len = Math.sqrt(dx * dx + dy * dy);\n    if (!len) {\n      lines.push(null);\n      continue;\n    }\n    const offsetX = (sign * dy * distance) / len;\n    const offsetY = (-sign * dx * distance) / len;\n    lines.push({ x: cur.x + offsetX, y: cur.y + offsetY, dx, dy, len, offsetX, offsetY });\n  }\n\n  // 预先找出每个顶点前后的有效边，避免连续退化边导致逐点回溯成 O(n²)\n  const prevLines: (OffsetLine | null)[] = new Array(n);\n  let prevLine: OffsetLine | null = null;\n  if (closePath) {\n    for (let i = edgeCount - 1; i >= 0; i--) {\n      if (lines[i]) {\n        prevLine = lines[i];\n        break;\n      }\n    }\n  }\n  for (let i = 0; i < n; i++) {\n    prevLines[i] = prevLine;\n    if (i < edgeCount && lines[i]) {\n      prevLine = lines[i];\n    }\n  }\n\n  const nextLines: (OffsetLine | null)[] = new Array(n);\n  let nextLine: OffsetLine | null = null;\n  if (closePath) {\n    for (let count = 0; count < edgeCount; count++) {\n      const line = lines[(n - 1 + count) % edgeCount];\n      if (line) {\n        nextLine = line;\n        break;\n      }\n    }\n  }\n  for (let i = n - 1; i >= 0; i--) {\n    if (i < edgeCount && lines[i]) {\n      nextLine = lines[i];\n    }\n    nextLines[i] = nextLine;\n  }\n\n  const offsetPointByLine = (point: IPointLike, line: OffsetLine) => ({\n    x: point.x + line.offsetX,\n    y: point.y + line.offsetY\n  });\n\n  const result: IPointLike[] = [];\n  for (let i = 0; i < n; i++) {\n    const prev = prevLines[i];\n    const cur = nextLines[i];\n    const line = prev || cur;\n    if (!line) {\n      result.push(points[i]);\n      continue;\n    }\n    if (!prev || !cur) {\n      result.push(offsetPointByLine(points[i], line));\n      continue;\n    }\n\n    const denominator = prev.dx * cur.dy - prev.dy * cur.dx;\n    if (Math.abs(denominator) <= 1e-12 * prev.len * cur.len) {\n      // 平行边没有唯一交点，沿有效边的法线平移原顶点\n      result.push(offsetPointByLine(points[i], cur));\n      continue;\n    }\n    const t = ((cur.x - prev.x) * cur.dy - (cur.y - prev.y) * cur.dx) / denominator;\n    const point = { x: prev.x + prev.dx * t, y: prev.y + prev.dy * t };\n    result.push(Number.isFinite(point.x) && Number.isFinite(point.y) ? point : offsetPointByLine(points[i], cur));\n  }\n  return result;\n}\n"]}

package/es/graphic/graphic-service/polygon-outer-border-bounds.d.ts

@@ -0,0 +1,4 @@
+import type { IAABBBounds } from '@visactor/vutils';
+import type { IPolygon, IPolygonGraphicAttribute } from '../../interface';
+export declare const getPolygonBoundsScale: (polygon: IPolygon) => number;
+export declare const updateBoundsOfPolygonOuterBorder: (attribute: IPolygonGraphicAttribute, polygonTheme: Required<IPolygonGraphicAttribute>, aabbBounds: IAABBBounds, polygon: IPolygon) => IAABBBounds;

package/es/graphic/graphic-service/polygon-outer-border-bounds.js

@@ -0,0 +1,32 @@
+import { getScaledStrokeWithMatrix } from "../../common/canvas-utils";
+
+import { offsetPolygonPoints } from "../../common/polygon";
+
+import { boundStroke } from "../tools";
+
+const getBoundsScaleMatrix = polygon => {
+    var _a;
+    const globalMatrix = polygon.globalTransMatrix, viewBoxMatrix = null === (_a = polygon.stage) || void 0 === _a ? void 0 : _a.window.getViewBoxTransform();
+    return viewBoxMatrix ? {
+        a: viewBoxMatrix.a * globalMatrix.a + viewBoxMatrix.c * globalMatrix.b,
+        b: viewBoxMatrix.b * globalMatrix.a + viewBoxMatrix.d * globalMatrix.b,
+        c: viewBoxMatrix.a * globalMatrix.c + viewBoxMatrix.c * globalMatrix.d,
+        d: viewBoxMatrix.b * globalMatrix.c + viewBoxMatrix.d * globalMatrix.d
+    } : globalMatrix;
+};
+
+export const getPolygonBoundsScale = polygon => getScaledStrokeWithMatrix(getBoundsScaleMatrix(polygon), 1, 1);
+
+export const updateBoundsOfPolygonOuterBorder = (attribute, polygonTheme, aabbBounds, polygon) => {
+    const {outerBorder: outerBorder, points: points = polygonTheme.points, closePath: closePath = polygonTheme.closePath, shadowBlur: shadowBlur = polygonTheme.shadowBlur, keepStrokeScale: keepStrokeScale = polygonTheme.keepStrokeScale} = attribute;
+    if (outerBorder && !1 !== outerBorder.visible) {
+        const defaultOuterBorder = polygonTheme.outerBorder, {distance: distance = defaultOuterBorder.distance, lineWidth: lineWidth = defaultOuterBorder.lineWidth, lineJoin: lineJoin = defaultOuterBorder.lineJoin, strokeBoundsBuffer: strokeBoundsBuffer = defaultOuterBorder.strokeBoundsBuffer} = outerBorder, boundsScale = getPolygonBoundsScale(polygon);
+        let scaledDistance = distance;
+        keepStrokeScale || (scaledDistance *= boundsScale), offsetPolygonPoints(points, scaledDistance, closePath).forEach((point => {
+            aabbBounds.add(point.x, point.y);
+        }));
+        boundStroke(aabbBounds, (shadowBlur * boundsScale + lineWidth * (keepStrokeScale ? 1 : boundsScale)) / 2, "miter" === lineJoin, strokeBoundsBuffer);
+    }
+    return aabbBounds;
+};
+//# sourceMappingURL=polygon-outer-border-bounds.js.map

package/es/graphic/graphic-service/polygon-outer-border-bounds.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/graphic/graphic-service/polygon-outer-border-bounds.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIvC,MAAM,oBAAoB,GAAG,CAAC,OAAiB,EAAqB,EAAE;;IACpE,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAC/C,MAAM,aAAa,GAAG,MAAA,OAAO,CAAC,KAAK,0CAAE,MAAM,CAAC,mBAAmB,EAAE,CAAC;IAClE,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,YAAY,CAAC;KACrB;IACD,OAAO;QACL,CAAC,EAAE,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC;QACtE,CAAC,EAAE,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC;QACtE,CAAC,EAAE,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC;QACtE,CAAC,EAAE,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC;KACvE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAiB,EAAU,EAAE,CACjE,yBAAyB,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAC9C,SAAmC,EACnC,YAAgD,EAChD,UAAuB,EACvB,OAAiB,EACJ,EAAE;IACf,MAAM,EACJ,WAAW,EACX,MAAM,GAAG,YAAY,CAAC,MAAM,EAC5B,SAAS,GAAG,YAAY,CAAC,SAAS,EAClC,UAAU,GAAG,YAAY,CAAC,UAAU,EACpC,eAAe,GAAG,YAAY,CAAC,eAAe,EAC/C,GAAG,SAAS,CAAC;IAEd,IAAI,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,EAAE;QAChD,MAAM,kBAAkB,GAAG,YAAY,CAAC,WAAW,CAAC;QACpD,MAAM,EACJ,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EACtC,SAAS,GAAG,kBAAkB,CAAC,SAAS,EACxC,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EACtC,kBAAkB,GAAG,kBAAkB,CAAC,kBAAkB,EAC3D,GAAG,WAAW,CAAC;QAEhB,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,cAAc,GAAG,QAAkB,CAAC;QACxC,IAAI,CAAC,eAAe,EAAE;YACpB,cAAc,IAAI,WAAW,CAAC;SAC/B;QACD,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,SAAS,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QACxE,MAAM,gBAAgB,GAAG,UAAU,GAAG,WAAW,CAAC;QAClD,WAAW,CAAC,UAAU,EAAE,CAAC,gBAAgB,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,QAAQ,KAAK,OAAO,EAAE,kBAAkB,CAAC,CAAC;KAC7G;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC","file":"polygon-outer-border-bounds.js","sourcesContent":["import type { IAABBBounds, IMatrixLike } from '@visactor/vutils';\nimport { getScaledStrokeWithMatrix } from '../../common/canvas-utils';\nimport { offsetPolygonPoints } from '../../common/polygon';\nimport type { IPolygon, IPolygonGraphicAttribute } from '../../interface';\nimport { boundStroke } from '../tools';\n\ntype BoundsScaleMatrix = Pick<IMatrixLike, 'a' | 'b' | 'c' | 'd'>;\n\nconst getBoundsScaleMatrix = (polygon: IPolygon): BoundsScaleMatrix => {\n  const globalMatrix = polygon.globalTransMatrix;\n  const viewBoxMatrix = polygon.stage?.window.getViewBoxTransform();\n  if (!viewBoxMatrix) {\n    return globalMatrix;\n  }\n  return {\n    a: viewBoxMatrix.a * globalMatrix.a + viewBoxMatrix.c * globalMatrix.b,\n    b: viewBoxMatrix.b * globalMatrix.a + viewBoxMatrix.d * globalMatrix.b,\n    c: viewBoxMatrix.a * globalMatrix.c + viewBoxMatrix.c * globalMatrix.d,\n    d: viewBoxMatrix.b * globalMatrix.c + viewBoxMatrix.d * globalMatrix.d\n  };\n};\n\nexport const getPolygonBoundsScale = (polygon: IPolygon): number =>\n  getScaledStrokeWithMatrix(getBoundsScaleMatrix(polygon), 1, 1);\n\nexport const updateBoundsOfPolygonOuterBorder = (\n  attribute: IPolygonGraphicAttribute,\n  polygonTheme: Required<IPolygonGraphicAttribute>,\n  aabbBounds: IAABBBounds,\n  polygon: IPolygon\n): IAABBBounds => {\n  const {\n    outerBorder,\n    points = polygonTheme.points,\n    closePath = polygonTheme.closePath,\n    shadowBlur = polygonTheme.shadowBlur,\n    keepStrokeScale = polygonTheme.keepStrokeScale\n  } = attribute;\n\n  if (outerBorder && outerBorder.visible !== false) {\n    const defaultOuterBorder = polygonTheme.outerBorder;\n    const {\n      distance = defaultOuterBorder.distance,\n      lineWidth = defaultOuterBorder.lineWidth,\n      lineJoin = defaultOuterBorder.lineJoin,\n      strokeBoundsBuffer = defaultOuterBorder.strokeBoundsBuffer\n    } = outerBorder;\n\n    const boundsScale = getPolygonBoundsScale(polygon);\n    let scaledDistance = distance as number;\n    if (!keepStrokeScale) {\n      scaledDistance *= boundsScale;\n    }\n    offsetPolygonPoints(points, scaledDistance, closePath).forEach(point => {\n      aabbBounds.add(point.x, point.y);\n    });\n    const scaledLineWidth = lineWidth * (keepStrokeScale ? 1 : boundsScale);\n    const scaledShadowBlur = shadowBlur * boundsScale;\n    boundStroke(aabbBounds, (scaledShadowBlur + scaledLineWidth) / 2, lineJoin === 'miter', strokeBoundsBuffer);\n  }\n\n  return aabbBounds;\n};\n"]}

package/es/graphic/graphic.d.ts

@@ -142,14 +142,12 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     getAttributes(): T;
     protected getStateTransitionOrchestrator(): StateTransitionOrchestrator<T>;
     protected resolveBoundSharedStateScope(): SharedStateScope<T> | SharedStateScope<Record<string, any>> | undefined;
-    protected syncSharedStateScopeBinding(nextScope: SharedStateScope<T> | SharedStateScope<Record<string, any>> | undefined, markDirty?: boolean): boolean;
-    protected syncSharedStateScopeBindingFromTree(markDirty?: boolean, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): boolean;
-    protected syncSharedStateScopeBindingOnTreeChange(markDirty?: boolean, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): boolean;
+    protected syncSharedStateScopeBindingFromTree(markDirty?: boolean): boolean;
+    protected syncSharedStateScopeBindingOnTreeChange(markDirty?: boolean): boolean;
     protected syncSharedStateActiveRegistrations(): void;
-    protected isSharedStateScopeChainRegistered(previousScopes: Set<SharedStateScope<T>>): boolean;
     protected clearSharedStateActiveRegistrations(): void;
     protected markSharedStateDirty(): void;
-    onParentSharedStateTreeChanged(stage?: IStage, layer?: ILayer, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): void;
+    onParentSharedStateTreeChanged(stage?: IStage, layer?: ILayer): void;
     refreshSharedStateBeforeRender(): void;
     protected getLocalStatesVersion(): number;
     protected resolveEffectiveCompiledDefinitions(): {
@@ -157,7 +155,10 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     };
     protected recomputeCurrentStatePatch(): void;
     protected buildStaticAttributeSnapshot(): Partial<T>;
-    protected buildRemovedStateAnimationAttrs(targetStateAttrs: Partial<T>, previousResolvedStatePatch?: Partial<T>): Partial<T>;
+    protected buildRemovedStateAnimationAttrs(targetStateAttrs: Partial<T>, previousResolvedStatePatch?: Partial<T>): {
+        extraAttrs: Partial<T>;
+        stateTransitionTargetAttrs: Partial<T>;
+    } | undefined;
     protected syncObjectToSnapshot(target: Record<string, any>, snapshot: Record<string, any>, excludedKeys?: ExcludedAttributeKeys): AttributeDelta;
     protected _syncAttribute(excludedKeys?: ExcludedAttributeKeys): AttributeDelta;
     protected _syncFinalAttributeFromStaticTruth(excludedKeys?: ExcludedAttributeKeys): void;
@@ -239,7 +240,6 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     }): void;
     hasState(stateName?: string): boolean;
     getState(stateName: string): Partial<T> | StateDefinition<T> | undefined;
-    setStateDefinitionsWithCompiled(definitions: StateDefinitionsInput<T>, compiledDefinitions: Map<string, CompiledStateDefinition<T>>): void;
     protected getStateResolveBaseAttrs(): Partial<T>;
     protected syncStateResolveContext(stateResolveBaseAttrs?: Partial<T>): Partial<T>;
     protected ensureStateEngine(stateResolveBaseAttrs?: Partial<T>): StateEngine<T>;
@@ -261,7 +261,7 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     protected sameStatePatches(left?: Partial<T>, right?: Partial<T>): boolean;
     protected commitSameStatePatchRefresh(states: string[], hasAnimation?: boolean, animateSameStatePatchChange?: boolean): void;
     protected resolveStateAnimateConfig(animateConfig?: IAnimateConfig): any;
-    applyStateAttrs(attrs: Partial<T>, stateNames: string[], hasAnimation?: boolean, isClear?: boolean, animateConfig?: IAnimateConfig, extraAnimateAttrs?: Partial<T>): void;
+    applyStateAttrs(attrs: Partial<T>, stateNames: string[], hasAnimation?: boolean, isClear?: boolean, animateConfig?: IAnimateConfig, extraAnimateAttrs?: Partial<T>, stateTransitionTargetAttrs?: Partial<T>): void;
     updateNormalAttrs(_stateAttrs: Partial<T>): void;
     protected getStateTransitionDefaultAttribute(key: string, targetAttrs?: Partial<T>): any;
     protected shouldSkipStateTransitionDefaultAttribute(_key: string, _targetAttrs?: Partial<T>): boolean;
@@ -295,7 +295,7 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     }, resetScale?: boolean): [number, number];
     protected doUpdateLocalMatrix(): void;
     protected doUpdateGlobalMatrix(): void;
-    setStage(stage?: IStage, layer?: ILayer, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): void;
+    setStage(stage?: IStage, layer?: ILayer): void;
     detachStageForRelease(): void;
     setStageToShadowRoot(stage?: IStage, layer?: ILayer): void;
     onAddStep(step: IStep): void;

package/es/graphic/graphic.js

@@ -181,8 +181,9 @@ class GraphicImpl extends Node {
         }
         return null === (_a = this.stage) || void 0 === _a ? void 0 : _a.rootSharedStateScope;
     }
-    syncSharedStateScopeBinding(nextScope, markDirty = !0) {
+    syncSharedStateScopeBindingFromTree(markDirty = !0) {
         var _a;
+        const nextScope = this.resolveBoundSharedStateScope();
         return this.boundSharedStateScope === nextScope ? (this.syncSharedStateActiveRegistrations(), 
         !1) : (this.boundSharedStateScope = nextScope, this.boundSharedStateRevision = void 0, 
         this.compiledStateDefinitions = void 0, this.compiledStateDefinitionsCacheKey = void 0, 
@@ -190,13 +191,9 @@ class GraphicImpl extends Node {
         markDirty && (null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) && this.markSharedStateDirty(), 
         !0);
     }
-    syncSharedStateScopeBindingFromTree(markDirty = !0, inheritedSharedStateScope) {
-        const nextScope = void 0 === inheritedSharedStateScope ? this.resolveBoundSharedStateScope() : null != inheritedSharedStateScope ? inheritedSharedStateScope : void 0;
-        return this.syncSharedStateScopeBinding(nextScope, markDirty);
-    }
-    syncSharedStateScopeBindingOnTreeChange(markDirty = !0, inheritedSharedStateScope) {
+    syncSharedStateScopeBindingOnTreeChange(markDirty = !0) {
         var _a, _b;
-        return !!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || this.boundSharedStateScope || (null === (_b = this.registeredActiveScopes) || void 0 === _b ? void 0 : _b.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);
+        return !!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || this.boundSharedStateScope || (null === (_b = this.registeredActiveScopes) || void 0 === _b ? void 0 : _b.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingFromTree(markDirty);
     }
     syncSharedStateActiveRegistrations() {
         var _a;
@@ -204,7 +201,6 @@ class GraphicImpl extends Node {
         if (!(null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || !this.boundSharedStateScope) return (null == previousScopes ? void 0 : previousScopes.size) && (previousScopes.forEach((scope => {
             scope.subtreeActiveDescendants.delete(this);
         })), previousScopes.clear()), void (this.registeredActiveScopes = void 0);
-        if ((null == previousScopes ? void 0 : previousScopes.size) && this.isSharedStateScopeChainRegistered(previousScopes)) return;
         const nextScopes = new Set(collectSharedStateScopeChain(this.boundSharedStateScope));
         null == previousScopes || previousScopes.forEach((scope => {
             nextScopes.has(scope) || scope.subtreeActiveDescendants.delete(this);
@@ -212,14 +208,6 @@ class GraphicImpl extends Node {
             scope.subtreeActiveDescendants.add(this);
         })), this.registeredActiveScopes = nextScopes;
     }
-    isSharedStateScopeChainRegistered(previousScopes) {
-        let scope = this.boundSharedStateScope, scopeCount = 0;
-        for (;scope; ) {
-            if (!previousScopes.has(scope)) return !1;
-            scopeCount += 1, scope = scope.parentScope;
-        }
-        return scopeCount === previousScopes.size;
-    }
     clearSharedStateActiveRegistrations() {
         const previousScopes = this.registeredActiveScopes;
         previousScopes && (previousScopes.forEach((scope => {
@@ -230,8 +218,8 @@ class GraphicImpl extends Node {
         this.sharedStateDirty = !0, enqueueGraphicSharedStateRefresh(this.stage, this), 
         scheduleStageSharedStateRefresh(this.stage);
     }
-    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
-        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope) : this.setStage(stage, layer, inheritedSharedStateScope);
+    onParentSharedStateTreeChanged(stage, layer) {
+        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange() : this.setStage(stage, layer);
     }
     refreshSharedStateBeforeRender() {
         var _a;
@@ -283,20 +271,19 @@ class GraphicImpl extends Node {
         })), snapshot) : snapshot;
     }
     buildRemovedStateAnimationAttrs(targetStateAttrs, previousResolvedStatePatch) {
-        const extraAttrs = {};
-        if (!previousResolvedStatePatch) return extraAttrs;
-        const snapshot = this.buildStaticAttributeSnapshot(), staticTargetAttrs = snapshot;
+        if (!previousResolvedStatePatch) return;
+        const snapshot = this.buildStaticAttributeSnapshot(), extraAttrs = {};
         return Object.keys(previousResolvedStatePatch).forEach((key => {
             const hasTargetAttr = Object.prototype.hasOwnProperty.call(targetStateAttrs, key);
             if (hasTargetAttr && void 0 !== targetStateAttrs[key]) return;
             const assignFallbackAttr = value => {
-                void 0 === value && this.shouldSkipStateTransitionDefaultAttribute(key, staticTargetAttrs) || (extraAttrs[key] = void 0 === value ? value : cloneAttributeValue(value));
+                extraAttrs[key] = void 0 === value ? value : cloneAttributeValue(value);
             };
-            if (hasTargetAttr) assignFallbackAttr(this.getStateTransitionDefaultAttribute(key, staticTargetAttrs)); else if (Object.prototype.hasOwnProperty.call(snapshot, key)) {
-                const snapshotValue = snapshot[key];
-                assignFallbackAttr(void 0 === snapshotValue ? this.getStateTransitionDefaultAttribute(key, staticTargetAttrs) : snapshotValue);
-            } else assignFallbackAttr(this.getStateTransitionDefaultAttribute(key, staticTargetAttrs));
-        })), extraAttrs;
+            hasTargetAttr ? assignFallbackAttr(targetStateAttrs[key]) : Object.prototype.hasOwnProperty.call(snapshot, key) ? assignFallbackAttr(snapshot[key]) : assignFallbackAttr(void 0);
+        })), {
+            extraAttrs: extraAttrs,
+            stateTransitionTargetAttrs: snapshot
+        };
     }
     syncObjectToSnapshot(target, snapshot, excludedKeys) {
         const delta = new Map;
@@ -874,12 +861,6 @@ class GraphicImpl extends Node {
         var _a;
         return null === (_a = this.states) || void 0 === _a ? void 0 : _a[stateName];
     }
-    setStateDefinitionsWithCompiled(definitions, compiledDefinitions) {
-        var _a;
-        this.states = definitions, this.localStateDefinitionsSource !== definitions && (this.localStateDefinitionsSource = definitions, 
-        this.localStateDefinitionsVersion = (null !== (_a = this.localStateDefinitionsVersion) && void 0 !== _a ? _a : 0) + 1), 
-        this.compiledStateDefinitions = compiledDefinitions, this.compiledStateDefinitionsCacheKey = `local:${this.localStateDefinitionsVersion}`;
-    }
     getStateResolveBaseAttrs() {
         var _a;
         return null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute;
@@ -997,32 +978,38 @@ class GraphicImpl extends Node {
     commitSameStatePatchRefresh(states, hasAnimation, animateSameStatePatchChange = !1) {
         var _a;
         const previousStates = null !== (_a = this.currentStates) && void 0 !== _a ? _a : EMPTY_STATE_NAMES, previousResolvedStatePatch = this.resolvedStatePatch, {transition: transition, effectiveStates: effectiveStates, resolvedStateAttrs: resolvedStateAttrs} = this.resolveGraphicStateTransition(states, !0), patchChanged = !this.sameStatePatches(previousResolvedStatePatch, resolvedStateAttrs);
-        patchChanged && !this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1) || (this.currentStates = transition.states, 
+        if ((!patchChanged || this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1)) && (this.currentStates = transition.states, 
         this.effectiveStates = [ ...effectiveStates ], this.resolvedStatePatch = resolvedStateAttrs, 
-        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), patchChanged && (hasAnimation && animateSameStatePatchChange ? (this._syncFinalAttributeFromStaticTruth(), 
-        this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch))) : (this.stopStateAnimates(), 
-        this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
+        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), patchChanged)) if (hasAnimation && animateSameStatePatchChange) {
+            this._syncFinalAttributeFromStaticTruth();
+            const removedStateAnimationAttrs = this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch);
+            this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.extraAttrs, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.stateTransitionTargetAttrs);
+        } else this.stopStateAnimates(), this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
             type: AttributeUpdateType.STATE
         }) : this.restoreAttributeFromStatePatchDelta(previousResolvedStatePatch, this.resolvedStatePatch, {
             type: AttributeUpdateType.STATE
-        }), this.emitStateUpdateEvent())));
+        }), this.emitStateUpdateEvent();
     }
     resolveStateAnimateConfig(animateConfig) {
         var _a, _b, _c;
         return null !== (_c = null !== (_a = null != animateConfig ? animateConfig : this.stateAnimateConfig) && void 0 !== _a ? _a : null === (_b = this.context) || void 0 === _b ? void 0 : _b.stateAnimateConfig) && void 0 !== _c ? _c : DefaultStateAnimateConfig;
     }
-    applyStateAttrs(attrs, stateNames, hasAnimation, isClear, animateConfig, extraAnimateAttrs) {
+    applyStateAttrs(attrs, stateNames, hasAnimation, isClear, animateConfig, extraAnimateAttrs, stateTransitionTargetAttrs) {
         const resolvedAnimateConfig = hasAnimation ? this.resolveStateAnimateConfig(animateConfig) : void 0, transitionOptions = resolvedAnimateConfig ? {
             animateConfig: resolvedAnimateConfig,
             extraAnimateAttrs: extraAnimateAttrs,
-            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this)
+            getStateTransitionDefaultAttribute: this.getStateTransitionDefaultAttribute.bind(this),
+            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this),
+            stateTransitionTargetAttrs: stateTransitionTargetAttrs
         } : void 0;
         if (isClear) return void this.getStateTransitionOrchestrator().applyClearTransition(this, attrs, hasAnimation, transitionOptions);
         const plan = this.getStateTransitionOrchestrator().analyzeTransition(attrs, hasAnimation, {
             noWorkAnimateAttr: this.getNoWorkAnimateAttr(),
             animateConfig: resolvedAnimateConfig,
             extraAnimateAttrs: extraAnimateAttrs,
-            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this)
+            getStateTransitionDefaultAttribute: this.getStateTransitionDefaultAttribute.bind(this),
+            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this),
+            stateTransitionTargetAttrs: stateTransitionTargetAttrs
         });
         this.getStateTransitionOrchestrator().applyTransition(this, plan, hasAnimation, transitionOptions);
     }
@@ -1049,15 +1036,17 @@ class GraphicImpl extends Node {
         this.effectiveStates = [], this.resolvedStatePatch = void 0, this.sharedStateDirty = !1, 
         void this.clearSharedStateActiveRegistrations();
         const resolvedStateAttrs = hasAnimation || this.hasCustomEvent("beforeStateUpdate") ? cloneAttributeValue(null !== (_b = this.baseAttributes) && void 0 !== _b ? _b : {}) : null !== (_c = this.baseAttributes) && void 0 !== _c ? _c : {};
-        transition.changed && !this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !0) || (this.currentStates = transition.states, 
+        if (!transition.changed || this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !0)) if (this.currentStates = transition.states, 
         this.effectiveStates = [], this.resolvedStatePatch = void 0, this.sharedStateDirty = !1, 
-        this.clearSharedStateActiveRegistrations(), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), 
-        this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !0, void 0, this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch))) : (this.stopStateAnimates(), 
-        this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
+        this.clearSharedStateActiveRegistrations(), hasAnimation) {
+            this._syncFinalAttributeFromStaticTruth();
+            const removedStateAnimationAttrs = this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch);
+            this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !0, void 0, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.extraAttrs, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.stateTransitionTargetAttrs);
+        } else this.stopStateAnimates(), this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
             type: AttributeUpdateType.STATE
         }) : this.restoreAttributeFromStatePatchDelta(previousResolvedStatePatch, void 0, {
             type: AttributeUpdateType.STATE
-        }), this.emitStateUpdateEvent()));
+        }), this.emitStateUpdateEvent();
     }
     removeState(stateName, hasAnimation) {
         const transition = this.resolveRemoveStateTransition(stateName);
@@ -1086,15 +1075,17 @@ class GraphicImpl extends Node {
         var _a;
         if (!states.length) return void this.clearStates(hasAnimation);
         const previousStates = null !== (_a = this.currentStates) && void 0 !== _a ? _a : EMPTY_STATE_NAMES, previousResolvedStatePatch = this.resolvedStatePatch, {transition: transition, effectiveStates: effectiveStates, resolvedStateAttrs: resolvedStateAttrs} = this.resolveGraphicStateTransition(states);
-        !transition.changed && this.sameStateNames(previousStates, transition.states) || this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1) && (this.currentStates = transition.states, 
+        if ((transition.changed || !this.sameStateNames(previousStates, transition.states)) && this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1)) if (this.currentStates = transition.states, 
         this.effectiveStates = [ ...effectiveStates ], this.resolvedStatePatch = resolvedStateAttrs, 
-        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), 
-        this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch))) : (this.stopStateAnimates(), 
-        this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
+        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), hasAnimation) {
+            this._syncFinalAttributeFromStaticTruth();
+            const removedStateAnimationAttrs = this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch);
+            this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.extraAttrs, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.stateTransitionTargetAttrs);
+        } else this.stopStateAnimates(), this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
             type: AttributeUpdateType.STATE
         }) : this.restoreAttributeFromStatePatchDelta(previousResolvedStatePatch, this.resolvedStatePatch, {
             type: AttributeUpdateType.STATE
-        }), this.emitStateUpdateEvent()));
+        }), this.emitStateUpdateEvent();
     }
     invalidateResolver() {
         var _a, _b;
@@ -1204,11 +1195,11 @@ class GraphicImpl extends Node {
             this._globalTransMatrix.translate(scrollX, scrollY);
         }
     }
-    setStage(stage, layer, inheritedSharedStateScope) {
+    setStage(stage, layer) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const graphicService = null !== (_c = null !== (_a = null == stage ? void 0 : stage.graphicService) && void 0 !== _a ? _a : null === (_b = this.stage) || void 0 === _b ? void 0 : _b.graphicService) && void 0 !== _c ? _c : application.graphicService, previousStage = this.stage;
         if (this.stage !== stage || this.layer !== layer) {
-            if (this.stage = stage, this.layer = layer, ((null === (_d = this.currentStates) || void 0 === _d ? void 0 : _d.length) || this.boundSharedStateScope || (null === (_e = this.registeredActiveScopes) || void 0 === _e ? void 0 : _e.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope), 
+            if (this.stage = stage, this.layer = layer, ((null === (_d = this.currentStates) || void 0 === _d ? void 0 : _d.length) || this.boundSharedStateScope || (null === (_e = this.registeredActiveScopes) || void 0 === _e ? void 0 : _e.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0), 
             this.setStageToShadowRoot(stage, layer), this.mayHaveTrackedAnimates() && this.hasAnyTrackedAnimate()) {
                 const previousTimeline = null === (_f = null == previousStage ? void 0 : previousStage.getTimeline) || void 0 === _f ? void 0 : _f.call(previousStage), nextTimeline = null === (_g = null == stage ? void 0 : stage.getTimeline) || void 0 === _g ? void 0 : _g.call(stage), detachedStageAnimates = [];
                 this.visitTrackedAnimates((a => {
@@ -1226,7 +1217,7 @@ class GraphicImpl extends Node {
             }
             return this._onSetStage && this._onSetStage(this, stage, layer), void (null === (_h = null == graphicService ? void 0 : graphicService.onSetStage) || void 0 === _h || _h.call(graphicService, this, stage));
         }
-        ((null === (_j = this.currentStates) || void 0 === _j ? void 0 : _j.length) || this.boundSharedStateScope || (null === (_k = this.registeredActiveScopes) || void 0 === _k ? void 0 : _k.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope);
+        ((null === (_j = this.currentStates) || void 0 === _j ? void 0 : _j.length) || this.boundSharedStateScope || (null === (_k = this.registeredActiveScopes) || void 0 === _k ? void 0 : _k.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0);
     }
     detachStageForRelease() {
         var _a, _b, _c;