highcharts 8.1.0 → 8.2.2

package/es-modules/{modules/accessibility/components → Accessibility/Components}/RangeSelectorComponent.js

@@ -10,15 +10,15 @@
  *
  * */
 'use strict';
-import H from '../../../parts/Globals.js';
-import U from '../../../parts/Utilities.js';
-var extend = U.extend;
 import AccessibilityComponent from '../AccessibilityComponent.js';
-import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
-import ChartUtilities from '../utils/chartUtilities.js';
+import ChartUtilities from '../Utils/ChartUtilities.js';
 var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
-import HTMLUtilities from '../utils/htmlUtilities.js';
+import H from '../../Core/Globals.js';
+import HTMLUtilities from '../Utils/HTMLUtilities.js';
 var setElAttrs = HTMLUtilities.setElAttrs;
+import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
+import U from '../../Core/Utilities.js';
+var extend = U.extend;
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
  * @private
@@ -196,7 +196,8 @@ extend(RangeSelectorComponent.prototype, /** @lends Highcharts.RangeSelectorComp
                 [
                     [
                         keys.tab, keys.up, keys.down
-                    ], function (keyCode, e) {
+                    ],
+                    function (keyCode, e) {
                         var direction = (keyCode === keys.tab && e.shiftKey ||
                             keyCode === keys.up) ? -1 : 1;
                         return component.onInputKbdMove(this, direction);

package/es-modules/Accessibility/Components/SeriesComponent/ForcedMarkers.js

@@ -0,0 +1,171 @@
+/* *
+ *
+ *  (c) 2009-2020 Øystein Moseng
+ *
+ *  Handle forcing series markers.
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ * */
+'use strict';
+import CartesianSeries from '../../../Core/Series/CartesianSeries.js';
+import U from '../../../Core/Utilities.js';
+var addEvent = U.addEvent, merge = U.merge;
+/* eslint-disable no-invalid-this, valid-jsdoc */
+/**
+ * @private
+ */
+function isWithinDescriptionThreshold(series) {
+    var a11yOptions = series.chart.options.accessibility;
+    return series.points.length <
+        a11yOptions.series.pointDescriptionEnabledThreshold ||
+        a11yOptions.series.pointDescriptionEnabledThreshold === false;
+}
+/**
+ * @private
+ */
+function shouldForceMarkers(series) {
+    var chart = series.chart, chartA11yEnabled = chart.options.accessibility.enabled, seriesA11yEnabled = (series.options.accessibility &&
+        series.options.accessibility.enabled) !== false;
+    return chartA11yEnabled && seriesA11yEnabled && isWithinDescriptionThreshold(series);
+}
+/**
+ * @private
+ */
+function hasIndividualPointMarkerOptions(series) {
+    return !!(series._hasPointMarkers && series.points && series.points.length);
+}
+/**
+ * @private
+ */
+function unforceSeriesMarkerOptions(series) {
+    var resetMarkerOptions = series.resetA11yMarkerOptions;
+    if (resetMarkerOptions) {
+        merge(true, series.options, {
+            marker: {
+                enabled: resetMarkerOptions.enabled,
+                states: {
+                    normal: {
+                        opacity: resetMarkerOptions.states &&
+                            resetMarkerOptions.states.normal &&
+                            resetMarkerOptions.states.normal.opacity
+                    }
+                }
+            }
+        });
+    }
+}
+/**
+ * @private
+ */
+function forceZeroOpacityMarkerOptions(options) {
+    merge(true, options, {
+        marker: {
+            enabled: true,
+            states: {
+                normal: {
+                    opacity: 0
+                }
+            }
+        }
+    });
+}
+/**
+ * @private
+ */
+function getPointMarkerOpacity(pointOptions) {
+    return pointOptions.marker.states &&
+        pointOptions.marker.states.normal &&
+        pointOptions.marker.states.normal.opacity || 1;
+}
+/**
+ * @private
+ */
+function unforcePointMarkerOptions(pointOptions) {
+    merge(true, pointOptions.marker, {
+        states: {
+            normal: {
+                opacity: getPointMarkerOpacity(pointOptions)
+            }
+        }
+    });
+}
+/**
+ * @private
+ */
+function handleForcePointMarkers(series) {
+    var i = series.points.length;
+    while (i--) {
+        var point = series.points[i];
+        var pointOptions = point.options;
+        delete point.hasForcedA11yMarker;
+        if (pointOptions.marker) {
+            if (pointOptions.marker.enabled) {
+                unforcePointMarkerOptions(pointOptions);
+                point.hasForcedA11yMarker = false;
+            }
+            else {
+                forceZeroOpacityMarkerOptions(pointOptions);
+                point.hasForcedA11yMarker = true;
+            }
+        }
+    }
+}
+/**
+ * @private
+ */
+function addForceMarkersEvents() {
+    /**
+     * Keep track of forcing markers.
+     * @private
+     */
+    addEvent(CartesianSeries, 'render', function () {
+        var series = this, options = series.options;
+        if (shouldForceMarkers(series)) {
+            if (options.marker && options.marker.enabled === false) {
+                series.a11yMarkersForced = true;
+                forceZeroOpacityMarkerOptions(series.options);
+            }
+            if (hasIndividualPointMarkerOptions(series)) {
+                handleForcePointMarkers(series);
+            }
+        }
+        else if (series.a11yMarkersForced) {
+            delete series.a11yMarkersForced;
+            unforceSeriesMarkerOptions(series);
+        }
+    });
+    /**
+     * Keep track of options to reset markers to if no longer forced.
+     * @private
+     */
+    addEvent(CartesianSeries, 'afterSetOptions', function (e) {
+        this.resetA11yMarkerOptions = merge(e.options.marker || {}, this.userOptions.marker || {});
+    });
+    /**
+     * Process marker graphics after render
+     * @private
+     */
+    addEvent(CartesianSeries, 'afterRender', function () {
+        var series = this;
+        // For styled mode the rendered graphic does not reflect the style
+        // options, and we need to add/remove classes to achieve the same.
+        if (series.chart.styledMode) {
+            if (series.markerGroup) {
+                series.markerGroup[series.a11yMarkersForced ? 'addClass' : 'removeClass']('highcharts-a11y-markers-hidden');
+            }
+            // Do we need to handle individual points?
+            if (hasIndividualPointMarkerOptions(series)) {
+                series.points.forEach(function (point) {
+                    if (point.graphic) {
+                        point.graphic[point.hasForcedA11yMarker ? 'addClass' : 'removeClass']('highcharts-a11y-marker-hidden');
+                        point.graphic[point.hasForcedA11yMarker === false ? 'addClass' : 'removeClass']('highcharts-a11y-marker-visible');
+                    }
+                });
+            }
+        }
+    });
+}
+export default addForceMarkersEvents;

package/es-modules/{modules/accessibility/components → Accessibility/Components}/SeriesComponent/NewDataAnnouncer.js

@@ -10,17 +10,18 @@
  *
  * */
 'use strict';
-import H from '../../../../parts/Globals.js';
-import U from '../../../../parts/Utilities.js';
+import H from '../../../Core/Globals.js';
+import CartesianSeries from '../../../Core/Series/CartesianSeries.js';
+import U from '../../../Core/Utilities.js';
 var extend = U.extend, defined = U.defined;
-import ChartUtilities from '../../utils/chartUtilities.js';
+import ChartUtilities from '../../Utils/ChartUtilities.js';
 var getChartTitle = ChartUtilities.getChartTitle;
 import SeriesDescriber from './SeriesDescriber.js';
 var defaultPointDescriptionFormatter = SeriesDescriber
     .defaultPointDescriptionFormatter, defaultSeriesDescriptionFormatter = SeriesDescriber
     .defaultSeriesDescriptionFormatter;
-import Announcer from '../../utils/Announcer.js';
-import EventProvider from '../../utils/EventProvider.js';
+import Announcer from '../../Utils/Announcer.js';
+import EventProvider from '../../Utils/EventProvider.js';
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
  * @private
@@ -92,13 +93,13 @@ extend(NewDataAnnouncer.prototype, {
         e.addEvent(chart, 'afterDrilldown', function () {
             announcer.lastAnnouncementTime = 0;
         });
-        e.addEvent(H.Series, 'updatedData', function () {
+        e.addEvent(CartesianSeries, 'updatedData', function () {
             announcer.onSeriesUpdatedData(this);
         });
         e.addEvent(chart, 'afterAddSeries', function (e) {
             announcer.onSeriesAdded(e.series);
         });
-        e.addEvent(H.Series, 'addPoint', function (e) {
+        e.addEvent(CartesianSeries, 'addPoint', function (e) {
             announcer.onPointAdded(e.point);
         });
         e.addEvent(chart, 'redraw', function () {

package/es-modules/{modules/accessibility/components → Accessibility/Components}/SeriesComponent/SeriesComponent.js

@@ -10,18 +10,18 @@
  *
  * */
 'use strict';
-import H from '../../../../parts/Globals.js';
-import U from '../../../../parts/Utilities.js';
+import H from '../../../Core/Globals.js';
+import U from '../../../Core/Utilities.js';
 var extend = U.extend;
 import AccessibilityComponent from '../../AccessibilityComponent.js';
 import SeriesKeyboardNavigation from './SeriesKeyboardNavigation.js';
 import NewDataAnnouncer from './NewDataAnnouncer.js';
-import addForceMarkersEvents from './forcedMarkers.js';
-import ChartUtilities from '../../utils/chartUtilities.js';
+import addForceMarkersEvents from './ForcedMarkers.js';
+import ChartUtilities from '../../Utils/ChartUtilities.js';
 var hideSeriesFromAT = ChartUtilities.hideSeriesFromAT;
 import SeriesDescriber from './SeriesDescriber.js';
 var describeSeries = SeriesDescriber.describeSeries;
-import Tooltip from '../../../../parts/Tooltip.js';
+import Tooltip from '../../../Core/Tooltip.js';
 // Expose functionality to users
 H.SeriesAccessibilityDescriber = SeriesDescriber;
 // Handle forcing markers

package/es-modules/{modules/accessibility/components → Accessibility/Components}/SeriesComponent/SeriesDescriber.js

@@ -10,15 +10,15 @@
  *
  * */
 'use strict';
-import U from '../../../../parts/Utilities.js';
-var find = U.find, format = U.format, isNumber = U.isNumber, numberFormat = U.numberFormat, pick = U.pick, defined = U.defined;
 import AnnotationsA11y from '../AnnotationsA11y.js';
 var getPointAnnotationTexts = AnnotationsA11y.getPointAnnotationTexts;
-import HTMLUtilities from '../../utils/htmlUtilities.js';
-var escapeStringForHTML = HTMLUtilities.escapeStringForHTML, reverseChildNodes = HTMLUtilities.reverseChildNodes, stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString;
-import ChartUtilities from '../../utils/chartUtilities.js';
+import ChartUtilities from '../../Utils/ChartUtilities.js';
 var getAxisDescription = ChartUtilities.getAxisDescription, getSeriesFirstPointElement = ChartUtilities.getSeriesFirstPointElement, getSeriesA11yElement = ChartUtilities.getSeriesA11yElement, unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
-import Tooltip from '../../../../parts/Tooltip.js';
+import HTMLUtilities from '../../Utils/HTMLUtilities.js';
+var escapeStringForHTML = HTMLUtilities.escapeStringForHTML, reverseChildNodes = HTMLUtilities.reverseChildNodes, stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString;
+import Tooltip from '../../../Core/Tooltip.js';
+import U from '../../../Core/Utilities.js';
+var find = U.find, format = U.format, isNumber = U.isNumber, numberFormat = U.numberFormat, pick = U.pick, defined = U.defined;
 /* eslint-disable valid-jsdoc */
 /**
  * @private

package/es-modules/{modules/accessibility/components → Accessibility/Components}/SeriesComponent/SeriesKeyboardNavigation.js

@@ -10,23 +10,28 @@
  *
  * */
 'use strict';
-import H from '../../../../parts/Globals.js';
-import Point from '../../../../parts/Point.js';
-import U from '../../../../parts/Utilities.js';
-var extend = U.extend, defined = U.defined;
+import Series from '../../../Core/Series/Series.js';
+var seriesTypes = Series.seriesTypes;
+import CartesianSeries from '../../../Core/Series/CartesianSeries.js';
+import Chart from '../../../Core/Chart/Chart.js';
+import Point from '../../../Core/Series/Point.js';
+import U from '../../../Core/Utilities.js';
+var defined = U.defined, extend = U.extend;
 import KeyboardNavigationHandler from '../../KeyboardNavigationHandler.js';
-import EventProvider from '../../utils/EventProvider.js';
-import ChartUtilities from '../../utils/chartUtilities.js';
+import EventProvider from '../../Utils/EventProvider.js';
+import ChartUtilities from '../../Utils/ChartUtilities.js';
 var getPointFromXY = ChartUtilities.getPointFromXY, getSeriesFromName = ChartUtilities.getSeriesFromName, scrollToPoint = ChartUtilities.scrollToPoint;
+import '../../../Series/ColumnSeries.js';
+import '../../../Series/PieSeries.js';
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /*
  * Set for which series types it makes sense to move to the closest point with
  * up/down arrows, and which series types should just move to next series.
  */
-H.Series.prototype.keyboardMoveVertical = true;
+CartesianSeries.prototype.keyboardMoveVertical = true;
 ['column', 'pie'].forEach(function (type) {
-    if (H.seriesTypes[type]) {
-        H.seriesTypes[type].prototype.keyboardMoveVertical = false;
+    if (seriesTypes[type]) {
+        seriesTypes[type].prototype.keyboardMoveVertical = false;
     }
 });
 /**
@@ -175,7 +180,7 @@ Point.prototype.highlight = function () {
  *         Returns highlighted point on success, false on failure (no adjacent
  *         point to highlight in chosen direction).
  */
-H.Chart.prototype.highlightAdjacentPoint = function (next) {
+Chart.prototype.highlightAdjacentPoint = function (next) {
     var chart = this, series = chart.series, curPoint = chart.highlightedPoint, curPointIndex = curPoint && getPointIndex(curPoint) || 0, curPoints = (curPoint && curPoint.series.points), lastSeries = chart.series && chart.series[chart.series.length - 1], lastPoint = lastSeries && lastSeries.points &&
         lastSeries.points[lastSeries.points.length - 1], newSeries, newPoint;
     // If no points, return false
@@ -231,7 +236,7 @@ H.Chart.prototype.highlightAdjacentPoint = function (next) {
  *
  * @return {boolean|Highcharts.Point}
  */
-H.Series.prototype.highlightFirstValidPoint = function () {
+CartesianSeries.prototype.highlightFirstValidPoint = function () {
     var curPoint = this.chart.highlightedPoint, start = (curPoint && curPoint.series) === this ?
         getPointIndex(curPoint) :
         0, points = this.points, len = points.length;
@@ -260,7 +265,7 @@ H.Series.prototype.highlightFirstValidPoint = function () {
  *
  * @return {Highcharts.Point|boolean}
  */
-H.Chart.prototype.highlightAdjacentSeries = function (down) {
+Chart.prototype.highlightAdjacentSeries = function (down) {
     var chart = this, newSeries, newPoint, adjacentNewPoint, curPoint = chart.highlightedPoint, lastSeries = chart.series && chart.series[chart.series.length - 1], lastPoint = lastSeries && lastSeries.points &&
         lastSeries.points[lastSeries.points.length - 1];
     // If no point is highlighted, highlight the first/last point
@@ -307,7 +312,7 @@ H.Chart.prototype.highlightAdjacentSeries = function (down) {
  *
  * @return {Highcharts.Point|boolean}
  */
-H.Chart.prototype.highlightAdjacentPointVertical = function (down) {
+Chart.prototype.highlightAdjacentPointVertical = function (down) {
     var curPoint = this.highlightedPoint, minDistance = Infinity, bestPoint;
     if (!defined(curPoint.plotX) || !defined(curPoint.plotY)) {
         return false;
@@ -397,7 +402,7 @@ extend(SeriesKeyboardNavigation.prototype, /** @lends Highcharts.SeriesKeyboardN
      */
     init: function () {
         var keyboardNavigation = this, chart = this.chart, e = this.eventProvider = new EventProvider();
-        e.addEvent(H.Series, 'destroy', function () {
+        e.addEvent(CartesianSeries, 'destroy', function () {
             return keyboardNavigation.onSeriesDestroy(this);
         });
         e.addEvent(chart, 'afterDrilldown', function () {
@@ -442,16 +447,13 @@ extend(SeriesKeyboardNavigation.prototype, /** @lends Highcharts.SeriesKeyboardN
         var keyboardNavigation = this, keys = this.keyCodes, chart = this.chart, inverted = chart.inverted;
         return new KeyboardNavigationHandler(chart, {
             keyCodeMap: [
-                [inverted ? [keys.up, keys.down] : [keys.left, keys.right],
-                    function (keyCode) {
+                [inverted ? [keys.up, keys.down] : [keys.left, keys.right], function (keyCode) {
                         return keyboardNavigation.onKbdSideways(this, keyCode);
                     }],
-                [inverted ? [keys.left, keys.right] : [keys.up, keys.down],
-                    function (keyCode) {
+                [inverted ? [keys.left, keys.right] : [keys.up, keys.down], function (keyCode) {
                         return keyboardNavigation.onKbdVertical(this, keyCode);
                     }],
-                [[keys.enter, keys.space],
-                    function () {
+                [[keys.enter, keys.space], function () {
                         if (chart.highlightedPoint) {
                             chart.highlightedPoint.firePointEvent('click');
                         }

package/es-modules/{modules/accessibility/components → Accessibility/Components}/ZoomComponent.js

@@ -10,15 +10,16 @@
  *
  * */
 'use strict';
-import H from '../../../parts/Globals.js';
-import U from '../../../parts/Utilities.js';
-var extend = U.extend, pick = U.pick;
 import AccessibilityComponent from '../AccessibilityComponent.js';
-import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
-import ChartUtilities from '../utils/chartUtilities.js';
+import ChartUtilities from '../Utils/ChartUtilities.js';
 var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
-import HTMLUtilities from '../utils/htmlUtilities.js';
-var setElAttrs = HTMLUtilities.setElAttrs, removeElement = HTMLUtilities.removeElement;
+import H from '../../Core/Globals.js';
+var noop = H.noop;
+import HTMLUtilities from '../Utils/HTMLUtilities.js';
+var removeElement = HTMLUtilities.removeElement, setElAttrs = HTMLUtilities.setElAttrs;
+import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
+import U from '../../Core/Utilities.js';
+var extend = U.extend, pick = U.pick;
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
  * @private
@@ -57,7 +58,7 @@ H.Axis.prototype.panStep = function (direction, granularity) {
  * @class
  * @name Highcharts.ZoomComponent
  */
-var ZoomComponent = function () { };
+var ZoomComponent = noop;
 ZoomComponent.prototype = new AccessibilityComponent();
 extend(ZoomComponent.prototype, /** @lends Highcharts.ZoomComponent */ {
     /**

package/es-modules/{modules/accessibility/focusBorder.js → Accessibility/FocusBorder.js}

@@ -10,8 +10,10 @@
  *
  * */
 'use strict';
-import H from '../../parts/Globals.js';
-import U from '../../parts/Utilities.js';
+import H from '../Core/Globals.js';
+import SVGElement from '../Core/Renderer/SVG/SVGElement.js';
+import SVGLabel from '../Core/Renderer/SVG/SVGLabel.js';
+import U from '../Core/Utilities.js';
 var addEvent = U.addEvent, extend = U.extend, pick = U.pick;
 /* eslint-disable no-invalid-this, valid-jsdoc */
 // Attributes that trigger a focus border update
@@ -21,7 +23,7 @@ var svgElementBorderUpdateTriggers = [
 /**
  * Add hook to destroy focus border if SVG element is destroyed, unless
  * hook already exists.
- *
+ * @private
  * @param el Element to add destroy hook to
  */
 function addDestroyFocusBorderHook(el) {
@@ -39,7 +41,7 @@ function addDestroyFocusBorderHook(el) {
 /**
  * Remove hook from SVG element added by addDestroyFocusBorderHook, if
  * existing.
- *
+ * @private
  * @param el Element to remove destroy hook from
  */
 function removeDestroyFocusBorderHook(el) {
@@ -52,7 +54,7 @@ function removeDestroyFocusBorderHook(el) {
 /**
  * Add hooks to update the focus border of an element when the element
  * size/position is updated, unless already added.
- *
+ * @private
  * @param el Element to add update hooks to
  * @param updateParams Parameters to pass through to addFocusBorder when updating.
  */
@@ -79,7 +81,7 @@ function addUpdateFocusBorderHooks(el) {
 /**
  * Remove hooks from SVG element added by addUpdateFocusBorderHooks, if
  * existing.
- *
+ * @private
  * @param el Element to remove update hooks from
  */
 function removeUpdateFocusBorderHooks(el) {
@@ -101,7 +103,7 @@ function removeUpdateFocusBorderHooks(el) {
  * Add focus border functionality to SVGElements. Draws a new rect on top of
  * element around its bounding box. This is used by multiple components.
  */
-extend(H.SVGElement.prototype, {
+extend(SVGElement.prototype, {
     /**
      * @private
      * @function Highcharts.SVGElement#addFocusBorder
@@ -146,15 +148,16 @@ extend(H.SVGElement.prototype, {
                 y: posYCorrection
             };
         }
-        if (this.element.nodeName === 'text' || this.isLabel) {
-            var isRotated = !!this.rotation, correction = !this.isLabel ? getTextAnchorCorrection(this) :
+        var isLabel = this instanceof SVGLabel;
+        if (this.element.nodeName === 'text' || isLabel) {
+            var isRotated = !!this.rotation, correction = !isLabel ? getTextAnchorCorrection(this) :
                 {
                     x: isRotated ? 1 : 0,
                     y: 0
                 };
             borderPosX = +this.attr('x') - (bb.width * correction.x) - pad;
             borderPosY = +this.attr('y') - (bb.height * correction.y) - pad;
-            if (this.isLabel && isRotated) {
+            if (isLabel && isRotated) {
                 var temp = borderWidth;
                 borderWidth = borderHeight;
                 borderHeight = temp;

package/es-modules/{modules/accessibility/high-contrast-mode.js → Accessibility/HighContrastMode.js}

@@ -10,7 +10,7 @@
  *
  * */
 'use strict';
-import H from '../../parts/Globals.js';
+import H from '../Core/Globals.js';
 var isMS = H.isMS, win = H.win, doc = win.document;
 var whcm = {
     /**
@@ -29,7 +29,8 @@ var whcm = {
         // Test BG image for IE
         if (isMS && win.getComputedStyle) {
             var testDiv = doc.createElement('div');
-            testDiv.style.backgroundImage = 'url(#)';
+            var imageSrc = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
+            testDiv.style.backgroundImage = "url(" + imageSrc + ")"; // #13071
             doc.body.appendChild(testDiv);
             var bi = (testDiv.currentStyle ||
                 win.getComputedStyle(testDiv)).backgroundImage;

package/es-modules/{modules/accessibility → Accessibility}/KeyboardNavigation.js

@@ -10,13 +10,13 @@
  *
  * */
 'use strict';
-import H from '../../parts/Globals.js';
-var win = H.win, doc = win.document;
-import U from '../../parts/Utilities.js';
+import H from '../Core/Globals.js';
+var doc = H.doc, win = H.win;
+import U from '../Core/Utilities.js';
 var addEvent = U.addEvent, fireEvent = U.fireEvent;
-import HTMLUtilities from './utils/htmlUtilities.js';
+import HTMLUtilities from './Utils/HTMLUtilities.js';
 var getElement = HTMLUtilities.getElement;
-import EventProvider from './utils/EventProvider.js';
+import EventProvider from './Utils/EventProvider.js';
 /* eslint-disable valid-jsdoc */
 // Add event listener to document to detect ESC key press and dismiss
 // hover/popup content.
@@ -76,11 +76,17 @@ KeyboardNavigation.prototype = {
         this.components = components;
         this.modules = [];
         this.currentModuleIx = 0;
-        ep.addEvent(chart.renderTo, 'keydown', function (e) { return _this.onKeydown(e); });
-        ep.addEvent(chart.container, 'focus', function (e) { return _this.onFocus(e); });
-        ep.addEvent(doc, 'mouseup', function () { return _this.onMouseUp(); });
-        ep.addEvent(chart.renderTo, 'mousedown', function () {
-            _this.isClickingChart = true;
+        // Run an update to get all modules
+        this.update();
+        ep.addEvent(this.tabindexContainer, 'keydown', function (e) { return _this.onKeydown(e); });
+        ep.addEvent(this.tabindexContainer, 'focus', function (e) { return _this.onFocus(e); });
+        ['mouseup', 'touchend'].forEach(function (eventName) {
+            return ep.addEvent(doc, eventName, function () { return _this.onMouseUp(); });
+        });
+        ['mousedown', 'touchstart'].forEach(function (eventName) {
+            return ep.addEvent(chart.renderTo, eventName, function () {
+                _this.isClickingChart = true;
+            });
         });
         ep.addEvent(chart.renderTo, 'mouseover', function () {
             _this.pointerIsOverChart = true;
@@ -88,8 +94,6 @@ KeyboardNavigation.prototype = {
         ep.addEvent(chart.renderTo, 'mouseout', function () {
             _this.pointerIsOverChart = false;
         });
-        // Run an update to get all modules
-        this.update();
         // Init first module
         if (this.modules.length) {
             this.modules[0].init(1);
@@ -234,7 +238,7 @@ KeyboardNavigation.prototype = {
             this.exitAnchor.focus();
         }
         else {
-            this.chart.container.focus();
+            this.tabindexContainer.focus();
         }
         return false;
     },
@@ -261,20 +265,31 @@ KeyboardNavigation.prototype = {
      * @private
      */
     updateContainerTabindex: function () {
-        var a11yOptions = this.chart.options.accessibility, keyboardOptions = a11yOptions && a11yOptions.keyboardNavigation, shouldHaveTabindex = !(keyboardOptions && keyboardOptions.enabled === false), container = this.chart.container, curTabindex = container.getAttribute('tabIndex');
+        var a11yOptions = this.chart.options.accessibility, keyboardOptions = a11yOptions && a11yOptions.keyboardNavigation, shouldHaveTabindex = !(keyboardOptions && keyboardOptions.enabled === false), chart = this.chart, container = chart.container;
+        var tabindexContainer;
+        if (chart.renderTo.hasAttribute('tabindex')) {
+            container.removeAttribute('tabindex');
+            tabindexContainer = chart.renderTo;
+        }
+        else {
+            tabindexContainer = container;
+        }
+        this.tabindexContainer = tabindexContainer;
+        var curTabindex = tabindexContainer.getAttribute('tabindex');
         if (shouldHaveTabindex && !curTabindex) {
-            container.setAttribute('tabindex', '0');
+            tabindexContainer.setAttribute('tabindex', '0');
         }
-        else if (!shouldHaveTabindex && curTabindex === '0') {
-            container.removeAttribute('tabindex');
+        else if (!shouldHaveTabindex) {
+            chart.container.removeAttribute('tabindex');
         }
     },
     /**
      * @private
      */
     makeElementAnExitAnchor: function (el) {
+        var chartTabindex = this.tabindexContainer.getAttribute('tabindex') || 0;
         el.setAttribute('class', 'highcharts-exit-anchor');
-        el.setAttribute('tabindex', '0');
+        el.setAttribute('tabindex', chartTabindex);
         el.setAttribute('aria-hidden', false);
         // Handle focus
         this.addExitAnchorEventsToEl(el);
@@ -308,7 +323,7 @@ KeyboardNavigation.prototype = {
             var e = ev || win.event, curModule, focusComesFromChart = (e.relatedTarget &&
                 chart.container.contains(e.relatedTarget)), comingInBackwards = !(focusComesFromChart || keyboardNavigation.exiting);
             if (comingInBackwards) {
-                chart.renderTo.focus();
+                keyboardNavigation.tabindexContainer.focus();
                 e.preventDefault();
                 // Move to last valid keyboard nav module
                 // Note the we don't run it, just set the index
@@ -342,9 +357,7 @@ KeyboardNavigation.prototype = {
     destroy: function () {
         this.removeExitAnchor();
         this.eventProvider.removeAddedEvents();
-        if (this.chart.container.getAttribute('tabindex') === '0') {
-            this.chart.container.removeAttribute('tabindex');
-        }
+        this.chart.container.removeAttribute('tabindex');
     }
 };
 export default KeyboardNavigation;

package/es-modules/{modules/accessibility → Accessibility}/KeyboardNavigationHandler.js

@@ -10,7 +10,7 @@
  *
  * */
 'use strict';
-import U from '../../parts/Utilities.js';
+import U from '../Core/Utilities.js';
 var find = U.find;
 /**
  * Options for the keyboard navigation handler.