Merge pull request #18524 from juliepagano/fix-18495

feat(axisPointer): add option to disable emphasis. close #18495
apache · Apr 19, 2023 · 6b4f895 · 6b4f895
2 parents f5bb3b0 + 8041cde
commit 6b4f895
Show file tree

Hide file tree

Showing 7 changed files with 225 additions and 4 deletions.
diff --git a/src/component/axisPointer/AxisPointerModel.ts b/src/component/axisPointer/AxisPointerModel.ts
@@ -88,6 +88,7 @@ class AxisPointerModel extends ComponentModel<AxisPointerOption> {
         // see `modelHelper`.
         snap: false,
         triggerTooltip: true,
+        triggerEmphasis: true,
 
         value: null,
         status: null, // Init value depends on whether handle is used.

diff --git a/src/component/axisPointer/axisTrigger.ts b/src/component/axisPointer/axisTrigger.ts
@@ -462,7 +462,7 @@ function dispatchHighDownActually(
     // Build hash map and remove duplicate incidentally.
     each(axesInfo, function (axisInfo, key) {
         const option = axisInfo.axisPointerModel.option;
-        option.status === 'show' && each(option.seriesDataIndices, function (batchItem) {
+        option.status === 'show' && axisInfo.triggerEmphasis && each(option.seriesDataIndices, function (batchItem) {
             const key = batchItem.seriesIndex + ' | ' + batchItem.dataIndex;
             newHighlights[key] = batchItem;
         });

diff --git a/src/component/axisPointer/modelHelper.ts b/src/component/axisPointer/modelHelper.ts
@@ -49,6 +49,7 @@ interface AxisInfo {
     coordSys: CoordinateSystemMaster
     axisPointerModel: Model<CommonAxisPointerOption>
     triggerTooltip: boolean
+    triggerEmphasis: boolean
     involveSeries: boolean
     snap: boolean
     useHandle: boolean
@@ -87,6 +88,7 @@ export function collect(ecModel: GlobalModel, api: ExtensionAPI) {
          *      coordSys,
          *      axisPointerModel,
          *      triggerTooltip,
+         *      triggerEmphasis,
          *      involveSeries,
          *      snap,
          *      seriesModels,
@@ -194,6 +196,7 @@ function collectAxesInfo(result: CollectionResult, ecModel: GlobalModel, api: Ex
                 : axisPointerModel;
 
             const snap = axisPointerModel.get('snap');
+            const triggerEmphasis = axisPointerModel.get('triggerEmphasis');
             const axisKey = makeKey(axis.model);
             const involveSeries = triggerTooltip || snap || axis.type === 'category';
 
@@ -204,6 +207,7 @@ function collectAxesInfo(result: CollectionResult, ecModel: GlobalModel, api: Ex
                 coordSys: coordSys,
                 axisPointerModel: axisPointerModel,
                 triggerTooltip: triggerTooltip,
+                triggerEmphasis: triggerEmphasis,
                 involveSeries: involveSeries,
                 snap: snap,
                 useHandle: isHandleTrigger(axisPointerModel),

diff --git a/src/util/types.ts b/src/util/types.ts
@@ -1376,6 +1376,8 @@ export interface CommonAxisPointerOption {
 
     triggerTooltip?: boolean
 
+    triggerEmphasis?: boolean
+
     /**
      * current value. When using axisPointer.handle, value can be set to define the initial position of axisPointer.
      */

diff --git a/test/runTest/actions/__meta__.json b/test/runTest/actions/__meta__.json
diff --git a/test/runTest/actions/tooltip-axisPointer2.json b/test/runTest/actions/tooltip-axisPointer2.json
diff --git a/test/tooltip-axisPointer2.html b/test/tooltip-axisPointer2.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -1376,6 +1376,8 @@ export interface CommonAxisPointerOption { @@
         triggerTooltip?: boolean
+        triggerEmphasis?: boolean
         /**
          * current value. When using axisPointer.handle, value can be set to define the initial position of axisPointer.
          */
@@ Expand Down @@