Feature: Implemented option to control inactive state of points from …

…a series level. Touch #9899.
highcharts · Mar 19, 2019 · f86f50f · f86f50f
1 parent 76437cf
commit f86f50f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 24 deletions.
diff --git a/js/modules/networkgraph/networkgraph.src.js b/js/modules/networkgraph/networkgraph.src.js
@@ -150,6 +150,7 @@ var addEvent = H.addEvent,
  * @optionparent plotOptions.networkgraph
  */
 seriesType('networkgraph', 'line', {
+    inactiveOtherPoints: true,
     marker: {
         enabled: true,
         states: {
@@ -671,6 +672,11 @@ seriesType('networkgraph', 'line', {
         } else {
             Series.prototype.setState.apply(this, arguments);
         }
+
+        // If simulation is done, re-render points with new states:
+        if (!this.layout.simulation && !state) {
+            this.render();
+        }
     }
 }, {
     setState: H.NodesMixin.setNodeState,

diff --git a/js/modules/sankey.src.js b/js/modules/sankey.src.js
@@ -188,6 +188,7 @@ seriesType('sankey', 'column'
             /** @ignore-option */
             inside: true
         },
+        inactiveOtherPoints: true,
         /**
          * Opacity for the links between nodes in the sankey diagram or
          * dependency wheel.

diff --git a/js/parts/Interaction.js b/js/parts/Interaction.js
@@ -765,11 +765,6 @@ extend(Point.prototype, /** @lends Highcharts.Point.prototype */ {
 
         point.firePointEvent('mouseOut');
 
-        // Reset all inactive states
-        chart.series.forEach(function (series) {
-            series.setState('', true);
-        });
-
         chart.hoverPoints = chart.hoverPoint = null;
     },
 
@@ -1098,8 +1093,11 @@ extend(Series.prototype, /** @lends Highcharts.Series.prototype */ {
             tooltip.hide();
         }
 
-        // set normal state
-        series.setState();
+        // Reset all inactive states
+        chart.series.forEach(function (s) {
+            s.setState('', true);
+        });
+
     },
 
     /**

diff --git a/js/parts/PieSeries.js b/js/parts/PieSeries.js
@@ -335,6 +335,7 @@ seriesType('pie', 'line',
          */
         ignoreHiddenPoint: true,
 
+        inactiveOtherPoints: true,
         /**
          * The size of the inner diameter for the pie. A size greater than 0
          * renders a donut chart. Can be a percentage or pixel value.

diff --git a/js/parts/Pointer.js b/js/parts/Pointer.js
@@ -561,24 +561,29 @@ Highcharts.Pointer.prototype = {
                 }
             });
 
-            // set normal state to previous series
+            // Set normal state to previous series
             if (chart.hoverSeries !== hoverSeries) {
                 hoverSeries.onMouseOver();
             }
 
-            // Do mouseover on all points (#3919, #3985, #4410, #5622)
-            (points || []).forEach(function (p) {
-                p.setState('hover');
-                activeSeries.push(p.series);
-            });
-
             // Set inactive state for all points
-            tooltip.chart.series.forEach(function (inactiveSeries) {
-                if (activeSeries.indexOf(inactiveSeries) === -1) {
+            activeSeries = (points || []).map(function (item) {
+                return item.series;
+            });
+            chart.series.forEach(function (inactiveSeries) {
+                if (
+                    inactiveSeries.options.inactiveOtherPoints ||
+                    activeSeries.indexOf(inactiveSeries) === -1
+                ) {
                     inactiveSeries.setState('inactive', true);
                 }
             });
 
+            // Do mouseover on all points (#3919, #3985, #4410, #5622)
+            (points || []).forEach(function (p) {
+                p.setState('hover');
+            });
+
             // If tracking is on series in stead of on each point,
             // fire mouseOver on hover point. // #4448
             if (chart.hoverPoint) {

diff --git a/js/parts/Tooltip.js b/js/parts/Tooltip.js
@@ -827,19 +827,24 @@ H.Tooltip.prototype = {
 
         // shared tooltip, array is sent over
         if (shared && !(point.series && point.series.noSharedTooltip)) {
+            // Set inactive state for all points
+            activeSeries = point.map(function (item) {
+                return item.series;
+            });
+            chart.series.forEach(function (inactiveSeries) {
+                if (
+                    inactiveSeries.options.inactiveOtherPoints ||
+                    activeSeries.indexOf(inactiveSeries) === -1
+                ) {
+                    inactiveSeries.setState('inactive', true);
+                }
+            });
+
             // Now set hover state for the choosen ones:
             point.forEach(function (item) {
                 item.setState('hover');
 
                 pointConfig.push(item.getLabelConfig());
-                activeSeries.push(item.series);
-            });
-
-            // Set inactive state for all points
-            chart.series.forEach(function (inactiveSeries) {
-                if (activeSeries.indexOf(inactiveSeries) === -1) {
-                    inactiveSeries.setState('inactive', true);
-                }
             });
 
             textConfig = {