@opensumi/ide-core-browser 3.2.5-next-1724743242.0 → 3.2.5

package/src/design/rule.ts

@@ -1,51 +1,35 @@
 /**
  * 定义了 zIndex 的层级
  */
-export const StackingLevel = Object.freeze({
+export const StackingLevel = {
   /**
    * 基础层级
    */
+  Base: 0,
   Background: 0,
 
-  /**
-   * IDE 的主要内容区域，基础控件
-   */
   Workbench: 1,
+  WorkbenchEditor: 1,
 
-  /**
-   * 顶部的工具栏
-   */
   Toolbar: 2,
 
-  /**
-   * xterm.css 中 decoration 的 z-index 是 7，所以这里要比它大一点
-   */
-  XtermDecoration: 8,
+  XtermDecoration: 8, // xterm.css 中 decoration 的 z-index 是 7，所以这里要比它大一点
 
-  /**
-   * 顶部工具栏的下拉菜单
-   */
   ToolbarDropdown: 10,
 
-  EditorTabbarCurrent: 11,
-
   ResizeHandle: 12,
 
-  EditorTabbarOverlay: 15,
-
   EditorFloatingContainer: 20,
 
-  // #region 中级弹窗区域
+  /**
+   * 一级弹窗
+   */
   Popup: 100,
-  // #endregion
-
-  // #region 顶级弹窗区域
+  PopoverComponent: 1000,
+  PopoverComponentArrow: 1001,
   Overlay: 800,
-  PopoverComponent: 999,
-  PopoverComponentArrow: 1000,
   OverlayTop: 1000,
-  // #endregion
-} as const);
+} as const;
 
 export const StackingLevelStr = Object.fromEntries(
   Object.entries(StackingLevel).map(([key, value]) => [key, value.toString()]),

package/src/index.ts

@@ -1,3 +1,4 @@
+// 输出所有 common 里面会有的内容
 export * from '@opensumi/ide-core-common';
 
 // 输出当前 browser 特有的内容
@@ -44,4 +45,3 @@ export * from './markdown';
 export * from './extensions';
 
 export * from './static-resource';
-export * from './context-key';

package/src/layout/constants.ts

@@ -1,7 +1,7 @@
 import merge from 'lodash/merge';
 
 import { Injectable } from '@opensumi/di';
-import { IDesignLayoutConfig, isDefined, isMacintosh } from '@opensumi/ide-core-common';
+import { IDesignLayoutConfig, isMacintosh } from '@opensumi/ide-core-common';
 
 import { electronEnv } from '../utils/electron';
 
@@ -25,48 +25,15 @@ export const DEFAULT_LAYOUT_VIEW_SIZE: ILayoutViewSize = {
   accordionHeaderSizeHeight: 24,
 };
 
-export enum ConfigPriority {
-  ModuleDefined,
-  UserDefined,
-}
-
-/**
- * 支持多档优先级配置
- */
-class ConfigAtom<T> {
-  /**
-   * index 越高，优先级越高
-   */
-  protected _value: (T | undefined)[] = [];
-  constructor(public defaultValue: T) {}
-
-  setValue(value: T | undefined, priority: number) {
-    this._value[priority] = value;
-  }
-
-  getValue(): T {
-    let value = this.defaultValue;
-
-    for (let i = this._value.length - 1; i >= 0; i--) {
-      if (isDefined(this._value[i])) {
-        value = this._value[i]!;
-        break;
-      }
-    }
-
-    return value;
-  }
-}
-
 @Injectable()
 export class LayoutViewSizeConfig implements ILayoutViewSize {
-  #menubarHeight = new ConfigAtom(DEFAULT_LAYOUT_VIEW_SIZE.menubarHeight);
-  #editorTabsHeight = new ConfigAtom(DEFAULT_LAYOUT_VIEW_SIZE.editorTabsHeight);
-  #bigSurTitleBarHeight = new ConfigAtom(DEFAULT_LAYOUT_VIEW_SIZE.bigSurTitleBarHeight);
-  #titleBarHeight = new ConfigAtom(DEFAULT_LAYOUT_VIEW_SIZE.titleBarHeight);
-  #panelTitleBarHeight = new ConfigAtom(DEFAULT_LAYOUT_VIEW_SIZE.panelTitleBarHeight);
-  #statusBarHeight = new ConfigAtom(DEFAULT_LAYOUT_VIEW_SIZE.statusBarHeight);
-  #accordionHeaderSizeHeight = new ConfigAtom(DEFAULT_LAYOUT_VIEW_SIZE.accordionHeaderSizeHeight);
+  #menubarHeight: number;
+  #editorTabsHeight: number;
+  #bigSurTitleBarHeight: number;
+  #titleBarHeight: number;
+  #panelTitleBarHeight: number;
+  #statusBarHeight: number;
+  #accordionHeaderSizeHeight: number;
 
   private inited = false;
   init(layoutViewSize: Partial<ILayoutViewSize> = {}) {
@@ -75,62 +42,63 @@ export class LayoutViewSizeConfig implements ILayoutViewSize {
     }
     this.inited = true;
 
-    this.#menubarHeight.setValue(layoutViewSize.menubarHeight, ConfigPriority.UserDefined);
-    this.#editorTabsHeight.setValue(layoutViewSize.editorTabsHeight, ConfigPriority.UserDefined);
-    this.#bigSurTitleBarHeight.setValue(layoutViewSize.bigSurTitleBarHeight, ConfigPriority.UserDefined);
-    this.#titleBarHeight.setValue(layoutViewSize.titleBarHeight, ConfigPriority.UserDefined);
-    this.#panelTitleBarHeight.setValue(layoutViewSize.panelTitleBarHeight, ConfigPriority.UserDefined);
-    this.#statusBarHeight.setValue(layoutViewSize.statusBarHeight, ConfigPriority.UserDefined);
-    this.#accordionHeaderSizeHeight.setValue(layoutViewSize.accordionHeaderSizeHeight, ConfigPriority.UserDefined);
+    this.#menubarHeight = layoutViewSize.menubarHeight || DEFAULT_LAYOUT_VIEW_SIZE.menubarHeight;
+    this.#editorTabsHeight = layoutViewSize.editorTabsHeight || DEFAULT_LAYOUT_VIEW_SIZE.editorTabsHeight;
+    this.#bigSurTitleBarHeight = layoutViewSize.bigSurTitleBarHeight || DEFAULT_LAYOUT_VIEW_SIZE.bigSurTitleBarHeight;
+    this.#titleBarHeight = layoutViewSize.titleBarHeight || DEFAULT_LAYOUT_VIEW_SIZE.titleBarHeight;
+    this.#panelTitleBarHeight = layoutViewSize.panelTitleBarHeight || DEFAULT_LAYOUT_VIEW_SIZE.panelTitleBarHeight;
+    this.#statusBarHeight = layoutViewSize.statusBarHeight || DEFAULT_LAYOUT_VIEW_SIZE.statusBarHeight;
+    this.#accordionHeaderSizeHeight =
+      layoutViewSize.accordionHeaderSizeHeight || DEFAULT_LAYOUT_VIEW_SIZE.accordionHeaderSizeHeight;
   }
 
   get menubarHeight(): number {
-    return this.#menubarHeight.getValue();
+    return this.#menubarHeight;
   }
-  setMenubarHeight(value: number, priority?: number) {
-    this.#menubarHeight.setValue(value, priority ?? ConfigPriority.ModuleDefined);
+  setMenubarHeight(value: number) {
+    this.#menubarHeight = value;
   }
 
   get editorTabsHeight(): number {
-    return this.#editorTabsHeight.getValue();
+    return this.#editorTabsHeight;
   }
-  setEditorTabsHeight(value: number, priority?: number) {
-    this.#editorTabsHeight.setValue(value, priority ?? ConfigPriority.ModuleDefined);
+  setEditorTabsHeight(value: number) {
+    this.#editorTabsHeight = value;
   }
 
   get bigSurTitleBarHeight(): number {
-    return this.#bigSurTitleBarHeight.getValue();
+    return this.#bigSurTitleBarHeight;
   }
-  setBigSurTitleBarHeight(value: number, priority?: number) {
-    this.#bigSurTitleBarHeight.setValue(value, priority ?? ConfigPriority.ModuleDefined);
+  setBigSurTitleBarHeight(value: number) {
+    this.#bigSurTitleBarHeight = value;
   }
 
   get titleBarHeight(): number {
-    return this.#titleBarHeight.getValue();
+    return this.#titleBarHeight;
   }
-  setTitleBarHeight(value: number, priority?: number) {
-    this.#titleBarHeight.setValue(value, priority ?? ConfigPriority.ModuleDefined);
+  setTitleBarHeight(value: number) {
+    this.#titleBarHeight = value;
   }
 
   get panelTitleBarHeight(): number {
-    return this.#panelTitleBarHeight.getValue();
+    return this.#panelTitleBarHeight;
   }
-  setPanelTitleBarHeight(value: number, priority?: number) {
-    this.#panelTitleBarHeight.setValue(value, priority ?? ConfigPriority.ModuleDefined);
+  setPanelTitleBarHeight(value: number) {
+    this.#panelTitleBarHeight = value;
   }
 
   get statusBarHeight(): number {
-    return this.#statusBarHeight.getValue();
+    return this.#statusBarHeight;
   }
-  setStatusBarHeight(value: number, priority?: number) {
-    this.#statusBarHeight.setValue(value, priority ?? ConfigPriority.ModuleDefined);
+  setStatusBarHeight(value: number) {
+    this.#statusBarHeight = value;
   }
 
   get accordionHeaderSizeHeight(): number {
-    return this.#accordionHeaderSizeHeight.getValue();
+    return this.#accordionHeaderSizeHeight;
   }
-  setAccordionHeaderSizeHeight(value: number, priority?: number) {
-    this.#accordionHeaderSizeHeight.setValue(value, priority ?? ConfigPriority.ModuleDefined);
+  setAccordionHeaderSizeHeight(value: number) {
+    this.#accordionHeaderSizeHeight = value;
   }
 
   protected supportNewMacHeaderBar = electronEnv.osRelease ? parseFloat(electronEnv.osRelease) >= 20 : false;

package/src/layout/index.ts

@@ -3,4 +3,3 @@ export * from './layout-hooks';
 export * from './layout.interface';
 export * from './accordion/view-context-key.registry';
 export * from './accordion/tab-bar-toolbar';
-export * from './render';

package/lib/layout/render.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import { View } from './layout.interface';
-export declare const renderView: (view?: View) => React.JSX.Element;
-//# sourceMappingURL=render.d.ts.map

package/lib/layout/render.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/layout/render.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,eAAO,MAAM,UAAU,UAAW,IAAI,sBAMnC,CAAC"}

package/lib/layout/render.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderView = void 0;
-const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
-const react_is_1 = tslib_1.__importDefault(require("react-is"));
-const react_providers_1 = require("../react-providers");
-const renderView = (view) => (react_1.default.createElement(react_1.default.Fragment, null, view && react_is_1.default.isValidElementType(view.component) ? (react_1.default.createElement(react_providers_1.ErrorBoundary, null, view.component && react_1.default.createElement(view.component, view.initialProps))) : null));
-exports.renderView = renderView;
-//# sourceMappingURL=render.js.map

package/lib/layout/render.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/layout/render.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,gEAA+B;AAE/B,wDAAmD;AAI5C,MAAM,UAAU,GAAG,CAAC,IAAW,EAAE,EAAE,CAAC,CACvC,8DACG,IAAI,IAAI,kBAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CACpD,8BAAC,+BAAa,QAAE,IAAI,CAAC,SAAS,IAAI,eAAK,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAiB,CAC1G,CAAC,CAAC,CAAC,IAAI,CACP,CACJ,CAAC;AANS,QAAA,UAAU,cAMnB"}

package/src/layout/render.tsx

@@ -1,14 +0,0 @@
-import React from 'react';
-import ReactIs from 'react-is';
-
-import { ErrorBoundary } from '../react-providers';
-
-import { View } from './layout.interface';
-
-export const renderView = (view?: View) => (
-    <>
-      {view && ReactIs.isValidElementType(view.component) ? (
-        <ErrorBoundary>{view.component && React.createElement(view.component, view.initialProps)}</ErrorBoundary>
-      ) : null}
-    </>
-  );