refactor: refactor editor related modules

dream-num · Jun 18, 2024 · 721f501 · 721f501
1 parent 5127019
commit 721f501
Show file tree

Hide file tree

Showing 21 changed files with 484 additions and 1,030 deletions.
diff --git a/packages/core/src/services/undoredo/undoredo.service.ts b/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.

diff --git a/...trollers/doc-drawing-update.controller.ts → ...s/doc-drawing-update.render-controller.ts b/...trollers/doc-drawing-update.controller.ts → ...s/doc-drawing-update.render-controller.ts
@@ -27,14 +27,14 @@ import { DocSkeletonManagerService, TextSelectionManagerService } from '@univerj
 import { docDrawingPositionToTransform, transformToDocDrawingPosition } from '@univerjs/docs-ui';
 import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 
-import type { IInsertImageOperationParams } from '../commands/operations/insert-image.operation';
-import { InsertDocImageOperation } from '../commands/operations/insert-image.operation';
-import type { IInsertDrawingCommandParams, ISetDrawingCommandParams } from '../commands/commands/interfaces';
-import { type ISetDrawingArrangeCommandParams, SetDocDrawingArrangeCommand } from '../commands/commands/set-drawing-arrange.command';
-import { InsertDocDrawingCommand } from '../commands/commands/insert-doc-drawing.command';
-import { GroupDocDrawingCommand } from '../commands/commands/group-doc-drawing.command';
-import { UngroupDocDrawingCommand } from '../commands/commands/ungroup-doc-drawing.command';
-import { SetDocDrawingCommand } from '../commands/commands/set-doc-drawing.command';
+import type { IInsertImageOperationParams } from '../../commands/operations/insert-image.operation';
+import { InsertDocImageOperation } from '../../commands/operations/insert-image.operation';
+import type { IInsertDrawingCommandParams, ISetDrawingCommandParams } from '../../commands/commands/interfaces';
+import { type ISetDrawingArrangeCommandParams, SetDocDrawingArrangeCommand } from '../../commands/commands/set-drawing-arrange.command';
+import { InsertDocDrawingCommand } from '../../commands/commands/insert-doc-drawing.command';
+import { GroupDocDrawingCommand } from '../../commands/commands/group-doc-drawing.command';
+import { UngroupDocDrawingCommand } from '../../commands/commands/ungroup-doc-drawing.command';
+import { SetDocDrawingCommand } from '../../commands/commands/set-doc-drawing.command';
 
 export class DocDrawingUpdateRenderController extends Disposable implements IRenderModule {
  constructor(
@@ -121,8 +121,6 @@ export class DocDrawingUpdateRenderController extends Disposable implements IRen
  const { imageId, imageSourceType, source, base64Cache } = imageParam;
  const { width, height, image } = await getImageSize(base64Cache || '');
 
- const { width: sceneWidth, height: sceneHeight } = this._context.scene;
-
  this._imageIoService.addImageSourceCache(imageId, imageSourceType, image);
 
  let scale = 1;
@@ -210,15 +208,11 @@ export class DocDrawingUpdateRenderController extends Disposable implements IRen
  }
 
  const sheetDrawing = this._sheetDrawingService.getDrawingByParam({ unitId, subUnitId, drawingId });
-
  if (sheetDrawing == null) {
  return;
  }
 
- // const { marginLeft, marginTop } = pageMarginCache.get(drawingId) || { marginLeft: 0, marginTop: 0 };
-
  const docTransform = transformToDocDrawingPosition({ ...sheetDrawing.transform, ...transform });
-
  if (docTransform == null) {
  return;
  }

diff --git a/packages/docs-drawing-ui/src/plugin.ts b/packages/docs-drawing-ui/src/plugin.ts
@@ -23,7 +23,7 @@ import { UniverDocsDrawingPlugin } from '@univerjs/docs-drawing';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { DocDrawingPopupMenuController } from './controllers/drawing-popup-menu.controller';
 import { DocDrawingUIController } from './controllers/doc-drawing.controller';
-import { DocDrawingUpdateRenderController } from './controllers/doc-drawing-update.controller';
+import { DocDrawingUpdateRenderController } from './controllers/render-controllers/doc-drawing-update.render-controller';
 
 const PLUGIN_NAME = 'DOCS_DRAWING_UI_PLUGIN';
 

diff --git a/packages/docs-ui/src/controllers/back-scroll.controller.ts b/packages/docs-ui/src/controllers/back-scroll.controller.ts
diff --git a/packages/docs-ui/src/controllers/doc-editor-bridge.controller.ts b/packages/docs-ui/src/controllers/doc-editor-bridge.controller.ts
@@ -81,7 +81,7 @@ export class DocEditorBridgeController extends Disposable {
  }
 
  const skeleton = this._renderManagerService.getRenderById(editorDataModel.getUnitId())
- ?.with(DocSkeletonManagerService).getSkeleton()?.skeleton;
+ ?.with(DocSkeletonManagerService).getSkeleton();
  if (editor == null || editor.render == null || skeleton == null || editorDataModel == null) {
  return;
  }