@univerjs/sheets-drawing 1.1.0 → 1.2.0

package/lib/cjs/index.js

@@ -37,8 +37,14 @@ function transformToDrawingPosition(transform, skeleton) {
 		angle,
 		skewX,
 		skewY,
-		from: skeleton.getCellIndexAndOffsetByPosition(left, top),
-		to: skeleton.getCellIndexAndOffsetByPosition(left + width, top + height)
+		from: skeleton.getCellIndexAndOffsetByPosition(left, top, 1, 1, {
+			x: 0,
+			y: 0
+		}),
+		to: skeleton.getCellIndexAndOffsetByPosition(left + width, top + height, 1, 1, {
+			x: 0,
+			y: 0
+		})
 	};
 }
 /**
@@ -340,6 +346,12 @@ const SetDrawingArrangeCommand = {
 
 //#endregion
 //#region src/services/sheet-drawing-placement.ts
+const PLACEMENT_ERROR = {
+	CELL_INVALID: "SHEET_DRAWING_PLACEMENT_CELL_INVALID",
+	EXTENT_INVALID: "SHEET_DRAWING_PLACEMENT_EXTENT_INVALID",
+	KIND_INVALID: "SHEET_DRAWING_PLACEMENT_KIND_INVALID",
+	POSITION_INVALID: "SHEET_DRAWING_PLACEMENT_POSITION_INVALID"
+};
 function getSheetDrawingPlacement(drawing) {
 	var _drawing$transform5, _drawing$transform6;
 	const anchorType = drawing.anchorType ?? "0";
@@ -366,7 +378,57 @@ function getSheetDrawingPlacement(drawing) {
 	};
 }
 function applySheetDrawingPlacement(drawing, input, skeleton) {
-	const placement = normalizePlacement(input, skeleton, drawing.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE || drawing.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_DOM);
+	return resolveSheetDrawingPlacement(drawing, normalizePlacement(input, skeleton, requiresDrawingArea(drawing)), skeleton);
+}
+/** Refresh layout-derived geometry without changing the drawing's anchor semantics. */
+function refreshSheetDrawingPlacement(drawing, skeleton) {
+	const result = tryRefreshSheetDrawingPlacement(drawing, skeleton);
+	if (!result.ok) throw createPlacementError(result);
+	return result.drawing;
+}
+/** Validate persisted markers before any caller reads them to select a refresh range. */
+function validateSheetDrawingPlacement(drawing) {
+	var _drawing$sheetTransfo, _drawing$sheetTransfo2;
+	if (!drawing || typeof drawing !== "object") return {
+		ok: false,
+		reason: PLACEMENT_ERROR.KIND_INVALID
+	};
+	const anchorType = drawing.anchorType ?? "0";
+	if (anchorType === "2") return;
+	if (anchorType !== "0" && anchorType !== "1") return {
+		ok: false,
+		reason: PLACEMENT_ERROR.KIND_INVALID
+	};
+	const markerFailure = validateCellPosition((_drawing$sheetTransfo = drawing.sheetTransform) === null || _drawing$sheetTransfo === void 0 ? void 0 : _drawing$sheetTransfo.from) ?? validateCellPosition((_drawing$sheetTransfo2 = drawing.sheetTransform) === null || _drawing$sheetTransfo2 === void 0 ? void 0 : _drawing$sheetTransfo2.to);
+	if (markerFailure) return markerFailure;
+	return validatePlacement(getSheetDrawingPlacement(drawing), requiresDrawingArea(drawing));
+}
+/** Expected snapshot errors are results; unexpected calculation failures are caught by the task owner. */
+function tryRefreshSheetDrawingPlacement(drawing, skeleton) {
+	var _resolved$transform, _resolved$transform2;
+	const failure = validateSheetDrawingPlacement(drawing);
+	if (failure) return failure;
+	if (drawing.anchorType === "2") return {
+		ok: true,
+		drawing
+	};
+	const resolved = resolveSheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), skeleton);
+	const extentFailure = validateExtent(((_resolved$transform = resolved.transform) === null || _resolved$transform === void 0 ? void 0 : _resolved$transform.width) ?? 0, ((_resolved$transform2 = resolved.transform) === null || _resolved$transform2 === void 0 ? void 0 : _resolved$transform2.height) ?? 0, requiresDrawingArea(drawing), true);
+	if (extentFailure) return extentFailure;
+	return {
+		ok: true,
+		drawing: {
+			...drawing,
+			sheetTransform: resolved.sheetTransform,
+			transform: resolved.transform,
+			axisAlignSheetTransform: resolved.axisAlignSheetTransform
+		}
+	};
+}
+function requiresDrawingArea(drawing) {
+	return drawing.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE || drawing.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_DOM;
+}
+function resolveSheetDrawingPlacement(drawing, placement, skeleton) {
 	if (placement.kind === "2") {
 		const transform = withExistingTransform(drawing.transform, placement);
 		const sheetTransform = absoluteSheetTransform(placement, drawing.sheetTransform);
@@ -380,29 +442,43 @@ function applySheetDrawingPlacement(drawing, input, skeleton) {
 	}
 	if (!skeleton) throw new Error("SHEET_DRAWING_PLACEMENT_SKELETON_REQUIRED");
 	if (placement.kind === "0") {
-		const converted = (0, _univerjs_sheets.convertPositionCellToSheetOverGrid)(drawing.unitId, drawing.subUnitId, placement.from, placement.width, placement.height, skeleton);
-		const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, converted.sheetTransform);
+		const converted = (0, _univerjs_sheets.convertPositionCellToSheetOverGrid)(drawing.unitId, drawing.subUnitId, getVisibleCellPosition(placement.from, skeleton), placement.width, placement.height, skeleton);
+		const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, {
+			from: placement.from,
+			to: converted.sheetTransform.to
+		});
 		const transform = withExistingTransform(drawing.transform, converted.transform);
 		return {
 			...drawing,
 			anchorType: "0",
 			sheetTransform,
 			transform,
-			axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton)
+			axisAlignSheetTransform: withExistingSheetTransform(drawing.axisAlignSheetTransform, transformToAxisAlignPosition(transform, skeleton))
 		};
 	}
 	const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, {
 		from: placement.from,
 		to: placement.to
 	});
