@opensumi/ide-overlay 2.21.8-rc-1670567192.0 → 2.21.8

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@opensumi/ide-overlay",
-  "version": "2.21.8-rc-1670567192.0",
+  "version": "2.21.8",
   "files": [
-    "lib",
-    "src"
+    "lib"
   ],
   "license": "MIT",
   "main": "lib/index.js",
@@ -17,12 +16,12 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.21.8-rc-1670567192.0"
+    "@opensumi/ide-core-common": "2.21.8"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-core-browser": "2.21.8-rc-1670567192.0",
+    "@opensumi/ide-components": "2.21.8",
+    "@opensumi/ide-core-browser": "2.21.8",
     "@opensumi/ide-dev-tool": "^1.3.1"
   },
-  "gitHead": "acb182cbff72a453386044944b33a9f71eca426d"
+  "gitHead": "603eaa81756ee0e8a58871fb67cfb01c8499593a"
 }

package/src/browser/ctx-menu/ctx-menu.service.ts

@@ -1,53 +0,0 @@
-import { observable, action } from 'mobx';
-
-import { Injectable } from '@opensumi/di';
-import { MenuNode } from '@opensumi/ide-core-browser/lib/menu/next/base';
-import { CtxMenuRenderParams } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/base';
-import { IBrowserCtxMenu } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/browser';
-
-@Injectable()
-export class BrowserCtxMenuService implements IBrowserCtxMenu {
-  @observable
-  visible = false;
-
-  @observable
-  onHide: ((canceled: boolean) => void) | undefined = undefined;
-
-  @observable
-  point: { pageX: number; pageY: number } | undefined = undefined;
-
-  @observable
-  context: any = undefined;
-
-  @observable
-  menuNodes: MenuNode[] = observable.array([]);
-
-  @action
-  public show(payload: CtxMenuRenderParams): void {
-    const { anchor, onHide, args: context, menuNodes } = payload;
-    // 上层调用前已经将 MenuNodes 处理为数组了
-    if (!Array.isArray(menuNodes) || !menuNodes.length) {
-      return;
-    }
-
-    this.context = context;
-    this.menuNodes.splice(0, this.menuNodes.length, ...menuNodes);
-    const { x, y } = anchor instanceof window.MouseEvent ? { x: anchor.clientX, y: anchor.clientY } : anchor;
-    this.onHide = onHide;
-    this.point = { pageX: x, pageY: y };
-    this.visible = true;
-  }
-
-  @action.bound
-  public hide(canceled: boolean) {
-    if (typeof this.onHide === 'function') {
-      this.onHide(canceled);
-    }
-    this.reset();
-  }
-
-  @action.bound
-  private reset() {
-    this.visible = false;
-  }
-}

package/src/browser/ctx-menu/ctx-menu.view.tsx

@@ -1,53 +0,0 @@
-import { observer } from 'mobx-react-lite';
-import React from 'react';
-import CtxMenuTrigger from 'react-ctxmenu-trigger';
-
-import { ClickOutside } from '@opensumi/ide-components';
-import { useInjectable } from '@opensumi/ide-core-browser';
-import { MenuActionList } from '@opensumi/ide-core-browser/lib/components/actions';
-import placements from '@opensumi/ide-core-browser/lib/components/actions/placements';
-import { IBrowserCtxMenu } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/browser';
-
-import 'react-ctxmenu-trigger/assets/index.css';
-
-export const CtxMenu = observer(() => {
-  const ctxMenuService = useInjectable<IBrowserCtxMenu>(IBrowserCtxMenu);
-
-  const handleClick = React.useCallback(() => {
-    ctxMenuService.hide(false);
-  }, []);
-
-  const onClickOutSide = React.useCallback(() => {
-    if (ctxMenuService.visible) {
-      ctxMenuService.hide(true);
-    }
-  }, [ctxMenuService.visible]);
-
-  // todo: 缓存上一次点击 visible 完成 toggle 效果
-  return (
-    <CtxMenuTrigger
-      // popupTransitionName='slide-up'
-      popupPlacement='bottomLeft'
-      popupVisible={ctxMenuService.visible}
-      action={['contextMenu']}
-      popupAlign={{
-        overflow: {
-          adjustX: 1,
-          adjustY: 1,
-        },
-        offset: [window.scrollX, window.scrollY],
-      }}
-      point={ctxMenuService.point || {}}
-      popupClassName='point-popup'
-      builtinPlacements={placements}
-      popup={
-        <ClickOutside mouseEvents={['click', 'contextmenu']} onOutsideClick={onClickOutSide}>
-          <MenuActionList data={ctxMenuService.menuNodes} afterClick={handleClick} context={ctxMenuService.context} />
-        </ClickOutside>
-      }
-      alignPoint
-    />
-  );
-});
-
-CtxMenu.displayName = 'CtxMenu';

