ts: fix types

src/chart/bar/BaseBarSeries.ts

@@ -30,7 +30,8 @@ import Cartesian2D from '../../coord/cartesian/Cartesian2D';
 import List from '../../data/List';
 
 
-export interface BaseBarSeriesOption<StateOption, ExtraStateOption> extends SeriesOption<StateOption, ExtraStateOption>,
+export interface BaseBarSeriesOption<StateOption, ExtraStateOption = unknown>
+    extends SeriesOption<StateOption, ExtraStateOption>,
     SeriesOnCartesianOptionMixin,
     SeriesOnPolarOptionMixin {
 
@@ -70,7 +71,7 @@ export interface BaseBarSeriesOption<StateOption, ExtraStateOption> extends Seri
     largeThreshold?: number
 }
 
-class BaseBarSeriesModel<Opts extends BaseBarSeriesOption<unknown, unknown> = BaseBarSeriesOption<unknown, unknown>>
+class BaseBarSeriesModel<Opts extends BaseBarSeriesOption<unknown> = BaseBarSeriesOption<unknown>>
     extends SeriesModel<Opts> {
 
     static type = 'series.__base_bar__';

src/chart/sankey/SankeySeries.ts

@@ -56,8 +56,14 @@ interface SankeyEdgeStyleOption extends LineStyleOption {
     curveness?: number
 }
 
+interface ExtraStateOption {
+    emphasis?: {
+        focus?: 'adjacency'
+    }
+}
+
 export interface SankeyNodeItemOption extends SankeyNodeStateOption,
-    StatesOptionMixin<SankeyNodeStateOption, 'adjacency'>,
+    StatesOptionMixin<SankeyNodeStateOption, ExtraStateOption>,
     OptionDataItemObject<OptionDataValue> {
     id?: string
 
@@ -72,7 +78,7 @@ export interface SankeyNodeItemOption extends SankeyNodeStateOption,
 }
 
 export interface SankeyEdgeItemOption
-    extends SankeyEdgeStateOption, StatesOptionMixin<SankeyEdgeStateOption, 'adjacency'> {
+    extends SankeyEdgeStateOption, StatesOptionMixin<SankeyEdgeStateOption, ExtraStateOption> {
     /**
      * Name or index of source node.
      */
@@ -89,7 +95,8 @@ export interface SankeyLevelOption {
     depth: number
 }
 
-export interface SankeySeriesOption extends SeriesOption<SankeyBothStateOption, 'adjacency'>, SankeyBothStateOption,
+export interface SankeySeriesOption
+    extends SeriesOption<SankeyBothStateOption, ExtraStateOption>, SankeyBothStateOption,
     BoxLayoutOptionMixin {
     type?: 'sankey'
 

src/chart/sunburst/SunburstSeries.ts

@@ -48,13 +48,19 @@ interface SunburstDataParams extends CallbackDataParams {
     }[]
 }
 
+interface ExtraStateOption {
+    emphasis?: {
+        focus?: 'descendant' | 'ancestor'
+    }
+}
+
 export interface SunburstStateOption {
     itemStyle?: ItemStyleOption
     label?: SunburstLabelOption
 }
 
 export interface SunburstSeriesNodeItemOption extends
-    SunburstStateOption, StatesOptionMixin<SunburstStateOption, 'descendant' | 'ancestor'>,
+    SunburstStateOption, StatesOptionMixin<SunburstStateOption, ExtraStateOption>,
     OptionDataItemObject<OptionDataValue>
 {
     nodeClick?: 'rootToNode' | 'link'
@@ -75,7 +81,7 @@ export interface SunburstSeriesLevelOption extends SunburstStateOption, StatesOp
     }
 }
 export interface SunburstSeriesOption extends
-    SeriesOption<SunburstStateOption, 'descendant' | 'ancestor'>, SunburstStateOption,
+    SeriesOption<SunburstStateOption, ExtraStateOption>, SunburstStateOption,
     CircleLayoutOptionMixin {
 
     type?: 'sunburst'

src/chart/treemap/TreemapSeries.ts

@@ -72,6 +72,12 @@ interface TreemapSeriesCallbackDataParams extends CallbackDataParams {
     treePathInfo?: TreePathInfo[]
 }
 
+interface ExtraStateOption {
+    emphasis?: {
+        focus?: 'descendant' | 'ancestor'
+    }
+}
+
 export interface TreemapStateOption {
     itemStyle?: TreemapSeriesItemStyleOption
     label?: TreemapSeriesLabelOption
@@ -106,13 +112,13 @@ export interface TreemapSeriesVisualOption {
 }
 
 export interface TreemapSeriesLevelOption extends TreemapSeriesVisualOption,
-    TreemapStateOption, StatesOptionMixin<TreemapStateOption, 'ancestor' | 'descendant'> {
+    TreemapStateOption, StatesOptionMixin<TreemapStateOption, ExtraStateOption> {
 
     color?: ColorString[] | 'none'
 }
 
 export interface TreemapSeriesNodeItemOption extends TreemapSeriesVisualOption,
-    TreemapStateOption, StatesOptionMixin<TreemapStateOption, 'ancestor' | 'descendant'> {
+    TreemapStateOption, StatesOptionMixin<TreemapStateOption, ExtraStateOption> {
     id?: string
     name?: string
 
@@ -124,7 +130,7 @@ export interface TreemapSeriesNodeItemOption extends TreemapSeriesVisualOption,
 }
 
 export interface TreemapSeriesOption
-    extends SeriesOption<TreemapStateOption, 'ancestor' | 'descendant'>, TreemapStateOption,
+    extends SeriesOption<TreemapStateOption, ExtraStateOption>, TreemapStateOption,
     BoxLayoutOptionMixin,
     RoamOptionMixin,
     TreemapSeriesVisualOption {

src/component/helper/selectableMixin.ts

@@ -25,7 +25,7 @@
 
 import * as zrUtil from 'zrender/src/core/util';
 import Model from '../../model/Model';
-import { Dictionary } from 'zrender/src/core/types';
+import { Dictionary } from '../../util/types';
 
 export interface SelectableTarget {
     name?: string;
@@ -33,7 +33,8 @@ export interface SelectableTarget {
 };
 
 export interface DataSelectableOptionMixin {
-    selected?: Dictionary<boolean>
+    // selectedIndices?: number[]
+    selectedMap?: Dictionary<boolean>
     selectedMode?: 'single' | 'multiple' | boolean
 }
 
@@ -46,7 +47,6 @@ class DataSelectableMixin<Opt extends DataSelectableOptionMixin> {
     // Key: target.name
     private _selectTargetMap: zrUtil.HashMap<SelectableTarget>;
 
-
     /**
      * @param targetList [{name, value, selected}, ...]
      *        If targetList is an array, it should like [{name: ..., value: ...}, ...].

src/preprocessor/backwardCompat.ts

@@ -122,7 +122,9 @@ function compatGraphFocus(option: Dictionary<any>) {
     if (option.focusNodeAdjacency != null) {
         option.emphasis = option.emphasis || {};
         if (option.emphasis.focus == null) {
-            deprecateLog('`focusNodeAdjacency` in graph/sankey has been changed to `emphasis: { focus: \'adjacency\'}`');
+            deprecateLog(
+                '`focusNodeAdjacency` in graph/sankey has been changed to `emphasis: { focus: \'adjacency\'}`'
+            );
             option.emphasis.focus = 'adjacency';
         }
     }

src/util/types.ts

@@ -1167,7 +1167,8 @@ export interface StatesOptionMixin<StateOption = unknown, ExtraStateOpts extends
          * series: Focus series and blur all other series.
          */
         focus?: 'none' | 'self' | 'series' |
-            (ExtraStateOpts extends unknown ? never : ExtraStateOpts['emphasis']['focus'])
+            (unknown extends ExtraStateOpts['emphasis']['focus']
+                ? never : ExtraStateOpts['emphasis']['focus'])
 
         /**
          * Scope of blurred element when focus.

test/hoverFocus2.html

@@ -67,9 +67,9 @@ under the License.
                         changeFocus({ blurScope: 'coordinateSystem' });
                     }
                 }, {
-                    text: 'Set blurScope: all',
+                    text: 'Set blurScope: global',
                     onclick: function () {
-                        changeFocus({ blurScope: 'all' });
+                        changeFocus({ blurScope: 'global' });
                     }
                 }];
             }