-	const bounds = (0, _univerjs_sheets.convertPositionSheetOverGridToAbsolute)(drawing.unitId, drawing.subUnitId, sheetTransform, skeleton);
+	const bounds = (0, _univerjs_sheets.convertPositionSheetOverGridToAbsolute)(drawing.unitId, drawing.subUnitId, {
+		from: getVisibleCellPosition(placement.from, skeleton),
+		to: getVisibleCellPosition(placement.to, skeleton)
+	}, skeleton);
 	const transform = withExistingTransform(drawing.transform, bounds);
 	return {
 		...drawing,
 		anchorType: "1",
 		sheetTransform,
 		transform,
-		axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton)
+		axisAlignSheetTransform: withExistingSheetTransform(drawing.axisAlignSheetTransform, transformToAxisAlignPosition(transform, skeleton))
+	};
+}
+function getVisibleCellPosition(position, skeleton) {
+	const cell = skeleton.getNoMergeCellWithCoordByIndex(position.row, position.column);
+	return {
+		...position,
+		columnOffset: cell.startX === cell.endX ? 0 : position.columnOffset,
+		rowOffset: cell.startY === cell.endY ? 0 : position.rowOffset
 	};
 }
 /**
@@ -414,14 +490,14 @@ function normalizeSheetDrawingPlacement(input, skeleton) {
 }
 function normalizePlacement(input, skeleton, requiresArea) {
 	if (!("bounds" in input)) {
-		validatePlacement(input, requiresArea);
-		if (input.kind === "1" && skeleton) validateBounds((0, _univerjs_sheets.convertPositionSheetOverGridToAbsolute)(skeleton.worksheet.getUnitId(), skeleton.worksheet.getSheetId(), {
+		assertValidPlacement(validatePlacement(input, requiresArea));
+		if (input.kind === "1" && skeleton) assertValidPlacement(validateBounds((0, _univerjs_sheets.convertPositionSheetOverGridToAbsolute)(skeleton.worksheet.getUnitId(), skeleton.worksheet.getSheetId(), {
 			from: input.from,
 			to: input.to
-		}, skeleton), requiresArea);
+		}, skeleton), requiresArea));
 		return input;
 	}
-	validateBounds(input.bounds, requiresArea);
+	assertValidPlacement(validateBounds(input.bounds, requiresArea));
 	if (input.kind === "2") return {
 		kind: "2",
 		...input.bounds
@@ -439,7 +515,7 @@ function normalizePlacement(input, skeleton, requiresArea) {
 		from: sheetTransform.from,
 		to: sheetTransform.to
 	};
-	throw new Error("SHEET_DRAWING_PLACEMENT_KIND_INVALID");
+	throw new Error(PLACEMENT_ERROR.KIND_INVALID);
 }
 function withExistingSheetTransform(current, placement) {
 	return {
@@ -475,36 +551,50 @@ function absoluteSheetTransform(placement, current) {
 	};
 }
 function validatePlacement(placement, requiresArea) {
-	if (placement.kind === "0") {
-		validateCellPosition(placement.from);
-		validateExtent(placement.width, placement.height, requiresArea);
-		return;
-	}
-	if (placement.kind === "1") {
-		validateCellPosition(placement.from);
-		validateCellPosition(placement.to);
-		return;
-	}
+	if (placement.kind === "0") return validateCellPosition(placement.from) ?? validateExtent(placement.width, placement.height, requiresArea);
+	if (placement.kind === "1") return validateCellPosition(placement.from) ?? validateCellPosition(placement.to);
 	if (placement.kind === "2") {
-		if (!Number.isFinite(placement.left) || !Number.isFinite(placement.top)) throw new TypeError("SHEET_DRAWING_PLACEMENT_POSITION_INVALID");
-		validateExtent(placement.width, placement.height, requiresArea);
-		return;
+		if (!Number.isFinite(placement.left) || !Number.isFinite(placement.top)) return {
+			ok: false,
+			reason: PLACEMENT_ERROR.POSITION_INVALID
+		};
+		return validateExtent(placement.width, placement.height, requiresArea);
 	}
-	throw new Error("SHEET_DRAWING_PLACEMENT_KIND_INVALID");
+	return {
+		ok: false,
+		reason: PLACEMENT_ERROR.KIND_INVALID
+	};
 }
 function validateBounds(bounds, requiresArea) {
-	if (!Number.isFinite(bounds.left) || !Number.isFinite(bounds.top)) throw new TypeError("SHEET_DRAWING_PLACEMENT_POSITION_INVALID");
-	validateExtent(bounds.width, bounds.height, requiresArea);
+	if (!bounds || !Number.isFinite(bounds.left) || !Number.isFinite(bounds.top)) return {
+		ok: false,
+		reason: PLACEMENT_ERROR.POSITION_INVALID
+	};
+	return validateExtent(bounds.width, bounds.height, requiresArea);
 }
 function validateCellPosition(position) {
-	if (!Number.isInteger(position.row) || !Number.isInteger(position.column) || position.row < 0 || position.column < 0 || !Number.isFinite(position.rowOffset) || !Number.isFinite(position.columnOffset)) throw new Error("SHEET_DRAWING_PLACEMENT_CELL_INVALID");
+	if (!position || !Number.isInteger(position.row) || !Number.isInteger(position.column) || position.row < 0 || position.column < 0 || !Number.isFinite(position.rowOffset) || !Number.isFinite(position.columnOffset)) return {
+		ok: false,
+		reason: PLACEMENT_ERROR.CELL_INVALID
+	};
 }
-function validateExtent(width, height, requiresArea) {
-	const hasInvalidZeroExtent = requiresArea ? width === 0 || height === 0 : width === 0 && height === 0;
-	if (!Number.isFinite(width) || !Number.isFinite(height) || width < 0 || height < 0 || hasInvalidZeroExtent) throw Object.assign(/* @__PURE__ */ new Error("SHEET_DRAWING_PLACEMENT_EXTENT_INVALID"), {
-		width,
-		height
-	});
+function validateExtent(width, height, requiresArea, allowCollapsed = false) {
+	const hasInvalidZeroExtent = !allowCollapsed && (requiresArea ? width === 0 || height === 0 : width === 0 && height === 0);
+	if (!Number.isFinite(width) || !Number.isFinite(height) || width < 0 || height < 0 || hasInvalidZeroExtent) return {
+		ok: false,
+		reason: PLACEMENT_ERROR.EXTENT_INVALID,
+		details: {
+			width,
+			height
+		}
+	};
+}
+function assertValidPlacement(failure) {
+	if (failure) throw createPlacementError(failure);
+}
+function createPlacementError(failure) {
+	const error = failure.reason === PLACEMENT_ERROR.POSITION_INVALID ? new TypeError(failure.reason) : new Error(failure.reason);
+	return Object.assign(error, failure.details);
 }
 
 //#endregion
