From ed0b611033072b06d8916a1b776a1ae93f7332b7 Mon Sep 17 00:00:00 2001
From: Matias Lera <62261539+luislera@users.noreply.github.com>
Date: Wed, 27 Oct 2021 18:01:25 -0300
Subject: [PATCH] [Accessibility] [Screen Reader] Enable the screen reader to
 announce when nodes are expanded and collapsed in the JSON tree view (#2299)

* Added screen reader announcements when nodes are expanded and collapsed.

* Added a new line at the end of the file

* Added a comment
---
 .../collapsibleJsonViewer.scss                |  6 ++
 .../collapsibleJsonViewer.spec.tsx            | 84 ++++++++++---------
 .../collapsibleJsonViewer.tsx                 |  7 ++
 3 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.scss b/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.scss
index 0318f1795..15dcf0eb8 100644
--- a/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.scss
+++ b/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.scss
@@ -23,3 +23,9 @@
     width: calc(100% - 10px);
   }
 }
+
+.aria-region {
+  position: absolute;
+  top: -9999px;
+  overflow: hidden;
+}
diff --git a/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.spec.tsx b/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.spec.tsx
index 244cc3048..92f3be20a 100644
--- a/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.spec.tsx
+++ b/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.spec.tsx
@@ -67,48 +67,51 @@ const mockData = {
 };
 
 const mockTreeHTMLText = `
-<ul id="rootGroup">
-  <li>
-    <div>
-      <div>▶</div>
-    </div>
-    <label><span>root:</span></label>
-    <span>
-      <span> 
-        <span>{}</span> 2 keys
-        </span></span>
-    <ul id="group1">
-      <li>
-        <div>
-          <div>▶</div>
-        </div>
-        <label><span>membersAdded:</span></label>
-        <span><span><span>[]</span> 1 item</span></span>
-        <ul id="group2">
-          <li>
-            <div role="button" id="actuator">
-              <div>▶</div>
-            </div>
-            <label><span>0:</span></label>
-            <span>
+<div>
+  <ul id="rootGroup">
+    <li>
+      <div>
+        <div>▶</div>
+      </div>
+      <label><span>root:</span></label>
+      <span>
+        <span>
+          <span>{}</span> 2 keys
+          </span></span>
+      <ul id="group1">
+        <li>
+          <div>
+            <div>▶</div>
+          </div>
+          <label><span>membersAdded:</span></label>
+          <span><span><span>[]</span> 1 item</span></span>
+          <ul id="group2">
+            <li>
+              <div role="button" id="actuator">
+                <div>▶</div>
+              </div>
+              <label><span>0:</span></label>
               <span>
-                <span>{}</span> 
-                2 keys
+                <span>
+                  <span>{}</span>
+                  2 keys
+                </span>
               </span>
-            </span>
-            <ul id="group3">
-              <li><label><span>id:</span></label><span>"1"</span></li>
-              <li><label><span>name:</span></label><span>"Bot"</span>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </li>
-      <li><label><span>type:</span></label><span>"conversationUpdate"</span>
-      </li>
-    </ul>
-  </li>
-</ul>`;
+              <ul id="group3">
+                <li><label><span>id:</span></label><span>"1"</span></li>
+                <li><label><span>name:</span></label><span>"Bot"</span>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </li>
+        <li><label><span>type:</span></label><span>"conversationUpdate"</span>
+        </li>
+      </ul>
+    </li>
+  </ul>
+  <div id="ariaRegion" role="region" aria-live="polite" className={styles.ariaRegion}>text content</div>
+</div>`;
 
 let jsonViewerWrapper;
 let jsonViewer;
@@ -117,6 +120,7 @@ describe('The JsonViewer', () => {
   beforeAll(() => {
     jsonViewerWrapper = mount(<CollapsibleJsonViewer data={mockData} themeName={'high-contrast'} />);
     jsonViewer = jsonViewerWrapper.find(CollapsibleJsonViewer).instance();
+    document.body.innerHTML = mockTreeHTMLText;
   });
 
   it('should render with data and a theme', () => {
diff --git a/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.tsx b/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.tsx
index c11b8e9e7..b271ed7bf 100644
--- a/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.tsx
+++ b/packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.tsx
@@ -115,6 +115,7 @@ export class CollapsibleJsonViewer extends Component<CollapsibleJsonViewerProps,
     return (
       <div ref={this.jsonTreeContainerRef} className={styles.collapsibleJsonViewer}>
         <JSONTree data={data} theme={themeNameToViewerThemeName[themeName]} invertTheme={false} {...jsonTreeProps} />
+        <div id="ariaRegion" role="region" aria-live="polite" className={styles.ariaRegion} />
       </div>
     );
   }
@@ -186,6 +187,12 @@ export class CollapsibleJsonViewer extends Component<CollapsibleJsonViewerProps,
     const proposedAriaExpandedValue = !(ul.getAttribute('aria-expanded') === 'true');
     ul.setAttribute('aria-expanded', proposedAriaExpandedValue.toString());
     target.setAttribute('aria-expanded', proposedAriaExpandedValue.toString());
+    // Announce the expanded/collapsed state
+    const ariaRegion = document.getElementById('ariaRegion');
+    const newState = proposedAriaExpandedValue ? 'Node expanded' : 'Node collapsed';
+    // Concatenate the '.' in case it's not present in the textContent property
+    // to announce that the node was expanded or collapsed
+    ariaRegion.textContent = ariaRegion.textContent.indexOf('.') > -1 ? newState : newState.concat('.');
   };
 
   private focusNext(event: KeyboardEvent): void {