@opensumi/ide-main-layout 3.7.1-next-1739781685.0 → 3.7.1

package/src/browser/main-layout.contribution.ts

@@ -41,9 +41,8 @@ import {
 import { ContributionProvider, Domain, IEventBus, WithEventBus, localize } from '@opensumi/ide-core-common';
 import { Command, CommandContribution, CommandRegistry, CommandService } from '@opensumi/ide-core-common/lib/command';
 
-import { DROP_BOTTOM_CONTAINER, DROP_RIGHT_CONTAINER, IMainLayoutService } from '../common';
+import { IMainLayoutService } from '../common';
 
-import { BottomDropArea, RightDropArea } from './drop-area/drop-area';
 import { ViewQuickOpenHandler } from './quick-open-view';
 import { BottomTabRenderer, LeftTabRenderer, RightTabRenderer } from './tabbar/renderer.view';
 
@@ -118,14 +117,7 @@ export const RETRACT_BOTTOM_PANEL: Command = {
   iconClass: getIcon('shrink'),
 };
 
-@Domain(
-  CommandContribution,
-  ClientAppContribution,
-  SlotRendererContribution,
-  MenuContribution,
-  QuickOpenContribution,
-  ComponentContribution,
-)
+@Domain(CommandContribution, ClientAppContribution, SlotRendererContribution, MenuContribution, QuickOpenContribution)
 export class MainLayoutModuleContribution
   extends WithEventBus
   implements
@@ -133,7 +125,6 @@ export class MainLayoutModuleContribution
     ClientAppContribution,
     SlotRendererContribution,
     MenuContribution,
-    ComponentContribution,
     QuickOpenContribution
 {
   @Autowired(IMainLayoutService)
@@ -195,19 +186,6 @@ export class MainLayoutModuleContribution
     }
   }
 
-  registerComponent(registry: ComponentRegistry): void {
-    registry.register(DROP_RIGHT_CONTAINER, [], {
-      component: RightDropArea,
-      hideTab: true,
-      containerId: DROP_RIGHT_CONTAINER,
-    });
-    registry.register(DROP_BOTTOM_CONTAINER, [], {
-      component: BottomDropArea,
-      hideTab: true,
-      containerId: DROP_BOTTOM_CONTAINER,
-    });
-  }
-
   async onStart() {
     this.registerSideToggleKey();
   }

package/src/browser/tabbar/bar.view.tsx

