From 1a9a7092537284e128791731ca13e45de7b08b42 Mon Sep 17 00:00:00 2001
From: Marco Braak <marco@floryn.com>
Date: Sun, 23 Jul 2023 16:28:20 +0200
Subject: [PATCH] Change aria roles

---
 src/elementsRenderer.ts | 54 ++++++++++++++++-------------------------
 src/nodeElement.ts      | 12 +++------
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/elementsRenderer.ts b/src/elementsRenderer.ts
index 98a7bee5..a43e754b 100644
--- a/src/elementsRenderer.ts
+++ b/src/elementsRenderer.ts
@@ -1,6 +1,7 @@
 import { getBoolString } from "./util";
 import { Node } from "./node";
 import { JqTreeWidget } from "./tree.jquery";
+import { title } from "process";
 
 type IconElement = Text | Element;
 
@@ -141,6 +142,18 @@ export default class ElementsRenderer {
         return li;
     }
 
+    private setTreeItemAriaAttributes(
+        li: HTMLLIElement,
+        node: Node,
+        level: number,
+        isSelected: boolean
+    ) {
+        li.setAttribute("aria-label", node.name);
+        li.setAttribute("aria-level", `${level}`);
+        li.setAttribute("aria-selected", getBoolString(isSelected));
+        li.setAttribute("role", "treeitem");
+    }
+
     private createFolderLi(
         node: Node,
         level: number,
@@ -156,40 +169,31 @@ export default class ElementsRenderer {
         // li
         const li = document.createElement("li");
         li.className = `jqtree_common ${folderClasses}`;
-        li.setAttribute("role", "presentation");
+        this.setTreeItemAriaAttributes(li, node, level, isSelected);
+        li.setAttribute("aria-expanded", getBoolString(node.is_open));
 
         // div
         const div = document.createElement("div");
         div.className = "jqtree-element jqtree_common";
-        div.setAttribute("role", "presentation");
+        div.setAttribute("role", "none");
 
         li.appendChild(div);
 
         // button link
         const buttonLink = document.createElement("a");
         buttonLink.className = buttonClasses;
+        buttonLink.setAttribute("aria-hidden", "true");
 
         if (iconElement) {
             buttonLink.appendChild(iconElement.cloneNode(true));
         }
 
-        buttonLink.setAttribute("role", "presentation");
-        buttonLink.setAttribute("aria-hidden", "true");
-
         if (this.treeWidget.options.buttonLeft) {
             div.appendChild(buttonLink);
         }
 
         // title span
-        div.appendChild(
-            this.createTitleSpan(
-                node.name,
-                level,
-                isSelected,
-                node.is_open,
-                true
-            )
-        );
+        div.appendChild(this.createTitleSpan(node.name, isSelected, true));
 
         if (!this.treeWidget.options.buttonLeft) {
             div.appendChild(buttonLink);
@@ -214,34 +218,24 @@ export default class ElementsRenderer {
         // li
         const li = document.createElement("li");
         li.className = classString;
-        li.setAttribute("role", "presentation");
+        this.setTreeItemAriaAttributes(li, node, level, isSelected);
 
         // div
         const div = document.createElement("div");
         div.className = "jqtree-element jqtree_common";
-        div.setAttribute("role", "presentation");
+        div.setAttribute("role", "none");
 
         li.appendChild(div);
 
         // title span
-        div.appendChild(
-            this.createTitleSpan(
-                node.name,
-                level,
-                isSelected,
-                node.is_open,
-                false
-            )
-        );
+        div.appendChild(this.createTitleSpan(node.name, isSelected, false));
 
         return li;
     }
 
     private createTitleSpan(
         nodeName: string,
-        level: number,
         isSelected: boolean,
-        isOpen: boolean,
         isFolder: boolean
     ): HTMLSpanElement {
         const titleSpan = document.createElement("span");
@@ -258,12 +252,6 @@ export default class ElementsRenderer {
 
         titleSpan.className = classes;
 
-        titleSpan.setAttribute("role", "treeitem");
-        titleSpan.setAttribute("aria-level", `${level}`);
-
-        titleSpan.setAttribute("aria-selected", getBoolString(isSelected));
-        titleSpan.setAttribute("aria-expanded", getBoolString(isOpen));
-
         if (isSelected) {
             const tabIndex = this.treeWidget.options.tabIndex;
 
diff --git a/src/nodeElement.ts b/src/nodeElement.ts
index 472ef6d8..b0ab3776 100644
--- a/src/nodeElement.ts
+++ b/src/nodeElement.ts
@@ -59,12 +59,12 @@ export class NodeElement {
         const $li = this.getLi();
 
         $li.removeClass("jqtree-selected");
-        $li.attr("aria-selected", "false");
+        $li.attr("aria-selected", "true");
 
         const $span = this.getSpan();
         $span.removeAttr("tabindex");
 
-        $span.blur();
+        $span.trigger("blur");
     }
 
     protected getUl(): JQuery<HTMLElement> {
@@ -117,9 +117,7 @@ export class FolderElement extends NodeElement {
         const doOpen = (): void => {
             const $li = this.getLi();
             $li.removeClass("jqtree-closed");
-
-            const $span = this.getSpan();
-            $span.attr("aria-expanded", "true");
+            $li.attr("aria-expanded", "true");
 
             if (onFinished) {
                 onFinished(this.node);
@@ -167,9 +165,7 @@ export class FolderElement extends NodeElement {
         const doClose = (): void => {
             const $li = this.getLi();
             $li.addClass("jqtree-closed");
-
-            const $span = this.getSpan();
-            $span.attr("aria-expanded", "false");
+            $li.attr("aria-expanded", "false");
 
             this.treeWidget._triggerEvent("tree.close", {
                 node: this.node,