@@ -935,7 +1025,7 @@ SheetsDrawingLoadController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing";
-var version = "1.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -1069,7 +1159,7 @@ const REFRESH_MUTATIONS = [
 	_univerjs_sheets.SetWorksheetColWidthMutation.id
 ];
 let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffectedController extends _univerjs_core.Disposable {
-	constructor(_commandService, _sheetSkeletonService, _sheetInterceptorService, _sheetDrawingService, _drawingManagerService, _univerInstanceService, _transformPlanService) {
+	constructor(_commandService, _sheetSkeletonService, _sheetInterceptorService, _sheetDrawingService, _drawingManagerService, _univerInstanceService, _transformPlanService, _logService) {
 		super();
 		this._commandService = _commandService;
 		this._sheetSkeletonService = _sheetSkeletonService;
@@ -1078,6 +1168,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 		this._drawingManagerService = _drawingManagerService;
 		this._univerInstanceService = _univerInstanceService;
 		this._transformPlanService = _transformPlanService;
+		this._logService = _logService;
 		_defineProperty(this, "_currentCommand", {
 			id: "",
 			params: {}
@@ -1133,13 +1224,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			} else if (id === _univerjs_sheets.InsertRangeMoveRightCommand.id) {
 				const { range } = params;
 				return this._getRangeMoveUndo(range, 3);
-			} else if (id === _univerjs_sheets.SetRowHiddenCommand.id || id === _univerjs_sheets.SetSpecificRowsVisibleCommand.id) {
-				const { unitId, subUnitId, ranges } = params;
-				return this._getDrawingUndoForRowVisible(unitId, subUnitId, ranges);
-			} else if (id === _univerjs_sheets.SetColHiddenCommand.id || id === _univerjs_sheets.SetSpecificColsVisibleCommand.id) {
-				const { unitId, subUnitId, ranges } = params;
-				return this._getDrawingUndoForColVisible(unitId, subUnitId, ranges);
-			} else if (id === _univerjs_sheets.DeltaRowHeightCommand.id || id === _univerjs_sheets.DeltaColumnWidthCommand.id || id === _univerjs_sheets.SetRowHeightCommand.id || id === _univerjs_sheets.SetColWidthCommand.id) {
+			} else if (id === _univerjs_sheets.SetRowHiddenCommand.id || id === _univerjs_sheets.SetSpecificRowsVisibleCommand.id || id === _univerjs_sheets.SetColHiddenCommand.id || id === _univerjs_sheets.SetSpecificColsVisibleCommand.id || id === _univerjs_sheets.DeltaRowHeightCommand.id || id === _univerjs_sheets.DeltaColumnWidthCommand.id || id === _univerjs_sheets.SetRowHeightCommand.id || id === _univerjs_sheets.SetColWidthCommand.id) {
 				const { unitId, subUnitId, ranges } = params;
 				return this._getDrawingUndoForRowAndColSize(unitId, subUnitId, ranges);
 			}
@@ -1370,266 +1455,20 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
 			axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
 		}
-		if (newSheetTransform && newTransform) {
-			const newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
-			updateDrawings.push({
-				...drawing,
-				sheetTransform: newSheetTransform,
-				transform: newTransform,
-				axisAlignSheetTransform
-			});
-		}
+		if (newSheetTransform && newTransform) updateDrawings.push({
+			...drawing,
+			sheetTransform: newSheetTransform,
+			transform: newTransform,
+			axisAlignSheetTransform
+		});
 		return {
 			updateDrawings,
 			deleteDrawings
 		};
 	}
-	_remainDrawingSize(transform, updateDrawings, drawing, skeleton) {
-		const newSheetTransform = transformToDrawingPosition({ ...transform }, skeleton);
-		if (newSheetTransform) {
-			const axisAlignSheetTransform = transformToAxisAlignPosition({ ...transform }, skeleton);
-			updateDrawings.push({
-				...drawing,
-				sheetTransform: newSheetTransform,
-				axisAlignSheetTransform
-			});
-		}
-	}
-	_getDrawingUndoForColVisible(unitId, subUnitId, ranges) {
-		const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
-		if (!sheetSkeletonParam) return {
-			redos: [],
-			undos: []
-		};
-		const { skeleton } = sheetSkeletonParam;
-		const drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId);
-		const updateDrawings = [];
-		const preUpdateDrawings = [];
-		Object.keys(drawingData).forEach((drawingId) => {
-			const drawing = drawingData[drawingId];
-			const { sheetTransform, transform, anchorType = "0" } = drawing;
-			if (anchorType === "2") this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);
-			else {
-				const { from, to } = sheetTransform;
-				const { row: fromRow, column: fromColumn } = from;
-				const { row: toRow, column: toColumn } = to;
-				for (let i = 0; i < ranges.length; i++) {
-					const { startColumn, endColumn } = ranges[i];
-					if (toColumn < startColumn) continue;
-					if (anchorType === "0") {
-						let newSheetTransform = null;
-						let newTransform = null;
-						if (fromColumn >= startColumn && fromColumn <= endColumn) {
-							const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-								startColumn: fromColumn,
-								endColumn,
-								startRow: fromRow,
-								endRow: toRow
-							});
-							newTransform = {
-								...transform,
-								left: selectionCell.startX
-							};
-						}
-						if (newTransform) {
-							newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-							const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-							if (newSheetTransform && newTransform) {
-								updateDrawings.push({
-									...drawing,
-									sheetTransform: newSheetTransform,
-									transform: newTransform,
-									axisAlignSheetTransform
-								});
-								break;
-							}
-						}
-						continue;
-					}
-					if (fromColumn >= startColumn && toColumn <= endColumn) continue;
-					let newSheetTransform = null;
-					let newTransform = null;
-					if (fromColumn >= startColumn && fromColumn <= endColumn) {
-						const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-							startColumn: fromColumn,
-							endColumn,
-							startRow: fromRow,
-							endRow: toRow
-						});
-						newTransform = {
-							...transform,
-							left: (selectionCell === null || selectionCell === void 0 ? void 0 : selectionCell.startX) || 0,
-							width: ((transform === null || transform === void 0 ? void 0 : transform.width) || 0) - selectionCell.endX + selectionCell.startX
-						};
-					} else if (toColumn >= startColumn && toColumn <= endColumn) {
-						const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-							startColumn,
-							endColumn: toColumn,
-							startRow: fromRow,
-							endRow: toRow
-						});
-						newTransform = {
-							...transform,
-							left: selectionCell.startX - ((transform === null || transform === void 0 ? void 0 : transform.width) || 0)
-						};
-					} else {
-						const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-							startColumn,
-							endColumn,
-							startRow: fromRow,
-							endRow: toRow
-						});
-						newTransform = {
-							...transform,
-							width: ((transform === null || transform === void 0 ? void 0 : transform.width) || 0) - selectionCell.endX + selectionCell.startX
-						};
-						newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-						if (newSheetTransform && newTransform) {
-							const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-							preUpdateDrawings.push({
-								...drawing,
-								sheetTransform: newSheetTransform,
-								transform: newTransform,
-								axisAlignSheetTransform
-							});
-							break;
-						}
-					}
-					if (newTransform) newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-					if (newTransform && newSheetTransform) {
-						const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-						updateDrawings.push({
-							...drawing,
-							sheetTransform: newSheetTransform,
-							transform: newTransform,
-							axisAlignSheetTransform
-						});
-						break;
-					} else this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);
-				}
-			}
-		});
-		return this._finalizePlan(unitId, subUnitId, [...preUpdateDrawings, ...updateDrawings]);
-	}
 	_createUndoAndRedoMutation(unitId, subUnitId, updateDrawings) {
 		return this._finalizePlan(unitId, subUnitId, updateDrawings);
 	}
