highcharts 8.1.0 → 8.2.2

package/modules/accessibility.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v8.1.0 (2020-05-05)
+ * @license Highcharts JS v8.2.2 (2020-10-22)
  *
  * Accessibility module
  *
@@ -29,7 +29,7 @@
             obj[path] = fn.apply(null, args);
         }
     }
-    _registerModule(_modules, 'modules/accessibility/utils/htmlUtilities.js', [_modules['parts/Utilities.js'], _modules['parts/Globals.js']], function (U, H) {
+    _registerModule(_modules, 'Accessibility/Utils/HTMLUtilities.js', [_modules['Core/Globals.js'], _modules['Core/Utilities.js']], function (H, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -41,9 +41,9 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
+        var doc = H.doc,
+            win = H.win;
         var merge = U.merge;
-        var win = H.win,
-            doc = win.document;
         /* eslint-disable valid-jsdoc */
         /**
          * @private
@@ -203,7 +203,7 @@
 
         return HTMLUtilities;
     });
-    _registerModule(_modules, 'modules/accessibility/utils/chartUtilities.js', [_modules['modules/accessibility/utils/htmlUtilities.js'], _modules['parts/Utilities.js']], function (HTMLUtilities, U) {
+    _registerModule(_modules, 'Accessibility/Utils/ChartUtilities.js', [_modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Core/Utilities.js']], function (HTMLUtilities, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -217,7 +217,8 @@
          * */
         var stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString;
         var defined = U.defined,
-            find = U.find;
+            find = U.find,
+            fireEvent = U.fireEvent;
         /* eslint-disable valid-jsdoc */
         /**
          * @return {string}
@@ -248,10 +249,12 @@
          * The DOM element for the point.
          */
         function getSeriesFirstPointElement(series) {
-            if (series.points &&
-                series.points.length &&
-                series.points[0].graphic) {
-                return series.points[0].graphic.element;
+            var _a,
+                _b;
+            if ((_a = series.points) === null || _a === void 0 ? void 0 : _a.length) {
+                var firstPointWithGraphic = find(series.points,
+                    function (p) { return !!p.graphic; });
+                return (_b = firstPointWithGraphic === null || firstPointWithGraphic === void 0 ? void 0 : firstPointWithGraphic.graphic) === null || _b === void 0 ? void 0 : _b.element;
             }
         }
         /**
@@ -275,7 +278,6 @@
          * @private
          * @param {Highcharts.Chart} chart
          * @param {Highcharts.HTMLDOMElement|Highcharts.SVGDOMElement} element
-         * @return {void}
          */
         function unhideChartElementFromAT(chart, element) {
             element.setAttribute('aria-hidden', false);
@@ -372,7 +374,7 @@
                 var pos = getRelativePointAxisPosition(axis,
                     point);
                 scrollbar.updatePosition(pos - range / 2, pos + range / 2);
-                Highcharts.fireEvent(scrollbar, 'changed', {
+                fireEvent(scrollbar, 'changed', {
                     from: scrollbar.from,
                     to: scrollbar.to,
                     trigger: 'scrollbar',
@@ -394,7 +396,7 @@
 
         return ChartUtilities;
     });
-    _registerModule(_modules, 'modules/accessibility/KeyboardNavigationHandler.js', [_modules['parts/Utilities.js']], function (U) {
+    _registerModule(_modules, 'Accessibility/KeyboardNavigationHandler.js', [_modules['Core/Utilities.js']], function (U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -497,107 +499,107 @@
 
         return KeyboardNavigationHandler;
     });
-    _registerModule(_modules, 'modules/accessibility/utils/EventProvider.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js']], function (H, U) {
+    _registerModule(_modules, 'Accessibility/Utils/DOMElementProvider.js', [_modules['Core/Globals.js'], _modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Core/Utilities.js']], function (H, HTMLUtilities, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
          *
-         *  Class that can keep track of events added, and clean them up on destroy.
+         *  Class that can keep track of elements added to DOM and clean them up on
+         *  destroy.
          *
          *  License: www.highcharts.com/license
          *
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var addEvent = U.addEvent,
-            extend = U.extend;
+        var doc = H.doc;
+        var removeElement = HTMLUtilities.removeElement;
+        var extend = U.extend;
         /* eslint-disable no-invalid-this, valid-jsdoc */
         /**
          * @private
          * @class
          */
-        var EventProvider = function () {
-                this.eventRemovers = [];
+        var DOMElementProvider = function () {
+                this.elements = [];
         };
-        extend(EventProvider.prototype, {
+        extend(DOMElementProvider.prototype, {
             /**
-             * Add an event to an element and keep track of it for later removal.
-             * Same args as Highcharts.addEvent.
+             * Create an element and keep track of it for later removal.
+             * Same args as document.createElement
              * @private
-             * @return {Function}
              */
-            addEvent: function () {
-                var remover = addEvent.apply(H,
+            createElement: function () {
+                var el = doc.createElement.apply(doc,
                     arguments);
-                this.eventRemovers.push(remover);
-                return remover;
+                this.elements.push(el);
+                return el;
             },
             /**
-             * Remove all added events.
+             * Destroy all created elements, removing them from the DOM.
              * @private
-             * @return {void}
              */
-            removeAddedEvents: function () {
-                this.eventRemovers.forEach(function (remover) {
-                    remover();
+            destroyCreatedElements: function () {
+                this.elements.forEach(function (element) {
+                    removeElement(element);
                 });
-                this.eventRemovers = [];
+                this.elements = [];
             }
         });
 
-        return EventProvider;
+        return DOMElementProvider;
     });
-    _registerModule(_modules, 'modules/accessibility/utils/DOMElementProvider.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (H, U, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Utils/EventProvider.js', [_modules['Core/Globals.js'], _modules['Core/Utilities.js']], function (H, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
          *
-         *  Class that can keep track of elements added to DOM and clean them up on
-         *  destroy.
+         *  Class that can keep track of events added, and clean them up on destroy.
          *
          *  License: www.highcharts.com/license
          *
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var doc = H.win.document;
-        var extend = U.extend;
-        var removeElement = HTMLUtilities.removeElement;
+        var addEvent = U.addEvent,
+            extend = U.extend;
         /* eslint-disable no-invalid-this, valid-jsdoc */
         /**
          * @private
          * @class
          */
-        var DOMElementProvider = function () {
-                this.elements = [];
+        var EventProvider = function () {
+                this.eventRemovers = [];
         };
-        extend(DOMElementProvider.prototype, {
+        extend(EventProvider.prototype, {
             /**
-             * Create an element and keep track of it for later removal.
-             * Same args as document.createElement
+             * Add an event to an element and keep track of it for later removal.
+             * Same args as Highcharts.addEvent.
              * @private
+             * @return {Function}
              */
-            createElement: function () {
-                var el = doc.createElement.apply(doc,
+            addEvent: function () {
+                var remover = addEvent.apply(H,
                     arguments);
-                this.elements.push(el);
-                return el;
+                this.eventRemovers.push(remover);
+                return remover;
             },
             /**
-             * Destroy all created elements, removing them from the DOM.
+             * Remove all added events.
              * @private
+             * @return {void}
              */
-            destroyCreatedElements: function () {
-                this.elements.forEach(function (element) {
-                    removeElement(element);
+            removeAddedEvents: function () {
+                this.eventRemovers.forEach(function (remover) {
+                    remover();
                 });
-                this.elements = [];
+                this.eventRemovers = [];
             }
         });
 
-        return DOMElementProvider;
+        return EventProvider;
     });
-    _registerModule(_modules, 'modules/accessibility/AccessibilityComponent.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/utils/EventProvider.js'], _modules['modules/accessibility/utils/DOMElementProvider.js']], function (H, U, HTMLUtilities, ChartUtilities, EventProvider, DOMElementProvider) {
+    _registerModule(_modules, 'Accessibility/AccessibilityComponent.js', [_modules['Accessibility/Utils/ChartUtilities.js'], _modules['Accessibility/Utils/DOMElementProvider.js'], _modules['Accessibility/Utils/EventProvider.js'], _modules['Core/Globals.js'], _modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Core/Utilities.js']], function (ChartUtilities, DOMElementProvider, EventProvider, H, HTMLUtilities, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -609,14 +611,14 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var win = H.win,
-            doc = win.document;
+        var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
+        var doc = H.doc,
+            win = H.win;
+        var removeElement = HTMLUtilities.removeElement,
+            getFakeMouseEvent = HTMLUtilities.getFakeMouseEvent;
         var extend = U.extend,
             fireEvent = U.fireEvent,
             merge = U.merge;
-        var removeElement = HTMLUtilities.removeElement,
-            getFakeMouseEvent = HTMLUtilities.getFakeMouseEvent;
-        var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
         /* eslint-disable valid-jsdoc */
         /** @lends Highcharts.AccessibilityComponent */
         var functionsToOverrideByDerivedClasses = {
@@ -802,8 +804,7 @@
                     attrs = merge({
                         'aria-label': svgEl.getAttribute('aria-label')
                     },
-                    attributes),
-                    bBox = this.getElementPosition(posElement || svgElement);
+                    attributes);
                 Object.keys(attrs).forEach(function (prop) {
                     if (attrs[prop] !== null) {
                         proxy.setAttribute(prop, attrs[prop]);
@@ -813,7 +814,8 @@
                 if (preClickEvent) {
                     this.addEvent(proxy, 'click', preClickEvent);
                 }
-                this.setProxyButtonStyle(proxy, bBox);
+                this.setProxyButtonStyle(proxy);
+                this.updateProxyButtonPosition(proxy, posElement || svgElement);
                 this.proxyMouseEventsForButton(svgEl, proxy);
                 // Add to chart div and unhide from screen readers
                 parentGroup.appendChild(proxy);
@@ -847,10 +849,9 @@
             },
             /**
              * @private
-             * @param {Highcharts.HTMLElement} button
-             * @param {Highcharts.BBoxObject} bBox
+             * @param {Highcharts.HTMLElement} button The proxy element.
              */
-            setProxyButtonStyle: function (button, bBox) {
+            setProxyButtonStyle: function (button) {
                 merge(true, button.style, {
                     'border-width': 0,
                     'background-color': 'transparent',
@@ -864,7 +865,17 @@
                     padding: 0,
                     margin: 0,
                     display: 'block',
-                    position: 'absolute',
+                    position: 'absolute'
+                });
+            },
+            /**
+             * @private
+             * @param {Highcharts.HTMLElement} proxy The proxy to update position of.
+             * @param {Highcharts.SVGElement} posElement The element to overlay and take position from.
+             */
+            updateProxyButtonPosition: function (proxy, posElement) {
+                var bBox = this.getElementPosition(posElement);
+                merge(true, proxy.style, {
                     width: (bBox.width || 1) + 'px',
                     height: (bBox.height || 1) + 'px',
                     left: (bBox.x || 0) + 'px',
@@ -883,8 +894,11 @@
                     'click', 'touchstart', 'touchend', 'touchcancel', 'touchmove',
                     'mouseover', 'mouseenter', 'mouseleave', 'mouseout'
                 ].forEach(function (evtType) {
+                    var isTouchEvent = evtType.indexOf('touch') === 0;
                     component.addEvent(button, evtType, function (e) {
-                        var clonedEvent = component.cloneMouseEvent(e);
+                        var clonedEvent = isTouchEvent ?
+                                component.cloneTouchEvent(e) :
+                                component.cloneMouseEvent(e);
                         if (source) {
                             component.fireEventOnWrappedOrUnwrappedElement(source, clonedEvent);
                         }
@@ -914,6 +928,50 @@
                 }
                 return getFakeMouseEvent(e.type);
             },
+            /**
+             * Utility function to clone a touch event for re-dispatching.
+             * @private
+             * @param {global.TouchEvent} e The event to clone.
+             * @return {global.TouchEvent} The cloned event
+             */
+            cloneTouchEvent: function (e) {
+                var touchListToTouchArray = function (l) {
+                        var touchArray = [];
+                    for (var i = 0; i < l.length; ++i) {
+                        var item = l.item(i);
+                        if (item) {
+                            touchArray.push(item);
+                        }
+                    }
+                    return touchArray;
+                };
+                if (typeof win.TouchEvent === 'function') {
+                    var newEvent = new win.TouchEvent(e.type, {
+                            touches: touchListToTouchArray(e.touches),
+                            targetTouches: touchListToTouchArray(e.targetTouches),
+                            changedTouches: touchListToTouchArray(e.changedTouches),
+                            ctrlKey: e.ctrlKey,
+                            shiftKey: e.shiftKey,
+                            altKey: e.altKey,
+                            metaKey: e.metaKey,
+                            bubbles: e.bubbles,
+                            cancelable: e.cancelable,
+                            composed: e.composed,
+                            detail: e.detail,
+                            view: e.view
+                        });
+                    if (e.defaultPrevented) {
+                        newEvent.preventDefault();
+                    }
+                    return newEvent;
+                }
+                // Fallback to mouse event
+                var fakeEvt = this.cloneMouseEvent(e);
+                fakeEvt.touches = e.touches;
+                fakeEvt.changedTouches = e.changedTouches;
+                fakeEvt.targetTouches = e.targetTouches;
+                return fakeEvt;
+            },
             /**
              * Remove traces of the component.
              * @private
@@ -928,7 +986,7 @@
 
         return AccessibilityComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/KeyboardNavigation.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js'], _modules['modules/accessibility/utils/EventProvider.js']], function (H, U, HTMLUtilities, EventProvider) {
+    _registerModule(_modules, 'Accessibility/KeyboardNavigation.js', [_modules['Core/Globals.js'], _modules['Core/Utilities.js'], _modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Accessibility/Utils/EventProvider.js']], function (H, U, HTMLUtilities, EventProvider) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -940,8 +998,8 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var win = H.win,
-            doc = win.document;
+        var doc = H.doc,
+            win = H.win;
         var addEvent = U.addEvent,
             fireEvent = U.fireEvent;
         var getElement = HTMLUtilities.getElement;
@@ -1004,11 +1062,17 @@
                 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;
@@ -1016,8 +1080,6 @@
                 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);
@@ -1167,7 +1229,7 @@
                     this.exitAnchor.focus();
                 }
                 else {
-                    this.chart.container.focus();
+                    this.tabindexContainer.focus();
                 }
                 return false;
             },
@@ -1198,21 +1260,32 @@
                 var a11yOptions = this.chart.options.accessibility,
                     keyboardOptions = a11yOptions && a11yOptions.keyboardNavigation,
                     shouldHaveTabindex = !(keyboardOptions && keyboardOptions.enabled === false),
-                    container = this.chart.container,
-                    curTabindex = container.getAttribute('tabIndex');
+                    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);
@@ -1251,7 +1324,7 @@
                             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
@@ -1285,15 +1358,13 @@
             destroy: function () {
                 this.removeExitAnchor();
                 this.eventProvider.removeAddedEvents();
-                if (this.chart.container.getAttribute('tabindex') === '0') {
-                    this.chart.container.removeAttribute('tabindex');
-                }
+                this.chart.container.removeAttribute('tabindex');
             }
         };
 
         return KeyboardNavigation;
     });
-    _registerModule(_modules, 'modules/accessibility/components/LegendComponent.js', [_modules['parts/Globals.js'], _modules['parts/Legend.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/AccessibilityComponent.js'], _modules['modules/accessibility/KeyboardNavigationHandler.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (H, Legend, U, AccessibilityComponent, KeyboardNavigationHandler, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Components/LegendComponent.js', [_modules['Core/Globals.js'], _modules['Core/Legend.js'], _modules['Core/Utilities.js'], _modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/KeyboardNavigationHandler.js'], _modules['Accessibility/Utils/HTMLUtilities.js']], function (H, Legend, U, AccessibilityComponent, KeyboardNavigationHandler, HTMLUtilities) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -1307,6 +1378,7 @@
          * */
         var addEvent = U.addEvent,
             extend = U.extend,
+            find = U.find,
             fireEvent = U.fireEvent;
         var stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString,
             removeElement = HTMLUtilities.removeElement;
@@ -1380,9 +1452,20 @@
              */
             init: function () {
                 var component = this;
+                this.proxyElementsList = [];
+                this.recreateProxies();
+                // Note: Chart could create legend dynamically, so events can not be
+                // tied to the component's chart's current legend.
                 this.addEvent(Legend, 'afterScroll', function () {
                     if (this.chart === component.chart) {
-                        component.updateProxies();
+                        component.updateProxiesPositions();
+                        component.updateLegendItemProxyVisibility();
+                        this.chart.highlightLegendItem(component.highlightedLegendItemIx);
+                    }
+                });
+                this.addEvent(Legend, 'afterPositionItem', function (e) {
+                    if (this.chart === component.chart && this.chart.renderer) {
+                        component.updateProxyPositionForItem(e.item);
                     }
                 });
             },
@@ -1410,26 +1493,52 @@
              * of the proxy overlays.
              */
             onChartRender: function () {
-                var component = this;
-                // Ignore render after proxy clicked. No need to destroy it, and
-                // destroying also kills focus.
-                if (this.legendProxyButtonClicked) {
-                    delete component.legendProxyButtonClicked;
-                    return;
+                if (shouldDoLegendA11y(this.chart)) {
+                    this.updateProxiesPositions();
+                }
+                else {
+                    this.removeProxies();
                 }
-                this.updateProxies();
             },
             /**
              * @private
              */
-            updateProxies: function () {
-                removeElement(this.legendProxyGroup);
+            updateProxiesPositions: function () {
+                for (var _i = 0, _a = this.proxyElementsList; _i < _a.length; _i++) {
+                    var _b = _a[_i],
+                        element = _b.element,
+                        posElement = _b.posElement;
+                    this.updateProxyButtonPosition(element, posElement);
+                }
+            },
+            /**
+             * @private
+             */
+            updateProxyPositionForItem: function (item) {
+                var proxyRef = find(this.proxyElementsList,
+                    function (ref) { return ref.item === item; });
+                if (proxyRef) {
+                    this.updateProxyButtonPosition(proxyRef.element, proxyRef.posElement);
+                }
+            },
+            /**
+             * @private
+             */
+            recreateProxies: function () {
+                this.removeProxies();
                 if (shouldDoLegendA11y(this.chart)) {
                     this.addLegendProxyGroup();
                     this.proxyLegendItems();
                     this.updateLegendItemProxyVisibility();
                 }
             },
+            /**
+             * @private
+             */
+            removeProxies: function () {
+                removeElement(this.legendProxyGroup);
+                this.proxyElementsList = [];
+            },
             /**
              * @private
              */
@@ -1456,11 +1565,13 @@
             },
             /**
              * @private
-             * @param {Highcharts.BubbleLegend|Highcharts.Point|Highcharts.Series} item
+             * @param {Highcharts.BubbleLegend|Point|Highcharts.Series} item
              */
             proxyLegendItem: function (item) {
-                var component = this,
-                    itemLabel = this.chart.langFormat('accessibility.legend.legendItem', {
+                if (!item.legendItem || !item.legendGroup) {
+                    return;
+                }
+                var itemLabel = this.chart.langFormat('accessibility.legend.legendItem', {
                         chart: this.chart,
                         itemName: stripHTMLTags(item.name)
                     }),
@@ -1469,14 +1580,15 @@
                         'aria-pressed': !item.visible,
                         'aria-label': itemLabel
                     }, 
-                    // Keep track of when we should ignore next render
-                    preClickEvent = function () {
-                        component.legendProxyButtonClicked = true;
-                }, 
-                // Considers useHTML
-                proxyPositioningElement = item.legendGroup.div ?
-                    item.legendItem : item.legendGroup;
-                item.a11yProxyElement = this.createProxyButton(item.legendItem, this.legendProxyGroup, attribs, proxyPositioningElement, preClickEvent);
+                    // Considers useHTML
+                    proxyPositioningElement = item.legendGroup.div ?
+                        item.legendItem : item.legendGroup;
+                item.a11yProxyElement = this.createProxyButton(item.legendItem, this.legendProxyGroup, attribs, proxyPositioningElement);
+                this.proxyElementsList.push({
+                    item: item,
+                    element: item.a11yProxyElement,
+                    posElement: proxyPositioningElement
+                });
             },
             /**
              * Get keyboard navigation handler for this component.
@@ -1581,7 +1693,7 @@
 
         return LegendComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/components/MenuComponent.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/AccessibilityComponent.js'], _modules['modules/accessibility/KeyboardNavigationHandler.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (H, U, AccessibilityComponent, KeyboardNavigationHandler, ChartUtilities, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Components/MenuComponent.js', [_modules['Core/Globals.js'], _modules['Core/Utilities.js'], _modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/KeyboardNavigationHandler.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Accessibility/Utils/HTMLUtilities.js']], function (H, U, AccessibilityComponent, KeyboardNavigationHandler, ChartUtilities, HTMLUtilities) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -1850,13 +1962,6 @@
                             function () {
                                 return component.onKbdClick(this);
                             }
-                        ],
-                        // ESC handler
-                        [
-                            [keys.esc],
-                            function () {
-                                return this.response.prev;
-                            }
                         ]
                     ],
                     // Only run exporting navigation if exporting support exists and is
@@ -1954,7 +2059,7 @@
 
         return MenuComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/components/SeriesComponent/SeriesKeyboardNavigation.js', [_modules['parts/Globals.js'], _modules['parts/Point.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/KeyboardNavigationHandler.js'], _modules['modules/accessibility/utils/EventProvider.js'], _modules['modules/accessibility/utils/chartUtilities.js']], function (H, Point, U, KeyboardNavigationHandler, EventProvider, ChartUtilities) {
+    _registerModule(_modules, 'Accessibility/Components/SeriesComponent/SeriesKeyboardNavigation.js', [_modules['Core/Series/Series.js'], _modules['Core/Series/CartesianSeries.js'], _modules['Core/Chart/Chart.js'], _modules['Core/Series/Point.js'], _modules['Core/Utilities.js'], _modules['Accessibility/KeyboardNavigationHandler.js'], _modules['Accessibility/Utils/EventProvider.js'], _modules['Accessibility/Utils/ChartUtilities.js']], function (Series, CartesianSeries, Chart, Point, U, KeyboardNavigationHandler, EventProvider, ChartUtilities) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -1966,8 +2071,9 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var extend = U.extend,
-            defined = U.defined;
+        var seriesTypes = Series.seriesTypes;
+        var defined = U.defined,
+            extend = U.extend;
         var getPointFromXY = ChartUtilities.getPointFromXY,
             getSeriesFromName = ChartUtilities.getSeriesFromName,
             scrollToPoint = ChartUtilities.scrollToPoint;
@@ -1976,10 +2082,10 @@
          * 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;
             }
         });
         /**
@@ -2138,7 +2244,7 @@
          *         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,
@@ -2202,7 +2308,7 @@
          *
          * @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) :
@@ -2234,7 +2340,7 @@
          *
          * @return {Highcharts.Point|boolean}
          */
-        H.Chart.prototype.highlightAdjacentSeries = function (down) {
+        Chart.prototype.highlightAdjacentSeries = function (down) {
             var chart = this,
                 newSeries,
                 newPoint,
@@ -2287,7 +2393,7 @@
          *
          * @return {Highcharts.Point|boolean}
          */
-        H.Chart.prototype.highlightAdjacentPointVertical = function (down) {
+        Chart.prototype.highlightAdjacentPointVertical = function (down) {
             var curPoint = this.highlightedPoint,
                 minDistance = Infinity,
                 bestPoint;
@@ -2385,7 +2491,7 @@
                 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 () {
@@ -2438,16 +2544,13 @@
                     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');
                                 }
@@ -2573,7 +2676,7 @@
 
         return SeriesKeyboardNavigation;
     });
-    _registerModule(_modules, 'modules/accessibility/components/AnnotationsA11y.js', [_modules['parts/Utilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (U, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Components/AnnotationsA11y.js', [_modules['Accessibility/Utils/HTMLUtilities.js']], function (HTMLUtilities) {
         /* *
          *
          *  (c) 2009-2019 Øystein Moseng
@@ -2585,7 +2688,6 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var inArray = U.inArray;
         var escapeStringForHTML = HTMLUtilities.escapeStringForHTML,
             stripHTMLTagsFromString = HTMLUtilities.stripHTMLTagsFromString;
         /**
@@ -2700,8 +2802,7 @@
         function getPointAnnotationTexts(point) {
             var labels = getChartAnnotationLabels(point.series.chart);
             var pointLabels = labels
-                    .filter(function (label) { return inArray(point,
-                label.points) > -1; });
+                    .filter(function (label) { return label.points.indexOf(point) > -1; });
             if (!pointLabels.length) {
                 return [];
             }
@@ -2716,7 +2817,7 @@
 
         return AnnotationsA11y;
     });
-    _registerModule(_modules, 'modules/accessibility/components/SeriesComponent/SeriesDescriber.js', [_modules['parts/Utilities.js'], _modules['modules/accessibility/components/AnnotationsA11y.js'], _modules['modules/accessibility/utils/htmlUtilities.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['parts/Tooltip.js']], function (U, AnnotationsA11y, HTMLUtilities, ChartUtilities, Tooltip) {
+    _registerModule(_modules, 'Accessibility/Components/SeriesComponent/SeriesDescriber.js', [_modules['Accessibility/Components/AnnotationsA11y.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Core/Tooltip.js'], _modules['Core/Utilities.js']], function (AnnotationsA11y, ChartUtilities, HTMLUtilities, Tooltip, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -2728,20 +2829,20 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
+        var getPointAnnotationTexts = AnnotationsA11y.getPointAnnotationTexts;
+        var getAxisDescription = ChartUtilities.getAxisDescription,
+            getSeriesFirstPointElement = ChartUtilities.getSeriesFirstPointElement,
+            getSeriesA11yElement = ChartUtilities.getSeriesA11yElement,
+            unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
+        var escapeStringForHTML = HTMLUtilities.escapeStringForHTML,
+            reverseChildNodes = HTMLUtilities.reverseChildNodes,
+            stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString;
         var find = U.find,
             format = U.format,
             isNumber = U.isNumber,
             numberFormat = U.numberFormat,
             pick = U.pick,
             defined = U.defined;
-        var getPointAnnotationTexts = AnnotationsA11y.getPointAnnotationTexts;
-        var escapeStringForHTML = HTMLUtilities.escapeStringForHTML,
-            reverseChildNodes = HTMLUtilities.reverseChildNodes,
-            stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString;
-        var getAxisDescription = ChartUtilities.getAxisDescription,
-            getSeriesFirstPointElement = ChartUtilities.getSeriesFirstPointElement,
-            getSeriesA11yElement = ChartUtilities.getSeriesA11yElement,
-            unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
         /* eslint-disable valid-jsdoc */
         /**
          * @private
@@ -3170,7 +3271,7 @@
 
         return SeriesDescriber;
     });
-    _registerModule(_modules, 'modules/accessibility/utils/Announcer.js', [_modules['parts/Globals.js'], _modules['modules/accessibility/utils/DOMElementProvider.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (H, DOMElementProvider, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Utils/Announcer.js', [_modules['Core/Globals.js'], _modules['Accessibility/Utils/DOMElementProvider.js'], _modules['Accessibility/Utils/HTMLUtilities.js']], function (H, DOMElementProvider, HTMLUtilities) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -3220,7 +3321,7 @@
 
         return Announcer;
     });
-    _registerModule(_modules, 'modules/accessibility/components/SeriesComponent/NewDataAnnouncer.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/components/SeriesComponent/SeriesDescriber.js'], _modules['modules/accessibility/utils/Announcer.js'], _modules['modules/accessibility/utils/EventProvider.js']], function (H, U, ChartUtilities, SeriesDescriber, Announcer, EventProvider) {
+    _registerModule(_modules, 'Accessibility/Components/SeriesComponent/NewDataAnnouncer.js', [_modules['Core/Globals.js'], _modules['Core/Series/CartesianSeries.js'], _modules['Core/Utilities.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Accessibility/Components/SeriesComponent/SeriesDescriber.js'], _modules['Accessibility/Utils/Announcer.js'], _modules['Accessibility/Utils/EventProvider.js']], function (H, CartesianSeries, U, ChartUtilities, SeriesDescriber, Announcer, EventProvider) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -3313,13 +3414,13 @@
                 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 () {
@@ -3483,7 +3584,7 @@
 
         return NewDataAnnouncer;
     });
-    _registerModule(_modules, 'modules/accessibility/components/SeriesComponent/forcedMarkers.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js']], function (H, U) {
+    _registerModule(_modules, 'Accessibility/Components/SeriesComponent/ForcedMarkers.js', [_modules['Core/Series/CartesianSeries.js'], _modules['Core/Utilities.js']], function (CartesianSeries, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -3510,42 +3611,38 @@
         /**
          * @private
          */
-        function isWithinNavigationThreshold(series) {
-            var navOptions = series.chart.options.accessibility
-                    .keyboardNavigation.seriesNavigation;
-            return series.points.length <
-                navOptions.pointNavigationEnabledThreshold ||
-                navOptions.pointNavigationEnabledThreshold === false;
+        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 shouldForceMarkers(series) {
-            var chartA11yEnabled = series.chart.options.accessibility.enabled,
-                seriesA11yEnabled = (series.options.accessibility &&
-                    series.options.accessibility.enabled) !== false,
-                withinDescriptionThreshold = isWithinDescriptionThreshold(series),
-                withinNavigationThreshold = isWithinNavigationThreshold(series);
-            return chartA11yEnabled && seriesA11yEnabled &&
-                (withinDescriptionThreshold || withinNavigationThreshold);
+        function hasIndividualPointMarkerOptions(series) {
+            return !!(series._hasPointMarkers && series.points && series.points.length);
         }
         /**
          * @private
          */
-        function unforceMarkerOptions(series) {
+        function unforceSeriesMarkerOptions(series) {
             var resetMarkerOptions = series.resetA11yMarkerOptions;
-            merge(true, series.options, {
-                marker: {
-                    enabled: resetMarkerOptions.enabled,
-                    states: {
-                        normal: {
-                            opacity: resetMarkerOptions.states &&
-                                resetMarkerOptions.states.normal &&
-                                resetMarkerOptions.states.normal.opacity
+            if (resetMarkerOptions) {
+                merge(true, series.options, {
+                    marker: {
+                        enabled: resetMarkerOptions.enabled,
+                        states: {
+                            normal: {
+                                opacity: resetMarkerOptions.states &&
+                                    resetMarkerOptions.states.normal &&
+                                    resetMarkerOptions.states.normal.opacity
+                            }
                         }
                     }
-                }
-            });
+                });
+            }
         }
         /**
          * @private
@@ -3573,7 +3670,7 @@
         /**
          * @private
          */
-        function forceDisplayPointMarker(pointOptions) {
+        function unforcePointMarkerOptions(pointOptions) {
             merge(true, pointOptions.marker, {
                 states: {
                     normal: {
@@ -3585,16 +3682,20 @@
         /**
          * @private
          */
-        function handleForcePointMarkers(points) {
-            var i = points.length;
+        function handleForcePointMarkers(series) {
+            var i = series.points.length;
             while (i--) {
-                var pointOptions = points[i].options;
+                var point = series.points[i];
+                var pointOptions = point.options;
+                delete point.hasForcedA11yMarker;
                 if (pointOptions.marker) {
                     if (pointOptions.marker.enabled) {
-                        forceDisplayPointMarker(pointOptions);
+                        unforcePointMarkerOptions(pointOptions);
+                        point.hasForcedA11yMarker = false;
                     }
                     else {
                         forceZeroOpacityMarkerOptions(pointOptions);
+                        point.hasForcedA11yMarker = true;
                     }
                 }
             }
@@ -3607,7 +3708,7 @@
              * Keep track of forcing markers.
              * @private
              */
-            addEvent(H.Series, 'render', function () {
+            addEvent(CartesianSeries, 'render', function () {
                 var series = this,
                     options = series.options;
                 if (shouldForceMarkers(series)) {
@@ -3615,27 +3716,50 @@
                         series.a11yMarkersForced = true;
                         forceZeroOpacityMarkerOptions(series.options);
                     }
-                    if (series._hasPointMarkers && series.points && series.points.length) {
-                        handleForcePointMarkers(series.points);
+                    if (hasIndividualPointMarkerOptions(series)) {
+                        handleForcePointMarkers(series);
                     }
                 }
-                else if (series.a11yMarkersForced && series.resetMarkerOptions) {
+                else if (series.a11yMarkersForced) {
                     delete series.a11yMarkersForced;
-                    unforceMarkerOptions(series);
+                    unforceSeriesMarkerOptions(series);
                 }
             });
             /**
              * Keep track of options to reset markers to if no longer forced.
              * @private
              */
-            addEvent(H.Series, 'afterSetOptions', function (e) {
+            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');
+                            }
+                        });
+                    }
+                }
+            });
         }
 
         return addForceMarkersEvents;
     });
-    _registerModule(_modules, 'modules/accessibility/components/SeriesComponent/SeriesComponent.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/AccessibilityComponent.js'], _modules['modules/accessibility/components/SeriesComponent/SeriesKeyboardNavigation.js'], _modules['modules/accessibility/components/SeriesComponent/NewDataAnnouncer.js'], _modules['modules/accessibility/components/SeriesComponent/forcedMarkers.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/components/SeriesComponent/SeriesDescriber.js'], _modules['parts/Tooltip.js']], function (H, U, AccessibilityComponent, SeriesKeyboardNavigation, NewDataAnnouncer, addForceMarkersEvents, ChartUtilities, SeriesDescriber, Tooltip) {
+    _registerModule(_modules, 'Accessibility/Components/SeriesComponent/SeriesComponent.js', [_modules['Core/Globals.js'], _modules['Core/Utilities.js'], _modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/Components/SeriesComponent/SeriesKeyboardNavigation.js'], _modules['Accessibility/Components/SeriesComponent/NewDataAnnouncer.js'], _modules['Accessibility/Components/SeriesComponent/ForcedMarkers.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Accessibility/Components/SeriesComponent/SeriesDescriber.js'], _modules['Core/Tooltip.js']], function (H, U, AccessibilityComponent, SeriesKeyboardNavigation, NewDataAnnouncer, addForceMarkersEvents, ChartUtilities, SeriesDescriber, Tooltip) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -3737,7 +3861,7 @@
 
         return SeriesComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/components/ZoomComponent.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/AccessibilityComponent.js'], _modules['modules/accessibility/KeyboardNavigationHandler.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (H, U, AccessibilityComponent, KeyboardNavigationHandler, ChartUtilities, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Components/ZoomComponent.js', [_modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Core/Globals.js'], _modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Accessibility/KeyboardNavigationHandler.js'], _modules['Core/Utilities.js']], function (AccessibilityComponent, ChartUtilities, H, HTMLUtilities, KeyboardNavigationHandler, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -3749,11 +3873,12 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
+        var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
+        var noop = H.noop;
+        var removeElement = HTMLUtilities.removeElement,
+            setElAttrs = HTMLUtilities.setElAttrs;
         var extend = U.extend,
             pick = U.pick;
-        var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
-        var setElAttrs = HTMLUtilities.setElAttrs,
-            removeElement = HTMLUtilities.removeElement;
         /* eslint-disable no-invalid-this, valid-jsdoc */
         /**
          * @private
@@ -3797,7 +3922,7 @@
          * @class
          * @name Highcharts.ZoomComponent
          */
-        var ZoomComponent = function () { };
+        var ZoomComponent = noop;
         ZoomComponent.prototype = new AccessibilityComponent();
         extend(ZoomComponent.prototype, /** @lends Highcharts.ZoomComponent */ {
             /**
@@ -4045,7 +4170,7 @@
 
         return ZoomComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/components/RangeSelectorComponent.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/AccessibilityComponent.js'], _modules['modules/accessibility/KeyboardNavigationHandler.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (H, U, AccessibilityComponent, KeyboardNavigationHandler, ChartUtilities, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Components/RangeSelectorComponent.js', [_modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Core/Globals.js'], _modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Accessibility/KeyboardNavigationHandler.js'], _modules['Core/Utilities.js']], function (AccessibilityComponent, ChartUtilities, H, HTMLUtilities, KeyboardNavigationHandler, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -4057,9 +4182,9 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var extend = U.extend;
         var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT;
         var setElAttrs = HTMLUtilities.setElAttrs;
+        var extend = U.extend;
         /* eslint-disable no-invalid-this, valid-jsdoc */
         /**
          * @private
@@ -4252,7 +4377,8 @@
                         [
                             [
                                 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);
@@ -4325,7 +4451,7 @@
 
         return RangeSelectorComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/components/InfoRegionsComponent.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/AccessibilityComponent.js'], _modules['modules/accessibility/utils/Announcer.js'], _modules['modules/accessibility/components/AnnotationsA11y.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js']], function (H, U, AccessibilityComponent, Announcer, AnnotationsA11y, ChartUtilities, HTMLUtilities) {
+    _registerModule(_modules, 'Accessibility/Components/InfoRegionsComponent.js', [_modules['Core/Globals.js'], _modules['Core/Utilities.js'], _modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/Utils/Announcer.js'], _modules['Accessibility/Components/AnnotationsA11y.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Accessibility/Utils/HTMLUtilities.js']], function (H, U, AccessibilityComponent, Announcer, AnnotationsA11y, ChartUtilities, HTMLUtilities) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -4337,7 +4463,7 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var doc = H.win.document;
+        var doc = H.doc;
         var extend = U.extend,
             format = U.format,
             pick = U.pick;
@@ -4679,7 +4805,7 @@
                 var chart = this.chart,
                     buttonText = chart.langFormat('accessibility.table.viewAsDataTableButtonText', { chart: chart,
                     chartTitle: getChartTitle(chart) });
-                return '<a id="' + buttonId + '">' + buttonText + '</a>';
+                return '<button id="' + buttonId + '">' + buttonText + '</button>';
             },
             /**
              * @private
@@ -4722,7 +4848,7 @@
                     if (this.viewDataTableButton) {
                         this.viewDataTableButton.setAttribute('aria-expanded', 'true');
                     }
-                    e.html = e.html.replace('<table ', '<table tabindex="0" summary="' + getTableSummary(chart) + '"');
+                    e.html = e.html.replace('<table ', '<table tabindex="-1" summary="' + getTableSummary(chart) + '"');
                 }
             },
             /**
@@ -4778,10 +4904,8 @@
                 var el = this.viewDataTableButton = getElement(tableButtonId), chart = this.chart, tableId = tableButtonId.replace('hc-linkto-', '');
                 if (el) {
                     setElAttrs(el, {
-                        role: 'button',
                         tabindex: '-1',
-                        'aria-expanded': !!getElement(tableId),
-                        href: '#' + tableId
+                        'aria-expanded': !!getElement(tableId)
                     });
                     el.onclick = chart.options.accessibility
                         .screenReaderSection.onViewDataTableClick ||
@@ -4932,7 +5056,7 @@
 
         return InfoRegionsComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/components/ContainerComponent.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/utils/htmlUtilities.js'], _modules['modules/accessibility/utils/chartUtilities.js'], _modules['modules/accessibility/AccessibilityComponent.js']], function (H, U, HTMLUtilities, ChartUtilities, AccessibilityComponent) {
+    _registerModule(_modules, 'Accessibility/Components/ContainerComponent.js', [_modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/Utils/ChartUtilities.js'], _modules['Core/Globals.js'], _modules['Accessibility/Utils/HTMLUtilities.js'], _modules['Core/Utilities.js']], function (AccessibilityComponent, ChartUtilities, H, HTMLUtilities, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -4944,11 +5068,11 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var doc = H.win.document;
-        var extend = U.extend;
-        var stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString;
         var unhideChartElementFromAT = ChartUtilities.unhideChartElementFromAT,
             getChartTitle = ChartUtilities.getChartTitle;
+        var doc = H.doc;
+        var stripHTMLTags = HTMLUtilities.stripHTMLTagsFromString;
+        var extend = U.extend;
         /* eslint-disable valid-jsdoc */
         /**
          * The ContainerComponent class
@@ -5048,7 +5172,7 @@
 
         return ContainerComponent;
     });
-    _registerModule(_modules, 'modules/accessibility/high-contrast-mode.js', [_modules['parts/Globals.js']], function (H) {
+    _registerModule(_modules, 'Accessibility/HighContrastMode.js', [_modules['Core/Globals.js']], function (H) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -5080,7 +5204,8 @@
                 // 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;
@@ -5133,7 +5258,7 @@
 
         return whcm;
     });
-    _registerModule(_modules, 'modules/accessibility/high-contrast-theme.js', [], function () {
+    _registerModule(_modules, 'Accessibility/HighContrastTheme.js', [], function () {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -5346,7 +5471,7 @@
 
         return theme;
     });
-    _registerModule(_modules, 'modules/accessibility/options/options.js', [], function () {
+    _registerModule(_modules, 'Accessibility/Options/Options.js', [], function () {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -5424,7 +5549,7 @@
                  * [accessibility module](https://code.highcharts.com/modules/accessibility.js)
                  * to be loaded. For a description of the module and information
                  * on its features, see
-                 * [Highcharts Accessibility](https://www.highcharts.com/docs/chart-concepts/accessibility).
+                 * [Highcharts Accessibility](https://www.highcharts.com/docs/accessibility/accessibility-module).
                  *
                  * @since        5.0.0
                  * @requires     modules/accessibility
@@ -6141,7 +6266,7 @@
 
         return options;
     });
-    _registerModule(_modules, 'modules/accessibility/options/langOptions.js', [], function () {
+    _registerModule(_modules, 'Accessibility/Options/LangOptions.js', [], function () {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -6248,7 +6373,7 @@
                      */
                     legend: {
                         legendLabel: 'Toggle series visibility',
-                        legendItem: 'Toggle visibility of {itemName}'
+                        legendItem: 'Hide {itemName}'
                     },
                     /**
                      * Chart and map zoom accessibility language options.
@@ -6481,7 +6606,7 @@
 
         return langOptions;
     });
-    _registerModule(_modules, 'modules/accessibility/options/deprecatedOptions.js', [_modules['parts/Utilities.js']], function (U) {
+    _registerModule(_modules, 'Accessibility/Options/DeprecatedOptions.js', [_modules['Core/Utilities.js']], function (U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -6544,19 +6669,6 @@
         var error = U.error,
             pick = U.pick;
         /* eslint-disable valid-jsdoc */
-        /**
-         * Warn user that a deprecated option was used.
-         * @private
-         * @param {Highcharts.Chart} chart
-         * @param {string} oldOption
-         * @param {string} newOption
-         * @return {void}
-         */
-        function warn(chart, oldOption, newOption) {
-            error('Highcharts: Deprecated option ' + oldOption +
-                ' used. This will be removed from future versions of Highcharts. Use ' +
-                newOption + ' instead.', false, chart);
-        }
         /**
          * Set a new option on a root prop, where the option is defined as an array of
          * suboptions.
@@ -6594,11 +6706,13 @@
                 rootNew = getChildProp(chart.options,
                 rootNewAsArray);
             Object.keys(mapToNewOptions).forEach(function (oldOptionKey) {
+                var _a;
                 var val = rootOld[oldOptionKey];
                 if (typeof val !== 'undefined') {
                     traverseSetOption(rootNew, mapToNewOptions[oldOptionKey], val);
-                    warn(chart, rootOldAsArray.join('.') + '.' + oldOptionKey, rootNewAsArray.join('.') + '.' +
-                        mapToNewOptions[oldOptionKey].join('.'));
+                    error(32, false, chart, (_a = {},
+                        _a[rootOldAsArray.join('.') + "." + oldOptionKey] = rootNewAsArray.join('.') + "." + mapToNewOptions[oldOptionKey].join('.'),
+                        _a));
                 }
             });
         }
@@ -6609,9 +6723,10 @@
             var chartOptions = chart.options.chart || {},
                 a11yOptions = chart.options.accessibility || {};
             ['description', 'typeDescription'].forEach(function (prop) {
+                var _a;
                 if (chartOptions[prop]) {
                     a11yOptions[prop] = chartOptions[prop];
-                    warn(chart, 'chart.' + prop, 'accessibility.' + prop);
+                    error(32, false, chart, (_a = {}, _a["chart." + prop] = "use accessibility." + prop, _a));
                 }
             });
         }
@@ -6624,7 +6739,7 @@
                 if (opts && opts.description) {
                     opts.accessibility = opts.accessibility || {};
                     opts.accessibility.description = opts.description;
-                    warn(chart, 'axis.description', 'axis.accessibility.description');
+                    error(32, false, chart, { 'axis.description': 'use axis.accessibility.description' });
                 }
             });
         }
@@ -6647,6 +6762,7 @@
             chart.series.forEach(function (series) {
                 // Handle series wide options
                 Object.keys(oldToNewSeriesOptions).forEach(function (oldOption) {
+                    var _a;
                     var optionVal = series.options[oldOption];
                     if (typeof optionVal !== 'undefined') {
                         // Set the new option
@@ -6655,8 +6771,7 @@
                         // value, since we set enabled rather than disabled
                         oldOption === 'skipKeyboardNavigation' ?
                             !optionVal : optionVal);
-                        warn(chart, 'series.' + oldOption, 'series.' +
-                            oldToNewSeriesOptions[oldOption].join('.'));
+                        error(32, false, chart, (_a = {}, _a["series." + oldOption] = "series." + oldToNewSeriesOptions[oldOption].join('.'), _a));
                     }
                 });
             });
@@ -6732,7 +6847,7 @@
 
         return copyDeprecatedOptions;
     });
-    _registerModule(_modules, 'modules/accessibility/a11y-i18n.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js']], function (H, U) {
+    _registerModule(_modules, 'Accessibility/A11yI18n.js', [_modules['Core/Globals.js'], _modules['Core/Utilities.js']], function (H, U) {
         /* *
          *
          *  Accessibility module - internationalization support
@@ -6990,7 +7105,7 @@
         };
 
     });
-    _registerModule(_modules, 'modules/accessibility/focusBorder.js', [_modules['parts/Globals.js'], _modules['parts/Utilities.js']], function (H, U) {
+    _registerModule(_modules, 'Accessibility/FocusBorder.js', [_modules['Core/Globals.js'], _modules['Core/Renderer/SVG/SVGElement.js'], _modules['Core/Renderer/SVG/SVGLabel.js'], _modules['Core/Utilities.js']], function (H, SVGElement, SVGLabel, U) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -7013,7 +7128,7 @@
         /**
          * 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) {
@@ -7032,7 +7147,7 @@
         /**
          * Remove hook from SVG element added by addDestroyFocusBorderHook, if
          * existing.
-         *
+         * @private
          * @param el Element to remove destroy hook from
          */
         function removeDestroyFocusBorderHook(el) {
@@ -7045,7 +7160,7 @@
         /**
          * 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.
          */
@@ -7073,7 +7188,7 @@
         /**
          * Remove hooks from SVG element added by addUpdateFocusBorderHooks, if
          * existing.
-         *
+         * @private
          * @param el Element to remove update hooks from
          */
         function removeUpdateFocusBorderHooks(el) {
@@ -7095,7 +7210,7 @@
          * 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
@@ -7145,16 +7260,17 @@
                         y: posYCorrection
                     };
                 }
-                if (this.element.nodeName === 'text' || this.isLabel) {
+                var isLabel = this instanceof SVGLabel;
+                if (this.element.nodeName === 'text' || isLabel) {
                     var isRotated = !!this.rotation,
-                        correction = !this.isLabel ? getTextAnchorCorrection(this) :
+                        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;
@@ -7250,7 +7366,7 @@
         };
 
     });
-    _registerModule(_modules, 'modules/accessibility/accessibility.js', [_modules['modules/accessibility/utils/chartUtilities.js'], _modules['parts/Globals.js'], _modules['modules/accessibility/KeyboardNavigationHandler.js'], _modules['parts/Point.js'], _modules['parts/Utilities.js'], _modules['modules/accessibility/AccessibilityComponent.js'], _modules['modules/accessibility/KeyboardNavigation.js'], _modules['modules/accessibility/components/LegendComponent.js'], _modules['modules/accessibility/components/MenuComponent.js'], _modules['modules/accessibility/components/SeriesComponent/SeriesComponent.js'], _modules['modules/accessibility/components/ZoomComponent.js'], _modules['modules/accessibility/components/RangeSelectorComponent.js'], _modules['modules/accessibility/components/InfoRegionsComponent.js'], _modules['modules/accessibility/components/ContainerComponent.js'], _modules['modules/accessibility/high-contrast-mode.js'], _modules['modules/accessibility/high-contrast-theme.js'], _modules['modules/accessibility/options/options.js'], _modules['modules/accessibility/options/langOptions.js'], _modules['modules/accessibility/options/deprecatedOptions.js']], function (ChartUtilities, H, KeyboardNavigationHandler, Point, U, AccessibilityComponent, KeyboardNavigation, LegendComponent, MenuComponent, SeriesComponent, ZoomComponent, RangeSelectorComponent, InfoRegionsComponent, ContainerComponent, whcm, highContrastTheme, defaultOptions, defaultLangOptions, copyDeprecatedOptions) {
+    _registerModule(_modules, 'Accessibility/Accessibility.js', [_modules['Accessibility/Utils/ChartUtilities.js'], _modules['Core/Globals.js'], _modules['Accessibility/KeyboardNavigationHandler.js'], _modules['Core/Series/CartesianSeries.js'], _modules['Core/Options.js'], _modules['Core/Series/Point.js'], _modules['Core/Utilities.js'], _modules['Accessibility/AccessibilityComponent.js'], _modules['Accessibility/KeyboardNavigation.js'], _modules['Accessibility/Components/LegendComponent.js'], _modules['Accessibility/Components/MenuComponent.js'], _modules['Accessibility/Components/SeriesComponent/SeriesComponent.js'], _modules['Accessibility/Components/ZoomComponent.js'], _modules['Accessibility/Components/RangeSelectorComponent.js'], _modules['Accessibility/Components/InfoRegionsComponent.js'], _modules['Accessibility/Components/ContainerComponent.js'], _modules['Accessibility/HighContrastMode.js'], _modules['Accessibility/HighContrastTheme.js'], _modules['Accessibility/Options/Options.js'], _modules['Accessibility/Options/LangOptions.js'], _modules['Accessibility/Options/DeprecatedOptions.js']], function (ChartUtilities, H, KeyboardNavigationHandler, CartesianSeries, O, Point, U, AccessibilityComponent, KeyboardNavigation, LegendComponent, MenuComponent, SeriesComponent, ZoomComponent, RangeSelectorComponent, InfoRegionsComponent, ContainerComponent, whcm, highContrastTheme, defaultOptionsA11Y, defaultLangOptions, copyDeprecatedOptions) {
         /* *
          *
          *  (c) 2009-2020 Øystein Moseng
@@ -7262,13 +7378,14 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
+        var doc = H.doc;
+        var defaultOptions = O.defaultOptions;
         var addEvent = U.addEvent,
             extend = U.extend,
             fireEvent = U.fireEvent,
             merge = U.merge;
-        var doc = H.win.document;
         // Add default options
-        merge(true, H.defaultOptions, defaultOptions, {
+        merge(true, defaultOptions, defaultOptionsA11Y, {
             accessibility: {
                 highContrastTheme: highContrastTheme
             },
@@ -7494,7 +7611,7 @@
             });
         });
         ['update', 'updatedData', 'remove'].forEach(function (event) {
-            addEvent(H.Series, event, function () {
+            addEvent(CartesianSeries, event, function () {
                 if (this.chart.accessibility) {
                     this.chart.a11yDirty = true;
                 }