Merge branch 'master' into fix/synchronize-voiceover-focus

microsoft · Dec 2, 2019 · b9adb97 · b9adb97
2 parents a4aec76 + 7019832
commit b9adb97
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [2002](https://github.com/microsoft/BotFramework-Emulator/pull/2002)
   - [2009](https://github.com/microsoft/BotFramework-Emulator/pull/2009)
   - [2010](https://github.com/microsoft/BotFramework-Emulator/pull/2010)
+  - [2012](https://github.com/microsoft/BotFramework-Emulator/pull/2012)
 
 - [main] Increased ngrok spawn timeout to 15 seconds to be more forgiving to slower networks in PR [1998](https://github.com/microsoft/BotFramework-Emulator/pull/1998)
 

diff --git a/packages/app/client/src/ui/editor/emulator/emulator.tsx b/packages/app/client/src/ui/editor/emulator/emulator.tsx
@@ -48,6 +48,7 @@ import {
 
 import { Document, SplitterSize } from '../../../state/reducers/editor';
 import { debounce } from '../../../utils';
+import { isMac } from '../../../../../main/src/utils/platform';
 
 import { ChatPanelContainer } from './chatPanel';
 import LogPanel from './logPanel/logPanel';
@@ -304,6 +305,7 @@ export class Emulator extends React.Component<EmulatorProps, {}> {
                   options={[NewUserId, SameUserId]}
                   onClick={this.onStartOverClick}
                   buttonRef={this.setRestartButtonRef}
+                  submenuLabel={isMac() ? 'Restart conversation sub menu' : ''}
                 />
                 <button
                   role={'menuitem'}

diff --git a/packages/sdk/ui-react/src/widget/splitButton/splitButton.tsx b/packages/sdk/ui-react/src/widget/splitButton/splitButton.tsx
@@ -46,6 +46,7 @@ export interface SplitButtonProps {
   options?: string[];
   buttonRef?: (ref: HTMLButtonElement) => void;
   selected?: number;
+  submenuLabel?: string;
 }
 
 export interface SplitButtonState {
@@ -66,7 +67,14 @@ export class SplitButton extends React.Component<SplitButtonProps, SplitButtonSt
   }
 
   public render(): JSX.Element {
-    const { buttonClass = '', defaultLabel = '', disabled = false, id = '', options = [] } = this.props;
+    const {
+      buttonClass = '',
+      defaultLabel = '',
+      disabled = false,
+      id = '',
+      options = [],
+      submenuLabel = '',
+    } = this.props;
     const { expanded, selected } = this.state;
     const {
       caretRef,
@@ -95,7 +103,7 @@ export class SplitButton extends React.Component<SplitButtonProps, SplitButtonSt
           </button>
           <div className={styles.separator} aria-hidden={'true'} />
           <button
-            aria-label={defaultLabel}
+            aria-label={submenuLabel || defaultLabel}
             className={styles.caretButton + expandedClass}
             ref={setCaretRef}
             onClick={onClickCaret}