package/src/browser/dialog.contextkey.ts

@@ -1,18 +0,0 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { IContextKeyService, IContextKey } from '@opensumi/ide-core-browser';
-import { DialogViewVisibleContext } from '@opensumi/ide-core-browser/lib/contextkey/dialog';
-
-@Injectable()
-export class DialogContextKey {
-  @Autowired(IContextKeyService)
-  private readonly globalContextKeyService: IContextKeyService;
-
-  public readonly dialogViewVisibleContext: IContextKey<boolean>;
-
-  private readonly _contextKeyService: IContextKeyService;
-
-  constructor() {
-    this._contextKeyService = this.globalContextKeyService;
-    this.dialogViewVisibleContext = DialogViewVisibleContext.bind(this._contextKeyService);
-  }
-}

package/src/browser/dialog.contribution.ts

@@ -1,43 +0,0 @@
-import { Autowired } from '@opensumi/di';
-import {
-  DIALOG_COMMANDS,
-  Domain,
-  localize,
-  CommandContribution,
-  CommandRegistry,
-  KeybindingContribution,
-  KeybindingRegistry,
-} from '@opensumi/ide-core-browser';
-import { DialogViewVisibleContext } from '@opensumi/ide-core-browser/lib/contextkey/dialog';
-
-import { IDialogService } from '../common';
-
-@Domain(CommandContribution, KeybindingContribution)
-export class DialogContribution implements CommandContribution, KeybindingContribution {
-  @Autowired(IDialogService)
-  private dialogService: IDialogService;
-
-  registerCommands(registry: CommandRegistry) {
-    registry.registerCommand(
-      {
-        id: DIALOG_COMMANDS.ENSURE.id,
-        label: localize('dialog.ensure'),
-      },
-      {
-        execute: () => {
-          const buttons = this.dialogService.getButtons();
-          // 默认使用最后一个选项作为返回值
-          this.dialogService.hide(buttons[buttons.length - 1]);
-        },
-      },
-    );
-  }
-
-  registerKeybindings(bindings: KeybindingRegistry) {
-    bindings.registerKeybinding({
-      command: DIALOG_COMMANDS.ENSURE.id,
-      keybinding: 'enter',
-      when: `${DialogViewVisibleContext.raw}`,
-    });
-  }
-}

package/src/browser/dialog.service.ts

@@ -1,110 +0,0 @@
-import { observable, action } from 'mobx';
-
-import { Injectable, Autowired } from '@opensumi/di';
-import { Deferred, MessageType } from '@opensumi/ide-core-common';
-
-import { IDialogService, AbstractMessageService, Icon } from '../common';
-
-import { DialogContextKey } from './dialog.contextkey';
-
-@Injectable()
-export class DialogService extends AbstractMessageService implements IDialogService {
-  protected type: MessageType | undefined;
-
-  protected deferred: Deferred<any>;
-
-  @Autowired(DialogContextKey)
-  private readonly contextkeyService: DialogContextKey;
-
-  @observable
-  protected visible = false;
-
-  protected message: string | React.ReactNode = '';
-
-  protected title = '';
-
-  public closable = true;
-
-  protected buttons: string[] = [];
-
-  protected props: Record<string, any> = {};
-
-  @action
-  open<T = string>(
-    message: string | React.ReactNode,
-    type: MessageType,
-    buttons?: any[],
-    closable = true,
-    _?: string,
-    props?: Record<string, any>,
-  ): Promise<T | undefined> {
-    this.deferred = new Deferred<string>();
-    this.type = type;
-    this.message = message;
-    this.visible = true;
-    this.contextkeyService.dialogViewVisibleContext.set(true);
-    this.closable = closable;
-    this.props = props ?? {};
-    if (buttons) {
-      this.buttons = buttons;
-    }
-    return this.deferred.promise;
-  }
-
-  @action
-  hide<T = string>(value?: T): void {
-    this.visible = false;
-    this.contextkeyService.dialogViewVisibleContext.set(false);
-    this.deferred.resolve(value);
-  }
-
-  @action
-  reset(): void {
-    this.type = undefined;
-    this.message = '';
-    this.buttons = [];
-    this.props = {};
-  }
-
-  isVisible(): boolean {
-    return this.visible;
-  }
-
-  getMessage(): string | React.ReactNode {
-    return this.message;
-  }
-
-  getType(): MessageType | undefined {
-    return this.type;
-  }
-
-  getIcon(): Icon | undefined {
-    switch (this.type) {
-      case MessageType.Error:
-        return {
-          color: 'var(--notificationsErrorIcon-foreground)',
-          className: 'close-circle',
-        };
-      case MessageType.Info:
-        return {
-          color: 'var(--notificationsInfoIcon-foreground)',
-          className: 'info-circle',
-        };
-      case MessageType.Warning:
-        return {
-          color: 'var(--notificationsWarningIcon-foreground)',
-          className: 'question-circle',
-        };
-      default:
-        break;
-    }
-  }
-
-  getButtons(): string[] {
-    return this.buttons;
-  }
-
-  getProps(): Record<string, any> {
-    return this.props;
-  }
-}

