Merge branch 'fix/ff_safari_issues' into sre-menus

Author: zorkow

ts/a11y/explorer/ExplorerPool.ts

@@ -204,6 +204,11 @@ export class ExplorerPool {
     this.attach();
   }
 
+  /**
+   * A11y options keys associated with the speech explorer.
+   */
+  private speechExplorerKeys = ['speech', 'braille', 'keyMagnifier'];
+
   /**
    * Attaches the explorers that are currently meant to be active given
    * the document options. Detaches all others.
@@ -212,12 +217,19 @@ export class ExplorerPool {
     this.attached = [];
     let keyExplorers = [];
     const a11y = this.document.options.a11y;
-    for (let key of Object.keys(this.explorers)) {
-      let explorer = this.explorers[key];
+    for (let [key, explorer] of Object.entries(this.explorers)) {
       if (explorer instanceof SpeechExplorer) {
         explorer.AddEvents();
         explorer.stoppable = false;
         keyExplorers.unshift(explorer);
+        if (this.speechExplorerKeys.some(
+          exKey => this.document.options.a11y[exKey])) {
+          explorer.Attach();
+          this.attached.push(key);
+        } else {
+          explorer.Detach();
+        }
+        continue;
       }
       if (a11y[key] || (key === 'speech' && (a11y.braille || a11y.keyMagnifier))) {
         explorer.Attach();

ts/a11y/explorer/KeyExplorer.ts

@@ -571,8 +571,8 @@ export class SpeechExplorer extends AbstractExplorer<string> implements KeyExplo
       }
     }
     if (this.active) {
-      this.stopEvent(event);
       if (this.Move(event)) {
+        this.stopEvent(event);
         this.Update();
         return;
       }
@@ -647,7 +647,8 @@ export class SpeechExplorer extends AbstractExplorer<string> implements KeyExplo
   public semanticFocus() {
     const node = this.current || this.node;
     const id = node.getAttribute('data-semantic-id');
-    const stree = this.generators.speechGenerator.getRebuilt().stree;
+    const stree = this.generators.speechGenerator.getRebuilt()?.stree;
+    if (!stree) return null;
     const snode = stree.root.querySelectorAll((x: any) => x.id.toString() === id)[0];
     return snode || stree.root;
   }

ts/a11y/speech/GeneratorPool.ts

@@ -370,13 +370,17 @@ export class GeneratorPool<N, T, D> {
         this.dummyList.forEach(attr => this.copyAttributes(xml, node, attr));
       }
     }
-    const speech = this.getLabel(node);
-    if (speech) {
-      this.adaptor.setAttribute(node, 'aria-label', buildSpeech(speech, locale)[0]);
+    if (this.options.a11y.speech) {
+      const speech = this.getLabel(node);
+      if (speech) {
+        this.adaptor.setAttribute(node, 'aria-label', buildSpeech(speech, locale)[0]);
+      }
     }
-    const braille = this.adaptor.getAttribute(node, 'data-semantic-braille');
-    if (braille) {
-      this.adaptor.setAttribute(node, 'aria-braillelabel', braille);
+    if (this.options.a11y.braille) {
+      const braille = this.adaptor.getAttribute(node, 'data-semantic-braille');
+      if (braille) {
+        this.adaptor.setAttribute(node, 'aria-braillelabel', braille);
+      }
     }
     const xmlChildren = Array.from(xml.childNodes);
     Array.from(this.adaptor.childNodes(node)).forEach(