-	_getDrawingUndoForRowVisible(unitId, subUnitId, ranges) {
-		const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
-		if (!sheetSkeletonParam) return {
-			redos: [],
-			undos: []
-		};
-		const { skeleton } = sheetSkeletonParam;
-		const drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId);
-		const updateDrawings = [];
-		const preUpdateDrawings = [];
-		Object.keys(drawingData).forEach((drawingId) => {
-			const drawing = drawingData[drawingId];
-			const { sheetTransform, transform, anchorType = "0" } = drawing;
-			if (anchorType === "2") this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);
-			else {
-				const { from, to } = sheetTransform;
-				const { row: fromRow, column: fromColumn } = from;
-				const { row: toRow, column: toColumn } = to;
-				for (let i = 0; i < ranges.length; i++) {
-					const { startRow, endRow } = ranges[i];
-					if (toRow < startRow) continue;
-					if (anchorType === "0") {
-						let newSheetTransform = null;
-						let newTransform = null;
-						if (fromRow >= startRow && fromRow <= endRow) {
-							const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-								startColumn: fromColumn,
-								endColumn: toColumn,
-								startRow: fromRow,
-								endRow
-							});
-							newTransform = {
-								...transform,
-								top: selectionCell.startY
-							};
-						}
-						if (newTransform) {
-							newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-							const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-							if (newSheetTransform && newTransform) {
-								updateDrawings.push({
-									...drawing,
-									sheetTransform: newSheetTransform,
-									transform: newTransform,
-									axisAlignSheetTransform
-								});
-								break;
-							}
-						}
-						continue;
-					}
-					if (fromRow >= startRow && toRow <= endRow) continue;
-					let newSheetTransform = null;
-					let newTransform = null;
-					if (fromRow >= startRow && fromRow <= endRow) {
-						const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-							startColumn: fromColumn,
-							endColumn: toColumn,
-							startRow: fromRow,
-							endRow
-						});
-						newTransform = {
-							...transform,
-							top: (selectionCell === null || selectionCell === void 0 ? void 0 : selectionCell.startY) || 0,
-							height: ((transform === null || transform === void 0 ? void 0 : transform.height) || 0) - selectionCell.endY + selectionCell.startY
-						};
-					} else if (toRow >= startRow && toRow <= endRow) {
-						const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-							startColumn: fromColumn,
-							endColumn: toColumn,
-							startRow,
-							endRow: toRow
-						});
-						newTransform = {
-							...transform,
-							top: selectionCell.startY - ((transform === null || transform === void 0 ? void 0 : transform.height) || 0)
-						};
-					} else {
-						const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-							startColumn: fromColumn,
-							endColumn: toColumn,
-							startRow,
-							endRow
-						});
-						newTransform = {
-							...transform,
-							height: ((transform === null || transform === void 0 ? void 0 : transform.height) || 0) - selectionCell.endY + selectionCell.startY
-						};
-						newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-						if (newSheetTransform && newTransform) {
-							const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-							preUpdateDrawings.push({
-								...drawing,
-								sheetTransform: newSheetTransform,
-								transform: newTransform,
-								axisAlignSheetTransform
-							});
-							break;
-						}
-					}
-					if (newTransform) newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-					if (newTransform && newSheetTransform) {
-						const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-						updateDrawings.push({
-							...drawing,
-							sheetTransform: newSheetTransform,
-							transform: newTransform,
-							axisAlignSheetTransform
-						});
-						break;
-					} else this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);
-				}
-			}
-		});
-		return this._finalizePlan(unitId, subUnitId, [...preUpdateDrawings, ...updateDrawings]);
-	}
 	_getDrawingUndoForRowAndColSize(unitId, subUnitId, ranges) {
 		const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
 		if (!sheetSkeletonParam) return {
@@ -1641,27 +1480,9 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 		const updateDrawings = [];
 		Object.keys(drawingData).forEach((drawingId) => {
 			const drawing = drawingData[drawingId];
-			const { sheetTransform, transform, anchorType = "0" } = drawing;
-			if (anchorType === "2") this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);
-			else {
-				const { row: toRow, column: toColumn } = sheetTransform.to;
-				for (let i = 0; i < ranges.length; i++) {
-					const { startRow, startColumn } = ranges[i];
-					if (toRow < startRow || toColumn < startColumn) continue;
-					if (anchorType === "0") {
-						updateDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), skeleton));
-						break;
-					}
-					const newTransform = drawingPositionToTransform({ ...sheetTransform }, sheetSkeletonParam);
-					if (newTransform) {
-						updateDrawings.push({
-							...drawing,
-							transform: newTransform
-						});
-						break;
-					}
-				}
-			}
+			if ((drawing === null || drawing === void 0 ? void 0 : drawing.anchorType) === "2") return;
+			const refreshed = this._tryRefreshDrawingPlacement(drawing, skeleton, this._currentCommand.id, ({ to }) => ranges.some(({ startRow, startColumn }) => to.row >= startRow && to.column >= startColumn));
+			if (refreshed) updateDrawings.push(refreshed);
 		});
 		if (updateDrawings.length === 0) return {
 			redos: [],
@@ -1898,7 +1719,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			};
 			newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
 			axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-		} else if (toColumn >= colEndIndex) {
+		} else if (toColumn >= colStartIndex) {
 			if (anchorType === "1") {
 				newSheetTransform = {
 					from: { ...from },
@@ -1914,12 +1735,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 				axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, skeleton)
 			};
 		}
