Fixed #6401, point.states didn't work for maps.

highcharts · Feb 23, 2017 · 545f87d · 545f87d
1 parent affec87
commit 545f87d
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/js/parts/ColumnSeries.js b/js/parts/ColumnSeries.js
@@ -333,7 +333,8 @@ seriesType('column', 'line', {
 
 		// Select or hover states
 		if (state) {
-			stateOptions = options.states[state];
+			stateOptions = point.options.states && point.options.states[state] || // #6401
+				options.states[state];
 			brightness = stateOptions.brightness;
 			fill = stateOptions.color || 
 				(brightness !== undefined && color(fill).brighten(stateOptions.brightness).get()) ||

diff --git a/samples/unit-tests/point/point/demo.js b/samples/unit-tests/point/point/demo.js
@@ -112,4 +112,44 @@ $(function () {
                 'One occurrence of class name'
             );
         });
+
+    QUnit.test('Point with state options (#6401)',
+        function (assert) {
+            var color = 'red',
+                chart = Highcharts.chart('container', {
+                    chart: {
+                        type: 'column'
+                    },
+                    plotOptions: {
+                        column: {
+                            states: {
+                                hover: {
+                                color: 'blue'
+                              }
+                            }
+                        }
+                    },
+                    series: [{
+                        data: [{
+                            y: 20,
+                            states: {
+                                hover: {
+                                    color: color
+                                }
+                            }
+                        }]
+                    }]
+                });
+
+            chart.series[0].points[0].setState('hover');
+
+            assert.strictEqual(
+                Highcharts.attr(
+                    chart.series[0].points[0].graphic.element,
+                    'fill'
+                ),
+                color,
+                'Correct fill color on hover'
+            );
+        });
 });
diff --git a/samples/unit-tests/series-heatmap/members/demo.js b/samples/unit-tests/series-heatmap/members/demo.js
@@ -26,7 +26,8 @@ QUnit.test('seriesTypes.heatmap.pointClass.setState', function (assert) {
                 },
                 pointAttribs: pointAttribs,
                 zones: []
-            }
+            },
+            options: {}
         };
     setState.call(point, '');
     assert.strictEqual(

diff --git a/samples/unit-tests/series-map/members/demo.js b/samples/unit-tests/series-map/members/demo.js
@@ -26,7 +26,8 @@ QUnit.test('seriesTypes.map.pointClass.setState', function (assert) {
                 },
                 pointAttribs: pointAttribs,
                 zones: []
-            }
+            },
+            options: {}
         };
     setState.call(point, '');
     assert.strictEqual(