refactor(docs-ui): refactor to RenderUnit

e2e/disposing/disposing.spec.ts

@@ -43,7 +43,7 @@ test('no error on constructing and disposing', async ({ page }) => {
  await page.waitForTimeout(2000);
 
  await page.evaluate(() => window.E2EControllerAPI.loadDefaultSheet());
- await page.waitForTimeout(2000);
+ await page.waitForTimeout(6000); // wait for features loaded in STEADY stage (5s)
 
  await page.evaluate(() => window.E2EControllerAPI.disposeUniver());
  await page.waitForTimeout(2000);

examples/src/docs/main.ts

@@ -15,18 +15,17 @@
  */
 
 /* eslint-disable node/prefer-global/process */
+
 import { LocaleType, Univer, UniverInstanceType } from '@univerjs/core';
 import { defaultTheme } from '@univerjs/design';
 import { UniverDocsPlugin } from '@univerjs/docs';
 import { UniverDocsUIPlugin } from '@univerjs/docs-ui';
 import { UniverRenderEnginePlugin } from '@univerjs/engine-render';
 import { UniverUIPlugin } from '@univerjs/ui';
-import { UniverDrawingPlugin } from '@univerjs/drawing';
 import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
 import { UniverDebuggerPlugin } from '@univerjs/debugger';
-import { UniverDrawingUIPlugin } from '@univerjs/drawing-ui';
-import { UniverDocsDrawingPlugin } from '@univerjs/docs-drawing';
 import { UniverDocsDrawingUIPlugin } from '@univerjs/docs-drawing-ui';
+
 import { DEFAULT_DOCUMENT_DATA_CN } from '../data';
 import { enUS, ruRU, zhCN } from '../locales';
 
@@ -58,7 +57,7 @@ univer.registerPlugin(UniverUIPlugin, {
  container: 'app',
  footer: false,
 });
-univer.registerPlugin(UniverDrawingPlugin);
+
 univer.registerPlugin(UniverDocsPlugin);
 univer.registerPlugin(UniverDocsUIPlugin, {
  container: 'univerdoc',
@@ -69,8 +68,6 @@ univer.registerPlugin(UniverDocsUIPlugin, {
  },
 });
 
-univer.registerPlugin(UniverDrawingUIPlugin);
-univer.registerPlugin(UniverDocsDrawingPlugin);
 univer.registerPlugin(UniverDocsDrawingUIPlugin);
 
 univer.createUnit(UniverInstanceType.UNIVER_DOC, DEFAULT_DOCUMENT_DATA_CN);

examples/src/sheets/main.ts

@@ -32,10 +32,10 @@ import type { IUniverRPCMainThreadConfig } from '@univerjs/rpc';
 import { UniverRPCMainThreadPlugin } from '@univerjs/rpc';
 import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula';
 import { UniverSheetsNumfmtPlugin } from '@univerjs/sheets-numfmt';
-import { UniverSheetsZenEditorPlugin } from '@univerjs/sheets-zen-editor';
 import { UniverSheetsDataValidationPlugin } from '@univerjs/sheets-data-validation';
 import { UniverSheetsDrawingUIPlugin } from '@univerjs/sheets-drawing-ui';
 import { FUniver } from '@univerjs/facade';
+import { UniverSheetsZenEditorPlugin } from '@univerjs/sheets-zen-editor';
 import { enUS, ruRU, zhCN } from '../locales';
 import { DEFAULT_WORKBOOK_DATA_DEMO } from '../data/sheets/demo/default-workbook-data-demo';
 

packages/core/src/common/const.ts

@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-export const DOCS_NORMAL_EDITOR_UNIT_ID_KEY = '__defaultDocumentNormalEditorSpecialUnitId_20231006__';
+const PREFIX = '__INTERNAL_EDITOR__';
 
-export const DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY = '__defaultDocumentFormulaBarEditorSpecialUnitId_20231012__';
+export const DOCS_NORMAL_EDITOR_UNIT_ID_KEY = `${PREFIX}DOCS_NORMAL`;
+
+export const DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY = `${PREFIX}DOCS_FORMULA_BAR`;
 
 export const DEFAULT_EMPTY_DOCUMENT_VALUE = '\r\n';
 
 export function createInternalEditorID(id: string) {
- return `__internalEditorId__${id}`;
+ return `${PREFIX}${id}`;
 }
 
 export function isInternalEditorID(id: string) {
- return id.startsWith('__');
+ return id.startsWith(PREFIX);
 }

packages/core/src/services/instance/instance.service.ts

@@ -41,7 +41,7 @@ export interface IUniverInstanceService {
  /** Subscribe to curtain type of units' creation. */
  getTypeOfUnitAdded$<T extends UnitModel>(type: UnitType): Observable<T>;
 
- /** @interal */
+ /** @ignore */
  __addUnit(unit: UnitModel): void;
 
  /** Omits value when a UnitModel is disposed. */

packages/core/src/services/undoredo/undoredo.service.ts

@@ -49,7 +49,7 @@ export interface IUndoRedoService {
  popUndoToRedo(): void;
  popRedoToUndo(): void;
 
- clearUndoRedo(unitID: string): void;
+ clearUndoRedo(unitId: string): void;
 
  /**
  * Batch undo redo elements into a single `IUndoRedoItem` util the returned `IDisposable` is called.

packages/debugger/src/controllers/performance-monitor.controller.ts

@@ -15,9 +15,9 @@
  */
 
 import { IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, UniverInstanceType } from '@univerjs/core';
-import { DocCanvasView } from '@univerjs/docs-ui';
+import { DocRenderController } from '@univerjs/docs-ui';
 import { Inject, Injector } from '@wendellhu/redi';
-import { interval, takeUntil, throttle } from 'rxjs';
+import { takeUntil } from 'rxjs';
 
 @OnLifecycle(LifecycleStages.Rendered, PerformanceMonitorController)
 export class PerformanceMonitorController extends RxDisposable {
@@ -27,7 +27,7 @@ export class PerformanceMonitorController extends RxDisposable {
  private _styleElement!: HTMLStyleElement;
 
  constructor(
- @Inject(DocCanvasView) private _docCanvasView: DocCanvasView,
+ @Inject(DocRenderController) private _DocRenderController: DocRenderController,
  @Inject(Injector) private _injector: Injector,
  @IUniverInstanceService private _instanceService: IUniverInstanceService
  ) {
@@ -86,13 +86,6 @@ export class PerformanceMonitorController extends RxDisposable {
  this._styleElement = document.createElement('style');
  document.head.appendChild(this._styleElement).innerText = style;
 
- if (this._documentType === UniverInstanceType.UNIVER_DOC) {
- this._docCanvasView.fps$
- .pipe(takeUntil(this.dispose$))
- .pipe(throttle(() => interval(THROTTLE_TIME)))
- .subscribe((fps) => {
- container.innerText = `FPS: ${fps}`;
- });
- }
+ // TODO@wzhudev: monitor fps from engine
  }
 }

packages/debugger/src/debugger-plugin.ts

@@ -20,7 +20,6 @@ import { Inject, Injector } from '@wendellhu/redi';
 
 import type { IUniverDebuggerConfig } from './controllers/debugger.controller';
 import { DebuggerController, DefaultDebuggerConfig } from './controllers/debugger.controller';
-import { PerformanceMonitorController } from './controllers/performance-monitor.controller';
 import { E2EMemoryController } from './controllers/e2e/e2e-memory.controller';
 
 export class UniverDebuggerPlugin extends Plugin {
@@ -39,7 +38,7 @@ export class UniverDebuggerPlugin extends Plugin {
 
  override onStarting(injector: Injector): void {
  ([
- [PerformanceMonitorController],
+ // [PerformanceMonitorController],
  [E2EMemoryController],
  ] as Dependency[]).forEach((d) => injector.add(d));
  }

packages/docs-drawing-ui/src/commands/operations/insert-image.operation.ts

@@ -21,10 +21,11 @@ export interface IInsertImageOperationParams {
  files: Nullable<File[]>;
 };
 
+/**
+ * @deprecated Do not use command as event!
+ */
 export const InsertDocImageOperation: IOperation<IInsertImageOperationParams> = {
  id: 'doc.operation.insert-float-image',
  type: CommandType.OPERATION,
- handler: (accessor, params) => {
- return true;
- },
+ handler: () => true,
 };