Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
feat(floatdom): add some hookes (#3854)
VicKun3747cd44a010
diff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.tsindex 04ff07eb6a..8a805c56a1 100644--- a/packages/engine-render/src/base-object.ts+++ b/packages/engine-render/src/base-object.ts@@ -15,20 +15,20 @@*/import type { IKeyValue, ITransformState, Nullable } from '@univerjs/core';-import { Disposable, EventSubject } from '@univerjs/core';--import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';import type { IDragEvent, IMouseEvent, IPointerEvent, IWheelEvent } from './basics/i-events';+import type { IObjectFullState, ITransformChangeState } from './basics/interfaces';-import { TRANSFORM_CHANGE_OBSERVABLE_TYPE } from './basics/interfaces';-import { generateRandomKey, toPx } from './basics/tools';-import { Transform } from './basics/transform';+import type { ITransformerConfig } from './basics/transformer-config';import type { IViewportInfo, Vector2 } from './basics/vector2';import type { UniverRenderingContext } from './context';+import type { Engine } from './engine';import type { Layer } from './layer';-import type { ITransformerConfig } from './basics/transformer-config';import type { Scene } from './scene';-import type { Engine } from './engine';+import { Disposable, EventSubject } from '@univerjs/core';+import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';+import { TRANSFORM_CHANGE_OBSERVABLE_TYPE } from './basics/interfaces';+import { generateRandomKey, toPx } from './basics/tools';+import { Transform } from './basics/transform';export const BASE_OBJECT_ARRAY = ['top',@@ -52,6 +52,7 @@ export enum ObjectType {IMAGE,RECT,CIRCLE,+ CHART,}export abstract class BaseObject extends Disposable {diff --git a/packages/engine-render/src/scene.transformer.ts b/packages/engine-render/src/scene.transformer.tsindex 185a1ac316..5615c47df0 100644--- a/packages/engine-render/src/scene.transformer.ts+++ b/packages/engine-render/src/scene.transformer.ts@@ -15,15 +15,15 @@*/import type { IAbsoluteTransform, IKeyValue, Nullable } from '@univerjs/core';-import type { BaseObject } from './base-object';-import type { IMouseEvent, IPointerEvent } from './basics/i-events';+import type { ITransformerConfig } from './basics/transformer-config';import type { IPoint } from './basics/vector2';import type { Scene } from './scene';import type { IRectProps } from './shape/rect';import { Disposable, MOVE_BUFFER_VALUE, requestImmediateMacroTask, toDisposable } from '@univerjs/core';import { Subject, type Subscription } from 'rxjs';+import { type BaseObject, ObjectType } from './base-object';import { CURSOR_TYPE } from './basics/const';import { offsetRotationAxis } from './basics/offset-rotation-axis';@@ -96,6 +96,10 @@ const MINI_HEIGHT_LIMIT = 20;const DEFAULT_CONTROL_PLUS_INDEX = 5000;+const SINGLE_ACTIVE_OBJECT_TYPE_MAP = new Set<ObjectType>([+ ObjectType.CHART,+]);+/*** Transformer constructor. Transformer is a special type of group that allow you transform* primitives and shapes. Transforming tool is not changing `width` and `height` properties of nodes@@ -1637,7 +1641,7 @@ export class Transformer extends Disposable implements ITransformerConfig {return;}- if (!evt.ctrlKey) {+ if (!evt.ctrlKey || SINGLE_ACTIVE_OBJECT_TYPE_MAP.has(applyObject.objectType)) {this._selectedObjectMap.clear();this._clearControlMap();}diff --git a/packages/engine-render/src/shape/rect.ts b/packages/engine-render/src/shape/rect.tsindex 0729c6107b..6f40109b3c 100644--- a/packages/engine-render/src/shape/rect.ts+++ b/packages/engine-render/src/shape/rect.ts@@ -65,6 +65,10 @@ export class Rect<T extends IRectProps = IRectProps> extends Shape<T> {return this._radius;}+ setObjectType(type: ObjectType) {+ this.objectType = type;+ }+static override drawWith(ctx: UniverRenderingContext, props: IRectProps) {let { radius, width, height } = props;diff --git a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.tsindex 6d39a81216..1a96c66616 100644--- a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts+++ b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts@@ -24,7 +24,7 @@ import type { IInsertDrawingCommandParams } from '../commands/commands/interfaceimport { Disposable, DisposableCollection, fromEventSubject, generateRandomId, ICommandService, Inject, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { DrawingTypeEnum, getDrawingShapeKeyByDrawingSearch, IDrawingManagerService } from '@univerjs/drawing';-import { DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render';+import { DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, ObjectType, Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render';import { getSheetCommandTarget, SetFrozenMutation } from '@univerjs/sheets';import { DrawingApplyType, ISheetDrawingService, SetDrawingApplyMutation } from '@univerjs/sheets-drawing';import { ISheetSelectionRenderService, SetZoomRatioOperation, SheetSkeletonManagerService, VIEWPORT_KEY } from '@univerjs/sheets-ui';@@ -186,6 +186,9 @@ export class SheetCanvasFloatDomManagerService extends Disposable {private _transformChange$ = new Subject<{ id: string; value: ITransformState }>();transformChange$ = this._transformChange$.asObservable();+ private _add$ = new Subject<{ unitId: string; subUnitId: string; id: string }>();+ public add$ = this._add$.asObservable();+private _remove$ = new Subject<{ unitId: string; subUnitId: string; id: string }>();remove$ = this._remove$.asObservable();@@ -222,6 +225,10 @@ export class SheetCanvasFloatDomManagerService extends Disposable {return subUnitMap;}+ getFloatDomInfo(id: string) {+ return this._domLayerInfoMap.get(id);+ }+private _getSceneAndTransformerByDrawingSearch(unitId: Nullable<string>) {if (unitId == null) {return;@@ -306,13 +313,19 @@ export class SheetCanvasFloatDomManagerService extends Disposable {zIndex: this._drawingManagerService.getDrawingOrder(unitId, subUnitId).length - 1,};- if (drawingType === DrawingTypeEnum.DRAWING_CHART) {+ const isChart = drawingType === DrawingTypeEnum.DRAWING_CHART;++ if (isChart) {imageConfig.fill = 'white';imageConfig.rotateEnabled = false;}const rect = new Rect(rectShapeKey, imageConfig);+ if (isChart) {+ rect.setObjectType(ObjectType.CHART);+ }+scene.addObject(rect, DRAWING_OBJECT_LAYER_INDEX);if (floatDomParam.allowTransform !== false) {scene.attachTransformerTo(rect);@@ -534,6 +547,9 @@ export class SheetCanvasFloatDomManagerService extends Disposable {drawings: [sheetDrawingParam],} as IInsertDrawingCommandParams);}++ this._add$.next({ unitId, subUnitId, id });+return {id,dispose: () => {