Fixed #16339, kbd focus management issues with fullscreen change.

highcharts · Feb 1, 2022 · 2ec55b2 · 2ec55b2
1 parent 2739631
commit 2ec55b2
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/ts/Accessibility/Components/MenuComponent.ts b/ts/Accessibility/Components/MenuComponent.ts
@@ -189,8 +189,25 @@ class MenuComponent extends AccessibilityComponent {
      * proxy overlay.
      */
     public onChartRender(): void {
+        const chart = this.chart,
+            focusEl = chart.focusElement,
+            a11y = chart.accessibility;
         this.proxyProvider.clearGroup('chartMenu');
         this.proxyMenuButton();
+
+        if (
+            this.exportButtonProxy &&
+            focusEl &&
+            focusEl === chart.exportingGroup
+        ) {
+            if (focusEl.focusBorder) {
+                chart.setFocusToElement(
+                    focusEl, this.exportButtonProxy.buttonElement
+                );
+            } else if (a11y) {
+                a11y.keyboardNavigation.tabindexContainer.focus();
+            }
+        }
     }