Skip to content

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.

feat: support props on float dom component (#2518)

zhangw0a52859a4e8d
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.ts
index 3e8b5bf9f8..8de4d1a8e2 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
@@ -39,6 +39,7 @@ export interface ICanvasFloatDom {
componentKey: string;
unitId?: string;
subUnitId?: string;
+ props?: Record<string, any>;
}
interface ICanvasFloatDomInfo {
@@ -266,7 +267,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
const rect = new Rect(rectShapeKey, imageConfig);
scene.addObject(rect, DRAWING_OBJECT_LAYER_INDEX).attachTransformerTo(rect);
-
+ const map = this._ensureMap(unitId, subUnitId);
const disposableCollection = new DisposableCollection();
const initPosition = calcPosition(rect, renderObject.renderObject, skeleton.skeleton, target.worksheet);
const position$ = new BehaviorSubject<IFloatDomLayout>(initPosition);
@@ -294,6 +295,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
onWheel: (evt: WheelEvent) => {
canvas.dispatchEvent(new WheelEvent(evt.type, evt));
},
+ props: map.get(drawingId)?.props,
});
const listener = rect.onTransformChangeObservable.add(() => {
@@ -434,6 +436,8 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
if (sheetTransform == null) {
return;
}
+ const map = this._ensureMap(unitId, subUnitId);
+ map.set(id, layer);
const sheetDrawingParam: ISheetFloatDom = {
unitId,
@@ -454,8 +458,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
unitId,
drawings: [sheetDrawingParam],
} as IInsertDrawingCommandParams);
- const map = this._ensureMap(unitId, subUnitId);
- map.set(id, layer);
return {
id,
diff --git a/packages/ui/src/services/dom/canvas-dom-layer.service.ts b/packages/ui/src/services/dom/canvas-dom-layer.service.ts
index 721836f7d8..12bb34e0f9 100644
--- a/packages/ui/src/services/dom/canvas-dom-layer.service.ts
+++ b/packages/ui/src/services/dom/canvas-dom-layer.service.ts
@@ -35,6 +35,7 @@ export interface IFloatDom {
onPointerDown: (evt: PointerEvent | MouseEvent) => void;
onPointerUp: (evt: PointerEvent | MouseEvent) => void;
onWheel: (evt: WheelEvent) => void;
+ props?: Record<string, any>;
}
export class CanvasFloatDomService {
diff --git a/packages/ui/src/views/components/dom/FloatDom.tsx b/packages/ui/src/views/components/dom/FloatDom.tsx
index ab08c89643..9ca8238185 100644
--- a/packages/ui/src/views/components/dom/FloatDom.tsx
+++ b/packages/ui/src/views/components/dom/FloatDom.tsx
@@ -65,7 +65,7 @@ const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {
...(position.absolute.top) ? { top: 0 } : { bottom: 0 },
}}
>
- {Component ? <Component /> : null}
+ {Component ? <Component {...layer.props} /> : null}
</div>
</div>
)