From c5b891fbaf65fa6517a09a2e218a16399a84be5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=8B=B8?= <junyu.junyujiang@alibaba-inc.com>
Date: Fri, 11 Feb 2022 18:12:57 +0800
Subject: [PATCH 1/5] feat: add TagGuide

---
 packages/f2/src/components/guide/index.tsx    |   4 +-
 .../f2/src/components/guide/views/Tag.tsx     | 223 ++++++++++++++++++
 .../f2/src/components/guide/withGuide.tsx     |  42 +++-
 packages/f2/src/components/index.ts           |   1 +
 .../f2/test/components/guide/type.test.tsx    |  16 ++
 5 files changed, 283 insertions(+), 3 deletions(-)
 create mode 100644 packages/f2/src/components/guide/views/Tag.tsx

diff --git a/packages/f2/src/components/guide/index.tsx b/packages/f2/src/components/guide/index.tsx
index 95d4b137b..1b3305c17 100644
--- a/packages/f2/src/components/guide/index.tsx
+++ b/packages/f2/src/components/guide/index.tsx
@@ -5,6 +5,7 @@ import LineGuideView from './views/Line';
 import ArcGuideView from './views/Arc';
 import RectGuideView from './views/Rect';
 import ImageGuideView from './views/Image';
+import TagGuideView from './views/Tag';
 
 const DefaultGuideView = () => null;
 const TextGuide = withGuide(TextGuideView);
@@ -13,7 +14,8 @@ const LineGuide = withGuide(LineGuideView);
 const ArcGuide = withGuide(ArcGuideView);
 const RectGuide = withGuide(RectGuideView);
 const ImageGuide = withGuide(ImageGuideView);
+const TagGuide = withGuide(TagGuideView)
 
 export default withGuide(DefaultGuideView);
 
-export { withGuide, TextGuide, PointGuide, ArcGuide, LineGuide, RectGuide, ImageGuide };
+export { withGuide, TextGuide, PointGuide, ArcGuide, LineGuide, RectGuide, ImageGuide, TagGuide };
diff --git a/packages/f2/src/components/guide/views/Tag.tsx b/packages/f2/src/components/guide/views/Tag.tsx
new file mode 100644
index 000000000..550d6ac5b
--- /dev/null
+++ b/packages/f2/src/components/guide/views/Tag.tsx
@@ -0,0 +1,223 @@
+import { jsx } from '../../../jsx';
+import { Style } from '../../../types';
+
+type BBox = {
+  width: number;
+  height: number;
+  minX: number;
+  minY: number;
+  maxX: number;
+  maxY: number;
+};
+
+interface TagGuideProps {
+  points?: { x: number; y: number }[] | null;
+  canvasWidth?: number;
+  canvasHeight?: number;
+  guideBBox?: BBox;
+  offsetX?: number;
+  offsetY?: number;
+  autoAdjust?: boolean;
+  /**
+   * 箭头的方向
+   */
+  direct?: string;
+  /**
+   * 箭头的边长
+   */
+  side?: number;
+  /**
+   * 文字内容
+   */
+  content?: string;
+  /**
+   * 背景样式设置，见 group 绘图属性
+   */
+  background?: any;
+  /**
+   * 文字样式
+   */
+  textStyle?: any;
+}
+
+const defaultProps: TagGuideProps = {
+  offsetX: 0,
+  offsetY: 0,
+  points: [],
+  direct: 'tl',
+  side: 6,
+  autoAdjust: true,
+};
+
+const defaultStyle = {
+  container: {
+    fill: '#1677FF',
+    radius: 2,
+    padding: [3, 5],
+  },
+  text: {
+    fontSize: '22px' as `${number}px`,
+    fill: '#fff',
+  },
+  arrow: {
+    fill: '#1677FF',
+  },
+};
+
+export default (props: TagGuideProps) => {
+  const cfg = { ...defaultProps, ...props };
+  const {
+    points,
+    content,
+    offsetX,
+    offsetY,
+    direct,
+    side,
+    autoAdjust,
+    canvasWidth,
+    canvasHeight,
+    guideBBox,
+    background,
+    textStyle,
+  } = cfg;
+  const { x, y } = points[0] || {};
+  const { width: guideWidth, height: guideHeight } = guideBBox || {};
+
+  let posX = x + (offsetX || 0);
+  let posY = y + (offsetY || 0);
+
+  const _getDirect = (point) => {
+    let newDirect = direct;
+    const { x, y } = point;
+
+    let vertical = newDirect[0];
+    let horizontal = newDirect[1];
+
+    // adjust for vertical direction
+    if (vertical === 't' && y - side - guideHeight < 0) {
+      vertical = 'b';
+    } else if (vertical === 'b' && y + side + guideHeight > canvasHeight) {
+      vertical = 't';
+    }
+    // adjust for horizontal direction
+    const diff = vertical === 'c' ? side : 0;
+    if (horizontal === 'l' && x - diff - guideWidth < 0) {
+      horizontal = 'r';
+    } else if (horizontal === 'r' && x + diff + guideWidth > canvasWidth) {
+      horizontal = 'l';
+    } else if (horizontal === 'c') {
+      if (guideWidth / 2 + x + diff > canvasWidth) {
+        horizontal = 'l';
+      } else if (x - guideWidth / 2 - diff < 0) {
+        horizontal = 'r';
+      }
+    }
+
+    newDirect = vertical + horizontal;
+    return newDirect;
+  };
+
+  const _getArrowPoints = (direct) => {
+    let arrowPoints = [];
+    const { minX, minY } = guideBBox || {};
+    if (direct === 'tl') {
+      arrowPoints = [
+        { x: minX, y: minY - 1 }, // 这个 1 是为了防止出现白边
+        { x: minX, y: minY + side },
+        { x: minX - side - 1, y: minY - 1 },
+      ];
+      posX -= (guideWidth || 0);
+      posY = posY - (guideHeight || 0) - side;
+    } else if (direct === 'cl') {
+      arrowPoints = [
+        { x: minX - 1, y: minY - 1 - side / 2 },
+        { x: minX - 1, y: minY + 1 + side / 2 },
+        { x: minX + side, y: minY },
+      ];
+      posX = posX - (guideWidth || 0) - side;
+      posY -= (guideHeight / 2 || 0);
+    } else if (direct === 'bl') {
+      arrowPoints = [
+        { x: minX, y: -side + minY },
+        { x: minX - side - 1, y: minY + 1 },
+        { x: minX, y: minY + 1 },
+      ];
+      posX = posX - (guideWidth || 0);
+      posY += side;
+    } else if (direct === 'bc') {
+      arrowPoints = [
+        { x: guideWidth / 2 + minX, y: -side + minY },
+        { x: (guideWidth - side) / 2 + minX - 1, y: minY + 1 },
+        { x: (guideWidth + side) / 2 + minX + 1, y: minY + 1 },
+      ];
+    } else if (direct === 'br') {
+      arrowPoints = [
+        { x: minX, y: minY - side },
+        { x: minX, y: minY + 1 },
+        { x: minX + side + 1, y: minY + 1 },
+      ];
+      posY += side;
+    } else if (direct === 'cr') {
+      arrowPoints = [
+        { x: minX - side, y: minY },
+        { x: minX + 1, y: minY - 1 - side / 2 },
+        { x: minX + 1, y: minY + 1 + side / 2 },
+      ];
+      posX += side;
+      posY -= (guideHeight / 2 || 0);
+    } else if (direct === 'tr') {
+      arrowPoints = [
+        { x: minX, y: minY + side },
+        { x: minX, y: minY - 1 },
+        { x: side + minX + 1, y: minY - 1 },
+      ];
+      posY = posY - (guideHeight || 0) - side;
+    } else if (direct === 'tc') {
+      arrowPoints = [
+        { x: minX - 1 - side / 2, y: minY - 1 },
+        { x: minX + 1 + side / 2, y: minY - 1 },
+        { x: minX, y: minY + side },
+      ];
+      posX -= (guideWidth / 2 || 0);
+      posY = posY - (guideHeight || 0) - side;
+    }
+
+    return arrowPoints;
+  };
+
+  const dr = autoAdjust ? _getDirect(points[0]) : direct;
+  const arrowPoints = _getArrowPoints(dr);
+
+  return (
+    <group
+      attrs={{
+        fill: defaultStyle.container.fill,
+        radius: defaultStyle.container.radius,
+        ...background,
+      }}
+      style={{
+        left: posX,
+        top: posY,
+        padding: defaultStyle.container.padding,
+        ...background,
+      }}
+    >
+      <text
+        attrs={{
+          text: content,
+          fontSize: defaultStyle.text.fontSize,
+          fill: defaultStyle.text.fill,
+          ...textStyle,
+        }}
+      />
+      {guideBBox && (
+        <polygon
+          attrs={{
+            points: arrowPoints,
+            fill: defaultStyle.arrow.fill,
+          }}
+        />
+      )}
+    </group>
+  );
+};
diff --git a/packages/f2/src/components/guide/withGuide.tsx b/packages/f2/src/components/guide/withGuide.tsx
index 21e74f118..eb4176bac 100644
--- a/packages/f2/src/components/guide/withGuide.tsx
+++ b/packages/f2/src/components/guide/withGuide.tsx
@@ -3,6 +3,7 @@ import Component from '../../base/component';
 import { isString, isNil } from '@antv/util';
 import { Ref } from '../../types';
 import Chart from '../../chart';