-		if (newSheetTransform && newTransform) return {
-			newSheetTransform,
-			newTransform,
-			axisAlignSheetTransform
-		};
-		return null;
+		return this._getStructuralDrawingResult(newSheetTransform, newTransform, axisAlignSheetTransform, skeleton);
 	}
 	_shrinkCol(colStartIndex, colEndIndex, options) {
 		const { sheetSkeletonParam, sheetTransform, transform, anchorType = "0" } = options;
@@ -1947,8 +1763,9 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 					column: toColumn - colCount
 				}
 			};
+			if (anchorType === "0") return this._resolveShiftedPositionDrawing(newSheetTransform, transform, sheetSkeletonParam);
 			newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
-		} else if (fromColumn >= colStartIndex && toColumn <= colEndIndex) return null;
+		} else if (anchorType === "1" && fromColumn >= colStartIndex && toColumn <= colEndIndex) return null;
 		else if (fromColumn < colStartIndex && toColumn > colEndIndex) {
 			if (anchorType === "1") {
 				newSheetTransform = {
@@ -1979,49 +1796,28 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 				};
 				newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
 				axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-			} else if (fromColumn === colStartIndex) newTransform = {
-				...transform,
-				left: (transform.left || 0) - sheetTransform.from.columnOffset
-			};
-			else {
-				const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-					startColumn: colStartIndex,
-					endColumn: fromColumn - 1,
-					startRow: from.row,
-					endRow: to.row
-				});
-				newTransform = {
-					...transform,
-					left: (transform.left || 0) - selectionCell.endX + selectionCell.startX - sheetTransform.from.columnOffset
-				};
-			}
-			if (!newSheetTransform) {
-				newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-				axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-			}
+			} else return this._resolveShiftedPositionDrawing({
+				...sheetTransform,
+				from: {
+					...from,
+					column: colStartIndex,
+					columnOffset: 0
+				}
+			}, transform, sheetSkeletonParam);
 		} else if (toColumn >= colStartIndex && toColumn <= colEndIndex && anchorType === "1") {
-			const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-				startColumn: colStartIndex - 1,
-				endColumn: colStartIndex - 1,
-				startRow: from.row,
-				endRow: to.row
-			});
+			const boundaryColumn = Math.min(colStartIndex, skeleton.worksheet.getColumnCount() - 1);
+			const boundaryCell = skeleton.getNoMergeCellWithCoordByIndex(from.row, boundaryColumn);
 			newSheetTransform = {
 				from: { ...from },
 				to: {
 					...to,
-					column: colStartIndex - 1,
-					columnOffset: selectionCell.endX - selectionCell.startX
+					column: boundaryColumn,
+					columnOffset: boundaryColumn < colStartIndex ? boundaryCell.endX - boundaryCell.startX : 0
 				}
 			};
 			newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
 		}
