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

CHANGELOG.md

@@ -27,6 +27,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [2010](https://github.com/microsoft/BotFramework-Emulator/pull/2010)
   - [2012](https://github.com/microsoft/BotFramework-Emulator/pull/2012)
   - [2013](https://github.com/microsoft/BotFramework-Emulator/pull/2013)
+  - [2014](https://github.com/microsoft/BotFramework-Emulator/pull/2014)
+  - [2015](https://github.com/microsoft/BotFramework-Emulator/pull/2015)
+  - [2017](https://github.com/microsoft/BotFramework-Emulator/pull/2017)
+  - [2019](https://github.com/microsoft/BotFramework-Emulator/pull/2019)
+  - [2021](https://github.com/microsoft/BotFramework-Emulator/pull/2021)
 
 - [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)
 

packages/app/client/src/ui/dialogs/openBotDialog/openBotDialog.tsx

@@ -126,7 +126,6 @@ export class OpenBotDialog extends Component<OpenBotDialogProps, OpenBotDialogSt
     const errorMessage = OpenBotDialog.getErrorMessage(validationResult);
     const shouldBeDisabled =
       validationResult === ValidationResult.Invalid || validationResult === ValidationResult.Empty;
-    const botUrlLabel = 'Bot URL';
 
     return (
       <Dialog cancel={this.props.onDialogCancel} className={openBotStyles.themeOverrides} title="Open a bot">
@@ -135,10 +134,10 @@ export class OpenBotDialog extends Component<OpenBotDialogProps, OpenBotDialogSt
             <AutoComplete
               autoFocus={true}
               errorMessage={errorMessage}
-              label={botUrlLabel}
+              label={'Bot URL'}
               items={savedBotUrls.map(elem => elem.url).slice(0, 9)}
               onChange={this.onBotUrlChange}
-              placeholder={botUrlLabel}
+              placeholder={'Enter your bot URL'}
               value={this.state.botUrl}
             />
             {this.browseButton}

packages/app/client/src/ui/editor/emulator/emulator.tsx

@@ -34,6 +34,7 @@
 import { Activity } from 'botframework-schema';
 import { createDirectLine } from 'botframework-webchat';
 import { DirectLine } from 'botframework-directlinejs';
+import { isMac } from '@bfemulator/app-shared';
 import { CommandServiceImpl, CommandServiceInstance, EmulatorMode, uniqueId, uniqueIdv4 } from '@bfemulator/sdk-shared';
 import { SplitButton, Splitter } from '@bfemulator/ui-react';
 import base64Url from 'base64url';
@@ -48,7 +49,6 @@ 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';

packages/app/client/src/ui/editor/emulator/parts/inspector/inspector.scss

@@ -65,23 +65,27 @@
 }
 
 .left-arrow {
-  background-image: url('../../../../media/ic_next.svg');
-  background-position: 50% 50%;
+  background-color: var(--accessory-button-icon-color);
+  -webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
+  -webkit-mask-size: 16px;
   transform: rotate(180deg);
 }
 
 .left-arrow-selected {
-  background-image: url('../../../../media/ic_next.svg');
-  background-position: 50% 50%;
+  background-color: var(--accessory-button-icon-color);
+  -webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
+  -webkit-mask-size: 16px;
   transform: rotate(180deg);
 }
 
 .right-arrow {
-  background-image: url('../../../../media/ic_next.svg');
-  background-position: 50% 50%;
+  background-color: var(--accessory-button-icon-color);
+  -webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
+  -webkit-mask-size: 16px;
 }
 
 .right-arrow-selected {
-  background-image: url('../../../../media/ic_next.svg');
-  background-position: 50% 50%;
+  background-color: var(--accessory-button-icon-color);
+  -webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
+  -webkit-mask-size: 16px;
 }

packages/app/client/src/ui/shell/explorer/botNotOpenExplorer/botNotOpenExplorer.scss

@@ -43,7 +43,7 @@
 }
 
 .explorer-link {
-  color: var(--dialog-link-color);
+  color: var(--explorer-link-color);
 }
 
 .explorer-empty-state {

packages/app/client/src/ui/shell/explorer/resourceExplorer/resourceExplorer.scss

@@ -15,7 +15,7 @@ ul > li > input[type="text"] {
 }
 
 .explorer-link {
-  color: var(--dialog-link-color);
+  color: var(--explorer-link-color);
   text-decoration: none;
   line-height: 20px;
 }

packages/app/client/src/ui/shell/explorer/servicesExplorer/servicesExplorer.scss

@@ -39,7 +39,7 @@ ul > li > svg {
 }
 
 .explorer-link {
-  color: var(--dialog-link-color);
+  color: var(--explorer-link-color);
   text-decoration: none;
   line-height: 20px;
 }

packages/app/client/src/ui/styles/themes/dark.css

@@ -164,6 +164,7 @@ html {
   --explorer-panel-group-title-color: var(--neutral-4);
   --explorer-panel-group-border: 1px solid transparent;
   --explorer-panel-empty-message-color: var(--neutral-5);
+  --explorer-link-color: #40A6FF;
 
   /* Explorer Bar */
   --explorer-bar-header-bg: var(--neutral-14);
@@ -220,7 +221,7 @@ html {
   --status-bar-color: #FFFFFF;
 
   /* Links */
-  --link-color: #3062D6;
+  --link-color: #3794FF;
   --link-color-disabled: #C8C8C8;
   --inspector-link-color: #75BEFF;
 
@@ -249,6 +250,7 @@ html {
 
   /* accessory buttons */
   --accessory-button-color: var(--neutral-5);
+  --accessory-button-icon-color: var(--link-color);
 
   /* Auto Complete */
   --auto-complete-results-opacity: 0.9;

packages/app/client/src/ui/styles/themes/high-contrast.css

@@ -163,6 +163,7 @@ html {
   --explorer-panel-group-title-color: var(--neutral-1);
   --explorer-panel-group-border: 1px solid #72C3DF;
   --explorer-panel-empty-message-color: var(--neutral-4);
+  --explorer-link-color: var(--link-color);
 
   /* Explorer Bar */
   --explorer-bar-header-bg: var(--neutral-16);
@@ -248,6 +249,7 @@ html {
 
   /* Inspector accessory buttons */
   --accessory-button-color: var(--neutral-5);
+  --accessory-button-icon-color: #72C3DF;
 
   /* Auto Complete */
   --auto-complete-results-opacity: 1;

packages/app/client/src/ui/styles/themes/light.css

@@ -36,14 +36,14 @@ html {
   --webchat-user-bubble-text: var(--neutral-1);
   --webchat-selected-activity-bg: #B89500;
   --webchat-selected-activity-text: var(--neutral-1);
-  --webchat-timestamp-text: var(--neutral-6);
+  --webchat-timestamp-text: var(--neutral-10);
   --webchat-scrollbar-color: var(--scrollbar-color);
 
   /* sendbox */
   --webchat-sendbox-bg: var(--neutral-1);
   --webchat-sendbox-text: initial;
-  --webchat-buttons-color: var(--neutral-6);
-  --webchat-buttons-color-focus: var(--neutral-9);
+  --webchat-buttons-color: var(--neutral-10);
+  --webchat-buttons-color-focus: var(--neutral-12);
   --webchat-buttons-dictate: #BE1100;
 
   /* transcript overlays */
@@ -163,6 +163,7 @@ html {
   --explorer-panel-group-border: 1px solid transparent;
   --explorer-panel-empty-message-color: var(--neutral-15);
   --service-panescrollbar-color: var(--neutral-13);
+  --explorer-link-color: var(--dialog-link-color);
 
   /* Explorer Bar */
   --explorer-bar-header-bg: var(--neutral-3);
@@ -249,6 +250,7 @@ html {
 
   /* Inspector accessory buttons */
   --accessory-button-color: var(--s-button-color);
+  --accessory-button-icon-color: var(--link-color);
 
   /* Auto Complete */
   --auto-complete-results-opacity: 0.9;

packages/app/client/src/utils/eventHandlers.ts

@@ -30,11 +30,10 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-import { Notification, NotificationType, SharedConstants } from '@bfemulator/app-shared';
+import { isLinux, isMac, Notification, NotificationType, SharedConstants } from '@bfemulator/app-shared';
 import { CommandServiceImpl, CommandServiceInstance } from '@bfemulator/sdk-shared';
 import { remote } from 'electron';
 
-import { isMac } from '../../../../app/main/src/utils/platform';
 const maxZoomFactor = 3; // 300%
 const minZoomFactor = 0.25; // 25%;
 class EventHandlers {
@@ -136,7 +135,7 @@ class EventHandlers {
       }
     }
 
-    if (isMac()) {
+    if (isMac() || isLinux()) {
       const tabPressed: boolean = key === 'tab';
       const lastDecendants = EventHandlers.getLastDecendants(document.querySelector('main'));
       const firstElement = document.querySelector('nav').firstElementChild as HTMLElement;

packages/app/main/src/appMenuBuilder.ts

@@ -31,7 +31,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import { BotInfo, SharedConstants, UpdateStatus } from '@bfemulator/app-shared';
+import { BotInfo, isMac, SharedConstants, UpdateStatus } from '@bfemulator/app-shared';
 import { CommandServiceImpl, CommandServiceInstance, ConversationService } from '@bfemulator/sdk-shared';
 import { app, clipboard, Menu, MenuItem, MenuItemConstructorOptions, shell } from 'electron';
 
@@ -40,7 +40,6 @@ import { BotHelpers } from './botHelpers';
 import { Emulator } from './emulator';
 import { rememberTheme } from './state/actions/windowStateActions';
 import { TelemetryService } from './telemetry';
-import { isMac } from './utils';
 import { store } from './state';
 import { getLocalhostServiceUrl } from './utils/getLocalhostServiceUrl';
 import { getCurrentConversationId } from './state/helpers/chatHelpers';

packages/app/main/src/commands/botCommands.ts

@@ -33,7 +33,7 @@
 
 import * as path from 'path';
 
-import { BotInfo, getBotDisplayName, SharedConstants } from '@bfemulator/app-shared';
+import { BotInfo, getBotDisplayName, isMac, SharedConstants } from '@bfemulator/app-shared';
 import {
   BotConfigWithPath,
   Command,
@@ -52,7 +52,6 @@ import { store } from '../state/store';
 import { BotHelpers } from '../botHelpers';
 import { Emulator } from '../emulator';
 import { TelemetryService } from '../telemetry';
-import { isMac } from '../utils';
 import { botProjectFileWatcher, chatWatcher, transcriptsWatcher } from '../watchers';
 import { CredentialManager } from '../credentialManager';
 

packages/app/main/src/main.ts

@@ -34,7 +34,7 @@ import './commands';
 import * as path from 'path';
 import * as url from 'url';
 
-import { newNotification, Notification, PersistentSettings, SharedConstants } from '@bfemulator/app-shared';
+import { isMac, newNotification, Notification, PersistentSettings, SharedConstants } from '@bfemulator/app-shared';
 import { app, BrowserWindow, Rectangle, screen, systemPreferences } from 'electron';
 import { CommandServiceImpl, CommandServiceInstance } from '@bfemulator/sdk-shared';
 
@@ -48,7 +48,7 @@ import { azureLoggedInUserChanged } from './state/actions/azureAuthActions';
 import { rememberBounds } from './state/actions/windowStateActions';
 import { dispatch, getSettings, store } from './state/store';
 import { TelemetryService } from './telemetry';
-import { botListsAreDifferent, ensureStoragePath, isMac, saveSettings, writeFile } from './utils';
+import { botListsAreDifferent, ensureStoragePath, saveSettings, writeFile } from './utils';
 import { openFileFromCommandLine } from './utils/openFileFromCommandLine';
 import { sendNotificationToClient } from './utils/sendNotificationToClient';
 import { WindowManager } from './windowManager';

packages/app/main/src/utils/index.ts

@@ -41,7 +41,6 @@ export * from './getSafeBotName';
 export * from './isDev';
 export * from './loadSettings';
 export * from './parseActivitiesFromChatFile';
-export * from './platform';
 export * from './readFileSync';
 export * from './saveSettings';
 export * from './sendErrorResponse';