+import { renderShape } from '../../base/diff';
 
 function isInBBox(bbox, point) {
   const { minX, maxX, minY, maxY } = bbox;
@@ -19,6 +20,12 @@ export default (View) => {
       super(props);
       // 创建ref
       this.triggerRef = {};
+      this.state = {};
+    }
+
+    willMount() {
+      super.willMount();
+      this.getGuideBBox();
     }
 
     didMount() {
@@ -38,6 +45,24 @@ export default (View) => {
       });
     }
 
+    getGuideBBox() {
+      const shape = renderShape(this, this.render(), false);
+      const { x, y, width, height } = shape.get('attrs');
+      // getBBox 没有包含 padding 所以这里手动计算 bbox
+      const bbox = {
+        minX: x,
+        minY: y,
+        maxX: x + width,
+        maxY: y + height,
+        width,
+        height,
+      };
+      this.setState({
+        guideBBox: bbox,
+      });
+      shape.destroy();
+    }
+
     // 解析record里的模板字符串，如min、max、50%...
     parseReplaceStr(value, scale) {
       const replaceMap = { min: 0, max: 1, median: 0.5 };
@@ -86,13 +111,26 @@ export default (View) => {
     }
 
     render() {
-      const { props } = this;
+      const { props, context } = this;
       const { coord, records = [] } = props;
+      const { width, height } = context;
       const points = this.convertPoints(records);
       const theme = this.getGuideTheme();
+      const { guideWidth, guideHeight, guideBBox } = this.state;
 
       return (
-        <View triggerRef={this.triggerRef} points={points} theme={theme} coord={coord} {...props} />
+        <View
+          triggerRef={this.triggerRef}
+          points={points}
+          theme={theme}
+          coord={coord}
+          {...props}
+          canvasWidth={width}
+          canvasHeight={height}
+          guideWidth={guideWidth}
+          guideHeight={guideHeight}
+          guideBBox={guideBBox}
+        />
       );
     }
   };
diff --git a/packages/f2/src/components/index.ts b/packages/f2/src/components/index.ts
index ac75b0372..5728c69a5 100644
--- a/packages/f2/src/components/index.ts
+++ b/packages/f2/src/components/index.ts
@@ -14,6 +14,7 @@ export {
   ArcGuide,
   RectGuide,
   ImageGuide,
+  TagGuide,
 } from './guide';
 export { default as Tooltip, withTooltip, TooltipView } from './tooltip';
 export { default as Treemap, withTreemap, TreemapView } from './treemap';
diff --git a/packages/f2/test/components/guide/type.test.tsx b/packages/f2/test/components/guide/type.test.tsx
index 2de63610e..d26afa40f 100644
--- a/packages/f2/test/components/guide/type.test.tsx
+++ b/packages/f2/test/components/guide/type.test.tsx
@@ -7,6 +7,7 @@ import {
   PointGuide,
   ArcGuide,
   RectGuide,
+  TagGuide,
   Interval,
   Line,
   Axis,
@@ -252,4 +253,19 @@ describe('Guide', () => {
     const canvas = new Canvas(props);
     canvas.render();
   });
+
+  it('TagGuide', () => {
+    const context = createContext('TagGuide');
+    const { props } = (
+      <Canvas context={context}>
+        <Chart data={data}>
+          <Line x="genre" y="sold" />
+          <TagGuide records={[{ genre: 'Action', sold: 20 }]} direct="tc" content="20个" />
+        </Chart>
+      </Canvas>
+    );
+
+    const canvas = new Canvas(props);
+    canvas.render();
+  });
 });

From 262611818c4b9a8677d66cd78a5e7d1afcf590b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=8B=B8?= <junyu.junyujiang@alibaba-inc.com>
Date: Tue, 15 Feb 2022 18:55:07 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=AF=BC=E5=87=BA=20graphic=20?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../f2/src/components/guide/views/Tag.tsx     |  14 +-----
 packages/f2/src/types.ts                      |  45 +++++++-----------
 .../type-test-tsx-guide-tag-guide-1-snap.png  | Bin 0 -> 7922 bytes
 .../f2/test/components/guide/type.test.tsx    |   9 ++--
 packages/graphic/src/index.ts                 |   4 +-
 5 files changed, 27 insertions(+), 45 deletions(-)
 create mode 100644 packages/f2/test/components/guide/__image_snapshots__/type-test-tsx-guide-tag-guide-1-snap.png

diff --git a/packages/f2/src/components/guide/views/Tag.tsx b/packages/f2/src/components/guide/views/Tag.tsx
index 550d6ac5b..1d0af0096 100644
--- a/packages/f2/src/components/guide/views/Tag.tsx
+++ b/packages/f2/src/components/guide/views/Tag.tsx
@@ -1,20 +1,10 @@
 import { jsx } from '../../../jsx';