package/src/browser/dialog.view.tsx

@@ -1,65 +0,0 @@
-import { observer } from 'mobx-react-lite';
-import React from 'react';
-
-import { Button, Dialog as DialogView } from '@opensumi/ide-components';
-import { useInjectable, localize } from '@opensumi/ide-core-browser';
-import { strings } from '@opensumi/ide-core-browser';
-
-import { IDialogService } from '../common';
-
-export const Dialog = observer(() => {
-  const dialogService = useInjectable<IDialogService>(IDialogService);
-  const icon = dialogService.getIcon();
-  const message = dialogService.getMessage();
-  const buttons = dialogService.getButtons();
-  const type = dialogService.getType();
-  // props will transfer to Overlay component
-  const customProps = dialogService.getProps();
-
-  function afterClose() {
-    dialogService.reset();
-  }
-
-  function handleClose() {
-    dialogService.hide();
-  }
-
-  function handlerClickButton(value: string) {
-    return () => {
-      dialogService.hide(value);
-    };
-  }
-
-  return (
-    <DialogView
-      visible={dialogService.isVisible()}
-      onClose={handleClose}
-      closable={dialogService.closable}
-      afterClose={afterClose}
-      message={message}
-      type='confirm'
-      messageType={type}
-      icon={icon}
-      keyboard={true}
-      buttons={
-        buttons.length ? (
-          buttons.map((button, index) => (
-            <Button
-              size='large'
-              onClick={handlerClickButton(button)}
-              key={button}
-              type={index === buttons.length - 1 ? 'primary' : 'secondary'}
-            >
-              {strings.mnemonicButtonLabel(button, true)}
-            </Button>
-          ))
-        ) : (
-          <Button size='large' onClick={handleClose} type='primary'>
-            {localize('dialog.confirm')}
-          </Button>
-        )
-      }
-      {...customProps}
-    />
-  );
-});

package/src/browser/index.ts

@@ -1,38 +0,0 @@
-import { Provider, Injectable } from '@opensumi/di';
-import { BrowserModule } from '@opensumi/ide-core-browser';
-import { IBrowserCtxMenu } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/browser';
-
-import { IDialogService, IMessageService } from '../common';
-
-import { BrowserCtxMenuService } from './ctx-menu/ctx-menu.service';
-import { DialogContextKey } from './dialog.contextkey';
-import { DialogContribution } from './dialog.contribution';
-import { DialogService } from './dialog.service';
-import { Overlay } from './index.view';
-import { MessageService } from './message.service';
-
-@Injectable()
-export class OverlayModule extends BrowserModule {
-  providers: Provider[] = [
-    {
-      token: DialogContextKey,
-      useClass: DialogContextKey,
-    },
-    {
-      token: IDialogService,
-      useClass: DialogService,
-    },
-    {
-      token: IMessageService,
-      useClass: MessageService,
-    },
-    {
-      token: IBrowserCtxMenu,
-      useClass: BrowserCtxMenuService,
-    },
-    DialogContribution,
-  ];
-
-  isOverlay = true;
-  component = Overlay;
-}

package/src/browser/index.view.tsx

