fix: Monaco editor links opened in blank window in electron (#4269)

* disable ctrl + click open window in electron * do not use hasOwnProperty * cast window to any Co-authored-by: Andy Brown <asbrown002@gmail.com>
microsoft · Sep 25, 2020 · 1143ea0 · 1143ea0
1 parent 69dd86d
commit 1143ea0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Composer/packages/lib/code-editor/src/BaseEditor.tsx b/Composer/packages/lib/code-editor/src/BaseEditor.tsx
@@ -13,6 +13,8 @@ import { Diagnostic } from '@bfc/shared';
 import { findErrors, combineSimpleMessage, findWarnings } from '@bfc/indexers';
 import { CodeEditorSettings, assignDefined } from '@bfc/shared';
 
+import { isElectron } from './utils';
+
 const defaultOptions = {
   scrollBeyondLastLine: false,
   wordWrap: 'off',
@@ -32,6 +34,7 @@ const defaultOptions = {
   renderLineHighlight: 'none',
   formatOnType: true,
   fixedOverflowWidgets: true,
+  links: isElectron() ? false : true, // disable in electron@8.2.4 before monaco editor can set target '_blank'
 };
 
 const styles = {

diff --git a/Composer/packages/lib/code-editor/src/utils/common.ts b/Composer/packages/lib/code-editor/src/utils/common.ts
@@ -4,3 +4,7 @@
 export function processSize(size) {
   return !/^\d+$/.test(size) ? size : `${size}px`;
 }
+
+export function isElectron(): boolean {
+  return !(window as any).__IS_ELECTRON__;
+}