@opensumi/ide-editor 3.3.1-next-1725281510.0 → 3.3.1-next-1725350427.0

package/src/browser/editor.view.tsx

@@ -1,8 +1,7 @@
 import cls from 'classnames';
 import { observer } from 'mobx-react-lite';
-import React from 'react';
+import React, { forwardRef } from 'react';
 import ReactDOM from 'react-dom/client';
-import ReactIs from 'react-is';
 
 import { Scrollbars } from '@opensumi/ide-components';
 import {
@@ -282,7 +281,6 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
 
   return (
     <div
-      ref={groupWrapperRef as any}
       className={styles_kt_editor_group}
       tabIndex={1}
       onFocus={(e) => {
@@ -294,7 +292,7 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
           <Tabs group={group} />
         </div>
       )}
-      <EditorGroupBody group={group} />
+      <EditorGroupBody ref={groupWrapperRef as any} group={group} />
       {isEmpty && (
         <div
           className={styles.kt_editor_background}
@@ -309,190 +307,201 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
   );
 });
 
-export const EditorGroupBody = observer(({ group }: { group: EditorGroup }) => {
-  const [context, setContext] = React.useState<IEditorContext>(defaultEditorContext);
-
-  const editorBodyRef = React.useRef<HTMLDivElement>(null);
-  const editorService = useInjectable(WorkbenchEditorService) as WorkbenchEditorServiceImpl;
-  const eventBus = useInjectable(IEventBus) as IEventBus;
-  const styles_kt_editor_component = useDesignStyles(styles.kt_editor_component, 'kt_editor_component');
-  const components: React.ReactNode[] = [];
-  const codeEditorRef = React.useRef<HTMLDivElement>(null);
-  const diffEditorRef = React.useRef<HTMLDivElement>(null);
-  const mergeEditorRef = React.useRef<HTMLDivElement>(null);
-  const [, updateState] = React.useState<any>();
-  const forceUpdate = React.useCallback(() => updateState({}), []);
-
-  React.useEffect(() => {
-    const disposables = new DisposableStore();
-
-    disposables.add(
-      group.onDidEditorGroupBodyChanged(() => {
-        forceUpdate();
-      }),
-    );
+export const EditorGroupBody = observer(
+  forwardRef(({ group }: { group: EditorGroup }, ref) => {
+    const [context, setContext] = React.useState<IEditorContext>(defaultEditorContext);
+
+    const editorBodyRef = React.useRef<HTMLDivElement | null>(null);
+    const editorService = useInjectable(WorkbenchEditorService) as WorkbenchEditorServiceImpl;
+    const eventBus = useInjectable(IEventBus) as IEventBus;
+    const styles_kt_editor_component = useDesignStyles(styles.kt_editor_component, 'kt_editor_component');
+    const components: React.ReactNode[] = [];
+    const codeEditorRef = React.useRef<HTMLDivElement>(null);
+    const diffEditorRef = React.useRef<HTMLDivElement>(null);
+    const mergeEditorRef = React.useRef<HTMLDivElement>(null);
+    const [, updateState] = React.useState<any>();
+    const forceUpdate = React.useCallback(() => updateState({}), []);
+
+    React.useEffect(() => {
+      const disposables = new DisposableStore();
+
+      disposables.add(
+        group.onDidEditorGroupBodyChanged(() => {
+          forceUpdate();
+        }),
+      );
 
-    if (codeEditorRef.current) {
-      if (cachedEditor[group.name]) {
-        cachedEditor[group.name].remove();
-        codeEditorRef.current.appendChild(cachedEditor[group.name]);
-      } else {
-        const container = document.createElement('div');
-        codeEditorRef.current.appendChild(container);
-        cachedEditor[group.name] = container;
-        group.createEditor(container);
-        const minimapWith = group.codeEditor.monacoEditor.getOption(monaco.editor.EditorOption.layoutInfo).minimap
-          .minimapWidth;
-        setContext({ minimapWidth: minimapWith });
-
-        disposables.add(
-          group.codeEditor.monacoEditor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(monaco.editor.EditorOption.layoutInfo)) {
-              setContext({
-                minimapWidth: group.codeEditor.monacoEditor.getOption(monaco.editor.EditorOption.layoutInfo).minimap
-                  .minimapWidth,
-              });
-            }
-          }),
-        );
+      if (codeEditorRef.current) {
+        if (cachedEditor[group.name]) {
+          cachedEditor[group.name].remove();
+          codeEditorRef.current.appendChild(cachedEditor[group.name]);
+        } else {
+          const container = document.createElement('div');
+          codeEditorRef.current.appendChild(container);
+          cachedEditor[group.name] = container;
+          group.createEditor(container);
+          const minimapWith = group.codeEditor.monacoEditor.getOption(monaco.editor.EditorOption.layoutInfo).minimap
+            .minimapWidth;
+          setContext({ minimapWidth: minimapWith });
+
+          disposables.add(
+            group.codeEditor.monacoEditor.onDidChangeConfiguration((e) => {
+              if (e.hasChanged(monaco.editor.EditorOption.layoutInfo)) {
+                setContext({
+                  minimapWidth: group.codeEditor.monacoEditor.getOption(monaco.editor.EditorOption.layoutInfo).minimap
+                    .minimapWidth,
+                });
+              }
+            }),
+          );
+        }
       }
-    }
 
-    if (diffEditorRef.current) {
-      group.attachDiffEditorDom(diffEditorRef.current);
-    }
-    if (mergeEditorRef.current) {
-      group.attachMergeEditorDom(mergeEditorRef.current);
-    }
+      if (diffEditorRef.current) {
+        group.attachDiffEditorDom(diffEditorRef.current);
+      }
+      if (mergeEditorRef.current) {
+        group.attachMergeEditorDom(mergeEditorRef.current);
+      }
 
-    return () => {
-      disposables.dispose();
-    };
-  }, []);
+      return () => {
+        disposables.dispose();
+      };
+    }, []);
 
-  group.activeComponents.forEach((resources, component) => {
-    const initialProps = group.activateComponentsProps.get(component);
-    components.push(
-      <div
-        key={component.uid}
-        className={cls({
-          [styles.kt_hidden]: !(group.currentOpenType && group.currentOpenType.componentId === component.uid),
-        })}
-      >
-        <ComponentsWrapper
+    group.activeComponents.forEach((resources, component) => {
+      const initialProps = group.activateComponentsProps.get(component);
+      components.push(
+        <div
           key={component.uid}
-          component={component}
-          {...initialProps}
-          resources={resources}
-          current={group.currentResource}
-        ></ComponentsWrapper>
-      </div>,
-    );
-  });
+          className={cls({
+            [styles.kt_hidden]: !(group.currentOpenType && group.currentOpenType.componentId === component.uid),
+          })}
+        >
+          <ComponentsWrapper
+            key={component.uid}
+            component={component}
+            {...initialProps}
+            resources={resources}
+            current={group.currentResource}
+          ></ComponentsWrapper>
+        </div>,
+      );
+    });
 
-  const editorHasNoTab = React.useMemo(
-    () => group.resources.length === 0 || !group.currentResource,
-    [group.resources.length, group.currentResource],
-  );
+    const editorHasNoTab = React.useMemo(
+      () => group.resources.length === 0 || !group.currentResource,
+      [group.resources.length, group.currentResource],
+    );
 
-  React.useEffect(() => {
-    if (group.currentOpenType?.type === EditorOpenType.code) {
-      eventBus.fire(
-        new CodeEditorDidVisibleEvent({
-          groupName: group.name,
-          type: EditorOpenType.code,
-          editorId: group.codeEditor.getId(),
-        }),
-      );
-    } else if (group.currentOpenType?.type === EditorOpenType.diff) {
-      eventBus.fire(
-        new CodeEditorDidVisibleEvent({
-          groupName: group.name,
-          type: EditorOpenType.diff,
-          editorId: group.diffEditor.modifiedEditor.getId(),
-        }),
-      );
-    }
-  });
+    React.useEffect(() => {
+      if (group.currentOpenType?.type === EditorOpenType.code) {
+        eventBus.fire(
+          new CodeEditorDidVisibleEvent({
+            groupName: group.name,
+            type: EditorOpenType.code,
+            editorId: group.codeEditor.getId(),
+          }),
+        );
+      } else if (group.currentOpenType?.type === EditorOpenType.diff) {
+        eventBus.fire(
+          new CodeEditorDidVisibleEvent({
+            groupName: group.name,
+            type: EditorOpenType.diff,
+            editorId: group.diffEditor.modifiedEditor.getId(),
+          }),
+        );
+      }
+    });
 
-  return (
-    <EditorContext.Provider value={context}>
-      <div
-        id={VIEW_CONTAINERS.EDITOR}
-        ref={editorBodyRef}
-        className={styles.kt_editor_body}
-        onDragOver={(e) => {
-          e.preventDefault();
-          if (editorBodyRef.current) {
-            const position = getDragOverPosition(e.nativeEvent, editorBodyRef.current);
-            decorateDragOverElement(editorBodyRef.current, position);
-          }
-        }}
-        onDragLeave={(e) => {
-          if (editorBodyRef.current) {
-            removeDecorationDragOverElement(editorBodyRef.current);
-          }
-        }}
-        onDrop={(e) => {
-          if (editorBodyRef.current) {
-            removeDecorationDragOverElement(editorBodyRef.current);
-            if (e.dataTransfer.getData('uri')) {
-              const uri = new URI(e.dataTransfer.getData('uri'));
-              let sourceGroup: EditorGroup | undefined;
-              if (e.dataTransfer.getData('uri-source-group')) {
-                sourceGroup = editorService.getEditorGroup(e.dataTransfer.getData('uri-source-group'));
+    return (
+      <EditorContext.Provider value={context}>
+        <div
+          id={VIEW_CONTAINERS.EDITOR}
+          ref={(_ref) => {
+            editorBodyRef.current = _ref;
+            if (ref) {
+              if (typeof ref === 'function') {
+                ref(_ref);
+              } else {
+                ref.current = _ref;
               }
-              group.dropUri(uri, getDragOverPosition(e.nativeEvent, editorBodyRef.current), sourceGroup);
             }
-            if (e.dataTransfer.files.length > 0) {
-              eventBus.fire(
-                new EditorGroupFileDropEvent({
-                  group,
-                  files: e.dataTransfer.files,
-                  position: getDragOverPosition(e.nativeEvent, editorBodyRef.current),
-                }),
-              );
+          }}
+          className={styles.kt_editor_body}
+          onDragOver={(e) => {
+            e.preventDefault();
+            if (editorBodyRef.current) {
+              const position = getDragOverPosition(e.nativeEvent, editorBodyRef.current);
+              decorateDragOverElement(editorBodyRef.current, position);
             }
-          }
-        }}
-      >
-        {group.currentResource && <EditorSideView side={'top'} resource={group.currentResource}></EditorSideView>}
-        {!editorHasNoTab && <NavigationBar editorGroup={group} />}
-        <div className={styles.kt_editor_components}>
-          <div
-            className={cls({
-              [styles_kt_editor_component]: true,
-              [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.component,
-            })}
-          >
-            {components}
+          }}
+          onDragLeave={(e) => {
+            if (editorBodyRef.current) {
+              removeDecorationDragOverElement(editorBodyRef.current);
+            }
+          }}
+          onDrop={(e) => {
+            if (editorBodyRef.current) {
+              removeDecorationDragOverElement(editorBodyRef.current);
+              if (e.dataTransfer.getData('uri')) {
+                const uri = new URI(e.dataTransfer.getData('uri'));
+                let sourceGroup: EditorGroup | undefined;
+                if (e.dataTransfer.getData('uri-source-group')) {
+                  sourceGroup = editorService.getEditorGroup(e.dataTransfer.getData('uri-source-group'));
+                }
+                group.dropUri(uri, getDragOverPosition(e.nativeEvent, editorBodyRef.current), sourceGroup);
+              }
+              if (e.dataTransfer.files.length > 0) {
+                eventBus.fire(
+                  new EditorGroupFileDropEvent({
+                    group,
+                    files: e.dataTransfer.files,
+                    position: getDragOverPosition(e.nativeEvent, editorBodyRef.current),
+                  }),
+                );
+              }
+            }
+          }}
+        >
+          {group.currentResource && <EditorSideView side='top' resource={group.currentResource}></EditorSideView>}
+          {!editorHasNoTab && <NavigationBar editorGroup={group} />}
+          <div className={styles.kt_editor_components}>
+            <div
+              className={cls({
+                [styles_kt_editor_component]: true,
+                [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.component,
+              })}
+            >
+              {components}
+            </div>
+            <div
+              className={cls({
+                [styles.kt_editor_code_editor]: true,
+                [styles_kt_editor_component]: true,
+                [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.code,
+              })}
+              ref={codeEditorRef}
+            />
+            <div
+              className={cls(styles.kt_editor_diff_editor, styles_kt_editor_component, {
+                [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.diff,
+              })}
+              ref={diffEditorRef}
+            />
+            <div
+              className={cls(styles.kt_editor_diff_3_editor, styles_kt_editor_component, {
+                [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.mergeEditor,
+              })}
+              ref={mergeEditorRef}
+            />
           </div>
-          <div
-            className={cls({
-              [styles.kt_editor_code_editor]: true,
-              [styles_kt_editor_component]: true,
-              [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.code,
-            })}
-            ref={codeEditorRef}
-          />
-          <div
-            className={cls(styles.kt_editor_diff_editor, styles_kt_editor_component, {
-              [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.diff,
-            })}
-            ref={diffEditorRef}
-          />
-          <div
-            className={cls(styles.kt_editor_diff_3_editor, styles_kt_editor_component, {
-              [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.mergeEditor,
-            })}
-            ref={mergeEditorRef}
-          />
+          {group.currentResource && <EditorSideView side={'bottom'} resource={group.currentResource}></EditorSideView>}
         </div>
-        {group.currentResource && <EditorSideView side={'bottom'} resource={group.currentResource}></EditorSideView>}
-      </div>
-    </EditorContext.Provider>
-  );
-});
+      </EditorContext.Provider>
+    );
+  }),
+);
 
 export const ComponentsWrapper = ({
   component,

package/src/browser/workbench-editor.service.ts

@@ -16,6 +16,7 @@ import {
   toMarkdown,
 } from '@opensumi/ide-core-browser';
 import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey/resource';
+import { IDimension } from '@opensumi/ide-core-browser/lib/dom/resize-observer';
 import { IMergeEditorEditor, MergeEditorInputData } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
 import {
   CUSTOM_EDITOR_SCHEME,
@@ -277,7 +278,7 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
   createEditorGroup(): EditorGroup {
     const editorGroup = this.injector.get(EditorGroup, [this.generateRandomEditorGroupName(), this.editorGroupIdGen++]);
     this.editorGroups.push(editorGroup);
-    const currentWatchDisposer = new Disposable(
+    editorGroup.addDispose([
       editorGroup.onDidEditorGroupBodyChanged(() => {
         if (editorGroup === this.currentEditorGroup) {
           if (!editorGroup.currentOpenType && editorGroup.currentResource) {
@@ -296,25 +297,15 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
           }
         }
       }),
-    );
-    editorGroup.addDispose({
-      dispose: () => {
-        currentWatchDisposer.dispose();
-      },
-    });
-    const groupChangeDisposer = editorGroup.onDidEditorGroupTabChanged(() => {
-      this.saveOpenedResourceState();
-    });
-    editorGroup.addDispose({
-      dispose: () => {
-        groupChangeDisposer.dispose();
-      },
-    });
-    editorGroup.onCurrentEditorCursorChange((e) => {
-      if (this._currentEditorGroup === editorGroup) {
-        this._onCursorChange.fire(e);
-      }
-    });
+      editorGroup.onDidEditorGroupTabChanged(() => {
+        this.saveOpenedResourceState();
+      }),
+      editorGroup.onCurrentEditorCursorChange((e) => {
+        if (this._currentEditorGroup === editorGroup) {
+          this._onCursorChange.fire(e);
+        }
+      }),
+    ]);
 
     return editorGroup;
   }
@@ -790,14 +781,14 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       this.eventBus.onDirective(
         ResizeEvent.createDirective(getSlotLocation('@opensumi/ide-editor', this.config.layoutConfig)),
         () => {
-          this.doLayoutEditors();
+          this.layoutEditors();
         },
       ),
     );
     this.addDispose(
       this.eventBus.on(GridResizeEvent, (e: GridResizeEvent) => {
         if (e.payload.gridId === this.grid.uid) {
-          this.doLayoutEditors();
+          this.layoutEditors();
         }
       }),
     );
@@ -848,26 +839,28 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   layoutEditors() {
     fastdom.measure(() => {
       if (this._domNode) {
-        const currentWidth = this._domNode.offsetWidth;
-        const currentHeight = this._domNode.offsetHeight;
-        if (currentWidth !== this._prevDomWidth || currentHeight !== this._prevDomHeight) {
-          this.doLayoutEditors();
-        }
-        this._prevDomWidth = currentWidth;
-        this._prevDomHeight = currentHeight;
+        this._prevDomWidth = this._domNode.offsetWidth;
+        this._prevDomHeight = this._domNode.offsetHeight;
+        this.doLayoutEditors(
+          {
+            width: this._prevDomWidth,
+            height: this._prevDomHeight,
+          },
+          true,
+        );
       }
     });
   }
 
-  private doLayoutEditors() {
+  private doLayoutEditors(e: IDimension, postponeRendering?: boolean) {
     if (this.codeEditor) {
       if (this.currentOpenType && this.currentOpenType.type === EditorOpenType.code) {
-        this.codeEditor.layout();
+        this.codeEditor.layout(e, postponeRendering);
       }
     }
     if (this.diffEditor) {
       if (this.currentOpenType && this.currentOpenType.type === EditorOpenType.diff) {
-        this.diffEditor.layout();
+        this.diffEditor.layout(e, postponeRendering);
       }
     }
   }
@@ -1817,7 +1810,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       this._currentOpenType = activeOpenType;
       this.notifyBodyChanged();
 
-      this.doLayoutEditors();
+      this.layoutEditors();
 
       this.cachedResourcesActiveOpenTypes.set(resource.uri.toString(), activeOpenType);
     }

package/src/common/editor.ts

@@ -310,7 +310,7 @@ export interface IDiffEditor extends IDisposable {
 
   modifiedEditor: IEditor;
 
-  layout(): void;
+  layout(dimension?: IDimension, postponeRendering?: boolean): void;
 
   focus(): void;