@@ -125,15 +125,11 @@ export const TabbarViewBase: React.FC<ITabbarViewProps> = (props) => {
   });
 
   const renderContainers = React.useCallback(
-    (component: ComponentRegistryInfo, tabbarService: TabbarService, currentContainerId?: string, side?: string) => {
+    (component: ComponentRegistryInfo, tabbarService: TabbarService, currentContainerId?: string) => {
       const containerId = component.options?.containerId;
       if (!containerId) {
         return null;
       }
-      if (side && component.options?.hideLocationTab?.includes(side)) {
-        return null;
-      }
-
       tabbarService.updateTabInMoreKey(containerId, false);
       let ref: HTMLLIElement | null;
       return (
@@ -172,9 +168,6 @@ export const TabbarViewBase: React.FC<ITabbarViewProps> = (props) => {
             }
             tabbarService.handleDrop(e, containerId);
           }}
-          onDragEnd={(e) => {
-            tabbarService.handleDragEnd(e);
-          }}
           key={containerId}
           id={containerId}
           onContextMenu={(e) => tabbarService.handleContextMenu(e, containerId)}
@@ -193,7 +186,7 @@ export const TabbarViewBase: React.FC<ITabbarViewProps> = (props) => {
   return (
     <div className={cls([styles_tab_bar, className])}>
       <div className={styles_bar_content} style={{ flexDirection: Layout.getTabbarDirection(direction) }}>
-        {visibleContainers.map((component) => renderContainers(component, tabbarService, currentContainerId, side))}
+        {visibleContainers.map((component) => renderContainers(component, tabbarService, currentContainerId))}
         {renderOtherVisibleContainers({ props, renderContainers })}
         {hideContainers.length ? (
           <li

package/src/browser/tabbar/panel.view.tsx

@@ -100,13 +100,12 @@ export const ContainerView: React.FC<{
   renderContainerWrap?: React.FC<{
     children: React.ReactNode;
   }>;
-  customTitleBar?: React.ReactNode;
   className?: string;
-}> = ({ component, titleMenu, side, renderContainerWrap, className, customTitleBar }) => {
+}> = ({ component, titleMenu, side, renderContainerWrap, className }) => {
   const ref = React.useRef<HTMLElement | null>();
   const containerRef = React.useRef<HTMLDivElement | null>(null);
   const appConfig = useInjectable<AppConfig>(AppConfig);
-  const { title, titleComponent, component: CustomComponent, containerId, draggable } = component.options || {};
+  const { title, titleComponent, component: CustomComponent, containerId } = component.options || {};
   const injector: Injector = useInjectable(INJECTOR_TOKEN);
   const layoutViewSize = useInjectable<LayoutViewSizeConfig>(LayoutViewSizeConfig);
 
@@ -141,15 +140,11 @@ export const ContainerView: React.FC<{
 
   return (
     <div ref={containerRef} className={cls(styles.view_container, className)}>
-      {!!customTitleBar && customTitleBar}
       {!CustomComponent && (
         <div onContextMenu={handleContextMenu} className={styles.panel_titlebar}>
           {!title ? null : (
             <TitleBar
-              containerId={containerId}
-              side={side}
               title={title}
-              draggable={draggable}
               height={layoutViewSize.panelTitleBarHeight}
               menubar={<InlineActionBar menus={titleMenu} />}
             />

package/src/browser/tabbar/tabbar.service.ts

@@ -664,7 +664,6 @@ export class TabbarService extends WithEventBus {
   // drag & drop
   handleDragStart(e: React.DragEvent, containerId: string) {
     e.dataTransfer.setData('containerId', containerId);
-    this.layoutService.showDropAreaForContainer(containerId);
   }
 
   handleDrop(e: React.DragEvent, target: string) {
@@ -678,10 +677,6 @@ export class TabbarService extends WithEventBus {
     }
   }
 
-  handleDragEnd(e: React.DragEvent) {
-    this.layoutService.hideDropArea();
-  }
-
   restoreState() {
     this.storedState = this.layoutState.getState(LAYOUT_STATE.getTabbarSpace(this.location), {});
     for (const containerId of this.state.keys()) {
@@ -696,19 +691,6 @@ export class TabbarService extends WithEventBus {
     });
   }
 
-  removeContainer(containerId: string) {
-    const disposable = this.disposableMap.get(containerId);
-    disposable?.dispose();
-    this.updateCurrentContainerId('');
-    this.doChangeViewEmitter.fire();
-  }
-
-  dynamicAddContainer(containerId: string, options: ComponentRegistryInfo) {
-    this.registerContainer(containerId, options);
-    this.updateCurrentContainerId(containerId);
-    this.doChangeViewEmitter.fire();
-  }
-
   protected doInsertTab(containers: ComponentRegistryInfo[], sourceIndex: number, targetIndex: number) {
     const targetPriority = this.getContainerState(containers[targetIndex].options!.containerId).priority;
     const changePriority = (sourceIndex: number, targetIndex: number) => {

package/src/common/main-layout.definition.ts

@@ -86,10 +86,6 @@ export interface IMainLayoutService {
   getExtraTopMenu(): IContextMenu;
   getExtraMenu(): IContextMenu;
   getAllAccordionService(): Map<string, AccordionService>;
-  moveContainerTo(containerId: string, to: string): void;
-  showDropAreaForContainer(containerId: string): void;
-  hideDropArea(): void;
-  findTabbarServiceByContainerId(containerId: string): TabbarService | undefined;
 }
 
 export const MainLayoutContribution = Symbol('MainLayoutContribution');
@@ -132,6 +128,3 @@ export class ViewCollapseChangedEvent extends BasicEvent<{
 }> {}
 
 export const SUPPORT_ACCORDION_LOCATION = new Set([SlotLocation.left, SlotLocation.right]);
-
-export const DROP_BOTTOM_CONTAINER = 'drop-bottom';
-export const DROP_RIGHT_CONTAINER = 'drop-right';

package/lib/browser/drop-area/drop-area.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-export declare const RightDropArea: () => React.JSX.Element;
-export declare const BottomDropArea: () => React.JSX.Element;
-//# sourceMappingURL=drop-area.d.ts.map

package/lib/browser/drop-area/drop-area.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"drop-area.d.ts","sourceRoot":"","sources":["../../../src/browser/drop-area/drop-area.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAqC1B,eAAO,MAAM,aAAa,yBAAsC,CAAC;AAEjE,eAAO,MAAM,cAAc,yBAAuC,CAAC"}

package/lib/browser/drop-area/drop-area.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BottomDropArea = exports.RightDropArea = void 0;
-const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
-const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const common_1 = require("../../common");
-const styles_module_less_1 = tslib_1.__importDefault(require("./styles.module.less"));
-const DropArea = (props) => {
-    const { location } = props;
-    const layoutService = (0, ide_core_browser_1.useInjectable)(common_1.IMainLayoutService);
-    const handleDrop = react_1.default.useCallback((e) => {
-        var _a;
-        const containerId = (_a = e.dataTransfer) === null || _a === void 0 ? void 0 : _a.getData('containerId');
-        layoutService.moveContainerTo(containerId, location);
-    }, [layoutService, location]);
-    return (react_1.default.createElement("div", { className: styles_module_less_1.default.drop_area, onDrop: handleDrop, onDragOver: (e) => {
-            e.preventDefault();
-        } }, (0, ide_core_browser_1.localize)('main-layout.drop-area.tip')));
-};
-const RightDropArea = () => react_1.default.createElement(DropArea, { location: 'right' });
-exports.RightDropArea = RightDropArea;
-const BottomDropArea = () => react_1.default.createElement(DropArea, { location: 'bottom' });
-exports.BottomDropArea = BottomDropArea;
-//# sourceMappingURL=drop-area.js.map

package/lib/browser/drop-area/drop-area.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"drop-area.js","sourceRoot":"","sources":["../../../src/browser/drop-area/drop-area.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAE1B,iEAAqE;AAErE,yCAAkD;AAElD,sFAA0C;AAM1C,MAAM,QAAQ,GAA6B,CAAC,KAAK,EAAE,EAAE;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC3B,MAAM,aAAa,GAAG,IAAA,gCAAa,EAAqB,2BAAkB,CAAC,CAAC;IAE5E,MAAM,UAAU,GAAG,eAAK,CAAC,WAAW,CAClC,CAAC,CAAkB,EAAE,EAAE;;QACrB,MAAM,WAAW,GAAG,MAAA,CAAC,CAAC,YAAY,0CAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3D,aAAa,CAAC,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC,EACD,CAAC,aAAa,EAAE,QAAQ,CAAC,CAC1B,CAAC;IAEF,OAAO,CACL,uCACE,SAAS,EAAE,4BAAM,CAAC,SAAS,EAC3B,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE;YAChB,CAAC,CAAC,cAAc,EAAE,CAAC;QACrB,CAAC,IAEA,IAAA,2BAAQ,EAAC,2BAA2B,CAAC,CAClC,CACP,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,8BAAC,QAAQ,IAAC,QAAQ,EAAC,OAAO,GAAG,CAAC;AAApD,QAAA,aAAa,iBAAuC;AAE1D,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,8BAAC,QAAQ,IAAC,QAAQ,EAAC,QAAQ,GAAG,CAAC;AAAtD,QAAA,cAAc,kBAAwC"}

package/lib/browser/drop-area/styles.module.less

@@ -1,7 +0,0 @@
-.drop_area {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}

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

@@ -1,40 +0,0 @@
-import React from 'react';
-
-import { localize, useInjectable } from '@opensumi/ide-core-browser';
-
-import { IMainLayoutService } from '../../common';
-
-import styles from './styles.module.less';
-
-interface IDropAreaProps {
-  location: string;
-}
-
-const DropArea: React.FC<IDropAreaProps> = (props) => {
-  const { location } = props;
-  const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
-
-  const handleDrop = React.useCallback(
-    (e: React.DragEvent) => {
-      const containerId = e.dataTransfer?.getData('containerId');
-      layoutService.moveContainerTo(containerId, location);
-    },
-    [layoutService, location],
-  );
-
-  return (
-    <div
-      className={styles.drop_area}
-      onDrop={handleDrop}
-      onDragOver={(e) => {
-        e.preventDefault();
-      }}
-    >
-      {localize('main-layout.drop-area.tip')}
-    </div>
-  );
-};
-
-export const RightDropArea = () => <DropArea location='right' />;
-
-export const BottomDropArea = () => <DropArea location='bottom' />;

package/src/browser/drop-area/styles.module.less

@@ -1,7 +0,0 @@
-.drop_area {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}