Merge branch 'master' into toanzian/acc-#1907

microsoft · Nov 20, 2019 · cd4db18 · cd4db18
2 parents dfc9f7b + 99c46c8
commit cd4db18
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [1990](https://github.com/microsoft/BotFramework-Emulator/pull/1990)
   - [1992](https://github.com/microsoft/BotFramework-Emulator/pull/1992)
   - [1993](https://github.com/microsoft/BotFramework-Emulator/pull/1993)
+  - [1991](https://github.com/microsoft/BotFramework-Emulator/pull/1991)
+  - [1994](https://github.com/microsoft/BotFramework-Emulator/pull/1994)
 
 ## Removed
 - [main] Removed unused `VersionManager` class in PR [1991](https://github.com/microsoft/BotFramework-Emulator/pull/1991)

diff --git a/packages/app/client/src/ui/shell/explorer/endpointExplorer/endpointEditor/endpointEditor.tsx b/packages/app/client/src/ui/shell/explorer/endpointExplorer/endpointEditor/endpointEditor.tsx
@@ -184,7 +184,13 @@ export class EndpointEditor extends Component<EndpointEditorProps, EndpointEdito
           Azure Bot Service configuration
           <span role="presentation"></span>
         </button>
-        <div id="abs-config-content" className={styles.absContent} ref={this.absContentRef} role="region">
+        <div
+          id="abs-config-content"
+          className={styles.absContent}
+          ref={this.absContentRef}
+          role="region"
+          aria-hidden={true}
+        >
           <div>
             <Row className={styles.absTextFieldRow}>
               <TextField
@@ -307,6 +313,7 @@ export class EndpointEditor extends Component<EndpointEditorProps, EndpointEdito
     const newHeight = expanded ? clientHeight : 0;
     this.absContent.style.height = `${newHeight}px`;
     currentTarget.setAttribute('aria-expanded', expanded + '');
+    this.absContent.setAttribute('aria-hidden', expanded ? 'false' : 'true');
     this.absContent.querySelectorAll('input').forEach((node: HTMLElement) => {
       if (node.hasAttribute('tabIndex')) {
         node.setAttribute('tabIndex', expanded ? '0' : '-1');

diff --git a/packages/app/main/package.json b/packages/app/main/package.json
@@ -93,7 +93,7 @@
     "@types/ws": "^4.0.1",
     "asar-integrity": "^0.2.4",
     "babel-jest": "24.8.0",
-    "botbuilder": "^3.14.0",
+    "botbuilder": "^4.5.1",
     "chalk": "^2.4.1",
     "concurrently": "^3.5.1",
     "cross-env": "^5.1.3",