-		if (newSheetTransform && newTransform) return {
-			newSheetTransform,
-			newTransform,
-			axisAlignSheetTransform
-		};
-		return null;
+		return this._getStructuralDrawingResult(newSheetTransform, newTransform, axisAlignSheetTransform, skeleton);
 	}
 	_expandRow(rowStartIndex, rowEndIndex, options) {
 		const { sheetSkeletonParam, sheetTransform, transform, anchorType = "0" } = options;
@@ -2051,7 +1847,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 			};
 			newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
 			axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-		} else if (toRow >= rowEndIndex) {
+		} else if (toRow >= rowStartIndex) {
 			if (anchorType === "1") {
 				newSheetTransform = {
 					from: { ...from },
@@ -2067,12 +1863,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 				axisAlignSheetTransform: transformToAxisAlignPosition({ ...transform }, skeleton)
 			};
 		}
-		if (newSheetTransform && newTransform) return {
-			newSheetTransform,
-			newTransform,
-			axisAlignSheetTransform
-		};
-		return null;
+		return this._getStructuralDrawingResult(newSheetTransform, newTransform, axisAlignSheetTransform, skeleton);
 	}
 	_shrinkRow(rowStartIndex, rowEndIndex, options) {
 		const { sheetSkeletonParam, sheetTransform, transform, anchorType = "0" } = options;
@@ -2100,8 +1891,9 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 					row: toRow - rowCount
 				}
 			};
+			if (anchorType === "0") return this._resolveShiftedPositionDrawing(newSheetTransform, transform, sheetSkeletonParam);
 			newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
