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.

fix(drawing): add axisAlignSheetTransform for sheet drawing (#6574)

VicKun8b0c70e257c6
diff --git a/packages/sheets-drawing-ui/src/basics/transform-position.ts b/packages/sheets-drawing-ui/src/basics/transform-position.ts
index a92d496bed..87ecedbd0c 100644
--- a/packages/sheets-drawing-ui/src/basics/transform-position.ts
+++ b/packages/sheets-drawing-ui/src/basics/transform-position.ts
@@ -146,3 +146,41 @@ export function transformToDrawingPosition(transform: ITransformState, selection
to,
};
}
+
+/**
+ * In excel, the basic drawing with rotate bound use major axis switch, axis-aligned bound will bu used.That means the position bound of drawing element will save as nearly axis-aligned rectangle.
+ * Here is the rule to convert transform to axis-aligned position:
+ * [-45°, 45°): use the original bound
+ * [45°, 135°): rotate the bound 90° clockwise,and the left, top, bottom,right will use the rotated bound.
+ * [135°, 225°): use the original bound
+ * [225°, 315°): rotate the bound 90° counterclockwise, and the left, top, bottom, right will use the rotated bound.
+ * @param transform The transform state of the drawing element.
+ * @param selectionRenderService
+ * @return The axis-aligned position of the drawing element.
+ */
+export function transformToAxisAlignPosition(
+ transform: ITransformState,
+ selectionRenderService: ISheetSelectionRenderService
+): Nullable<ISheetDrawingPosition> {
+ const { left = 0, top = 0, width = 0, height = 0, angle = 0 } = transform;
+
+ const norm = ((angle % 360) + 360) % 360;
+
+ const useSwappedAxis =
+ (norm >= 45 && norm < 135) ||
+ (norm >= 225 && norm < 315);
+
+ if (!useSwappedAxis) {
+ return transformToDrawingPosition(transform, selectionRenderService);
+ }
+
+ const rotatedTransform = {
+ ...transform,
+ left: left + width / 2 - height / 2,
+ top: top + height / 2 - width / 2,
+ width: height,
+ height: width,
+ };
+
+ return transformToDrawingPosition(rotatedTransform, selectionRenderService);
+}
diff --git a/packages/sheets-drawing-ui/src/commands/commands/move-drawings.command.ts b/packages/sheets-drawing-ui/src/commands/commands/move-drawings.command.ts
index c2a0e61bc4..1bbffa8f6a 100644
--- a/packages/sheets-drawing-ui/src/commands/commands/move-drawings.command.ts
+++ b/packages/sheets-drawing-ui/src/commands/commands/move-drawings.command.ts
@@ -21,7 +21,7 @@ import { CommandType, Direction, ICommandService } from '@univerjs/core';
import { ISheetDrawingService } from '@univerjs/sheets-drawing';
import { ISheetSelectionRenderService } from '@univerjs/sheets-ui';
-import { transformToDrawingPosition } from '../../basics/transform-position';
+import { transformToAxisAlignPosition, transformToDrawingPosition } from '../../basics/transform-position';
import { ClearSheetDrawingTransformerOperation } from '../operations/clear-drawing-transformer.operation';
import { SetSheetDrawingCommand } from './set-sheet-drawing.command';
@@ -70,6 +70,7 @@ export const MoveDrawingsCommand: ICommand = {
...drawing,
transform: newTransform,
sheetTransform: transformToDrawingPosition(newTransform, selectionRenderService),
+ axisAlignSheetTransform: transformToAxisAlignPosition(newTransform, selectionRenderService),
} as ISheetDrawing;
}).filter((drawing) => drawing != null) as ISheetDrawing[];
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-copy-paste.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-copy-paste.controller.ts
index 4c11188f13..084e7c5ad9 100644
--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-copy-paste.controller.ts
+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-copy-paste.controller.ts
@@ -34,7 +34,7 @@ import {
virtualizeDiscreteRanges,
} from '@univerjs/sheets-ui';
import { IClipboardInterfaceService } from '@univerjs/ui';
-import { transformToDrawingPosition } from '../basics/transform-position';
+import { transformToAxisAlignPosition, transformToDrawingPosition } from '../basics/transform-position';
import { InsertFloatImageCommand } from '../commands/commands/insert-image.command';
import { RemoveSheetDrawingCommand } from '../commands/commands/remove-sheet-drawing.command';
@@ -314,6 +314,7 @@ export class SheetsDrawingCopyPasteController extends Disposable {
return {
transform: newTransform,
sheetTransform: transformToDrawingPosition(newTransform, selectionRenderService) ?? sheetTransform,
+ axisAlignSheetTransform: transformToAxisAlignPosition(newTransform, selectionRenderService) ?? sheetTransform,
};
},
});
@@ -325,6 +326,7 @@ export class SheetsDrawingCopyPasteController extends Disposable {
getTransform: (transform: ISheetDrawing['transform'], sheetTransform: ISheetDrawing['sheetTransform']) => {
transform: ISheetDrawing['transform'];
sheetTransform: ISheetDrawing['sheetTransform'];
+ axisAlignSheetTransform: ISheetDrawing['sheetTransform'];
};
isCut: boolean;
}) {
@@ -353,6 +355,7 @@ export class SheetsDrawingCopyPasteController extends Disposable {
drawingId: isCut ? drawing.drawingId : generateRandomId(),
transform: transformContext.transform,
sheetTransform: transformContext.sheetTransform,
+ axisAlignSheetTransform: transformContext.axisAlignSheetTransform,
};
if (isCut) {
@@ -460,26 +463,66 @@ export class SheetsDrawingCopyPasteController extends Disposable {
return this._generateMutations(drawings, {
unitId,
subUnitId,
- getTransform: (transform, sheetTransform) => ({
- transform: {
+ getTransform: (transform, sheetTransform) => {
+ const newTransform = {
...transform,
left: (transform?.left ?? 0) + leftOffset,
top: (transform?.top ?? 0) + topOffset,
- },
- sheetTransform: {
- ...sheetTransform,
- to: {
- ...sheetTransform.to,
- row: sheetTransform.to.row + rowOffset,
- column: sheetTransform.to.column + columnOffset,
- },
- from: {
- ...sheetTransform.from,
- row: sheetTransform.from.row + rowOffset,
- column: sheetTransform.from.column + columnOffset,
+ };
+ const render = this._renderManagerService.getRenderById(unitId);
+ const selectionRenderService = render?.with(ISheetSelectionRenderService);
+
+ if (!selectionRenderService) {
+ // todo : if rotate has the angle, the axisAlignSheetTransform is not equal to sheetTransform, need to calculate the new axisAlignSheetTransform based on the new transform
+ return {
+ transform: newTransform,
+ sheetTransform: {
+ ...sheetTransform,
+ to: {
+ ...sheetTransform.to,
+ row: sheetTransform.to.row + rowOffset,
+ column: sheetTransform.to.column + columnOffset,
+ },
+ from: {
+ ...sheetTransform.from,
+ row: sheetTransform.from.row + rowOffset,
+ column: sheetTransform.from.column + columnOffset,
+ },
+ },
+ axisAlignSheetTransform: {
+ ...sheetTransform,
+ to: {
+ ...sheetTransform.to,
+ row: sheetTransform.to.row + rowOffset,
+ column: sheetTransform.to.column + columnOffset,
+ },
+ from: {
+ ...sheetTransform.from,
+ row: sheetTransform.from.row + rowOffset,
+ column: sheetTransform.from.column + columnOffset,
+ },
+ },
+ };
+ }
+
+ return {
+ transform: newTransform,
+ sheetTransform: {
+ ...sheetTransform,
+ to: {
+ ...sheetTransform.to,
+ row: sheetTransform.to.row + rowOffset,
+ column: sheetTransform.to.column + columnOffset,
+ },
+ from: {
+ ...sheetTransform.from,
+ row: sheetTransform.from.row + rowOffset,
+ column: sheetTransform.from.column + columnOffset,
+ },
},
- },
- }),
+ axisAlignSheetTransform: transformToAxisAlignPosition(newTransform, selectionRenderService) ?? sheetTransform,
+ };
+ },
isCut: copyType === COPY_TYPE.CUT,
});
}
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.ts
index efc59b10ae..f14911b1f8 100644
--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.ts
+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-transform-affected.controller.ts
@@ -25,7 +25,7 @@ import { IRenderManagerService } from '@univerjs/engine-render';
import { DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, getSheetCommandTarget, InsertColCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowCommand, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RemoveColCommand, RemoveRowCommand, SetColHiddenCommand, SetColHiddenMutation, SetColVisibleMutation, SetColWidthCommand, SetRowHeightCommand, SetRowHiddenCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetActiveOperation, SetWorksheetColWidthMutation, SetWorksheetRowAutoHeightMutation, SetWorksheetRowHeightMutation, SetWorksheetRowIsAutoHeightMutation, SheetInterceptorService } from '@univerjs/sheets';
import { DrawingApplyType, ISheetDrawingService, SetDrawingApplyMutation, SheetDrawingAnchorType } from '@univerjs/sheets-drawing';
import { attachRangeWithCoord, ISheetSelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
-import { drawingPositionToTransform, transformToDrawingPosition } from '../basics/transform-position';
+import { drawingPositionToTransform, transformToAxisAlignPosition, transformToDrawingPosition } from '../basics/transform-position';
import { ClearSheetDrawingTransformerOperation } from '../commands/operations/clear-drawing-transformer.operation';
enum RangeMoveUndoType {
@@ -219,6 +219,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
const { startRow, endRow, startColumn, endColumn } = range;
let newSheetTransform: Nullable<ISheetDrawingPosition> = null;
let newTransform: Nullable<ITransformState> = null;
+ let axisAlignSheetTransform: ISheetDrawingPosition | undefined;
if (type === RangeMoveUndoType.deleteLeft && fromRow >= startRow && toRow <= endRow) {
if (fromColumn >= startColumn && toColumn <= endColumn) {
@@ -229,6 +230,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
const param = this._shrinkCol(sheetTransform, transform, startColumn, endColumn, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
}
} else if (type === RangeMoveUndoType.deleteUp && fromColumn >= startColumn && toColumn <= endColumn) {
if (fromRow >= startRow && toRow <= endRow) {
@@ -239,20 +241,23 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
const param = this._shrinkRow(sheetTransform, transform, startRow, endRow, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
}
} else if (type === RangeMoveUndoType.insertDown) {
const param = this._expandRow(sheetTransform, transform, startRow, endRow, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
} else if (type === RangeMoveUndoType.insertRight) {
const param = this._expandCol(sheetTransform, transform, startColumn, endColumn, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
}
if (newSheetTransform != null && newTransform != null) {
const newTransform = drawingPositionToTransform(newSheetTransform, this._selectionRenderService, this._skeletonManagerService);
- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform });
+ updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });
}
return { updateDrawings, deleteDrawings };
@@ -261,9 +266,11 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
private _remainDrawingSize(transform: Nullable<ITransformState>, updateDrawings: ISheetDrawing[], drawing: ISheetDrawing) {
const newSheetTransform = transformToDrawingPosition({ ...transform }, this._selectionRenderService);
if (newSheetTransform != null) {
+ const axisAlignSheetTransform = transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition;
updateDrawings.push({
...drawing,
sheetTransform: newSheetTransform,
+ axisAlignSheetTransform,
});
}
}
@@ -301,8 +308,9 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
}
if (newTransform != null) {
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
+ const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
if (newSheetTransform != null && newTransform != null) {
- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform });
+ updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });
break;
}
}
@@ -347,7 +355,8 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
};
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
if (newSheetTransform != null && newTransform != null) {
- preUpdateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform });
+ const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
+ preUpdateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });
break;
}
}
@@ -356,7 +365,8 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
}
if (newTransform != null && newSheetTransform != null) {
- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform });
+ const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
+ updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });
break;
} else {
this._remainDrawingSize(transform, updateDrawings, drawing);
@@ -440,8 +450,9 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
}
if (newTransform != null) {
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
+ const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
if (newSheetTransform != null && newTransform != null) {
- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform });
+ updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });
break;
}
}
@@ -486,7 +497,8 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
};
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
if (newSheetTransform != null && newTransform != null) {
- preUpdateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform });
+ const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
+ preUpdateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });
break;
}
}
@@ -495,7 +507,8 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
}
if (newTransform != null && newSheetTransform != null) {
- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform });
+ const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
+ updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });
break;
} else {
this._remainDrawingSize(transform, updateDrawings, drawing);
@@ -710,10 +723,12 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
}
let newSheetTransform: Nullable<ISheetDrawingPosition>;
let newTransform: Nullable<ITransformState>;
+ let axisAlignSheetTransform: ISheetDrawingPosition | undefined;
if (type === 'insert') {
const param = this._expandRow(sheetTransform, transform, rowStartIndex, rowEndIndex, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
} else {
const { from, to } = sheetTransform;
const { row: fromRow } = from;
@@ -725,12 +740,13 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
const param = this._shrinkRow(sheetTransform, transform, rowStartIndex, rowEndIndex, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
}
}
if (!newSheetTransform || !newTransform) {
return;
}
- const params = { unitId, subUnitId, drawingId, transform: newTransform, sheetTransform: newSheetTransform };
+ const params = { unitId, subUnitId, drawingId, transform: newTransform, sheetTransform: newSheetTransform, axisAlignSheetTransform };
updateDrawings.push(params);
});
@@ -790,10 +806,12 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
}
let newSheetTransform: Nullable<ISheetDrawingPosition>;
let newTransform: Nullable<ITransformState>;
+ let axisAlignSheetTransform: ISheetDrawingPosition | undefined;
if (type === 'insert') {
const param = this._expandCol(sheetTransform, transform, colStartIndex, colEndIndex, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
} else {
const { from, to } = sheetTransform;
const { column: fromColumn } = from;
@@ -805,6 +823,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
const param = this._shrinkCol(sheetTransform, transform, colStartIndex, colEndIndex, anchorType);
newSheetTransform = param?.newSheetTransform;
newTransform = param?.newTransform;
+ axisAlignSheetTransform = param?.axisAlignSheetTransform ?? undefined;
}
}
@@ -812,7 +831,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return;
}
- const params = { unitId, subUnitId, drawingId, transform: newTransform, sheetTransform: newSheetTransform };
+ const params = { unitId, subUnitId, drawingId, transform: newTransform, sheetTransform: newSheetTransform, axisAlignSheetTransform };
updateDrawings.push(params);
});
@@ -854,11 +873,13 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
let newSheetTransform: Nullable<ISheetDrawingPosition> = null;
let newTransform: Nullable<ITransformState> = null;
+ let axisAlignSheetTransform: Nullable<ISheetDrawingPosition> = null;
if (fromColumn >= colStartIndex) {
// move start and end col right
@@ -874,6 +895,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
}
newTransform = { ...transform, left: (transform.left || 0) + selectionCell.endX - selectionCell.startX };
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
+ axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
} else if (toColumn >= colEndIndex) {
// move end right only
if (anchorType === SheetDrawingAnchorType.Both) {
@@ -886,6 +908,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
}
@@ -894,6 +917,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform,
newTransform,
+ axisAlignSheetTransform,
};
}
@@ -909,10 +933,12 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
let newSheetTransform: Nullable<ISheetDrawingPosition> = null;
let newTransform: Nullable<ITransformState> = null;
+ let axisAlignSheetTransform: Nullable<ISheetDrawingPosition> = null;
if (fromColumn > colEndIndex) {
// shrink start and end col left only
@@ -936,6 +962,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
} else if (fromColumn >= colStartIndex && fromColumn <= colEndIndex) {
@@ -949,6 +976,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
newTransform = { ...transform, left: (transform.left || 0) - selectionCell.endX + selectionCell.startX - sheetTransform.from.columnOffset };
}
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
+ axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
} else if (toColumn >= colStartIndex && toColumn <= colEndIndex && anchorType === SheetDrawingAnchorType.Both) {
// shrink end col left, then set toColOffset to full cell width
const selectionCell = this._skeletonManagerService.attachRangeWithCoord({
@@ -972,6 +1000,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform,
newTransform,
+ axisAlignSheetTransform,
};
}
@@ -990,11 +1019,13 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
let newSheetTransform: Nullable<ISheetDrawingPosition> = null;
let newTransform: Nullable<ITransformState> = null;
+ let axisAlignSheetTransform: Nullable<ISheetDrawingPosition> = null;
if (fromRow >= rowStartIndex) {
// move start and end row down
@@ -1004,6 +1035,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
}
newTransform = { ...transform, top: (transform.top || 0) + selectionCell.endY - selectionCell.startY };
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
+ axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
} else if (toRow >= rowEndIndex) {
// move end down only
if (anchorType === SheetDrawingAnchorType.Both) {
@@ -1019,6 +1051,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
}
@@ -1027,6 +1060,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform,
newTransform,
+ axisAlignSheetTransform,
};
}
@@ -1045,11 +1079,13 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
let newSheetTransform: Nullable<ISheetDrawingPosition> = null;
let newTransform: Nullable<ITransformState> = null;
+ let axisAlignSheetTransform: Nullable<ISheetDrawingPosition> = null;
if (fromRow > rowEndIndex) {
// shrink start and end up only
@@ -1073,6 +1109,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform: transformToDrawingPosition({ ...transform }, this._selectionRenderService),
newTransform: transform,
+ axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, this._selectionRenderService) as ISheetDrawingPosition,
};
}
} else if (fromRow >= rowStartIndex && fromRow <= rowEndIndex) {
@@ -1087,6 +1124,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
newTransform = { ...transform, top: (transform.top || 0) - selectionCell.endY + selectionCell.startY - sheetTransform.from.rowOffset };
}
newSheetTransform = transformToDrawingPosition(newTransform, this._selectionRenderService);
+ axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, this._selectionRenderService) as ISheetDrawingPosition;
} else if (toRow >= rowStartIndex && toRow <= rowEndIndex && anchorType === SheetDrawingAnchorType.Both) {
// shrink end row up, then set toRowOffset to full cell height
const selectionCell = this._skeletonManagerService.attachRangeWithCoord({ startColumn: from.column, endColumn: from.column, startRow: rowStartIndex - 1, endRow: rowStartIndex - 1 });
@@ -1105,6 +1143,7 @@ export class SheetDrawingTransformAffectedController extends Disposable implemen
return {
newSheetTransform,
newTransform,
+ axisAlignSheetTransform,
};
}
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts
index 24ad44adaa..27d7d4ac5b 100644
--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts
+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts
@@ -30,7 +30,7 @@ import { SetRangeValuesCommand, SheetsSelectionsService } from '@univerjs/sheets
import { ISheetDrawingService } from '@univerjs/sheets-drawing';
import { attachRangeWithCoord, ISheetSelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
import { ILocalFileService, IMessageService } from '@univerjs/ui';
-import { drawingPositionToTransform, transformToDrawingPosition } from '../basics/transform-position';
+import { drawingPositionToTransform, transformToAxisAlignPosition, transformToDrawingPosition } from '../basics/transform-position';
import { GroupSheetDrawingCommand } from '../commands/commands/group-sheet-drawing.command';
import { InsertSheetDrawingCommand } from '../commands/commands/insert-sheet-drawing.command';
import { SetDrawingArrangeCommand } from '../commands/commands/set-drawing-arrange.command';
@@ -209,6 +209,7 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM
return;
}
+ const newTransform = drawingPositionToTransform(sheetTransform, this._selectionRenderService, this._skeletonManagerService)!;
const sheetDrawingParam: ISheetDrawing = {
unitId,
subUnitId,
@@ -216,8 +217,9 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM
drawingType: DrawingTypeEnum.DRAWING_IMAGE,
imageSourceType,
source,
- transform: drawingPositionToTransform(sheetTransform, this._selectionRenderService, this._skeletonManagerService),
+ transform: newTransform,
sheetTransform,
+ axisAlignSheetTransform: transformToAxisAlignPosition(newTransform, this._selectionRenderService) ?? sheetTransform,
};
return this._commandService.executeCommand(InsertSheetDrawingCommand.id, {
@@ -574,8 +576,9 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM
}
const sheetTransform = transformToDrawingPosition({ ...sheetDrawing.transform, ...transform }, this._selectionRenderService);
+ const axisAlignSheetTransform = transformToAxisAlignPosition({ ...sheetDrawing.transform, ...transform }, this._selectionRenderService);
- if (sheetTransform == null) {
+ if (sheetTransform == null || axisAlignSheetTransform == null) {
return;
}
@@ -587,6 +590,7 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM
...param,
transform: { ...sheetDrawing.transform, ...transform, ...drawingPositionToTransform(sheetTransform, this._selectionRenderService, this._skeletonManagerService) },
sheetTransform: { ...sheetTransform },
+ axisAlignSheetTransform: { ...axisAlignSheetTransform },
};
drawings.push(newDrawing);
@@ -601,7 +605,10 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM
}));
}
- private _getSheetTransformByParam(param: IDrawingParam): Nullable<ISheetDrawingPosition> {
+ private _getSheetTransformByParam(param: IDrawingParam): Nullable<{
+ sheetTransform: ISheetDrawingPosition;
+ axisAlignSheetTransform: ISheetDrawingPosition;
+ }> {
const { unitId, subUnitId, drawingId, transform } = param;
if (transform == null) {
return null;
@@ -613,10 +620,12 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM
}
const sheetTransform = transformToDrawingPosition({ ...sheetDrawing.transform, ...transform }, this._selectionRenderService);
- if (sheetTransform == null) {
+ const axisAlignSheetTransform = transformToAxisAlignPosition({ ...sheetDrawing.transform, ...transform }, this._selectionRenderService);
+
+ if (sheetTransform == null || axisAlignSheetTransform == null) {
return null;
}
- return sheetTransform;
+ return { sheetTransform, axisAlignSheetTransform };
}
private _groupDrawingListener() {
@@ -627,11 +636,12 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM
const children = [];
for (const child of param.children) {
- const childSheetTransform = this._getSheetTransformByParam(child);
- if (childSheetTransform != null) {
+ const childSheetTransformInfo = this._getSheetTransformByParam(child);
+ if (childSheetTransformInfo != null) {
children.push({
...child,
- sheetTransform: childSheetTransform,
+ sheetTransform: childSheetTransformInfo.sheetTransform,
+ axisAlignSheetTransform: childSheetTransformInfo.axisAlignSheetTransform,
});
}
}
diff --git a/packages/sheets-drawing-ui/src/facade/f-over-grid-image.ts b/packages/sheets-drawing-ui/src/facade/f-over-grid-image.ts
index 3a6d261973..8105d66a61 100644
--- a/packages/sheets-drawing-ui/src/facade/f-over-grid-image.ts
+++ b/packages/sheets-drawing-ui/src/facade/f-over-grid-image.ts
@@ -21,7 +21,7 @@ import { ArrangeTypeEnum, DrawingTypeEnum, generateRandomId, ICommandService, Im
import { FBase } from '@univerjs/core/facade';
import { getImageSize } from '@univerjs/drawing';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { RemoveSheetDrawingCommand, SetDrawingArrangeCommand, SetSheetDrawingCommand } from '@univerjs/sheets-drawing-ui';
+import { RemoveSheetDrawingCommand, SetDrawingArrangeCommand, SetSheetDrawingCommand, transformToAxisAlignPosition } from '@univerjs/sheets-drawing-ui';
import { convertPositionCellToSheetOverGrid, convertPositionSheetOverGridToAbsolute, ISheetSelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
export interface IFOverGridImage extends Omit<ISheetImage, 'sheetTransform' | 'transform'>, ICellOverGridPosition, IRotationSkewFlipTransform, Required<ISize> {
@@ -104,6 +104,7 @@ function convertFOverGridImageToSheetImage(fOverGridImage: IFOverGridImage, sele
skewX,
skewY,
},
+ axisAlignSheetTransform: transformToAxisAlignPosition(transform, selectionRenderService)!,
};
}
@@ -132,6 +133,20 @@ export class FOverGridImageBuilder {
rowOffset: 0,
width: 0,
height: 0,
+ axisAlignSheetTransform: {
+ from: {
+ column: 0,
+ columnOffset: 0,
+ row: 0,
+ rowOffset: 0,
+ },
+ to: {
+ column: 0,
+ columnOffset: 0,
+ row: 0,
+ rowOffset: 0,
+ },
+ },
};
}
@@ -184,6 +199,22 @@ export class FOverGridImageBuilder {
},
};
}
+ if (image.axisAlignSheetTransform == null) {
+ image.axisAlignSheetTransform = {
+ from: {
+ column: 0,
+ columnOffset: 0,
+ row: 0,
+ rowOffset: 0,
+ },
+ to: {
+ column: 0,
+ columnOffset: 0,
+ row: 0,
+ rowOffset: 0,
+ },
+ };
+ }
this._image = convertSheetImageToFOverGridImage(image, skeletonManagerService);
return this;
}
@@ -867,6 +898,17 @@ export class FOverGridImage extends FBase {
setRotate(angle: number): boolean {
this._image.sheetTransform.angle = angle;
this._image.transform && (this._image.transform.angle = angle);
+ if (this._image.transform) {
+ const renderManagerService = this._injector.get(IRenderManagerService);
+ const render = renderManagerService.getRenderById(this._image.unitId);
+ if (!render) {
+ throw new Error(`Render Unit with unitId ${this._image.unitId} not found`);
+ }
+ const selectionRenderService = render.with(ISheetSelectionRenderService);
+
+ this._image.axisAlignSheetTransform && (this._image.axisAlignSheetTransform = transformToAxisAlignPosition(this._image.transform, selectionRenderService)!);
+ }
+
return this._commandService.syncExecuteCommand(SetSheetDrawingCommand.id, { unitId: this._image.unitId, drawings: [this._image] });
}
diff --git a/packages/sheets-drawing-ui/src/facade/f-worksheet.ts b/packages/sheets-drawing-ui/src/facade/f-worksheet.ts
index 399c46a9b9..f0a83ec93b 100644
--- a/packages/sheets-drawing-ui/src/facade/f-worksheet.ts
+++ b/packages/sheets-drawing-ui/src/facade/f-worksheet.ts
@@ -24,7 +24,7 @@ import type { ISaveCellImagesOptions } from './f-range';
import { DrawingTypeEnum, ImageSourceType, toDisposable } from '@univerjs/core';
import { IRenderManagerService } from '@univerjs/engine-render';
import { ISheetDrawingService } from '@univerjs/sheets-drawing';
-import { FileNamePart, IBatchSaveImagesService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetSheetDrawingCommand, SheetCanvasFloatDomManagerService, transformToDrawingPosition } from '@univerjs/sheets-drawing-ui';
+import { FileNamePart, IBatchSaveImagesService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetSheetDrawingCommand, SheetCanvasFloatDomManagerService, transformToAxisAlignPosition, transformToDrawingPosition } from '@univerjs/sheets-drawing-ui';
import { ISheetSelectionRenderService } from '@univerjs/sheets-ui';
import { transformComponentKey } from '@univerjs/sheets-ui/facade';
import { FWorksheet } from '@univerjs/sheets/facade';
@@ -730,6 +730,12 @@ export class FWorksheetLegacy extends FWorksheet implements IFWorksheetLegacy {
...drawingParm.transform,
...config.position, // Merge with existing transform
},
+ axisAlignSheetTransform: config.position
+ ? transformToAxisAlignPosition(
+ config.position,
+ selectionRenderService
+ ) ?? drawingParm.sheetTransform
+ : drawingParm.sheetTransform,
};
const res = this._commandService.syncExecuteCommand(SetSheetDrawingCommand.id, { unitId, subUnitId, drawings: [newParam] });
if (!res) {
@@ -782,6 +788,12 @@ export class FWorksheetLegacy extends FWorksheet implements IFWorksheetLegacy {
...drawingParm.transform,
...update.config.position, // Merge with existing transform
},
+ axisAlignSheetTransform: update.config.position
+ ? transformToAxisAlignPosition(
+ update.config.position,
+ selectionRenderService
+ ) ?? drawingParm.sheetTransform
+ : drawingParm.sheetTransform,
};
drawings.push(newParam);
diff --git a/packages/sheets-drawing-ui/src/index.ts b/packages/sheets-drawing-ui/src/index.ts
index a497bc5e02..f2bb3b4a77 100644
--- a/packages/sheets-drawing-ui/src/index.ts
+++ b/packages/sheets-drawing-ui/src/index.ts
@@ -16,7 +16,7 @@
import './global.css';
-export { drawingPositionToTransform, transformToDrawingPosition } from './basics/transform-position';
+export { drawingPositionToTransform, transformToDrawingPosition, transformToAxisAlignPosition } from './basics/transform-position';
export { DeleteDrawingsCommand } from './commands/commands/delete-drawings.command';
export { GroupSheetDrawingCommand } from './commands/commands/group-sheet-drawing.command';
export { type IInsertImageCommandParams, InsertFloatImageCommand } from './commands/commands/insert-image.command';
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 cdb61889bb..24b05dc294 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
@@ -699,6 +699,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
width: initPosition.endX - initPosition.startX,
height: initPosition.endY - initPosition.startY,
},
+ axisAlignSheetTransform: sheetTransform,
data,
allowTransform,
};
@@ -783,6 +784,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
drawingType: config.type || DrawingTypeEnum.DRAWING_DOM,
componentKey,
sheetTransform,
+ axisAlignSheetTransform: sheetTransform,
transform: {
left: domPosFromRange.startX,
top: domPosFromRange.startY,
@@ -1036,6 +1038,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
drawingType: config.type || DrawingTypeEnum.DRAWING_DOM,
componentKey,
sheetTransform,
+ axisAlignSheetTransform: sheetTransform,
transform: {
left: headerCellPosition.startX,
top: headerCellPosition.startY,
diff --git a/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx b/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
index 247d254d7c..e0c8eb645d 100644
--- a/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
+++ b/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
@@ -70,7 +70,7 @@ export const SheetDrawingAnchor = (props: ISheetDrawingAnchorProps) => {
return true;
}
- const { unitId, subUnitId, drawingId, drawingType, anchorType, sheetTransform } = searchParam as ISheetDrawing;
+ const { unitId, subUnitId, drawingId, drawingType, anchorType, sheetTransform, axisAlignSheetTransform } = searchParam as ISheetDrawing;
params.push({
unitId,
@@ -79,6 +79,7 @@ export const SheetDrawingAnchor = (props: ISheetDrawingAnchorProps) => {
anchorType,
sheetTransform,
drawingType,
+ axisAlignSheetTransform,
});
});
diff --git a/packages/sheets-drawing/src/services/sheet-drawing.service.ts b/packages/sheets-drawing/src/services/sheet-drawing.service.ts
index f5d3142161..17f51fe7a0 100644
--- a/packages/sheets-drawing/src/services/sheet-drawing.service.ts
+++ b/packages/sheets-drawing/src/services/sheet-drawing.service.ts
@@ -43,6 +43,10 @@ export interface ISheetDrawingPosition extends IRotationSkewFlipTransform, IShee
export interface ISheetDrawingBase {
sheetTransform: ISheetDrawingPosition;
+ /**
+ * this property is used to store the excel drawing axis alignment position, which is not always the same as the sheetTransform.
+ */
+ axisAlignSheetTransform: ISheetDrawingPosition;
anchorType?: SheetDrawingAnchorType;
}
@@ -61,6 +65,10 @@ export interface IFloatDomData extends IDrawingParam {
componentKey: string;
data?: Serializable;
allowTransform?: boolean;
+ /**
+ * this property is used to store the excel drawing axis alignment position, which is not always the same as the sheetTransform.
+ */
+ axisAlignSheetTransform: ISheetDrawingPosition;
}
// TODO@wzhudev: this shouldn't be here. It should be in the sheets package