@opensumi/ide-webview 3.4.5-next-1730102270.0 → 3.4.5-next-1730118482.0

package/src/browser/webview.service.ts

@@ -243,7 +243,7 @@ export class WebviewServiceImpl implements IWebviewService {
 
   getWebviewThemeData(theme: ITheme): IWebviewThemeData {
     const editorFontFamily = this.editorPreferences['editor.fontFamily'];
-    const editorFontWeight = this.editorPreferences['editor.fontFamily'];
+    const editorFontWeight = this.editorPreferences['editor.fontWeight'];
     const editorFontSize = this.editorPreferences['editor.fontSize'];
 
     const exportedColors = getColorRegistry()

package/src/electron-webview/host-channel.ts

@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron';
 
 import { IWebviewChannel } from '../webview-host/common';
+import { getIdFromSearch } from '../webview-host/web-iframe-channel';
 import { WebviewPanelManager } from '../webview-host/webview-manager';
 
 export class ElectronWebviewChannel implements IWebviewChannel {
@@ -11,6 +12,10 @@ export class ElectronWebviewChannel implements IWebviewChannel {
 
   public isInDevelopmentMode = false;
 
+  get id() {
+    return getIdFromSearch();
+  }
+
   constructor() {
     window.addEventListener('message', (e) => {
       if (e.data && (e.data.command === 'onmessage' || e.data.command === 'do-update-state')) {

package/src/webview-host/common.ts

@@ -63,6 +63,7 @@ export interface IWebviewChannel {
   ready?: Promise<void>;
   onIframeLoaded?: (iframe: HTMLIFrameElement) => void;
   fakeLoad: boolean;
+  id: string;
   onKeydown?: (event: KeyboardEvent) => void;
 }
 

package/src/webview-host/web-iframe-channel.ts

@@ -0,0 +1,90 @@
+/* istanbul ignore file */
+import { IWebviewChannel } from './common';
+
+export const getIdFromSearch = () => {
+  const params = new URLSearchParams(document.location.search);
+  const id = params.get('id');
+  if (id) {
+    return id;
+  } else {
+    throw new Error('Missing "id" parameter in URL');
+  }
+};
+
+export class WebIframeChannel implements IWebviewChannel {
+  private handlers = new Map();
+  focusIframeOnCreate?: boolean;
+  ready?: Promise<void>;
+  fakeLoad = false;
+  private isInDevelopmentMode = false;
+
+  private _id: string;
+  get id() {
+    if (!this._id) {
+      this._id = this.getId() ?? '';
+    }
+    return this._id;
+  }
+
+  constructor(protected getId: () => string) {
+    window.addEventListener('message', (e) => {
+      if (e.data && (e.data.command === 'onmessage' || e.data.command === 'do-update-state')) {
+        // Came from inner iframe
+        this.postMessage(e.data.command, e.data.data);
+        return;
+      }
+
+      const channel = e.data.channel;
+      const handler = this.handlers.get(channel);
+      if (handler) {
+        handler(e, e.data.data);
+      } else {
+        // eslint-disable-next-line no-console
+        console.log('no handler for ', e);
+      }
+    });
+
+    this.ready = new Promise<void>((resolve) => {
+      // TODO 等待service worker完成  未来资源使用service worker时需要加入
+      resolve();
+    });
+
+    this.onMessage('devtools-opened', () => {
+      this.isInDevelopmentMode = true;
+    });
+  }
+
+  get inDev() {
+    return this.isInDevelopmentMode;
+  }
+
+  postMessage(channel, data?) {
+    if (window.parent !== window) {
+      window.parent.postMessage({ target: this.id, channel, data }, '*');
+    }
+  }
+
+  onMessage(channel, handler) {
+    this.handlers.set(channel, handler);
+  }
+
+  onIframeLoaded(newFrame) {
+    // newFrame.contentWindow.onbeforeunload = () => {
+    //   if (this.isInDevelopmentMode) { // Allow reloads while developing a webview
+    //     this.postMessage('do-reload');
+    //     return false;
+    //   }
+    //   // Block navigation when not in development mode
+    //   console.log('prevented webview navigation');
+    //   return false;
+    // };
+  }
+
+  onKeydown(event: KeyboardEvent) {
+    // 在浏览器上，需要阻止一些默认的keydown快捷键
+    if (event.key === 's' && (event.metaKey || event.ctrlKey)) {
+      // 阻止保存
+      event.preventDefault();
+    }
+  }
+}

package/src/webview-host/web-preload-builtin.ts

@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+import { WebIframeChannel } from './web-iframe-channel';
+import { WebviewPanelManager } from './webview-manager';
+
+interface ExtendedWindow extends Window {
+  channelId: string;
+}
+
+new WebviewPanelManager(new WebIframeChannel(() => (window as unknown as ExtendedWindow).channelId));

package/src/webview-host/web-preload.ts

@@ -1,76 +1,5 @@
 /* istanbul ignore file */
-import { IWebviewChannel } from './common';
+import { WebIframeChannel, getIdFromSearch } from './web-iframe-channel';
 import { WebviewPanelManager } from './webview-manager';
 
-export class WebIframeChannel implements IWebviewChannel {
-  private handlers = new Map();
-  focusIframeOnCreate?: boolean | undefined;
-  ready?: Promise<void> | undefined;
-  fakeLoad = false;
-  private isInDevelopmentMode = false;
-  private id = document!.location!.search!.match(/\bid=([\w-]+)/)![1];
-
-  constructor() {
-    window.addEventListener('message', (e) => {
-      if (e.data && (e.data.command === 'onmessage' || e.data.command === 'do-update-state')) {
-        // Came from inner iframe
-        this.postMessage(e.data.command, e.data.data);
-        return;
-      }
-
-      const channel = e.data.channel;
-      const handler = this.handlers.get(channel);
-      if (handler) {
-        handler(e, e.data.data);
-      } else {
-        // eslint-disable-next-line no-console
-        console.log('no handler for ', e);
-      }
-    });
-
-    this.ready = new Promise<void>(async (resolve) => {
-      // TODO 等待service worker完成  未来资源使用service worker时需要加入
-      resolve();
-    });
-
-    this.onMessage('devtools-opened', () => {
-      this.isInDevelopmentMode = true;
-    });
-  }
-
-  get inDev() {
-    return this.isInDevelopmentMode;
-  }
-
-  postMessage(channel, data?) {
-    if (window.parent !== window) {
-      window.parent.postMessage({ target: this.id, channel, data }, '*');
-    }
-  }
-
-  onMessage(channel, handler) {
-    this.handlers.set(channel, handler);
-  }
-
-  onIframeLoaded(newFrame) {
-    // newFrame.contentWindow.onbeforeunload = () => {
-    //   if (this.isInDevelopmentMode) { // Allow reloads while developing a webview
-    //     this.postMessage('do-reload');
-    //     return false;
-    //   }
-    //   // Block navigation when not in development mode
-    //   console.log('prevented webview navigation');
-    //   return false;
-    // };
-  }
-
-  onKeydown(event: KeyboardEvent) {
-    // 在浏览器上，需要阻止一些默认的keydown快捷键
-    if (event.key === 's' && (event.metaKey || event.ctrlKey)) {
-      // 阻止保存
-      event.preventDefault();
-    }
-  }
-}
-
-new WebviewPanelManager(new WebIframeChannel());
+new WebviewPanelManager(new WebIframeChannel(getIdFromSearch));

package/src/webview-host/webview-manager.ts

@@ -9,15 +9,16 @@ export class WebviewPanelManager {
   private loadTimeout;
   private pendingMessages: any[] = [];
   private initialScrollProgress: number;
-  private ID: string | undefined;
+
+  get ID() {
+    return this.channel.id;
+  }
 
   constructor(private channel: IWebviewChannel) {
     document.addEventListener('DOMContentLoaded', this.init.bind(this));
   }
 
   private init() {
-    const idMatch = document.location.search.match(/\bid=([\w-]+)/);
-    this.ID = idMatch ? idMatch[1] : undefined;
     if (!document.body) {
       return;
     }