-		} else if (fromRow >= rowStartIndex && toRow <= rowEndIndex) return null;
+		} else if (anchorType === "1" && fromRow >= rowStartIndex && toRow <= rowEndIndex) return null;
 		else if (fromRow < rowStartIndex && toRow > rowEndIndex) {
 			if (anchorType === "1") {
 				newSheetTransform = {
@@ -2132,67 +1924,108 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 				};
 				newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
 				axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-			} else if (fromRow === rowStartIndex) newTransform = {
-				...transform,
-				top: (transform.top || 0) - sheetTransform.from.rowOffset
-			};
-			else {
-				const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-					startRow: rowStartIndex,
-					endRow: fromRow - 1,
-					startColumn: from.column,
-					endColumn: to.column
-				});
-				newTransform = {
-					...transform,
-					top: (transform.top || 0) - selectionCell.endY + selectionCell.startY - sheetTransform.from.rowOffset
-				};
-			}
-			if (!newSheetTransform) {
-				newSheetTransform = transformToDrawingPosition(newTransform, skeleton);
-				axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
-			}
+			} else return this._resolveShiftedPositionDrawing({
+				...sheetTransform,
+				from: {
+					...from,
+					row: rowStartIndex,
+					rowOffset: 0
+				}
+			}, transform, sheetSkeletonParam);
 		} else if (toRow >= rowStartIndex && toRow <= rowEndIndex && anchorType === "1") {
-			const selectionCell = (0, _univerjs_sheets.attachRangeWithCoord)(skeleton, {
-				startColumn: from.column,
-				endColumn: from.column,
-				startRow: rowStartIndex - 1,
-				endRow: rowStartIndex - 1
-			});
+			const boundaryRow = Math.min(rowStartIndex, skeleton.worksheet.getRowCount() - 1);
+			const boundaryCell = skeleton.getNoMergeCellWithCoordByIndex(boundaryRow, from.column);
 			newSheetTransform = {
 				from: { ...from },
 				to: {
 					...to,
-					row: rowStartIndex - 1,
-					rowOffset: selectionCell.endY - selectionCell.startY
+					row: boundaryRow,
+					rowOffset: boundaryRow < rowStartIndex ? boundaryCell.endY - boundaryCell.startY : 0
 				}
 			};
 			newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
 		}
-		if (newSheetTransform && newTransform) return {
+		return this._getStructuralDrawingResult(newSheetTransform, newTransform, axisAlignSheetTransform, skeleton);
+	}
+	_resolveShiftedPositionDrawing(sheetTransform, transform, { unitId, sheetId, skeleton }) {
+		const converted = (0, _univerjs_sheets.convertPositionCellToSheetOverGrid)(unitId, sheetId, sheetTransform.from, transform.width ?? 0, transform.height ?? 0, skeleton);
+		const newTransform = {
+			...transform,
+			...converted.transform
+		};
+		return this._getStructuralDrawingResult({
+			...sheetTransform,
+			...transformToDrawingPosition(newTransform, skeleton)
+		}, newTransform, null, skeleton);
+	}
+	_getStructuralDrawingResult(newSheetTransform, newTransform, axisAlignSheetTransform, skeleton) {
+		if (!newSheetTransform || !newTransform) return null;
+		const { left = 0, top = 0, width = 0, height = 0 } = newTransform;
+		if (![
+			left,
+			top,
+			width,
+			height
+		].every(Number.isFinite) || width < 0 || height < 0) return null;
+		if ([newSheetTransform.from, newSheetTransform.to].some(({ row, column, rowOffset, columnOffset }) => !Number.isInteger(row) || !Number.isInteger(column) || row < 0 || column < 0 || !Number.isFinite(rowOffset) || !Number.isFinite(columnOffset))) return null;
+		return {
 			newSheetTransform,
 			newTransform,
-			axisAlignSheetTransform
+			axisAlignSheetTransform: axisAlignSheetTransform ?? transformToAxisAlignPosition(newTransform, skeleton)
 		};
-		return null;
+	}
+	_tryRefreshDrawingPlacement(drawing, skeleton, commandId, shouldRefresh) {
+		try {
+			const failure = validateSheetDrawingPlacement(drawing);
+			if (failure) {
+				this._logSkippedDrawingRefresh(drawing, commandId, failure);
+				return;
+			}
+			if (shouldRefresh && !shouldRefresh(drawing.sheetTransform)) return;
+			const result = tryRefreshSheetDrawingPlacement(drawing, skeleton);
+			if (result.ok) return result.drawing;
+			this._logSkippedDrawingRefresh(drawing, commandId, result);
+		} catch (error) {
+			this._logSkippedDrawingRefresh(drawing, commandId, error);
+		}
+	}
+	_logSkippedDrawingRefresh(drawing, commandId, failure) {
+		this._logService.warn("[SheetDrawingTransformAffectedController]", "Skipping drawing placement refresh", {
+			unitId: drawing === null || drawing === void 0 ? void 0 : drawing.unitId,
+			subUnitId: drawing === null || drawing === void 0 ? void 0 : drawing.subUnitId,
+			drawingId: drawing === null || drawing === void 0 ? void 0 : drawing.drawingId,
+			commandId,
+			transform: drawing === null || drawing === void 0 ? void 0 : drawing.transform,
+			sheetTransform: drawing === null || drawing === void 0 ? void 0 : drawing.sheetTransform,
+			failure
+		});
 	}
 	_sheetRefreshListener() {
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (!REFRESH_MUTATIONS.includes(command.id)) return;
 			queueMicrotask(() => {
-				const params = command.params;
-				const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, params);
-				if (!target) return;
-				const { unitId, subUnitId, worksheet } = target;
-				let ranges = [];
-				if ("ranges" in params) ranges = params.ranges;
-				else if ("rowsAutoHeightInfo" in params) ranges = params.rowsAutoHeightInfo.map((info) => ({
-					startRow: info.row,
-					endRow: info.row,
-					startColumn: 0,
-					endColumn: worksheet.getColumnCount() - 1
-				}));
-				this._refreshDrawingTransform(command, unitId, subUnitId, ranges);
+				if (this._disposed) return;
+				try {
+					const params = command.params;
+					const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, params);
+					if (!target) return;
+					const { unitId, subUnitId, worksheet } = target;
+					let ranges = [];
+					if ("ranges" in params) ranges = params.ranges;
+					else if ("rowsAutoHeightInfo" in params) ranges = params.rowsAutoHeightInfo.map((info) => ({
+						startRow: info.row,
+						endRow: info.row,
+						startColumn: 0,
+						endColumn: worksheet.getColumnCount() - 1
+					}));
+					this._refreshDrawingTransform(command, unitId, subUnitId, ranges);
+				} catch (error) {
+					this._logService.error("[SheetDrawingTransformAffectedController]", "Drawing layout refresh failed", {
+						commandId: command.id,
+						params: command.params,
+						error
+					});
+				}
 			});
 		}));
 	}
