@opensumi/ide-core-browser 2.27.2 → 2.27.3-next-1706509546.0

package/src/toolbar/toolbar.tsx

@@ -1,7 +1,7 @@
 import classnames from 'classnames';
 import throttle from 'lodash/throttle';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import ReactDOM from 'react-dom/client';
 
 import { IEventBus, Disposable, Emitter } from '@opensumi/ide-core-common';
 
@@ -638,7 +638,7 @@ class ToolbarActionRenderer {
             element.classList.add(...this.resolvedToolbarAction.extraClassNames);
           }
           let setInDropDown: (inDropDown: boolean) => void | undefined;
-          ReactDOM.render(
+          ReactDOM.createRoot(element).render(
             <ToolbarActionRenderWrapper
               initialInDropDown={inDropDown}
               action={this.toolbarAction}
@@ -651,23 +651,20 @@ class ToolbarActionRenderer {
               }}
               location={location}
             />,
-            element,
-            () => {
-              if (canceled) {
-                reject('canceled render toolbar');
-              } else {
-                this.reactElement = {
-                  element,
-                  setInDropDown: (inDropdown: boolean) => {
-                    if (setInDropDown) {
-                      setInDropDown(inDropdown);
-                    }
-                  },
-                };
-                resolve(element);
-              }
-            },
           );
+          if (canceled) {
+            reject('canceled render toolbar');
+          } else {
+            this.reactElement = {
+              element,
+              setInDropDown: (inDropdown: boolean) => {
+                if (setInDropDown) {
+                  setInDropDown(inDropdown);
+                }
+              },
+            };
+            resolve(element);
+          }
         }
       }).then((resolved) => {
         this.renderPromise.resolved = resolved;

package/src/utils/create-overlay.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import ReactDOMClient from 'react-dom/client';
 
 export const destroyFns: Array<() => void> = [];
 
@@ -31,7 +32,7 @@ export function createOverlay(children: React.ReactElement) {
   }
 
   function render(comp: React.ReactElement) {
-    ReactDOM.render(React.cloneElement(comp), div);
+    ReactDOMClient.createRoot(div).render(React.cloneElement(comp));
   }
 
   function update(newChildren: React.ReactElement) {

package/src/utils/electron.ts

@@ -1,6 +1,6 @@
+import { NetSocketConnection } from '@opensumi/ide-connection/lib/common/connection';
 import { IDisposable, isDefined } from '@opensumi/ide-core-common';
 import { IElectronMainApi } from '@opensumi/ide-core-common/lib/electron';
-import type { MessageConnection } from '@opensumi/vscode-jsonrpc';
 
 declare const ElectronIpcRenderer: IElectronIpcRenderer;
 
@@ -92,12 +92,18 @@ export function createElectronMainApi(name: string, enableCaptured?: boolean): I
   );
 }
 
+export interface IElectronEnvMetadata {
+  windowClientId: string;
+  [key: string]: any;
+}
+
 export const electronEnv: {
   currentWindowId: number;
   currentWebContentsId: number;
   ipcRenderer: IElectronIpcRenderer;
   webviewPreload: string;
   plainWebviewPreload: string;
+  metadata: IElectronEnvMetadata;
   [key: string]: any;
 } = (global as any) || {};
 
@@ -107,19 +113,21 @@ if (typeof ElectronIpcRenderer !== 'undefined') {
 
 export interface IElectronNativeDialogService {
   showOpenDialog(options: Electron.OpenDialogOptions): Promise<string[] | undefined>;
-
   showSaveDialog(options: Electron.SaveDialogOptions): Promise<string | undefined>;
 }
 
 export const IElectronNativeDialogService = Symbol('IElectronNativeDialogService');
 
-export function createElectronClientConnection(connectPath?: string): MessageConnection {
+export function createNetSocketConnection(connectPath?: string): NetSocketConnection {
   let socket;
   if (connectPath) {
     socket = electronEnv.createNetConnection(connectPath);
   } else {
     socket = electronEnv.createRPCNetConnection();
   }
-  const { createSocketConnection } = require('@opensumi/ide-connection/lib/node/connect');
-  return createSocketConnection(socket);
+  return new NetSocketConnection(socket);
+}
+
+export function fromWindowClientId(suffix: string) {
+  return `${suffix}-${electronEnv.metadata.windowClientId}`;
 }