-import { Style } from '../../../types';
-
-type BBox = {
-  width: number;
-  height: number;
-  minX: number;
-  minY: number;
-  maxX: number;
-  maxY: number;
-};
-
+import type { Types } from '@antv/f2-graphic';
 interface TagGuideProps {
   points?: { x: number; y: number }[] | null;
   canvasWidth?: number;
   canvasHeight?: number;
-  guideBBox?: BBox;
+  guideBBox?: Types.BBox;
   offsetX?: number;
   offsetY?: number;
   autoAdjust?: boolean;
diff --git a/packages/f2/src/types.ts b/packages/f2/src/types.ts
index d65ab361f..fb8983723 100644
--- a/packages/f2/src/types.ts
+++ b/packages/f2/src/types.ts
@@ -1,20 +1,7 @@
 import { AxisTypes } from './components/axis/types';
-import type {
-  Point,
-  CircleAttrs as CircleGraphicAttrs,
-  RectAttrs as RectGraphicAttrs,
-  LineAttrs as LineGraphicAttrs,
-  PolygonAttrs as PolygonGraphicAttrs,
-  PolylineAttrs as PolylineGraphicAttrs,
-  ArcAttrs as ArcGraphicAttrs,
-  SectorAttrs as SectorGraphicAttrs,
-  TextAttrs as TextGraphicAttrs,
-  CustomAttrs as CustomGraphicAttrs,
-  MarkerAttrs as MarkerGraphicAttrs,
-  ImageAttrs as ImageGraphicAttrs,
-} from '@antv/f2-graphic';
-
-type PX_FIELD_NAME = 
+import type { Types } from '@antv/f2-graphic';
+
+type PX_FIELD_NAME =
   'lineWidth'
 | 'lineDash'
 | 'x'
@@ -49,9 +36,9 @@ export type { AxisTypes }
 type SupportPx<T> = {
   [k in keyof T]:
     k extends PX_FIELD_NAME ?
-      T[k] extends number ? number | pxstr : 
+      T[k] extends number ? number | pxstr :
       T[k] extends number[] ? number[] | pxstr[] :
-      T[k] extends Point[] ? PxPoint[] : T[k]
+      T[k] extends Types.Point[] ? PxPoint[] : T[k]
     :T[k];
 }
 
@@ -107,57 +94,57 @@ export type ElementType =
   | (new (props: Props, context?: any) => any);
 
 
-export type CircleAttrs = Partial<SupportPx<CircleGraphicAttrs>>;
+export type CircleAttrs = Partial<SupportPx<Types.CircleAttrs>>;
 export interface CircleProps extends IntrinsicElementsProps {
   attrs?: CircleAttrs;
 }
 
-export type RectAttrs = Partial<SupportPx<RectGraphicAttrs>>;
+export type RectAttrs = Partial<SupportPx<Types.RectAttrs>>;
 export interface RectProps extends IntrinsicElementsProps {
   attrs?: RectAttrs;
 }
 
-export type LineAttrs = Partial<SupportPx<LineGraphicAttrs>>;
+export type LineAttrs = Partial<SupportPx<Types.LineAttrs>>;
 export interface LineProps extends IntrinsicElementsProps {
   attrs?: LineAttrs;
 }
 
-export type PolygonAttrs = Partial<SupportPx<PolygonGraphicAttrs>>;
+export type PolygonAttrs = Partial<SupportPx<Types.PolygonAttrs>>;
 export interface PolygonProps extends IntrinsicElementsProps {
   attrs?: PolygonAttrs;
 }
 
-export type PolylineAttrs = Partial<SupportPx<PolylineGraphicAttrs>>;
+export type PolylineAttrs = Partial<SupportPx<Types.LineAttrs>>;
 export interface PolylineProps extends IntrinsicElementsProps {
   attrs?: PolylineAttrs;
 }
 
-export type ArcAttrs = Partial<SupportPx<ArcGraphicAttrs>>
+export type ArcAttrs = Partial<SupportPx<Types.ArcAttrs>>
 export interface ArcProps extends IntrinsicElementsProps {
   attrs?: ArcAttrs;
 }
 
-export type SectorAttrs = Partial<SupportPx<SectorGraphicAttrs>>;
+export type SectorAttrs = Partial<SupportPx<Types.SectorAttrs>>;
 export interface SectorProps extends IntrinsicElementsProps {
   attrs?: SectorAttrs;
 }
 
-export type TextAttrs = Partial<SupportPx<TextGraphicAttrs>>;
+export type TextAttrs = Partial<SupportPx<Types.TextAttrs>>;
 export interface TextProps extends IntrinsicElementsProps {
   attrs?: TextAttrs;
 }
 
-export type CustomAttrs = Partial<SupportPx<CustomGraphicAttrs>>;
+export type CustomAttrs = Partial<SupportPx<Types.CustomAttrs>>;
 export interface CustomProps extends IntrinsicElementsProps {
   attrs?: CustomAttrs
 }
 
-export type MarkerAttrs = Partial<SupportPx<MarkerGraphicAttrs>>;
+export type MarkerAttrs = Partial<SupportPx<Types.MarkerAttrs>>;
 export interface MarkerProps extends IntrinsicElementsProps {
   attrs?: MarkerAttrs;
 }
 
-export type ImageAttrs = Partial<SupportPx<ImageGraphicAttrs>>;
+export type ImageAttrs = Partial<SupportPx<Types.ImageAttrs>>;
 export interface ImageProps extends IntrinsicElementsProps {
   attrs?: ImageAttrs;
 }
diff --git a/packages/f2/test/components/guide/__image_snapshots__/type-test-tsx-guide-tag-guide-1-snap.png b/packages/f2/test/components/guide/__image_snapshots__/type-test-tsx-guide-tag-guide-1-snap.png
new file mode 100644
index 0000000000000000000000000000000000000000..99aca38ec75b447adeebc7cfdc2fda7fce79ed90
GIT binary patch
literal 7922
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
Ix{q?<U%}L+T>t<8

literal 0
HcmV?d00001

diff --git a/packages/f2/test/components/guide/type.test.tsx b/packages/f2/test/components/guide/type.test.tsx
index d26afa40f..eefa67e8f 100644
--- a/packages/f2/test/components/guide/type.test.tsx
+++ b/packages/f2/test/components/guide/type.test.tsx
@@ -13,7 +13,7 @@ import {
   Axis,
   Point,
 } from '../../../src/components';
-import { createContext } from '../../util';
+import { createContext, delay } from '../../util';
 
 const data = [
   { type: 'a', genre: 'Sports', sold: 5 },
@@ -254,18 +254,21 @@ describe('Guide', () => {
     canvas.render();
   });
 
-  it('TagGuide', () => {
+  it('TagGuide', async () => {
     const context = createContext('TagGuide');
     const { props } = (
       <Canvas context={context}>
         <Chart data={data}>
           <Line x="genre" y="sold" />
-          <TagGuide records={[{ genre: 'Action', sold: 20 }]} direct="tc" content="20个" />
+          <TagGuide records={[{ genre: 'Action', sold: 20 }]} direct="tc" content="20" />
         </Chart>
       </Canvas>
     );
 
     const canvas = new Canvas(props);
     canvas.render();
+
+    await delay(100);
+    expect(context).toMatchImageSnapshot();
   });
 });
diff --git a/packages/graphic/src/index.ts b/packages/graphic/src/index.ts
index a1d996ac8..6339f6fc4 100644
--- a/packages/graphic/src/index.ts
+++ b/packages/graphic/src/index.ts
@@ -35,4 +35,6 @@ export {
   Smooth,
   BBox,
 };
-export * from './types';
+
+import * as Types from './types';
+export { Types };

From d034288d734393f9348e8ee99b88de24bac3f3da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=8B=B8?= <junyu.junyujiang@alibaba-inc.com>
Date: Wed, 16 Feb 2022 10:16:48 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DtagGuide=20snapsho?=
 =?UTF-8?q?t=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../type-test-tsx-guide-tag-guide-1-snap.png  | Bin 7922 -> 15816 bytes
 .../f2/test/components/guide/type.test.tsx    |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/f2/test/components/guide/__image_snapshots__/type-test-tsx-guide-tag-guide-1-snap.png b/packages/f2/test/components/guide/__image_snapshots__/type-test-tsx-guide-tag-guide-1-snap.png
index 99aca38ec75b447adeebc7cfdc2fda7fce79ed90..259b764f29ce6530c888e09c3ef55533a64da0a6 100644
GIT binary patch
literal 15816
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%0AAp_
zAGsZbd<k;fH5R3pYM+=6`xfy?jpu>umA2jfCmQ(y;%7ln0qo0C_#H_?YpVe4H$uB5
zCRK9zlt^LLOPxn-_g2s=8??V}bJ79#RCxJ{n>Hc_>GgcC1y}U5#C9t&#o^YUhpkVx
zl-(3WA%5=)u3y~Y&~2ZmY%l4lBMMZGR3zU4Xo`HxP)r<5Lh)JdD;hOh(Qu(*q}^<~
z!pu65qGVCaVU6#%nJ~)C;5ZyW%X9X3N20nEpc3O0xK&G+m)e1;=-TXds7ZBp>wt-G
zE!&rn0wXsBsJFa(cMj6z{Lu+$Z1-)>nq_o25fR%{Xchpf=<_ua0%#+iBX{q}br<+^
ztue&Mt@JhZ<g4}aO!8P7n}6@^W%8?0dG8w4JOf_paAsVPs=y53NW2;m5s9&2HQE~|
z!s_giycWF;c;qN{bJ>A{H&gNDopbJmMmld--M;;UP-~Z&GNw`W>7BS$_(D}`nnr>o
zju#-V@47gO;2_dQ>0b2Y8&9;_v=}B#h31C6&$>L%)QPC`gV!=3N-sBm%Eq)pQfEVJ
zz!|5m_#+bO08Fo9$I6q0HYFIydI>8w@v&ra<w}<0d_Z62tF7yW{)p+SO|~!rygN3!
zPxZ<E<NZ<#9+D}5pzNz8TQ3A5pCY!Bepfy8`I8Xd>Wp%)ZO`rIk}8)6+>$}>PEOhy
zp(<=e%X8HTA%uWEHM~xtqD5M8L*L63K{ccX?W~LQOpl5hWw}pX0u3|=jncpm6ZZ<*
zGDb2fCrE<_Kq!@-AE<<ku&eD-J4^NM>wmtKjlX`l;cRh^8kY@f?hQ4cz7J<UdrW^V
zD%;Dv>0AHQsz&^OA6JN&_Q#kzzr~L#Ecqsz)$BfQ^(=I7H(MnIT#mChO3ImM_>J~J
z#{?cbNgO-?N*d|a!F6)Z>T|)**{83r^@wDDr2|&bnYbDXnop*)tSe}=SN>TE#q55d
zeu<}bY#?>t%|5E3x{-9>Cm=&wn*aCxIL$KbY=L*u)^3I7=(`T`dH``pHJx?=mN-W-
za<ehGN91!v^%{@j(<8~$ObM?&ReZ13%*`*mw<l<WsX_H7O)}UB-rWSchWmJyj4Q)Q
zsZOkNF_#`(v~cql;$2#^xmFS(LTlR$ymR55BcKoJ=s?9{kvgzVH7ivoWL?Ly<aN8t
z^nFf1`q&_cXRhY1LUt;+u(f?H;L627-*fYB+V-D9;a<x%#zz%Dop+L$Cpo5DueDzI
zVgv%U&EX^)F$p(l#{@*09wewv7<{baVgsy%)qV7>9ddP$h{XLx2SEAA1XYJOl5ZNL
z`%gHpfQI6#&`jn6R9G4Tzqi)-2uhtVg27Ij+ZBt>Ij1hS7diJI+i1^f%{beRnUzEQ
zRJ}G3k1A?Ri6}UXH22o5io}^puL>C)v)Ry_UqRTJP0RBUV3~&@ST;voEsG$(vt{sG
zpe^^5sn3&&aFuZ@5#uKN8f-W{IEyw86bAWr_XH3W450Eg5zIUF4?fv-Ewy7Y#^L@S
z@_l8*bRnRS?=*pRb0-RANxln$iHmkqd|ZCf*cc8oxzOe>IMATO3e{+dpe4NuTGG-N
z0jGV~@8Nv7$enRL0e#mapH~86s?q>KV}IsyALuB}Bkpy_#CrVVwrPqM+?g&sp81VA
z4;8oXZUfB!;+hr-0!O#ZhyS@g^$&GoIyLXokGAbQU-%H@myJL~_y>n!MO=dz;G}%~
zpuTL|+&Ke-cjczNP)ETUG+)xLvGH6CLgpd126u%7VqV^uUupMT`np=#;nsPWJ=Aa=
z;snS+k;?ccp_mQ?1~0?)>8e!>>7tK`6YFA2f6EBkr{<9V+b%EAEp3WcP|*9(U?PMN
zJ)rft7B6{Mn#nrT5AT%P-Y=P5x0_sqiBS)*Z1k32qY~#Qglyj-Rpz-TA4c6*@NK_p
zlp8jK^M2%9-n;7pDq?3~HZ4nc_sHuNfOQ><;rik-CDxs85n8`-8b%Pa6!8j3UFmH$
z14$ew=-0me^-9KI-n>#r?NHzUi17-joH>62Gkq76a+1zA3ptn#VpEe{BW7r!jcv9=
zb%Fxyv0M(UzV7HpG}00z1gLvVv2Mzy4f4oV)nlj$UIJ2ef%S-3ByyD`H@7O*;U1Pc
zrfCE~`+|z;)I`WO9|KSSF2!7WoAY#VoxkQT9m)bjwn}N1@d*;^)K!)oRdAQ=W^k89
zpIR2M<;TqLTaM8kyf`*bjbmeNb3PZjyHqEmpf;-~NF>4(K%$LZ2O*u=xvyL(ccWz{
zJ?1y7nV@z|VLLAmRL@g@N|DPpr9K2HLsBcyHqL)(u*t_68!)@PGWJF<eA0aS9+@w+
z&=q9p_fMop!jPXya&H}brwYH?-gYf$78aDv4>h(=Oi5G+2r~!?wIbQ>+vt$IfmC?7
z*wWPDmQ1<Owi7;1#|Uxo6<`XXVIV1y?#@f3?za4bw0}t0O`YCp8~S11DCi^&a3yhy
zI4jyarGM$v^smisLc)8~b}DP>9e@}Mo`fK6UQaXmWmC|<5NSTSGG%Imd6UzoC$~Is
z3g`oAfdIT<GH8{k0}{Cn|FSIR<$j(+l*o#}!Vj5hcq~C3Fa+OMz;3RHLFr-ilY^hH
zY)lVr*!nXV4QA5<_W2&d6ps!F8BMprj_RB;%Y)ZgfvJT^C#8#`R!rJI29PlWmkjD!
z1lcQH@;f<+_JuDx+Xl@sH|Fh^TEaSYUNKdEGLd4W6@#2k3^>9li9!;R(<Ar?<!rxc
za$kd<(-r5I->EdVb1q3!^ErEW4k0PZfc@4+tgnz*g6jk1XP%y24-rrdZ{zqNdy4?$
zRRX)0a*-s)JmA0+SkGN<nWkugo#|`;n$v%%MhorWA8vBJBGNfWMDZuXeo2sn`~dF!
z8Jr=Co>wOcVFYpda%$3u_%}Bp!5xzwIx50^pEaP!(@5EiF4E=#v(H*BJY2Q!oGs{Z
zo9UplygLH*DBfuR-$p;zqCp6qnOHv^Xumg)uT7uPL%+u+-J1nSwMNmT4(cw(LRfo6
zN%O58LrP%S#`3DibG0hg@y=D|%zNfiHs1L|p_z~u=z~;a%+=RI{!YQdtlNBw3$>2f
zvR8A%wMa4UU?nZeEVcRJ_WyI>QC!vuVj*3Hh#|_rcs-8>HIwnf9n9zWhDSTMcJF?L
zDb)XrT+yBi{`0iM=Do)#$$P(?1oYDf_b$Wp92B7Ez~xb0pXeO?Bm0Wj@Shz@Yw7#E
zHd*RuYAkHA5LB2+VWYJz1Nr?eSB7+Vp&B5M3o71MpM##J4W6b-c6a&{)HL7Xc5(~v
zMUf@!ueCk&(lCJ3c>tW^XF3Jrg{zl>9lHmw;euM?j~k(2I$(QG6K4HWKooLNa(w*^
z=|=*gWsb__Gx59U4H8%H_7+zq)UD3z2qi-9frCh~2Lm3dTES}ro4j?J$?5fKPA`P9
zQ)??GP{*O(a|+tg60ow7JCAv(gFivEpJL|FsGDr(dhu$7iNAdKWY#9kK`*}qflGA#
zM`Twy$s!G2IPql%-?)V5Db&x$N~bo=9Rt%xPrinmQC9_s5o6`Qub&IvJ@xQZN4Uyt
z`Rt_n64gTak^K7Fl~^{I?1YCuIXOYU`ZzXSUsLNBUqPD?MKPl)l$g%^C5nYr5R(g;
zbuTG*WSdvx!Tiz%m3GW2AW7O5VAk6d+JXEewNH<vMA>A!r$fkS7Ji&6L1wE!k(d*R
z8u>PN#N*!<)A*qr%GeNuQJij$1GHiW#K*^j;VT%y>Jib&3gt}Kops}r$@-ou{$*QU
zsI(``P^O8f11Aj(=QNH`ewG_WS9q-Qt5j9VH@$5ck*xn1@XGi++_6OfVUu3Htg4>e
z<)s*CmK<{<Y>sqZ+8b+#)1FOx@8#X1u*?LuBfksWVCHl2^=`zFTVRw(ixNiEep+mJ
zyfv(0vxB%*u6u2m1u~Vh;Qp3MDwlE~h_WVpxJTmeSCTM(`_qkW_7V=T)14RKVnXqS
zgNC4)+)>rsVQikS_H?0*>Rrp@NLXbPpkjHi7>o=j1$3IDwrj|-7rRdHq$`_n%o?l%
zYfyTm5wjFQ7{{?YMii$*Uyd$LKo6%k(5ylxL|zZNR-<MvUh*KQnQUH3@z7%XG{0zk
zeZ+-X9v(}gtpvCDI(hF&7XT1dvD=v~OuZsdqeF%mtwb0ii323~N%H!87U}f<WzBcT
zBo}<-v5lQuFY&!E))pm_-s%I(2buieHheL2#7X}m5MrCn4ENAk)=Gi+Ma>b|N8_MY
z+=uhHi;D;dMDa7~1<GuudKLuqjF(jTJ*#;B<Wxd9xHjiiDqw?R)z=vSsR3GyLe}_z
z!)9Us=7WbqBexozxmVq&!Kxsn9|&zfGpG`|kesbw_ZmJI($FU2>a_=$c(N6ZVUjup
z34~}BjC=tMt>dG*0Jq^$T|t|Fq2hEcVHV;vR6(9aa9zF&T4aO0+c^Bd=TW&4m(YJa
z)s^9wH9)l*8A+NTXq^bEaFm%e)&h@amUtqQ1nVgx2gndix8^_k%kQ^PAFW{CK*7`5
zMi*`dUS$LC@u<Jf1o*tgtThvT_95}O8AI=nsB=2AE3XgF-T)R&6#Q=+(&-gwg!}LB
zqyj0n7dyYmD$DJ_1Rb{g4Y5H;b@1+MY^SY4FMz>cwa=dI`A!ai$8C6vUD@xuXu_t%
zqf6*)r~@+;6*m&l1I3Yd;wo9Xm{UtWn2g+Dtyb11y<G=C@BxG&PLf!2f=b9&qvc`9
zBTs!koAA#TDw+`fqrC%WR0M9l%}?9~gOPIT7`vU;RF4C#nP}&`j6XskebL&0b6yw8
zJJmoKvONER1m9=4Ss8`uW`IXCzkvQ7G(ak*04f@rUe8DVYr<>h1Ji#l>?-ubx2S+f
zjt_}?^k5|HP^9_D!PKNMygWA)8d7~TRlo*I=-=@s3g+w6OA0Y7(#<ov<2YHCu{W4G
zeSd`$5Q+m=UO5VUgaoPlHr&|B%wJu=kGGr%(EC*E(r?*HB~4hxeFhr;B1O=XEA$<{
z7dh0DI3muC3#gtea#<&Z04-3-Ctx0?tmGpU3Qv!$CqE8Pu9_Q^2deuAN@3VfQW4ga
zKx;SvSE$hE&tc_ZCmX4<M7^+vtcLIMmw7nTlMjt)$XiMK$6FJI;rMB7&p<n5^MO!S
zc(wM<GGZwEN+M2l$G-_0<IXti6F3qB$@hyHke+Y*q)-@e)4|yKPa9-u+ci0D8Ek)X
z0+MqP?2$qf@yl2Mn5jeDZsqg>2SC$+YYd!+T|KC)9$3vV_x!VbpvI~Ioy~sF!><Mq
zaGCa0!NuQ%Z#xA|E_X`FcxhQo$NL?<ZkB#iaKLSq;w)L>0=l&x)e4PpNBIsQXP_~v
z(0&l$4)x52&ZO?9{<F;bb<|)TeT@Dydj0Q6C!vY<oav+Rp0{ywbnGfsytsX3)nIB_
zhc8VH*_o(Y?y&lu=z;p9(xRsLV4TySfN?LH*aPuAY0E1>#^C|1+2DTwNQ;x3AMv;z
zSmI(dY5$K?*IO=G&&Ur|6SU<WuUO8rz%6{+GLY>mzB-Ok20sxvXqG7FvQAqma%6wy
zao@_2xkBn|047q}ke;AE(DV?j47DKjN!n+<A^J<=8+*LOeSCbYaA}HuW&b2ch*J__
zJ}m@<I8t%p$O>o<Ryi-L%4d|}B3gI$q+hMWg6!cgryKl||CHQmiG(78)2@e)3Gd=v
zA-FefVAF7p2Od%3ym|@*1;Neh4LgYGto6b3>|<w|spIPx@@3M5OPhqhQ~apNqL6{(
zxFeu#8lGH=UJgQfH6L?W)xXQ9(QIj7y&#GDvS!>|I_tcKOeHikgSwtU?)=h_;<Ndj
zOPOv~lknj*Lnszkd1|Rie+B|pqeSoFT{$_QgV+f0lI<6{i#nb8$(lbUzD14FRLb>x
z4541E)fh5p(h;7d4*g`KcKJ0JEgNu_bwjVv#y4i=#tJCkG#_;_@UArUf~^9K2>?T#
z*FQgbIrvYXUytheooZ<$=If^<&v7Xfrg!wvODDe3`W(UkrY-_oJ0+T~3ldylg<h7q
zmCqo<MF*^hrgyS_rS#{3n7;#f7eK{y`?ax!_#nr&tbn#zp`?a!%c|Gl@`2RbmSrgI
zRx|N26SV0Hy*?rdOw-FLV7lYXL?*d~QOT|-DCeQeX_@}slfa<x__sO@?iG2;-uQJ;
zdRW$JFKSoqhWa{MkXXh%-Jl|w1J8^HZv(7~k=#o1xY7CT$|D?k@@~AC%^MB%x9ids
z0-|Ti14iR+8~z=QKMP70%d5{~)u1k}b8l+>5`)W$%HBIRQ`N%8{!NEc{{)mkzy!n=
zB@j2FcwIkpLzAhq`7xh%!uTFLUmKTlN00UT;(y#b3#a*ip@Oq^7S!C^zNc~}%|m4z
zEtIzfMo0DH8?FAzlVG2f0}L`%-zHzK&ey&gH0Vz+rxeYw!GxB%@6HeC_5w-^0tWBo
z0gj20dRH6yr|*C<QCKK$`@Tx5N~GUN{z9V}bH!29p>R@^*59!$Cr}eMoV)RCEjPCl
zOo6HwdTSb2;bIo0g@$E+z1!&w`@$>^&-`+J5eE8i%|9{0BeT43qwX)<?i}eBXpc#i
zf3ojJBy<m+W+FncfmrYPO!j8_dfS_&o2El^68M8sW_A5kH3O^sy6|7S*x$N$x&B@i
z5Lk?Z&Gl`i&@WiZmaqQ#xKx%Yg$t{!lkmH=nUuu*{v=`LWdN8GV{b`JeQ3+=6rPv9
zljmK|?R%(Es3V#;OWuYaYLFsCbz%}|z>}}}3@C7~SZ&iaA3can+7Pp=F3U~aqnfzH
zmy@GGFwrznJK9UzwK2T}43|}XmT7yu{v!TWswQjiG~>_GOnX9zCx`C1__eScZ)Ag)
zSY;p2xd|SWQFQ$`h6<c~A^3Ft-(QsU0G+etxg31}@UbS9dUJ@U(nWNVdXc{rAJrAG
z@3d8Bp-4Cy;<&%DKm!ya{u996fp40Za+n$@F()uhPm$DXocb#tF#XOrJ>=L??Kre2
z&e3eLvk}kk)Plm)Y7Yp1J%~IHXcl;7KiE-Rz9z$=$wYS~hn2l<bLCT`1WwwU3UrFo
zypnp%2pe*CJzxoGJ_$288<-=O_6Iw!RZe-M9%7BJ0mw|J?#=+u`voE2kTgAI+zQ?m
z+&f-HUCJrN7l&4G^P#o<S+y!f)egPxem2R4kqsybpvgO21Zbx3+84Xw4s{Zmrt)<J
zRy{N!T1?#}N09JpZ62_0@}n=9UtqM86K!{j#5lW-*SdB3i(4<~z^D&AXH!S&XVXbA
zBCR8)%+WA3OXfG4ub0}<KF1n7-jnB63PV5OVb8$@N4r-oXD9=m3v1`L^e~$7iI$i@
zW<wTsT>;o`w@DV*6+v4L{&B|W=eN0xM=W|u0Uru|dR9u}%MWdLoRAgck-z8~3sd*&
z;9*~IfqEeHQR7+HGG)cUp0FOlHt$HMvRQ<welPBH>J!$!2LgYUXbUL8GL={zp<$hE
znkc_ZUmB(vda$O4O5e0*DsAOe9RJmh5V$}Cxi>UXaep`<acGv@@6SUpD6E(4Fu4-Y
zTB2A`4Fgu_a6s9OKHOxBJZke~^q+A2XG>2;v!xAJ9%(lT)hh977E*tYU#<qnKR*FL
z*;p7&rHj<3+Q71a4*SQ^Nma5VM>Fp#j41yKz!D-8F;~GXqXuS%Uf2fTu2=6^JUd{A
z@e+gw`9RpX1~s|tu7h?g&9R?5)(y->79}xHOQzRT0TL26GbH%sUpY4wA81mp>+J~Z
z?|9-q<}v-+-QpG+6!~jkv=E-mzJHIOV3*|2Kv_WfK$8Gj!8XJo+#*<*3J4)32zeH4
zd38}C@xNc^{IBT#Yc`Oh{nusw--V0KW8zwhVA~|2vESeq+C(afnhKS-Ekgc3l(k}O

literal 7922
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
Ix{q?<U%}L+T>t<8

diff --git a/packages/f2/test/components/guide/type.test.tsx b/packages/f2/test/components/guide/type.test.tsx
index eefa67e8f..1ca6c5a37 100644
--- a/packages/f2/test/components/guide/type.test.tsx
+++ b/packages/f2/test/components/guide/type.test.tsx
@@ -257,7 +257,7 @@ describe('Guide', () => {
   it('TagGuide', async () => {
     const context = createContext('TagGuide');
     const { props } = (
-      <Canvas context={context}>
+      <Canvas context={context} animate={false}>
         <Chart data={data}>
           <Line x="genre" y="sold" />
           <TagGuide records={[{ genre: 'Action', sold: 20 }]} direct="tc" content="20" />
@@ -268,7 +268,7 @@ describe('Guide', () => {
     const canvas = new Canvas(props);
     canvas.render();
 
-    await delay(100);
+    await delay(500);
     expect(context).toMatchImageSnapshot();
   });
 });

From a1be0cf04f073a72aad5400de1a8638191679b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=8B=B8?= <junyu.junyujiang@alibaba-inc.com>
Date: Wed, 16 Feb 2022 10:36:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DtagGuide=20snapsho?=
 =?UTF-8?q?t=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../type-test-tsx-guide-tag-guide-1-snap.png  | Bin 15816 -> 6052 bytes
 .../f2/test/components/guide/type.test.tsx    |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/f2/test/components/guide/__image_snapshots__/type-test-tsx-guide-tag-guide-1-snap.png b/packages/f2/test/components/guide/__image_snapshots__/type-test-tsx-guide-tag-guide-1-snap.png
index 259b764f29ce6530c888e09c3ef55533a64da0a6..469d28e7f070a66513e1c789f484702908741e75 100644
GIT binary patch
literal 6052
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

literal 15816
zcmeIZWmuGL*ES3zNGK(xAYss<k^&;5l%z=40HSnBD-BAB64D{v-3%QT3IZ}TI3RKn
z0}@K<P~UN$<8?pJyM2G(ZF~RRfB3;1bHvJh?Q6|*Elp)AN)}2YA|fi4I||xFL<mD7
zBH}mXC&7P2-O&$;h&YK<6mIE0He16!d2Q;Mxc76TWc}<rQms2!>TlWKCGbr*?Ulbi
z(mF?`oIva<FH`$5PS^7ivEsFeS{@Xmgi#_VWo?T{NMs0abnew}A#W~SR59S{y~wYI
z@ys;v<k9dfXw|`@`VO)CC7mC(+dF5aHr#i1GEDT)>TR@0B4QHwPa4041}f_P|NKLt
z>-)w3`BV_uWiP_pcOi%fLCy*OkO)@({UR+g`xAnsocn3*dBR8JoXD>4EdTxL|1~jb
z3&slJJ5xOhO=+5O^b4>3<=&syaL5Q66;oxp4eO6nF!+bvk)ugfx>cH_b~A3T;B`A^
zx$t)*A!30{_Z)tLij9T8=xp9f{w2<O*ph%wuJ@Z~a71>gcE{S$!MY6g3APRGRAM|V
z-<?HCx4cHr52dve5j*ULl@rvCe1woC?VKps8)pdU**q^~=v#a!+hlENc$HWnOg`uG
z-(&b<g?_Vh``4|nj|MNaWlZ<_57$c&3up`%8W2`o-eEW}PM$G->gvzu;zC^X1lZ4_
zQSBLm{nRi=M9%Pxlg_W3rS1wY{aCHJax)u2VMt8%LYodYtCXlNP4jIbc3&;YR-Bdi
zs;P1BbVr?0vb!WBr-iE?BzSVp*fYV!-;`CQYZ|eUcFE#W`zosBQ)Ar3WlkfG&tNM?
zE|Dx|&B^GG;jC4*97?aZC!iHG%J`dQ=&R#oOr+&u(ORf;^8YT0qprH}XZ4X{y93z|
z;gqy1z#BUF1TMk{(Fz1-=63d?jxX_v>ZjmRv<ISJ=;cuGhXo~O-^WlA9z{=~K-#H=
z2@nt5UwaT^-+e-PQa++VDJW=^#Xw(?phPBwtl}&dH9o@hpzvw9+is{KL&}$n<c1V%
zf=&d-(_)OEG@~+T9k>0e)jOU3#jb*gxU8Y0Jeu&H9+KP;gIT8X4%zFwBI9QAhhA1a
zk*c3Qkd!B!PLqITr_EhG(wbMH%-*+I%7aN1zOvxBk)Yy{k3#4xPfRip>|l&ifwbyo
zTn^qgjOUl0qRV-fYF3k0(J}*4azj%x*#F5dt6NMD`vvS(2k_&J#J#Hq_!oY}K5Jl^
z_98c|VWSEqT==ReP{L@|+ma)}fscI!WUcu#qfc7htp(i1JiundjPs8PCSfUf)g`o3
zP-p1MWzU#IoOI)ei`oNIukWgtEV!KW#bAZST7%7)@2s$jUOnvaH9WP>TD?E~1G7Fu
zVYtR*Blp+(E?=$s=F)#>JlbT&)39WAz;-A}Q06%i@e8#Rgx5VIS0Ftu%$JpDoX2P^
zw6)*7utqw1l31YF^`78gWu1EX;wZo!Wx6-+ull6*blvVL+UhBnfoQ_h#f-Xy_+Q>g
znri^>uH;`@lhv4sSYTn`v=AqMf1j}CogSyj_UmTK`4#sy;}tZ=hla)cam6lG{4*R4
zbPdiS#AKacrfg;Ug3s;*R$yFeAwY(AD5|GT3Zeg*OyLP(8+9(=OG_H~hyB-R1oCDu
zmitt08T6bMo&%W~e|;el*|>bACery8PUV4jRsLY&)-KLS=<}yKCQgg~v{+I?L|=Z1
zZ2Y#A;(_d6_ZG+_EqLG9D9Tu~szi)n8b=UbO-!kvIICC5F_N^dUHKZ#NZc6T6h~qB
zoRyCXR%ZUK?4oZ5&Gj}KRg%fS8ab)j!@pc27I?;Y?-F4Ham2l$y;rLkSMMtI4S}T}
zXR^OvKz2p;oG(TYBp*iVLm3dSR#hf7$6C<VUN%R1y?O!oeiD5hF=2~-`UuK^l>Fh9
zb+a}7fyupe^eKUU{h%OmlUoDIu$N?OAf`Ds2G7rEA78>rv7*Ir2RUtPvxR3S3U3i3
z^q*>-4<k535ovA+hX5`mP5KCjS`oTZJ1v7^-H%}g5kip=A!viT4u%gx6Yn3YVwiyJ
z)Ok)Xl<)Gb6MMu(pP?|srHG<n4<`|(Wjs`GrmnP`&z$RNuvj}IKssZ5v5&`s%dK22
z6b?3*gEJYAPF5|4O=YUHob8>qh{LOEUm+>KtPyVpYv2qYE#rZkitnh{-WKNR%BXhP
z<=QzCF<=s1w06X>Ni>7#I@?!Z-^Jo<q{MOF*pZnBy}BuL$s$xvUK$R3cdC)Pn;a@W
z^Yl2?S>Xl87!vgBh%s`*=Vvczz;C*IFS}@&!+qSSq1}q#XMcsbRpR*}cL@(dKdw;a
z3T#u)=_VExX6@IR@S*t`4rzF8J{SMzb|T$TwAE*Bm>R=TkKBNhA78Y9chn$@@oe@n
z*qN@F^GeL@1wu&`&maipVm0<$hx@oRmfNncCQgGV+0E-Ar%--}IzoTt3NaD<=<nRL
zjBWS_1EU<CGr#ff-inaV>baIB`fvm5bhY}chfBdv6a!HoJcpa&OqCPxYa?e9Rru2B
zz>4SpSyB8g`Hqi^hDztxqfaaC3!Em*c_MtFLGQ)?rlzxq$=uF9Q-g86{W<L!{jeco
zJ!gh*)c>*WYjhEjM<<%SD)^RK3)<G$<A3o!U;(ygXW`0Au)T^iADR3E-7{pI{l{fg
z54|+Xb{}HLC}^vVZTfoudj92D+4otNSbTx{Acsu1$2~rqeerrCviF)nL5!`hv}mE7
zkW(bJq{sOxSyedS_Eev6H!rm*!8ptnVgbJRd>SZ91#^<t7X7Ysias*H=s2(#>i16f
zJavr7RVD%Pm7H*thZd*F=B@Z&;#{Y#)Z5G4y<EupELV*vX{)U%KH>;#KI?KC&sE)1
zlq-`tF4msWOv9zUW~KpNaAOh42ruDd_{el%89&om<0*=j*u$-~7Y(v&Tu{z6=C<In
ze=YVDGG5w9Wc{0Cc}9N+)Aqv9g4h1n64;B~-9TtCAR~x|jW*)s;l4<_)sOYWRbTnT
z-7)HfH%UUYoE8m4iCljJkt!#@PnIe32>U!nrtb-Bpz^5?79hrVM@PSbSKMZpuq$!-
zxjcqX%x8|qw#RjdB%o=YP0)zn1?cj7F99)TM}a7k{Bh?UnnYv0l60YMG%&q7O0Pz*
z4(!#>WF<=o^W1bPou9qSJ#f@2cR5;p7x<}nOxE11H`RiOhy{q{^GRVjUj+#<iyyaH
zV~=uZGihH?-0it4o!zShwu(}9{fk%YXqTn1=D1bybu=jf_Sn=27JbkKDjn|DVuDp#
z3pO(6wd+i)TtAzcN9sV+(8*J#(^3M|(L_y%u(mbGyF=dI<Khj|O&%6fE=!G%9g;R;
zL4uawbbJ8^3HIR3Tb%<Mt)m`(0QfwhIj0e$;3LgtQD8IX5ecpMLJXip;761|54K%o
z&1hh9Tt<u9q)`RH1a8~LTTlSJlhdWW5#2cE6nE56xUZ)6WLh$mrNllpD6!Oa7|vfv
z84&plI6i6li@lvFvz)Th7zn@&NKcd<0(0L@uY;pCl9HrR_S2HLoJ!{_yRtN|yH^&R
z?om$N^?yN9K4Oj_g8i=kHo!j5<D$!r_N(49?o_f>w;I=QIDAk8qN#eKMFoonL9!^c
zm2B1GvD&1s-jm?wWr~=}3q1);nTpeuoM1o0bRet;=Xa#J2kcMe8E<yo+x_A(HaGDI
zC}M6Px)-(&OWs)2T&t1d_-K+f0sov$Qd1E+1B{G3$qHVA;frP4-blkaiDPFW0E8)d
zHB$+KQig2CB`6Mv8G)?3m%jQPq##pYs-5XXjhV;=OJR_O{si$75-$TWx;XndaXYRi
zQX@Ipt<js8P0MBrT(`gOAs1{l3?ThyiW=PiiY<$rxh`fQS(w7rP(fd<E#t!iCn4J;
z<Ss*&jr+EY%Jj(BcImQ&I{CB)vejo?$Sz6;GhJBQwDQ4@Lvl8id6G$sn5QW1jg>a+
zxwme7B~(BS5}b9Uu=LzWa~F;*tvq^~s8Kyhcqcoz*221e5OgGX-p&4XtlOL{+gnz~
z*S#Wed)T+ek7k3gG^Rd4bpLtxXKfI#E8PyW0pz}45Fqm)NzL8o8#t$n?9LxJ5M)4!
zH7Xw~ss9ZIJss|hHSVV1)vl=|p0Kh>xM&&uIhutl1bnizXM|6c(nUG}*i^<<E(qIZ
ztOr0}XcZs3er#D;?-Sp<nEk@e4`7EVDOU!9njZkyrAb`fcD-DQQajw0PoXXTUk;KI
z)<xZScy3h`-=1#+{NF7@XC3{tu;z3)w`ovN;wJGhJ1i3Se-pPJhrUvK!Ta6x#r1dg
z7XSpioypz+>$zUf;;7{4jVe08q_spXOJHej*h%PFza_xsk%tkyv~W5VM#w%5s7&9j
zDp_*2s?V;U82eD5v=R{x0tCBzHYKd;lvCS+dy<cpBuB9Ay@^|m7Z(e3%*eo_*pN1A
z@QO{~`GF=F8GHWD<^(k9oagQLYf#*iPnCuJK7?u6Xl~<YWaU}!z25B(w*g^_mTQqN
zsX%g8^@1;9zh?-}3_0#CNFLwbiqf8$NlZ9e&iezjvzT6c5q@$AiBIIwHSY{P?>&38
z+dxNFwuD{5|E{W$ZX}ITL+G^D&?8Q})+kh}$C1{IeWyyw>o8ot9oVYyUM(T{V4xa+
zgV)%<dile+T)P?wdS1R5pMtDKpo+BBPxi1mP|!^{H*b7RJlE_izAG|JAuqN6@V0S&
z6cbov9MOk?7tK*VBs+8zWiuS^mVF!J&^^VaPl*=bcS#0sLt%apa>vWAwp-@0*A5?k
z#R}M2@VY$h7Q2<h2I?@+gsgtpfWPws<dYt^TU@fXR6sUbR-pg<LHh`U9LQ4#*0&Ym
zqu4;6Iz%nD_yC`KdGmVxgz&nBkt16Q&{cKtJz-c#4!|yswJ`!8ysr7TCe%%}8dV4d
zjnV^%srv4$9SkwE&jA#$;Zo`DFy5=Xy*qls%Sm+1CTg3Uwi+YqAPv`9DYrR&Bjw&N
zE<3ACroHXZ?KR<eM6PZCFed6+H0<7Y@{xDD<rXlm;{CE?3oEEm7c_V6{WSX$@a}>(
zLAcnW4MB=6%Y54IacxM`6kho8k#?o%!*AfX-zDk!;iBBO4q&yF7^%Q=>uEV}gZghB
z#3rMQ+7rSTfV!TYj+21R$C{f~Xm6Z1FDpuB+EbxqRx@KV@^xqsAYb?ih_3<cQl*9;
zWO-)peEe`{#x1r&P5gBKpeneqz)ejhC?}8`fe3LNi!<?*^=nE%Ctlc7T+0AJ*E8Ux
zE)0*pTmZh?8M|GYw$^FVJH5`vAMQkd83^vnRXbA1S+ZS&i<kY~P*>Ma6R^*G*`vz{
zdf;<SBJe%6d8)T4v-bCTKR!6;^C3+VrQ16hQ1Ui=E(yri_)TvvtVUO+<#XG4*zM*t
zmhtowZ(bYpyJlzmQ_3J;43rnc)nzsXVk`MibfPfU1U*u#J#%yB*@6)wm=2%~X1EYR
zmO@GU0xmYKFkGZ?W>l(-236vgGx>km?=|QkgO-vbr>;EJCo+5=taOZnfLw{fl|I2Y
z5v5<|`>iLu*8J1)e}E4x+pc#Id373gZe4QV{#e<(pD`9!g#;IVyeJ{c{?rJ3V5+y@
z8r~=4Oa$eTT%4J#*Iw^Vdrp9_L($6p*@r+dakAzuFj$Ud02tS=?3BYbQy&{CmmRtI
zr_2ZqfL_HzUn#=EvlIYDcb&;9dwe6nDqQ|nye=FOPW=o_ZNR>N(_x?>5!9uNn7noT
zEH#=#=EFbh###f@gR%12df-v|pK1vn&_mkDww>ubyfStBv)=g?v|rDQydVW|mou_v
zY0zCTLcrC;RKlb9n#LZZefnOM<7J+;(c1p+X!J!T_(|V^RjM%7*yO32a`M*hyXnvj
z!Ps_sAz%>OkL{=-lu-rBMT4~Mb(Ub6uqE5>DfzVxoL<hB7qIXtuKt^_Y@FynQsbSi
zTPpu0dKxcI@Q#8D>&9d)0@n|I2zZ1}BaDMXOKV308hyFWq$M&BJULn?hZ~mvxl`K=
z2Tz4jV(aUPc7q`B-JDmHq6@YI8YrarFbALVlL=(5s(dzw(zf~pwEsLxe3VNA<cs>}
z7#bkASW95q5Y3a6O@KOamQ2PQ00owvSay64gDSt^AAC0l7j5ro7h3NOt35FpIlvmy
z1($#fYI*@a<2mgz-{YZz_u~Bro=v$k4JW(|F0$l5&jyL$R@4hiIE-<hiAdUikvPOQ
ze`GCPm{2!QE1yjd9;;bg#{<VF9T1<)h3%@+6a)VSIa)fBme)xB4`$#e1Ax-~A}Di{
zj8tm&-bv=~M%VNTZh;4d@eM=JEY<=%Xw-#VxY+Jz7|0e0-;(Tvh(NF;lFwCurS_cE
z=j7oDXZ)|GR)fm+F#MY8XWHd_@Zxy<k0|KHR|UWpfpOdAHHzvG#MvunT6jp326$O}
z#6>j%v@-|LjxJ7<-FvSzSCX1)B5JKFjE(Lr$e`aN;mAX-X%W6~^m6B1BA4g*Uyu{x
z5Eequ2h8LjLp#dgvlKtpP%WRs9_YSe=t;9AWjMC1CFKy~>#WgEX8#fAW3aR~@Y~>S
zs2#|c1^0WmBambywaR!3VZA^L?;>i)*^fzkDIO|+F7GQ`B6C;wBUxlVAZ5gP&-1&n
znXI4-ewM_kVgPni-DgA|lh-3HTDbx$Q+HjuF&gF=)KZ1)B(*L6jo^d`c&&N-_B*mk
zjm{1Bv5@_fKaP@|df$+%>wqAsag|z`2q=4zV|}`EV{9t+b<4Oz>uBGPD;Gvzj~V+?
z9w{XU=z8z1RBLx;ywaz~M;8GTg;~=O#*e~3%_I-S@=tzl$o8wnp4aZTs}MKY<VdgY
z`*4J6DS3?^FB*N?F)sjs$A)9^X;9fMvdy*f=5dhe`6*VJyGLRfbo==PC1jR2M28Jl
zjAx4y(0$q;Z}nXR@%g<UG9esk3ykOsH<M=jz3yYf{Q`<)m{OYaKo-~m>|0<rwH=9M
z1(xW9)SP3w*G-e`vC=e#YE8ngh4cNBy+8y$B0l~63>`Tr6Bse|Z;E%$2^`?=mcI0J
z{jS0);6<R8UQ!o}M1hmUG&3^kY;(HQ5o51~arv?ZGd5~l=s0#09_)UQ#}Ds(j#*jP
znhpO%k8i@5=;=G7Tj59C{(F*nOX~aYZK?}3#s=tXNzI+L1N$@oQc@Z+s}@&C3NInM
z(xRDqE(Ud3lNPd8XQDH<*W~jnGH?9EBp+%^m*YqB(#DhJF1GK4(sP(o8CTs@F_z4*
z>7lQdkQvuxtH!#`HVfp*jjV5AmU^G;dlcDQnv<|VaWwbcHBcK>cX^x`(+F3Sagl5}
z=*?0YMK)~Rz=>|eHqOwt+{9bqOuS#RZ>=Y*m_MFfK1SiEm)Xk5j`<d5F77x#wmuj|
ztC0CO%*Amb#>A?pd~J0%)h@TAt;bsvhe9xxr&f#{*7P2ruY+{<{VJ(FlJgc~n8L7X
z;vRlOUO8QE#}~sl>x-~V7b=*JVfWwP_|TevEbX%G!g^xz(rW&a5L;l;3Yiq{y=>lb
z<J+NOB$tK8i8BB2fh+h`fl5{fZx23$f$7Lyy>3nN&+5P|MI{Gr69ub~6w+5y`?Y&~
zW!HYMd}8R4)j{sKaGY7=;c`Z4GMgM8okO4hQpNmF^GM+P-}BzSIUYZim5$d?HfoXv
zog=d!Uj&UtXivvHj|_Nf>QX%Udr^CaslJ_7Lc!uBQ1-cOSHM533t!C$@*J7YKQPI6
z(+Da>{o&zA&TOsl7&o>{w$k3U!yG#|iSE35k?#;7+Yw#)vff9YwyeYR@gfzKW@OMP
zr|v#=AJakmD93yyc1QzIdyZc_8>%jP-L~)nhv1&LiXq4yl`N!*9ZCx_<?goJN0uJN
zjC>f>Z9i(pFtP?DHSaOtVgj)qq5C)G@QvS-os**5TDo27s#%`d&)&b+T{g?%uh}0x
z%e%0KS}P06piRjDeFv|A*C3pEBKpY<2LlQ{u$DMGcjeieez>KAhQQ>R-HW(fni%Kb
zArA`3I3^R0W3mz({o=Mq&F}o_V?9qpTz0E?_xza7W<YY%IJSMN;&t5yx(MNQ%VHN?
zdXlvkpp6mo&k`2?+nyMkz1SAfIJI7LZj@W!^2vs*8vOWte&^AHUqRwS^K9H~48#Hw
z<BxV30wZNr0$(}2h*E?h_->5GD~1r{39#eI*y|+3BrMD+c3q_b9V?g^)hm%odp?fs
zy8bubdUpC+ZlJQRplTm&%XR)zup51vKIXZxl;4cSyq8NpxpI@_ZkN4ZbcVDD|Kpvd
zN2PKv>VEFr-OzS<@(Mdsk~YB{oC++{I`@MV2=673_qLkxXEbjtqsmrRl>^UG8PLc{
z1f(Z_PVVS@ygj>n^KQ#rrA8lb#&vvi#rGY|&snEOT3@^EX-gZz6`yv*tIv1r+ZED>
zx$S-$TmQU5E@lom20tBr1<p~#FqPpbS$O77$B>pTl`h8t=ARgY;(*8P_zSx$4x40{
z=i|{u0r&OsLtz}cQoqmOdQDi*lS1MiV+Z1{YO0^RR(r`8D|*nxRF1MN`2X)uVR&~X
zY28>FpETo7bEnEg0zdXmw@OA%6#r~bk4B~H#{Gj=OKs+*GgM_Ar8E}~r}L<yLm)d`
zrA{~B9@jIK99_4-bZO0;G(igpT>2snvg4|w(Yat<N_8F!e|vAcp>*X=zTXE0=^b3x
z>AvCi@A!7QZC|lDe!N}eR!YNrxW}w!e(+^EquO^P+06f!*l!BM;V%3BoO?royyNNi
z`o~Xjw|4AHMr8vU#rNy@5&eL!6gNrOp}o`G<$)OUe375*EJvwNWfb2YfLF%JF1<Wz
z@IkM7_q@CrnS(brKL<n@Sk+P5*X9}OvA<$>IwVM(s(g`yh0)JNWj+8iErS2{#j>^O
zPixIZ#2Sck4LzwS+B;Fu<{NUCoEqlHGKvtTVFg(G0DtEmC#6n}rk~2Wl9?v{!ehkD
zcMs<F_{fl5E6Y3Q7!PRTyx0ZaY_Dk#>@M5hbByj11jwe2<R1?b+Ot=H>x-MTuAs^c
zj$dro3n|H+J?@gTX}U=45ca4}P6%#NGzbvL;<A0pw?FnQNlB(aj<+w8@VyX=2=+Qz
zUg&zJI!#F`Bh<@m&i#13#k^9;VPGF3j)#rHAJ9eo2h$;dm`HE5NhGraNUZnll6|9p
zdEaPj=`4$Xmr}ZbwG8kNAV}x;uRuJ9FdFe?>Y;;Nxw7y0;p>#cp9)^HQP3b%0AAp_
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

diff --git a/packages/f2/test/components/guide/type.test.tsx b/packages/f2/test/components/guide/type.test.tsx
index 1ca6c5a37..31ab12da5 100644
--- a/packages/f2/test/components/guide/type.test.tsx
+++ b/packages/f2/test/components/guide/type.test.tsx
@@ -257,7 +257,7 @@ describe('Guide', () => {
   it('TagGuide', async () => {
     const context = createContext('TagGuide');
     const { props } = (
-      <Canvas context={context} animate={false}>
+      <Canvas context={context} animate={false} pixelRatio={1}>
         <Chart data={data}>
           <Line x="genre" y="sold" />
           <TagGuide records={[{ genre: 'Action', sold: 20 }]} direct="tc" content="20" />

From b7b372f959e888e85f1b85acdf0789b6e5c67961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=8B=B8?= <junyu.junyujiang@alibaba-inc.com>
Date: Wed, 16 Feb 2022 11:37:46 +0800
Subject: [PATCH 5/5] fix: ts error

---
 packages/f2/src/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/f2/src/types.ts b/packages/f2/src/types.ts
index fb8983723..91eb03fac 100644
--- a/packages/f2/src/types.ts
+++ b/packages/f2/src/types.ts
@@ -114,7 +114,7 @@ export interface PolygonProps extends IntrinsicElementsProps {
   attrs?: PolygonAttrs;
 }
 
-export type PolylineAttrs = Partial<SupportPx<Types.LineAttrs>>;
+export type PolylineAttrs = Partial<SupportPx<Types.PolylineAttrs>>;
 export interface PolylineProps extends IntrinsicElementsProps {
   attrs?: PolylineAttrs;
 }