@@ -1,49 +0,0 @@
-import { observer } from 'mobx-react-lite';
-import React from 'react';
-
-import {
-  ComponentRenderer,
-  ComponentRegistry,
-  SlotLocation,
-  useInjectable,
-  AppConfig,
-  IClientApp,
-} from '@opensumi/ide-core-browser';
-
-import { CtxMenu } from './ctx-menu/ctx-menu.view';
-import { Dialog } from './dialog.view';
-import './styles.module.less';
-
-export const Overlay = observer(() => {
-  const componentRegistry: ComponentRegistry = useInjectable(ComponentRegistry);
-  const clientApp = useInjectable(IClientApp);
-  const [extraComponents, setExtra] = React.useState<React.ComponentType[]>([]);
-  const appConfig: AppConfig = useInjectable(AppConfig);
-  React.useEffect(() => {
-    // 对于嵌套在模块视图的SlotRenderer，渲染时应用已启动
-    clientApp.appInitialized.promise.then(() => {
-      if (appConfig.layoutConfig[SlotLocation.extra]?.modules) {
-        const components: React.ComponentType[] = [];
-        appConfig.layoutConfig[SlotLocation.extra].modules.forEach((name) => {
-          const info = componentRegistry.getComponentRegistryInfo(name);
-          if (info) {
-            (info.views || []).forEach((v) => {
-              if (v.component) {
-                components.push(v.component!);
-              }
-            });
-          }
-        });
-        setExtra(components);
-      }
-    });
-  }, []);
-
-  return (
-    <div id='ide-overlay' className='ide-overlay'>
-      <Dialog />
-      <CtxMenu />
-      <ComponentRenderer Component={extraComponents} />
-    </div>
-  );
-});

package/src/browser/message.service.tsx

@@ -1,81 +0,0 @@
-import React from 'react';
-
-import { Autowired, Injectable } from '@opensumi/di';
-import { notification, open } from '@opensumi/ide-components';
-import { IOpenerService, toMarkdown } from '@opensumi/ide-core-browser';
-import { MessageType, uuid, localize } from '@opensumi/ide-core-common';
-
-import { IMessageService, AbstractMessageService, MAX_MESSAGE_LENGTH } from '../common';
-
-@Injectable()
-export class MessageService extends AbstractMessageService implements IMessageService {
-  @Autowired(IOpenerService)
-  private readonly openerService: IOpenerService;
-
-  // 上一个展示的文案
-  private preMessage: string | React.ReactNode;
-
-  // 当前组件展示的时间
-  private showTime = 0;
-
-  // 相同文案返回的间隔时间
-  // https://github.com/react-component/notification#notificationnoticeprops
-  protected static SAME_MESSAGE_DURATION = 30;
-
-  // 参考 vscode message 组件消失的时间
-  protected static DURATION: { [type: number]: number } = {
-    [MessageType.Info]: 15,
-    [MessageType.Warning]: 18,
-    [MessageType.Error]: 20,
-  };
-
-  /**
-   *
-   * @param rawMessage message
-   * @param type MessageType
-   * @param buttons buttons
-   * @param closable true | false
-   * @param from from extension
-   */
-  open<T = string>(
-    rawMessage: string | React.ReactNode,
-    type: MessageType,
-    buttons?: string[],
-    closable = true,
-    from?: string,
-  ): Promise<T | undefined> {
-    if (!rawMessage) {
-      return Promise.resolve(undefined);
-    }
-    let message = rawMessage;
-    // 如果两秒内提示信息相同，则直接返回上一个提示
-    if (
-      Date.now() - this.showTime < MessageService.SAME_MESSAGE_DURATION &&
-      typeof message === 'string' &&
-      this.preMessage === message
-    ) {
-      return Promise.resolve(undefined);
-    }
-    this.preMessage = typeof message === 'string' && message;
-    this.showTime = Date.now();
-    if (typeof rawMessage === 'string' && rawMessage.length > MAX_MESSAGE_LENGTH) {
-      message = `${rawMessage.substr(0, MAX_MESSAGE_LENGTH)}...`;
-    }
-    const description = from && typeof from === 'string' ? `${localize('component.message.origin')}: ${from}` : '';
-    const key = uuid();
-    const promise = open<T>(
-      toMarkdown(message, this.openerService),
-      type,
-      closable,
-      key,
-      buttons,
-      description,
-      MessageService.DURATION[type],
-    );
-    return promise || Promise.resolve(undefined);
-  }
-
-  hide(): void {
-    notification.destroy();
-  }
-}