@@ -2203,43 +2036,26 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
 		const updateDrawings = [];
 		Object.keys(drawingData).forEach((drawingId) => {
 			const drawing = drawingData[drawingId];
-			const { sheetTransform, transform, anchorType = "0" } = drawing;
-			if (anchorType === "2") return true;
-			if (!sheetTransform) return true;
-			const { from, to } = sheetTransform;
-			const { row: fromRow, column: fromColumn } = from;
-			const { row: toRow, column: toColumn } = to;
-			for (let i = 0; i < ranges.length; i++) {
-				const { startRow, endRow, startColumn, endColumn } = ranges[i];
-				if (_univerjs_core.Rectangle.intersects({
-					startRow,
-					endRow,
-					startColumn,
-					endColumn
-				}, {
-					startRow: fromRow,
-					endRow: toRow,
-					startColumn: fromColumn,
-					endColumn: toColumn
-				}) || fromRow > endRow || fromColumn > endColumn) {
-					if (anchorType === "0") {
-						updateDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), sheetSkeletonParam.skeleton));
-						break;
-					}
-					const newTransform = drawingPositionToTransform(sheetTransform, sheetSkeletonParam);
-					updateDrawings.push({
-						...drawing,
-						transform: {
-							...transform,
-							left: newTransform === null || newTransform === void 0 ? void 0 : newTransform.left,
-							top: newTransform === null || newTransform === void 0 ? void 0 : newTransform.top,
-							width: newTransform === null || newTransform === void 0 ? void 0 : newTransform.width,
-							height: newTransform === null || newTransform === void 0 ? void 0 : newTransform.height
-						}
-					});
-					break;
-				}
-			}
+			if ((drawing === null || drawing === void 0 ? void 0 : drawing.anchorType) === "2") return;
+			const refreshed = this._tryRefreshDrawingPlacement(drawing, sheetSkeletonParam.skeleton, command.id, ({ from, to }) => {
+				const { row: fromRow, column: fromColumn } = from;
+				const { row: toRow, column: toColumn } = to;
+				return ranges.some((range) => {
+					const { startRow, endRow, startColumn, endColumn } = range;
+					return _univerjs_core.Rectangle.intersects({
+						startRow,
+						endRow,
+						startColumn,
+						endColumn
+					}, {
+						startRow: fromRow,
+						endRow: toRow,
+						startColumn: fromColumn,
+						endColumn: toColumn
+					}) || fromRow > endRow || fromColumn > endColumn;
+				});
+			});
+			if (refreshed) updateDrawings.push(refreshed);
 		});
 		this._finalizePlan(unitId, subUnitId, updateDrawings, [], "refresh", command);
 	}
@@ -2251,7 +2067,8 @@ SheetDrawingTransformAffectedController = __decorate([
 	__decorateParam(3, ISheetDrawingService),
 	__decorateParam(4, _univerjs_drawing.IDrawingManagerService),
 	__decorateParam(5, _univerjs_core.IUniverInstanceService),
-	__decorateParam(6, (0, _univerjs_core.Inject)(SheetDrawingTransformPlanService))
+	__decorateParam(6, (0, _univerjs_core.Inject)(SheetDrawingTransformPlanService)),
+	__decorateParam(7, _univerjs_core.ILogService)
 ], SheetDrawingTransformAffectedController);
 
 //#endregion
@@ -2313,6 +2130,7 @@ exports.drawingPositionToTransform = drawingPositionToTransform;
 exports.getSheetDrawingPlacement = getSheetDrawingPlacement;
 exports.isKnownSheetNonRotatableDrawingType = isKnownSheetNonRotatableDrawingType;
 exports.normalizeSheetDrawingPlacement = normalizeSheetDrawingPlacement;
+exports.refreshSheetDrawingPlacement = refreshSheetDrawingPlacement;
 exports.resolveSheetDrawingRotateEnabled = resolveSheetDrawingRotateEnabled;
 exports.transformToAxisAlignPosition = transformToAxisAlignPosition;
 exports.transformToDrawingPosition = transformToDrawingPosition;