@opensumi/ide-main-layout 3.9.1-next-1748425167.0 → 3.9.1-next-1748425792.0

package/lib/common/main-layout.definition.d.ts

@@ -33,7 +33,7 @@ export interface IMainLayoutService {
      * 注册单个或多个视图到tabbar位置
      * @param views 使用手风琴能力时传入的多个子视图
      * @param options container相关选项
-     * @param side 注册的位置，支持 view、extendView、panel，对应之前的 left、right、bottom
+     * @param side 注册的位置，支持left、right、bottom
      */
     collectTabbarComponent(views: View[], options: ViewContainerOptions, side: string): string;
     /**
@@ -112,7 +112,6 @@ export declare class ViewCollapseChangedEvent extends BasicEvent<{
 }> {
 }
 export declare const SUPPORT_ACCORDION_LOCATION: Set<string>;
-export declare const DROP_PANEL_CONTAINER = "drop-panel";
-export declare const DROP_EXTEND_VIEW_CONTAINER = "drop-extend-view";
-export declare const DROP_VIEW_CONTAINER = "drop-view";
+export declare const DROP_BOTTOM_CONTAINER = "drop-bottom";
+export declare const DROP_RIGHT_CONTAINER = "drop-right";
 //# sourceMappingURL=main-layout.definition.d.ts.map

package/lib/common/main-layout.definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-layout.definition.d.ts","sourceRoot":"","sources":["../../src/common/main-layout.definition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main-layout.definition.d.ts","sourceRoot":"","sources":["../../src/common/main-layout.definition.ts"],"names":[],"mappings":"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"}

package/lib/common/main-layout.definition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DROP_VIEW_CONTAINER = exports.DROP_EXTEND_VIEW_CONTAINER = exports.DROP_PANEL_CONTAINER = exports.SUPPORT_ACCORDION_LOCATION = exports.ViewCollapseChangedEvent = exports.IViewsRegistry = exports.TabBarRegistrationEvent = exports.MainLayoutContribution = exports.IMainLayoutService = void 0;
+exports.DROP_RIGHT_CONTAINER = exports.DROP_BOTTOM_CONTAINER = exports.SUPPORT_ACCORDION_LOCATION = exports.ViewCollapseChangedEvent = exports.IViewsRegistry = exports.TabBarRegistrationEvent = exports.MainLayoutContribution = exports.IMainLayoutService = void 0;
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 exports.IMainLayoutService = Symbol('IMainLayoutService');
 exports.MainLayoutContribution = Symbol('MainLayoutContribution');
@@ -14,8 +14,7 @@ exports.IViewsRegistry = Symbol('IViewsRegistry');
 class ViewCollapseChangedEvent extends ide_core_browser_1.BasicEvent {
 }
 exports.ViewCollapseChangedEvent = ViewCollapseChangedEvent;
-exports.SUPPORT_ACCORDION_LOCATION = new Set([ide_core_browser_1.SlotLocation.view, ide_core_browser_1.SlotLocation.extendView]);
-exports.DROP_PANEL_CONTAINER = 'drop-panel';
-exports.DROP_EXTEND_VIEW_CONTAINER = 'drop-extend-view';
-exports.DROP_VIEW_CONTAINER = 'drop-view';
+exports.SUPPORT_ACCORDION_LOCATION = new Set([ide_core_browser_1.SlotLocation.left, ide_core_browser_1.SlotLocation.right]);
+exports.DROP_BOTTOM_CONTAINER = 'drop-bottom';
+exports.DROP_RIGHT_CONTAINER = 'drop-right';
 //# sourceMappingURL=main-layout.definition.js.map

package/lib/common/main-layout.definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"main-layout.definition.js","sourceRoot":"","sources":["../../src/common/main-layout.definition.ts"],"names":[],"mappings":";;;AAAA,iEAAmF;AAyBtE,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAsElD,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AASvE;;GAEG;AACH,MAAa,uBAAwB,SAAQ,6BAAgC;CAAG;AAAhF,0DAAgF;AAEnE,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAoBvD,MAAa,wBAAyB,SAAQ,6BAG5C;CAAG;AAHL,4DAGK;AAEQ,QAAA,0BAA0B,GAAG,IAAI,GAAG,CAAC,CAAC,+BAAY,CAAC,IAAI,EAAE,+BAAY,CAAC,UAAU,CAAC,CAAC,CAAC;AAEnF,QAAA,oBAAoB,GAAG,YAAY,CAAC;AACpC,QAAA,0BAA0B,GAAG,kBAAkB,CAAC;AAChD,QAAA,mBAAmB,GAAG,WAAW,CAAC"}
+{"version":3,"file":"main-layout.definition.js","sourceRoot":"","sources":["../../src/common/main-layout.definition.ts"],"names":[],"mappings":";;;AAAA,iEAAmF;AAwBtE,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAsElD,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AASvE;;GAEG;AACH,MAAa,uBAAwB,SAAQ,6BAAgC;CAAG;AAAhF,0DAAgF;AAEnE,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAoBvD,MAAa,wBAAyB,SAAQ,6BAG5C;CAAG;AAHL,4DAGK;AAEQ,QAAA,0BAA0B,GAAG,IAAI,GAAG,CAAC,CAAC,+BAAY,CAAC,IAAI,EAAE,+BAAY,CAAC,KAAK,CAAC,CAAC,CAAC;AAE9E,QAAA,qBAAqB,GAAG,aAAa,CAAC;AACtC,QAAA,oBAAoB,GAAG,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-main-layout",
-  "version": "3.9.1-next-1748425167.0",
+  "version": "3.9.1-next-1748425792.0",
   "description": "@opensumi/ide-main-layout",
   "files": [
     "lib",
@@ -18,14 +18,14 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-components": "3.9.1-next-1748425167.0",
-    "@opensumi/ide-core-browser": "3.9.1-next-1748425167.0",
-    "@opensumi/ide-core-common": "3.9.1-next-1748425167.0",
-    "@opensumi/ide-theme": "3.9.1-next-1748425167.0"
+    "@opensumi/ide-components": "3.9.1-next-1748425792.0",
+    "@opensumi/ide-core-browser": "3.9.1-next-1748425792.0",
+    "@opensumi/ide-core-common": "3.9.1-next-1748425792.0",
+    "@opensumi/ide-theme": "3.9.1-next-1748425792.0"
   },
   "devDependencies": {
-    "@opensumi/ide-dev-tool": "3.9.1-next-1748425167.0",
-    "@opensumi/ide-monaco": "3.9.1-next-1748425167.0"
+    "@opensumi/ide-dev-tool": "3.9.1-next-1748425792.0",
+    "@opensumi/ide-monaco": "3.9.1-next-1748425792.0"
   },
-  "gitHead": "0e3e46b4854eff92ec24b8650e9f060ad3e5f794"
+  "gitHead": "0e655f74e699a47a29624a1bb3afed069d6d9366"
 }

package/src/browser/accordion/accordion.service.ts

@@ -21,7 +21,7 @@ import {
   isDefined,
   localize,
 } from '@opensumi/ide-core-browser';
-import { Layout, RESIZE_LOCK } from '@opensumi/ide-core-browser/lib/components';
+import { RESIZE_LOCK } from '@opensumi/ide-core-browser/lib/components';
 import {
   ISplitPanelService,
   SplitPanelManager,
@@ -85,6 +85,9 @@ export class AccordionService extends WithEventBus {
   @Autowired()
   private viewContextKeyRegistry: ViewContextKeyRegistry;
 
+  @Autowired(IMainLayoutService)
+  private readonly mainLayoutService: IMainLayoutService;
+
   @Autowired(IContextKeyService)
   private contextKeyService: IContextKeyService;
 
@@ -149,15 +152,6 @@ export class AccordionService extends WithEventBus {
   private afterDisposeViewEmitter = this.registerDispose(new Emitter<string>());
   public onAfterDisposeViewEvent = this.afterDisposeViewEmitter.event;
 
-  private _alignment: Layout.alignment = 'vertical';
-
-  public set alignment(alignment: Layout.alignment) {
-    if (this._alignment !== alignment) {
-      this._alignment = alignment;
-      this.doUpdateResize();
-    }
-  }
-
   constructor(public containerId: string, private noRestore?: boolean) {
     super();
     this.addDispose(recomputeInitiallyAndOnChange(this.visibleViews));
@@ -617,24 +611,39 @@ export class AccordionService extends WithEventBus {
     const viewState = this.getViewState(viewId);
     this.updateViewState(viewId, { ...viewState, collapsed });
 
-    const isHorizontal = this._alignment === 'horizontal';
-
-    // 统一的尺寸计算和设置逻辑
-    let sizeIncrement: number;
-    if (collapsed) {
-      sizeIncrement = this.setSizeByAlignment(index, 0, false, noAnimation, isHorizontal);
-    } else {
-      // 仅有一个视图展开时独占
-      const targetSize =
-        this.expandedViews.length === 1
-          ? this.getAvailableSizeByAlignment(isHorizontal)
-          : viewState.size || this.minSize;
-      sizeIncrement = this.setSizeByAlignment(index, targetSize, false, noAnimation, isHorizontal);
+    const container = this.mainLayoutService.getContainer(this.containerId)!;
+    if (container?.options?.alignment !== 'horizontal') {
+      let sizeIncrement: number;
+      if (collapsed) {
+        sizeIncrement = this.setSize(index, 0, false, noAnimation);
+      } else {
+        // 仅有一个视图展开时独占
+        sizeIncrement = this.setSize(
+          index,
+          this.expandedViews.length === 1 ? this.getAvailableSize() : viewState.size || this.minSize,
+          false,
+          noAnimation,
+        );
+      }
+      // 下方视图被影响的情况下，上方视图不会同时变化，该情况会在sizeIncrement=0上体现
+      // 从视图下方最后一个展开的视图起依次减去对应的高度
+      for (let i = this.visibleViews.get().length - 1; i > index; i--) {
+        if (this.getViewState(this.visibleViews.get()[i].id).collapsed !== true) {
+          sizeIncrement = this.setSize(i, sizeIncrement, true, noAnimation);
+        } else {
+          this.setSize(i, 0, false, noAnimation);
+        }
+      }
+      // 找到视图上方首个展开的视图减去对应的高度
+      for (let i = index - 1; i >= 0; i--) {
+        if ((this.state[this.visibleViews.get()[i].id] || {}).collapsed !== true) {
+          sizeIncrement = this.setSize(i, sizeIncrement, true, noAnimation);
+        } else {
+          this.setSize(i, 0, false, noAnimation);
+        }
+      }
     }
 
-    // 统一的相邻视图调整逻辑
-    this.adjustAdjacentViews(index, sizeIncrement, noAnimation, isHorizontal);
-
     this.eventBus.fire(
       new ViewCollapseChangedEvent({
         viewId,
@@ -643,49 +652,6 @@ export class AccordionService extends WithEventBus {
     );
   }
 
-  private setSizeByAlignment(
-    index: number,
-    targetSize: number,
-    isIncrement?: boolean,
-    noAnimation?: boolean,
-    isHorizontal?: boolean,
-  ): number {
-    return isHorizontal
-      ? this.setSizeHorizontal(index, targetSize, isIncrement, noAnimation)
-      : this.setSize(index, targetSize, isIncrement, noAnimation);
-  }
-
-  private getAvailableSizeByAlignment(isHorizontal: boolean): number {
-    return isHorizontal ? this.getAvailableSizeHorizontal() : this.getAvailableSize();
-  }
-
-  private adjustAdjacentViews(
-    currentIndex: number,
-    sizeIncrement: number,
-    noAnimation?: boolean,
-    isHorizontal?: boolean,
-  ) {
-    const visibleViews = this.visibleViews.get();
-
-    // 处理当前视图后方的视图（右侧或下方）
-    for (let i = visibleViews.length - 1; i > currentIndex; i--) {
-      if (this.getViewState(visibleViews[i].id).collapsed !== true) {
-        sizeIncrement = this.setSizeByAlignment(i, sizeIncrement, true, noAnimation, isHorizontal);
-      } else {
-        this.setSizeByAlignment(i, 0, false, noAnimation, isHorizontal);
-      }
-    }
-
-    // 处理当前视图前方的视图（左侧或上方）
-    for (let i = currentIndex - 1; i >= 0; i--) {
-      if ((this.state[visibleViews[i].id] || {}).collapsed !== true) {
-        sizeIncrement = this.setSizeByAlignment(i, sizeIncrement, true, noAnimation, isHorizontal);
-      } else {
-        this.setSizeByAlignment(i, 0, false, noAnimation, isHorizontal);
-      }
-    }
-  }
-
   protected setSize(index: number, targetSize: number, isIncrement?: boolean, noAnimation?: boolean): number {
     const view = this.visibleViews.get()[index];
     const fullHeight = this.splitPanelService.rootNode?.clientHeight;
@@ -759,89 +725,6 @@ export class AccordionService extends WithEventBus {
     return fullHeight ? fullHeight - (this.visibleViews.get().length - 1) * this.headerSize : 0;
   }
 
-  protected setSizeHorizontal(index: number, targetSize: number, isIncrement?: boolean, noAnimation?: boolean): number {
-    const view = this.visibleViews.get()[index];
-    const fullWidth = this.splitPanelService.rootNode?.clientWidth;
-    const panel = this.splitPanelService.panels[index];
-
-    if (!panel) {
-      return 0;
-    }
-
-    if (!noAnimation) {
-      panel.classList.add('resize-ease-horizontal');
-    }
-
-    if (!targetSize && !isIncrement) {
-      targetSize = this.headerSize;
-      panel.classList.add(RESIZE_LOCK);
-    } else {
-      panel.classList.remove(RESIZE_LOCK);
-    }
-
-    // clientWidth会被上次展开的元素挤掉
-    const prevSize = panel.clientWidth;
-    const viewState = this.getViewState(view.id);
-    let calcTargetSize: number = targetSize;
-
-    if (isIncrement) {
-      calcTargetSize = Math.max(prevSize - targetSize, this.minSize);
-    }
-
-    if (index === this.expandedViews.length - 1 && isDefined(fullWidth)) {
-      // 最后一个视图需要兼容最大宽度超出总视图宽度及最大宽度不足总视图宽度的情况
-      if (calcTargetSize + index * this.minSize > fullWidth) {
-        calcTargetSize -= calcTargetSize + index * this.minSize - fullWidth;
-      } else {
-        const restSize = this.getPanelFullWidthHorizontal(view.id);
-        if (calcTargetSize + restSize < fullWidth) {
-          calcTargetSize += fullWidth - (calcTargetSize + restSize);
-        }
-      }
-    }
-
-    if (this.rendered) {
-      let toSaveSize: number;
-      if (targetSize === this.headerSize) {
-        // 当前视图即将折叠且不是唯一展开的视图时，存储当前宽度
-        toSaveSize = prevSize;
-      } else {
-        toSaveSize = calcTargetSize;
-      }
-      if (toSaveSize !== this.headerSize) {
-        // 视图折叠宽度不做存储
-        viewState.size = toSaveSize;
-      }
-    }
-
-    this.storeState();
-    viewState.nextSize = calcTargetSize;
-
-    if (!noAnimation) {
-      setTimeout(() => {
-        // 动画 0.1s，保证结束后移除
-        panel.classList.remove('resize-ease-horizontal');
-      }, 200);
-    }
-
-    return isIncrement ? calcTargetSize - (prevSize - targetSize) : targetSize - prevSize;
-  }
-
-  protected getAvailableSizeHorizontal() {
-    const fullWidth = this.splitPanelService.rootNode?.clientWidth;
-    return fullWidth ? fullWidth - (this.visibleViews.get().length - 1) * this.headerSize : 0;
-  }
-
-  private getPanelFullWidthHorizontal(ignoreViewId?: string) {
-    return Object.keys(this.state)
-      .filter((viewId) => this.views.find((item) => item.id === viewId) && viewId !== ignoreViewId)
-      .reduce(
-        (acc, id) =>
-          acc + (this.state[id].collapsed ? this.headerSize : this.state[id].hidden ? 0 : this.state[id].size!),
-        0,
-      );
-  }
-
   private handleContextKeyChange() {
     Array.from(this.viewsWithContextKey.values()).forEach((view) => {
       if (

package/src/browser/accordion/accordion.view.tsx

@@ -1,4 +1,3 @@
-import cls from 'classnames';
 import React, { useMemo } from 'react';
 
 import { View, useAutorun, useInjectable } from '@opensumi/ide-core-browser';
@@ -34,7 +33,6 @@ export const AccordionContainer = ({
   const layoutViewSize = useInjectable<LayoutViewSizeConfig>(LayoutViewSizeConfig);
 
   const accordionService: AccordionService = useInjectable(AccordionServiceFactory)(containerId, noRestore);
-  accordionService.alignment = alignment;
   const visibleViews = useAutorun(accordionService.visibleViews);
 
   useAutorun(accordionService.stateObservable);
@@ -54,10 +52,10 @@ export const AccordionContainer = ({
   React.useEffect(() => {
     accordionService.initConfig({ headerSize: layoutHeaderSize, minSize });
   }, []);
-  // FIXME: accordion 的 resize event 失效了
+
   return (
     <SplitPanel
-      className={cls(className, { horizontal: alignment === 'horizontal' })}
+      className={className}
       style={style}
       headerSize={headerSize}
       dynamicTarget={true}

package/src/browser/accordion/section.view.tsx

@@ -169,11 +169,7 @@ export const AccordionSection = ({
   }, [expanded, headerSize, alignment]);
 
   return (
-    <div
-      className={cls(styles_kt_split_panel, { horizontal: alignment === 'horizontal' })}
-      data-view-id={viewId}
-      draggable={false}
-    >
+    <div className={styles_kt_split_panel} data-view-id={viewId} draggable={false}>
       {!noHeader && (
         <div
           {...attrs}

package/src/browser/accordion/styles.module.less

@@ -2,9 +2,6 @@
   .resize-ease {
     transition: height 0.1s ease-out;
   }
-  .resize-ease-horizontal {
-    transition: width 0.1s ease-out;
-  }
 }
 
 .kt_split_panel_container {
@@ -13,10 +10,6 @@
   height: 100%;
   white-space: nowrap;
   flex-direction: column;
-
-  &.horizontal {
-    flex-direction: row;
-  }
 }
 
 .kt_split_panel {
@@ -26,14 +19,6 @@
   display: flex;
   flex-direction: column;
   position: relative;
-
-  &.horizontal {
-    flex-direction: column;
-    width: auto;
-    min-width: 0;
-    height: 100%;
-  }
-
   &:hover .actions_wrap {
     display: block;
   }
@@ -239,49 +224,3 @@
     }
   }
 }
-
-// 水平模式样式支持
-.kt_split_panel.horizontal {
-  .kt_split_panel_header {
-    writing-mode: vertical-lr;
-    text-orientation: mixed;
-    border-top: 1px solid transparent;
-    border-left: 1px solid var(--sideBar-border);
-    flex-direction: column;
-    width: 100%;
-    height: auto;
-    justify-content: flex-start;
-  }
-
-  .label_wrap {
-    flex-direction: column;
-    align-items: flex-start;
-    width: 100%;
-
-    i.arrow_icon {
-      margin: 4px 0;
-      &.kt_mod_collapsed {
-        transform: rotate(-180deg);
-      }
-    }
-  }
-
-  .section_label {
-    writing-mode: vertical-lr;
-    text-orientation: mixed;
-    line-height: normal;
-  }
-
-  .section_description {
-    writing-mode: vertical-lr;
-    text-orientation: mixed;
-    margin-left: 0;
-    margin-top: 10px;
-    line-height: normal;
-  }
-
-  .section_badge {
-    margin-left: 0;
-    margin-top: 6px;
-  }
-}

package/src/browser/default-config.ts

@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 import { LayoutConfig, SlotLocation } from '@opensumi/ide-core-browser';
 
-import { DROP_EXTEND_VIEW_CONTAINER, DROP_PANEL_CONTAINER, DROP_VIEW_CONTAINER } from '../common';
+import { DROP_BOTTOM_CONTAINER, DROP_RIGHT_CONTAINER } from '../common';
 
 export const defaultConfig: LayoutConfig = {
   [SlotLocation.top]: {
@@ -10,26 +10,25 @@ export const defaultConfig: LayoutConfig = {
   [SlotLocation.action]: {
     modules: ['@opensumi/ide-toolbar-action'],
   },
-  [SlotLocation.view]: {
+  [SlotLocation.left]: {
     modules: [
-      DROP_VIEW_CONTAINER,
       '@opensumi/ide-explorer',
       '@opensumi/ide-search',
       '@opensumi/ide-scm',
-      '@opensumi/ide-debug',
       '@opensumi/ide-extension-manager',
+      '@opensumi/ide-debug',
       '@opensumi/ide-notebook',
     ],
   },
-  [SlotLocation.extendView]: {
-    modules: [DROP_EXTEND_VIEW_CONTAINER],
+  [SlotLocation.right]: {
+    modules: [DROP_RIGHT_CONTAINER],
   },
   [SlotLocation.main]: {
     modules: ['@opensumi/ide-editor'],
   },
-  [SlotLocation.panel]: {
+  [SlotLocation.bottom]: {
     modules: [
-      DROP_PANEL_CONTAINER,
+      DROP_BOTTOM_CONTAINER,
       '@opensumi/ide-terminal-next',
       '@opensumi/ide-output',
       'debug-console',

package/src/browser/drop-area/drop-area.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SlotLocation, localize, useInjectable } from '@opensumi/ide-core-browser';
+import { localize, useInjectable } from '@opensumi/ide-core-browser';
 
 import { IMainLayoutService } from '../../common';
 
@@ -18,7 +18,6 @@ const DropArea: React.FC<IDropAreaProps> = (props) => {
     (e: React.DragEvent) => {
       const containerId = e.dataTransfer?.getData('containerId');
       layoutService.moveContainerTo(containerId, location);
-      layoutService.hideDropArea();
     },
     [layoutService, location],
   );
@@ -36,8 +35,6 @@ const DropArea: React.FC<IDropAreaProps> = (props) => {
   );
 };
 
-export const ViewDropArea = () => <DropArea location={SlotLocation.view} />;
+export const RightDropArea = () => <DropArea location='right' />;
 
-export const ExtendViewDropArea = () => <DropArea location={SlotLocation.extendView} />;
-
-export const PanelDropArea = () => <DropArea location={SlotLocation.panel} />;
+export const BottomDropArea = () => <DropArea location='bottom' />;

package/src/browser/index.ts

@@ -1,6 +1,5 @@
 import { Injectable, Injector, Provider } from '@opensumi/di';
 import { BrowserModule } from '@opensumi/ide-core-browser';
-import { Layout } from '@opensumi/ide-core-browser/lib/components';
 
 import { IMainLayoutService, IViewsRegistry, MainLayoutContribution } from '../common';