package/src/browser/styles.module.less

@@ -1,8 +0,0 @@
-:global {
-  .ide-overlay {
-    position: relative;
-    z-index: 999;
-    overflow: auto;
-    outline: 0;
-  }
-}

package/src/common/index.ts

@@ -1,134 +0,0 @@
-import React from 'react';
-
-import { MessageType, URI } from '@opensumi/ide-core-common';
-
-export const IMessageService = Symbol('IMessageService');
-
-export interface IMessageService {
-  info(
-    message: string | React.ReactNode,
-    buttons?: string[],
-    closable?: boolean,
-    props?: Record<string, any>,
-  ): Promise<string | undefined>;
-  warning(
-    message: string | React.ReactNode,
-    buttons?: string[],
-    closable?: boolean,
-    props?: Record<string, any>,
-  ): Promise<string | undefined>;
-  error(
-    message: string | React.ReactNode,
-    buttons?: string[],
-    closable?: boolean,
-    props?: Record<string, any>,
-  ): Promise<string | undefined>;
-  open<T = string>(
-    message: string | React.ReactNode,
-    type: MessageType,
-    buttons?: string[],
-    closable?: boolean,
-    from?: string,
-    props?: Record<string, any>,
-  ): Promise<T | undefined>;
-  hide<T = string>(value?: T): void;
-}
-
-export interface Icon {
-  color: string;
-  className: string;
-}
-
-export const MAX_MESSAGE_LENGTH = 1000;
-
-export const IDialogService = Symbol('IDialogService');
-export interface IDialogService extends IMessageService {
-  closable?: boolean;
-  isVisible(): boolean;
-  getMessage(): string | React.ReactNode;
-  getIcon(): Icon | undefined;
-  getButtons(): string[];
-  getType(): MessageType | undefined;
-  getProps(): Record<string, any>;
-  reset(): void;
-}
-
-export abstract class AbstractMessageService implements IMessageService {
-  info(
-    message: string | React.ReactNode,
-    buttons?: string[],
-    closable?: boolean,
-    props?: Record<string, any>,
-  ): Promise<string | undefined> {
-    return this.open(message, MessageType.Info, buttons, closable, undefined, props);
-  }
-
-  warning(
-    message: string | React.ReactNode,
-    buttons?: string[],
-    closable?: boolean,
-    props?: Record<string, any>,
-  ): Promise<string | undefined> {
-    return this.open(message, MessageType.Warning, buttons, closable, undefined, props);
-  }
-
-  error(
-    message: string | React.ReactNode,
-    buttons?: string[],
-    closable?: boolean,
-    props?: Record<string, any>,
-  ): Promise<string | undefined> {
-    return this.open(message, MessageType.Error, buttons, closable, undefined, props);
-  }
-  abstract open<T = string>(
-    message: string | React.ReactNode,
-    type: MessageType,
-    buttons?: any[],
-    closable?: boolean,
-    from?: string,
-    props?: Record<string, any>,
-  ): Promise<T | undefined>;
-  abstract hide<T = string>(value?: T): void;
-}
-
-export interface IWindowDialogService {
-  showOpenDialog(options?: IOpenDialogOptions): Promise<URI[] | undefined>;
-  showSaveDialog(options?: ISaveDialogOptions): Promise<URI | undefined>;
-}
-
-export const IWindowDialogService = Symbol('IWindowDialogService');
-
-export interface IDialogOptions {
-  title?: string;
-  defaultUri?: URI;
-  filters?: {
-    [name: string]: string;
-  };
-}
-
-export interface ISaveDialogOptions extends IDialogOptions {
-  saveLabel?: string;
-  showNameInput?: boolean;
-  defaultFileName?: string;
-}
-
-export interface IOpenDialogOptions extends IDialogOptions {
-  canSelectFiles?: boolean;
-  canSelectFolders?: boolean;
-  canSelectMany?: boolean;
-  openLabel?: string;
-}
-
-export namespace ISaveDialogOptions {
-  export function is(option) {
-    return 'saveLabel' in option || 'showNameInput' in option || 'defaultFileName' in option;
-  }
-}
-
-export namespace IOpenDialogOptions {
-  export function is(option) {
-    return (
-      'canSelectFiles' in option || 'canSelectFolders' in option || 'canSelectMany' in option || 'openLabel' in option
-    );
-  }
-}

package/src/index.ts

@@ -1 +0,0 @@
-export * from './common';