feat(interaction): add elementpointmove interaction

antvis · Mar 14, 2024 · a6a9f86 · a6a9f86
1 parent 8aed000
commit a6a9f86
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/__tests__/plots/static/flare-element-point-move-pie.ts b/__tests__/plots/static/flare-element-point-move-pie.ts
@@ -27,7 +27,9 @@ export function flareElementPointMovePie(): G2Spec {
       legendFilter: false,
       elementPointMove: {
         selection: [2],
-        style: { pathLineDash: [2, 4], pathStroke: '#fff', pathLineWidth: 2 },
+        pathLineDash: [2, 4],
+        pathStroke: '#fff',
+        pathLineWidth: 2,
       },
     },
   };

diff --git a/site/examples/interaction/data/demo/line-element-point-move.ts b/site/examples/interaction/data/demo/line-element-point-move.ts
@@ -30,15 +30,13 @@ chart
   .interaction({
     legendFilter: false,
     elementPointMove: {
-      style: {
-        pointR: 8,
-        pointStrokeWidth: 2,
-        pointActiveStroke: '#fff',
-        pathLineDash: [2, 4],
-        pathStroke: 'red',
-        labelFontSize: 14,
-        labelY: 24,
-      },
+      pointR: 8,
+      pointStrokeWidth: 2,
+      pointActiveStroke: '#fff',
+      pathLineDash: [2, 4],
+      pathStroke: 'red',
+      labelFontSize: 14,
+      labelY: 24,
     },
   })
   .encode('x', 'year')

diff --git a/site/examples/interaction/data/demo/pie-element-point-move.ts b/site/examples/interaction/data/demo/pie-element-point-move.ts
@@ -22,11 +22,9 @@ chart
   .interaction({
     legendFilter: false,
     elementPointMove: {
-      style: {
-        pathLineDash: [2, 4],
-        pathStroke: '#fff',
-        pathLineWidth: 2,
-      },
+      pathLineDash: [2, 4],
+      pathStroke: '#fff',
+      pathLineWidth: 2,
     },
   })
   .encode('y', 'count')

diff --git a/src/interaction/elementPointMove.ts b/src/interaction/elementPointMove.ts
@@ -13,9 +13,6 @@ import {
 
 export type ElementPointMoveOptions = {
   selection?: number[];
-  labelStyle?: TextStyleProps;
-  lineDashPathStyle?: PathStyleProps;
-  pointStyle?: CircleStyleProps;
   precision?: number;
   [key: string]: any;
 };
@@ -187,9 +184,9 @@ const getSamePointPosition = (center, point, target) => {
 export function ElementPointMove(
   elementPointMoveOptions: ElementPointMoveOptions = {},
 ) {
-  const { selection = [], style = {}, precision = 2 } = elementPointMoveOptions;
+  const { selection = [], precision = 2, ...style } = elementPointMoveOptions;
 
-  const defaultStyle = { ...DEFAULT_STYLE, ...style };
+  const defaultStyle = { ...DEFAULT_STYLE, ...(style || {}) };
 
   // Shape default style.
   const pathDefaultStyle = subObject(defaultStyle, 'path') as PathStyleProps;