@opensumi/ide-editor 2.25.4 → 2.26.0

package/src/browser/merge-editor/merge-editor.contribution.ts

@@ -1,25 +1,45 @@
 import { Autowired } from '@opensumi/di';
-import { Domain } from '@opensumi/ide-core-browser';
+import { Disposable, Domain, IContextKeyService, Schemes, Uri } from '@opensumi/ide-core-browser';
 
 import { ResourceService } from '../../common';
 import { BrowserEditorContribution, EditorComponentRegistry, EditorOpenType } from '../types';
 
 import { MergeEditorResourceProvider } from './merge-editor.provider';
+import { MergeEditorFloatComponents } from './MergeEditorFloatComponents';
+
+const MERGE_EDITOR_FLOATING_WIDGET = 'merge.editor.floating.widget';
 
 @Domain(BrowserEditorContribution)
-export class MergeEditorContribution implements BrowserEditorContribution {
+export class MergeEditorContribution extends Disposable implements BrowserEditorContribution {
   @Autowired()
   private readonly mergeEditorResourceProvider: MergeEditorResourceProvider;
 
+  @Autowired(IContextKeyService)
+  private readonly contextKeyService: IContextKeyService;
+
   registerResource(resourceService: ResourceService): void {
     resourceService.registerResourceProvider(this.mergeEditorResourceProvider);
   }
 
   registerEditorComponent(registry: EditorComponentRegistry) {
-    registry.registerEditorComponentResolver('mergeEditor', (_, results) => {
+    registry.registerEditorComponentResolver(EditorOpenType.mergeEditor, (_, results) => {
       results.push({
         type: EditorOpenType.mergeEditor,
       });
     });
+
+    registry.registerEditorSideWidget({
+      id: MERGE_EDITOR_FLOATING_WIDGET,
+      component: MergeEditorFloatComponents as any,
+      displaysOnResource: (resource) => {
+        const { uri } = resource;
+        if (uri.scheme !== Schemes.file) {
+          return false;
+        }
+
+        const mergeChanges = this.contextKeyService.getValue<Uri[]>('git.mergeChanges') || [];
+        return mergeChanges.some((value) => value.toString() === uri.toString());
+      },
+    });
   }
 }

package/src/browser/navigation.module.less

@@ -1,4 +1,4 @@
-@import '~@opensumi/ide-components/lib/style/mixins.less';
+@import '@opensumi/ide-components/lib/style/mixins.less';
 
 .navigation_container {
   display: flex;

package/src/browser/navigation.view.tsx

@@ -137,6 +137,7 @@ export const NavigationMenu = observer(({ model }: { model: NavigationMenuModel
     >
       <Scrollbars
         className={styles.navigation_menu_items}
+        universal={true}
         forwardedRef={(el) => {
           scrollerContainer.current = el;
           scrollToCurrent();

package/src/browser/tab.view.tsx

@@ -333,7 +333,12 @@ export const Tabs = ({ group }: ITabsProps) => {
             style={
               wrapMode && i === group.resources.length - 1
                 ? { marginRight: lastMarginRight, height: LAYOUT_VIEW_SIZE.EDITOR_TABS_HEIGHT }
-                : { height: LAYOUT_VIEW_SIZE.EDITOR_TABS_HEIGHT }
+                : {
+                    height:
+                      group.currentResource === resource
+                        ? LAYOUT_VIEW_SIZE.EDITOR_TABS_HEIGHT + 1
+                        : LAYOUT_VIEW_SIZE.EDITOR_TABS_HEIGHT,
+                  }
             }
             onContextMenu={(event) => {
               tabTitleMenuService.show(event.nativeEvent.x, event.nativeEvent.y, resource && resource.uri, group);