fix: change data wont update (#5002)

* fix: fix issue that change data wont update * test: update test snapshot
antvis · May 13, 2023 · 349a9f4 · 349a9f4
1 parent 2e92914
commit 349a9f4
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 15 deletions.
diff --git a/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval2-0.png b/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval2-0.png
diff --git a/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval2-1.png b/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval2-1.png
diff --git a/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval3-0.png b/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval3-0.png
diff --git a/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval3-1.png b/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval3-1.png
diff --git a/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval3-2.png b/...ts__/integration/snapshots/animation/sold-interval-pie-keyframe/interval3-2.png
diff --git a/__tests__/integration/snapshots/api/chartOptionsChangeData.png b/__tests__/integration/snapshots/api/chartOptionsChangeData.png
diff --git a/src/component/legendCategory.ts b/src/component/legendCategory.ts
@@ -244,20 +244,27 @@ export const LegendCategory: GCC<LegendCategoryOptions> = (options) => {
     };
 
     const { legend: legendTheme = {} } = theme;
+
+    const categoryStyle = adaptor(
+      Object.assign({}, legendTheme, legendStyle, style),
+    );
+
     const layoutWrapper = new LegendCategoryLayout({
       style: {
         x: bbox.x,
         y: bbox.y,
         width: bbox.width,
         height: bbox.height,
         ...finalLayout,
+        // @ts-ignore
+        subOptions: categoryStyle,
       },
     });
 
     layoutWrapper.appendChild(
       new Category({
         className: 'legend-category',
-        style: adaptor(Object.assign({}, legendTheme, legendStyle, style)),
+        style: categoryStyle,
       }),
     );
     return layoutWrapper;

diff --git a/src/component/legendContinuous.ts b/src/component/legendContinuous.ts
@@ -214,15 +214,6 @@ export const LegendContinuous: GCC<LegendContinuousOptions> = (options) => {
     const { bbox } = value;
     const { x, y, width, height } = bbox;
     const finalLayout = inferComponentLayout(position, layout);
-    const layoutWrapper = new G2Layout({
-      style: {
-        x,
-        y,
-        width,
-        height,
-        ...finalLayout,
-      },
-    });
 
     const { continuousLegend: legendTheme = {} } = theme;
     const finalStyle = adaptor(
@@ -252,6 +243,18 @@ export const LegendContinuous: GCC<LegendContinuousOptions> = (options) => {
       ),
     );
 
+    const layoutWrapper = new G2Layout({
+      style: {
+        x,
+        y,
+        width,
+        height,
+        ...finalLayout,
+        // @ts-ignore
+        subOptions: finalStyle,
+      },
+    });
+
     layoutWrapper.appendChild(
       new Continuous({
         style: finalStyle,

diff --git a/src/component/utils.ts b/src/component/utils.ts
@@ -83,17 +83,21 @@ export function inferComponentLayout(
 }
 
 export class G2Layout extends Layout {
+  get child() {
+    return this.children?.[0] as any;
+  }
+
   update(options: any) {
     this.attr(options);
-    const { width, height, ...restOptions } = options;
-    (this.children?.[0] as any)?.update(restOptions);
+    const { subOptions } = options;
+    this.child?.update(subOptions);
   }
 }
 
-export class LegendCategoryLayout extends Layout {
+export class LegendCategoryLayout extends G2Layout {
   update(options: any) {
-    this.attr(options);
-    (this.children?.[0] as any)?.update(options);
+    const { subOptions } = options;
+    this.child?.update(subOptions);
   }
 }