Merge pull request #1908 from VisActor/fix/glyph-subgraphic-state

fix: ignore subGraphic wich glyph set state

Author: neuqzxy

common/changes/@visactor/vrender-core/feat-afterClearRect_2025-07-24-11-35.json renamed to common/changes/@visactor/vrender-core/develop_2025-07-31-08-37.json

@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@visactor/vrender-core",
-      "comment": "feat: support afterClearRect hooks",
+      "comment": "fix: ignore subGraphic wich glyph set state",
       "type": "none"
     }
   ],
   "packageName": "@visactor/vrender-core"
-}
+}

packages/vrender-core/src/graphic/glyph.ts

@@ -221,10 +221,10 @@ export class Glyph extends Graphic<IGlyphGraphicAttribute> implements IGlyph {
       }
     });
 
-    this.subGraphic.forEach((graphic, index) => {
-      graphic.updateNormalAttrs(subAttrs[index]);
-      graphic.applyStateAttrs(subAttrs[index], states, hasAnimation);
-    });
+    // this.subGraphic.forEach((graphic, index) => {
+    //   graphic.updateNormalAttrs(subAttrs[index]);
+    //   graphic.applyStateAttrs(subAttrs[index], states, hasAnimation);
+    // });
 
     this.updateNormalAttrs(stateAttrs);
     this.currentStates = states;
@@ -235,10 +235,10 @@ export class Glyph extends Graphic<IGlyphGraphicAttribute> implements IGlyph {
     this.stopStateAnimates();
     if (this.hasState() && this.normalAttrs) {
       this.currentStates = [];
-      this.subGraphic.forEach(graphic => {
-        graphic.applyStateAttrs(graphic.normalAttrs, this.currentStates, hasAnimation, true);
-        graphic.normalAttrs = null;
-      });
+      // this.subGraphic.forEach(graphic => {
+      //   graphic.applyStateAttrs(graphic.normalAttrs, this.currentStates, hasAnimation, true);
+      //   graphic.normalAttrs = null;
+      // });
       this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, true);
     } else {
       this.currentStates = [];

packages/vrender/__tests__/graphic/graphic-state.test.ts

@@ -209,18 +209,18 @@ describe('glyph-state', () => {
     expect(glyph.attribute).toMatchObject(glyph.glyphStates.hover.attributes);
     expect(glyph.normalAttrs).toMatchObject({ fillOpacity: undefined });
     expect(glyph.currentStates).toEqual(['hover']);
-    expect(glyph.subGraphic[0].attribute).toMatchObject(glyph.glyphStates.hover.subAttributes[0]);
-    expect(glyph.subGraphic[1].attribute).toMatchObject(glyph.glyphStates.hover.subAttributes[1]);
+    // expect(glyph.subGraphic[0].attribute).toMatchObject(glyph.glyphStates.hover.subAttributes[0]);
+    // expect(glyph.subGraphic[1].attribute).toMatchObject(glyph.glyphStates.hover.subAttributes[1]);
 
     glyph.addState('selected', true);
     expect(glyph.attribute).toMatchObject({
       ...glyph.glyphStates.hover.attributes,
       ...glyph.glyphStates.selected.attributes
     });
-    expect(glyph.subGraphic[0].attribute).toMatchObject({
-      ...glyph.glyphStates.hover.subAttributes[0],
-      ...glyph.glyphStates.selected.subAttributes[0]
-    });
-    expect(glyph.subGraphic[1].attribute).toMatchObject(glyph.glyphStates.hover.subAttributes[1]);
+    // expect(glyph.subGraphic[0].attribute).toMatchObject({
+    //   ...glyph.glyphStates.hover.subAttributes[0],
+    //   ...glyph.glyphStates.selected.subAttributes[0]
+    // });
+    // expect(glyph.subGraphic[1].attribute).toMatchObject(glyph.glyphStates.hover.subAttributes[1]);
   });
 });