feat(state): add focus ascendant, descendant on tree

apache · Jul 15, 2020 · e6c0f31 · e6c0f31
1 parent ff88adc
commit e6c0f31
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 163 deletions.
diff --git a/src/chart/helper/Symbol.ts b/src/chart/helper/Symbol.ts
@@ -32,6 +32,11 @@ import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
 
 type ECSymbol = ReturnType<typeof createSymbol>;
 
+interface SymbolOpts {
+    useNameLabel?: boolean
+    symbolInnerColor?: string
+}
+
 class Symbol extends graphic.Group {
 
     private _seriesModel: SeriesModel;
@@ -46,9 +51,9 @@ class Symbol extends graphic.Group {
 
     private _z2: number;
 
-    constructor(data: List, idx: number, seriesScope?: SymbolDrawSeriesScope) {
+    constructor(data: List, idx: number, seriesScope?: SymbolDrawSeriesScope, opts?: SymbolOpts) {
         super();
-        this.updateData(data, idx, seriesScope);
+        this.updateData(data, idx, seriesScope, opts);
     }
 
     _createSymbol(
@@ -139,7 +144,7 @@ class Symbol extends graphic.Group {
     /**
      * Update symbol properties
      */
-    updateData(data: List, idx: number, seriesScope?: SymbolDrawSeriesScope) {
+    updateData(data: List, idx: number, seriesScope?: SymbolDrawSeriesScope, opts?: SymbolOpts) {
         this.silent = false;
 
         const symbolType = data.getItemVisual(idx, 'symbol') || 'circle';
@@ -160,7 +165,7 @@ class Symbol extends graphic.Group {
             }, seriesModel, idx);
         }
 
-        this._updateCommon(data, idx, symbolSize, seriesScope);
+        this._updateCommon(data, idx, symbolSize, seriesScope, opts);
 
         if (isInit) {
             const symbolPath = this.childAt(0) as ECSymbol;
@@ -187,7 +192,8 @@ class Symbol extends graphic.Group {
         data: List,
         idx: number,
         symbolSize: number[],
-        seriesScope?: SymbolDrawSeriesScope
+        seriesScope?: SymbolDrawSeriesScope,
+        opts?: SymbolOpts
     ) {
         const symbolPath = this.childAt(0) as ECSymbol;
         const seriesModel = data.hostModel as SeriesModel;
@@ -263,7 +269,7 @@ class Symbol extends graphic.Group {
         else {
             symbolPath.useStyle(symbolStyle);
         }
-        symbolPath.setColor(visualColor, seriesScope && seriesScope.symbolInnerColor);
+        symbolPath.setColor(visualColor, opts && opts.symbolInnerColor);
         symbolPath.style.strokeNoScale = true;
 
         const liftZ = data.getItemVisual(idx, 'liftZ');
@@ -279,7 +285,7 @@ class Symbol extends graphic.Group {
             this._z2 = null;
         }
 
-        const useNameLabel = seriesScope && seriesScope.useNameLabel;
+        const useNameLabel = opts && opts.useNameLabel;
 
         setLabelStyle(
             symbolPath, labelStatesModels,

diff --git a/src/chart/helper/SymbolDraw.ts b/src/chart/helper/SymbolDraw.ts
@@ -115,10 +115,9 @@ export interface SymbolDrawSeriesScope {
 
     hoverAnimation?: boolean
     itemModel?: Model<SymbolDrawItemModelOption>
-    symbolInnerColor?: ColorString
+
     cursorStyle?: string
     fadeIn?: boolean
-    useNameLabel?: boolean
 }
 
 function makeSeriesScope(data: List): SymbolDrawSeriesScope {

diff --git a/src/chart/sunburst/SunburstPiece.ts b/src/chart/sunburst/SunburstPiece.ts
@@ -127,24 +127,11 @@ class SunburstPiece extends graphic.Sector {
         this._ecModel = ecModel || this._ecModel;
 
         const focus = emphasisModel.get('focus');
-        let focusDataIndices: number[];
-
-        switch (focus) {
-            case 'ancestor':
-                focusDataIndices = [];
-                let currNode = node;
-                while (currNode) {
-                    focusDataIndices.push(currNode.dataIndex);
-                    currNode = currNode.parentNode;
-                }
-                break;
-            case 'descendant':
-                focusDataIndices = [];
-                node.eachNode(childNode => {
-                    focusDataIndices.push(childNode.dataIndex);
-                });
-                break;
-        }
+
+        const focusDataIndices: number[] = focus === 'ancestor'
+            ? node.getAncestorsIndices()
+            : focus === 'descendant' ? node.getDescendantIndices() : null;
+
 
         enableHoverEmphasis(this, focusDataIndices || focus, emphasisModel.get('blurScope'));
     }