@univerjs/sheets-drawing 1.5.2 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/cjs/index.js CHANGED
@@ -1,8 +1,30 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
2
2
  let _univerjs_sheets = require("@univerjs/sheets");
3
3
  let _univerjs_core = require("@univerjs/core");
4
- let _univerjs_drawing = require("@univerjs/drawing");
5
4
  let _univerjs_engine_render = require("@univerjs/engine-render");
5
+ let _univerjs_drawing = require("@univerjs/drawing");
6
+
7
+ // src/basics/drawing-reference.ts
8
+ /** Map an anchor marker through a row/column insertion or deletion. */
9
+ function transformSheetDrawingReference(marker, reference) {
10
+ const { axis, action, start, end, limit, boundaryOffset } = reference;
11
+ const offset = axis === "row" ? "rowOffset" : "columnOffset";
12
+ if (!["row", "column"].includes(axis) || !["insert", "remove"].includes(action) || !Number.isInteger(start) || !Number.isInteger(end) || start < 0 || end < start || !Number.isInteger(limit) || limit <= 0 || !Number.isFinite(boundaryOffset) || boundaryOffset < 0 || !Number.isInteger(marker[axis]) || marker[axis] < 0 || !Number.isFinite(marker[offset])) throw new Error("Invalid drawing reference change.");
13
+ const result = { ...marker };
14
+ const count = end - start + 1;
15
+ if (action === "insert") {
16
+ if (result[axis] >= start) result[axis] += count;
17
+ } else if (result[axis] > end) result[axis] -= count;
18
+ else if (result[axis] >= start) {
19
+ result[axis] = start;
20
+ result[offset] = 0;
21
+ }
22
+ if (result[axis] >= limit) {
23
+ result[axis] = limit - 1;
24
+ result[offset] = boundaryOffset;
25
+ }
26
+ return result;
27
+ }
6
28
 
7
29
  // src/basics/transform-position.ts
8
30
  function drawingPositionToTransform(position, sheetSkeletonParam) {
@@ -58,15 +80,40 @@ function transformToDrawingPosition(transform, skeleton) {
58
80
  */
59
81
  function transformToAxisAlignPosition(transform, skeleton) {
60
82
  const { left = 0, top = 0, width = 0, height = 0, angle = 0 } = transform;
61
- const norm = (angle % 360 + 360) % 360;
62
- if (!(norm >= 45 && norm < 135 || norm >= 225 && norm < 315)) return transformToDrawingPosition(transform, skeleton);
63
- return transformToDrawingPosition({
64
- ...transform,
65
- left: left + width / 2 - height / 2,
66
- top: top + height / 2 - width / 2,
83
+ const { from, to } = transformToDrawingPosition(isDrawingAxisSwapped(angle) ? {
84
+ left: left + (width - height) / 2,
85
+ top: top + (height - width) / 2,
67
86
  width: height,
68
87
  height: width
88
+ } : {
89
+ left,
90
+ top,
91
+ width,
92
+ height
69
93
  }, skeleton);
94
+ return {
95
+ from,
96
+ to
97
+ };
98
+ }
99
+ function isDrawingAxisSwapped(angle = 0) {
100
+ const normalized = (angle % 360 + 360) % 360;
101
+ return normalized >= 45 && normalized < 135 || normalized >= 225 && normalized < 315;
102
+ }
103
+
104
+ // \0@oxc-project+runtime@0.158.0/helpers/esm/decorateParam.js
105
+ function __decorateParam(paramIndex, decorator) {
106
+ return function(target, key) {
107
+ decorator(target, key, paramIndex);
108
+ };
109
+ }
110
+
111
+ // \0@oxc-project+runtime@0.158.0/helpers/esm/decorate.js
112
+ function __decorate(decorators, target, key, desc) {
113
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
114
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
115
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
116
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
70
117
  }
71
118
 
72
119
  // src/services/sheet-drawing.service.ts
@@ -85,326 +132,135 @@ let SheetDrawingAnchorType = /* @__PURE__ */ function(SheetDrawingAnchorType) {
85
132
  SheetDrawingAnchorType["None"] = "2";
86
133
  return SheetDrawingAnchorType;
87
134
  }({});
88
- var SheetDrawingService = class extends _univerjs_drawing.UnitDrawingService {};
89
- const ISheetDrawingService = (0, _univerjs_core.createIdentifier)("sheets-drawing.sheet-drawing.service");
90
-
91
- // src/commands/mutations/set-drawing-apply.mutation.ts
92
- let DrawingApplyType = /* @__PURE__ */ function(DrawingApplyType) {
93
- DrawingApplyType[DrawingApplyType["INSERT"] = 0] = "INSERT";
94
- DrawingApplyType[DrawingApplyType["REMOVE"] = 1] = "REMOVE";
95
- DrawingApplyType[DrawingApplyType["UPDATE"] = 2] = "UPDATE";
96
- DrawingApplyType[DrawingApplyType["ARRANGE"] = 3] = "ARRANGE";
97
- DrawingApplyType[DrawingApplyType["GROUP"] = 4] = "GROUP";
98
- DrawingApplyType[DrawingApplyType["UNGROUP"] = 5] = "UNGROUP";
99
- return DrawingApplyType;
100
- }({});
101
- const SetDrawingApplyMutation = {
102
- id: "sheet.mutation.set-drawing-apply",
103
- type: _univerjs_core.CommandType.MUTATION,
104
- handler: (accessor, params) => {
105
- const drawingManagerService = accessor.get(_univerjs_drawing.IDrawingManagerService);
106
- const sheetDrawingService = accessor.get(ISheetDrawingService);
107
- const { op, unitId, subUnitId, type, objects } = params;
108
- drawingManagerService.applyJson1(unitId, subUnitId, op);
109
- sheetDrawingService.applyJson1(unitId, subUnitId, op);
110
- switch (type) {
111
- case 0:
112
- drawingManagerService.addNotification(objects);
113
- sheetDrawingService.addNotification(objects);
114
- break;
115
- case 1:
116
- drawingManagerService.removeNotification(objects);
117
- sheetDrawingService.removeNotification(objects);
118
- break;
119
- case 2:
120
- drawingManagerService.updateNotification(objects);
121
- sheetDrawingService.updateNotification(objects);
122
- break;
123
- case 3:
124
- drawingManagerService.orderNotification(objects);
125
- sheetDrawingService.orderNotification(objects);
126
- break;
127
- case 4:
128
- drawingManagerService.groupUpdateNotification(objects);
129
- sheetDrawingService.groupUpdateNotification(objects);
130
- break;
131
- case 5:
132
- drawingManagerService.ungroupUpdateNotification(objects);
133
- sheetDrawingService.ungroupUpdateNotification(objects);
134
- }
135
- return true;
135
+ let SheetDrawingService = class SheetDrawingService extends _univerjs_drawing.UnitDrawingService {
136
+ constructor(_sheetSkeletonService) {
137
+ super();
138
+ this._sheetSkeletonService = _sheetSkeletonService;
136
139
  }
137
- };
138
-
139
- // src/commands/operations/clear-drawing-transformer.operation.ts
140
- const ClearSheetDrawingTransformerOperation = {
141
- id: "sheet.operation.clear-drawing-transformer",
142
- type: _univerjs_core.CommandType.MUTATION,
143
- handler: (accessor, params) => {
144
- const renderManagerService = accessor.get(_univerjs_engine_render.IRenderManagerService);
145
- params.forEach((unitId) => {
146
- var _renderManagerService;
147
- (_renderManagerService = renderManagerService.getRenderUnitById(unitId)) === null || _renderManagerService === void 0 || (_renderManagerService = _renderManagerService.scene.getTransformer()) === null || _renderManagerService === void 0 || _renderManagerService.debounceRefreshControls();
148
- });
149
- return true;
140
+ getBatchAddOp(drawings) {
141
+ return super.getBatchAddOp(drawings.map((drawing) => this._normalizeDrawing(drawing)));
150
142
  }
151
- };
152
-
153
- // src/commands/commands/insert-sheet-drawing.command.ts
154
- const InsertSheetDrawingCommand = {
155
- id: "sheet.command.insert-sheet-image",
156
- type: _univerjs_core.CommandType.COMMAND,
157
- handler: (accessor, params) => {
158
- if (!params) return false;
159
- const commandService = accessor.get(_univerjs_core.ICommandService);
160
- const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
161
- const sheetDrawingService = accessor.get(ISheetDrawingService);
162
- const sheetInterceptorService = accessor.get(_univerjs_sheets.SheetInterceptorService);
163
- const drawings = params.drawings;
164
- const { unitId, subUnitId, undo, redo, objects } = sheetDrawingService.getBatchAddOp(drawings);
165
- const intercepted = sheetInterceptorService.onCommandExecute({
166
- id: InsertSheetDrawingCommand.id,
167
- params
168
- });
169
- const redoMutations = [
170
- ...intercepted.preRedos ?? [],
171
- {
172
- id: SetDrawingApplyMutation.id,
173
- params: {
174
- unitId,
175
- subUnitId,
176
- op: redo,
177
- objects,
178
- type: 0
179
- }
180
- },
181
- {
182
- id: ClearSheetDrawingTransformerOperation.id,
183
- params: [unitId]
184
- },
185
- ...intercepted.redos
186
- ];
187
- const undoMutations = [
188
- ...intercepted.preUndos ?? [],
189
- {
190
- id: SetDrawingApplyMutation.id,
191
- params: {
192
- unitId,
193
- subUnitId,
194
- op: undo,
195
- objects,
196
- type: 1
197
- }
198
- },
199
- {
200
- id: ClearSheetDrawingTransformerOperation.id,
201
- params: [unitId]
202
- },
203
- ...intercepted.undos
204
- ];
205
- if ((0, _univerjs_core.sequenceExecute)(redoMutations, commandService).result) {
206
- undoRedoService.pushUndoRedo({
207
- unitID: unitId,
208
- undoMutations,
209
- redoMutations
143
+ getBatchUpdateOp(drawings) {
144
+ return super.getBatchUpdateOp(drawings.map((drawing) => {
145
+ if (!drawing.sheetTransform) return this._normalizeDrawing(drawing);
146
+ const current = this.getDrawingByParam(drawing);
147
+ return this._normalizeDrawing({
148
+ ...current,
149
+ ...drawing,
150
+ transform: {
151
+ ...current === null || current === void 0 ? void 0 : current.transform,
152
+ ...drawing.transform
153
+ },
154
+ axisAlignSheetTransform: drawing.axisAlignSheetTransform
210
155
  });
211
- return true;
156
+ }));
157
+ }
158
+ _normalizeDrawing(drawing) {
159
+ var _drawing$axisAlignShe, _drawing$transform, _this$_sheetSkeletonS;
160
+ const hasGeometry = ((_drawing$axisAlignShe = drawing.axisAlignSheetTransform) === null || _drawing$axisAlignShe === void 0 ? void 0 : _drawing$axisAlignShe.from) && ((_drawing$transform = drawing.transform) === null || _drawing$transform === void 0 ? void 0 : _drawing$transform.width) != null && drawing.transform.height != null;
161
+ const skeleton = drawing.sheetTransform && !hasGeometry && drawing.anchorType !== "2" && !drawing.groupId ? (_this$_sheetSkeletonS = this._sheetSkeletonService) === null || _this$_sheetSkeletonS === void 0 ? void 0 : _this$_sheetSkeletonS.ensureSkeleton(drawing.unitId, drawing.subUnitId) : void 0;
162
+ const normalized = normalizeSheetDrawing(drawing, skeleton);
163
+ if (!normalized.sheetTransform) {
164
+ const { sheetTransform: _legacy, ...model } = normalized;
165
+ return model;
212
166
  }
213
- return false;
167
+ return normalized;
214
168
  }
215
169
  };
170
+ SheetDrawingService = __decorate([__decorateParam(0, (0, _univerjs_core.Optional)(_univerjs_sheets.SheetSkeletonService))], SheetDrawingService);
171
+ const ISheetDrawingService = (0, _univerjs_core.createIdentifier)("sheets-drawing.sheet-drawing.service");
216
172
 
217
- // src/commands/commands/remove-sheet-drawing.command.ts
218
- function expandDrawingRemovalParams(service, requested) {
219
- const drawings = [];
220
- const visit = (search, ancestors) => {
221
- if (ancestors.has(search.drawingId)) throw new _univerjs_core.CustomCommandExecutionError(RemoveSheetDrawingCommand.id);
222
- if (drawings.some((drawing) => drawing.unitId === search.unitId && drawing.subUnitId === search.subUnitId && drawing.drawingId === search.drawingId)) return;
223
- const current = service.getDrawingByParam(search);
224
- drawings.push({
225
- unitId: search.unitId,
226
- subUnitId: search.subUnitId,
227
- drawingId: search.drawingId,
228
- drawingType: (current === null || current === void 0 ? void 0 : current.drawingType) ?? search.drawingType
229
- });
230
- if (!current) return;
231
- const children = Object.values(service.getDrawingData(search.unitId, search.subUnitId)).filter((drawing) => current.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_GROUP && drawing.groupId === search.drawingId);
232
- const nextAncestors = new Set(ancestors);
233
- nextAncestors.add(search.drawingId);
234
- children.forEach((drawing) => visit({
235
- unitId: search.unitId,
236
- subUnitId: search.subUnitId,
237
- drawingId: drawing.drawingId,
238
- drawingType: drawing.drawingType
239
- }, nextAncestors));
173
+ // src/services/sheet-drawing-placement.ts
174
+ const PLACEMENT_ERROR = {
175
+ CELL_INVALID: "SHEET_DRAWING_PLACEMENT_CELL_INVALID",
176
+ EXTENT_INVALID: "SHEET_DRAWING_PLACEMENT_EXTENT_INVALID",
177
+ KIND_INVALID: "SHEET_DRAWING_PLACEMENT_KIND_INVALID",
178
+ POSITION_INVALID: "SHEET_DRAWING_PLACEMENT_POSITION_INVALID"
179
+ };
180
+ function getSheetDrawingPositionAnchorField(drawing) {
181
+ const axis = drawing.axisAlignSheetTransform;
182
+ const from = axis === null || axis === void 0 ? void 0 : axis.from;
183
+ if (!from || validateCellPosition(from)) return "sheetTransform";
184
+ if (axis.to && validateCellPosition(axis.to) && (from.row > 0 && from.rowOffset < 0 || from.column > 0 && from.columnOffset < 0)) return "sheetTransform";
185
+ return "axisAlignSheetTransform";
186
+ }
187
+ function getAxisAlignedDrawingPosition(drawing, usesImportedMarkers = false) {
188
+ if (usesImportedMarkers) return drawing.axisAlignSheetTransform ?? drawing.sheetTransform;
189
+ if (drawing.anchorType === "1" || getSheetDrawingPositionAnchorField(drawing) === "axisAlignSheetTransform") return drawing.axisAlignSheetTransform;
190
+ }
191
+ /** Reconstruct the unrotated coordinates expected by legacy drawing APIs. */
192
+ function getLegacySheetDrawingPosition(drawing, skeleton) {
193
+ const transform = getSheetDrawingTransformWithOrientation(drawing);
194
+ const position = transformToDrawingPosition(transform, skeleton);
195
+ const anchorType = drawing.anchorType ?? "0";
196
+ if (anchorType !== "2" && !isDrawingAxisSwapped(transform.angle)) {
197
+ const anchor = drawing.axisAlignSheetTransform;
198
+ if (anchor === null || anchor === void 0 ? void 0 : anchor.from) position.from = { ...anchor.from };
199
+ if (anchorType === "1" && (anchor === null || anchor === void 0 ? void 0 : anchor.to)) position.to = { ...anchor.to };
200
+ }
201
+ return position;
202
+ }
203
+ /** Convert old position and orientation fields at the drawing model boundary. */
204
+ function normalizeSheetDrawing(drawing, skeleton) {
205
+ const { sheetTransform, axisAlignSheetTransform, ...model } = drawing;
206
+ const axisHasOrientation = axisAlignSheetTransform && Object.keys(axisAlignSheetTransform).some((key) => key !== "from" && key !== "to");
207
+ if (!sheetTransform && !axisHasOrientation) return drawing;
208
+ const transform = getSheetDrawingTransformWithOrientation(drawing);
209
+ if (skeleton && !drawing.groupId && drawing.anchorType !== "2") {
210
+ const result = tryRefreshSheetDrawingPlacement({
211
+ ...drawing,
212
+ transform
213
+ }, skeleton);
214
+ if (!result.ok) return drawing;
215
+ return {
216
+ ...model,
217
+ transform: result.drawing.transform,
218
+ axisAlignSheetTransform: result.drawing.axisAlignSheetTransform
219
+ };
220
+ }
221
+ const markers = axisAlignSheetTransform ?? sheetTransform;
222
+ if (!markers || !axisAlignSheetTransform && drawing.anchorType !== "2" && !drawing.groupId) return {
223
+ ...drawing,
224
+ transform
225
+ };
226
+ return {
227
+ ...model,
228
+ transform,
229
+ axisAlignSheetTransform: {
230
+ from: markers.from,
231
+ to: markers.to
232
+ }
240
233
  };
241
- requested.forEach((drawing) => visit(drawing, /* @__PURE__ */ new Set()));
242
- return drawings;
243
234
  }
244
- const RemoveSheetDrawingCommand = {
245
- id: "sheet.command.remove-sheet-image",
246
- type: _univerjs_core.CommandType.COMMAND,
247
- handler: (accessor, params) => {
248
- if (!params) return false;
249
- const commandService = accessor.get(_univerjs_core.ICommandService);
250
- const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
251
- const sheetInterceptorService = accessor.get(_univerjs_sheets.SheetInterceptorService);
252
- const sheetDrawingService = accessor.get(ISheetDrawingService);
253
- const normalizedParams = {
254
- ...params,
255
- drawings: expandDrawingRemovalParams(sheetDrawingService, params.drawings)
256
- };
257
- if (!accessor.get(_univerjs_drawing.IDrawingManagerService).canExecuteCommand({
258
- id: RemoveSheetDrawingCommand.id,
259
- params: normalizedParams
260
- })) return false;
261
- const intercepted = sheetInterceptorService.onCommandExecute({
262
- id: RemoveSheetDrawingCommand.id,
263
- params: normalizedParams
264
- });
265
- const { unitId, subUnitId, undo, redo, objects } = sheetDrawingService.getBatchRemoveOp(normalizedParams.drawings);
266
- if (Array.isArray(objects) && objects.length === 0) return false;
267
- const redoMutations = [
268
- ...intercepted.preRedos ?? [],
269
- {
270
- id: SetDrawingApplyMutation.id,
271
- params: {
272
- unitId,
273
- subUnitId,
274
- op: redo,
275
- objects,
276
- type: 1
277
- }
278
- },
279
- {
280
- id: ClearSheetDrawingTransformerOperation.id,
281
- params: [unitId]
282
- },
283
- ...intercepted.redos
284
- ];
285
- const undoMutations = [
286
- ...intercepted.preUndos ?? [],
287
- {
288
- id: SetDrawingApplyMutation.id,
289
- params: {
290
- unitId,
291
- subUnitId,
292
- op: undo,
293
- objects,
294
- type: 0
295
- }
296
- },
297
- {
298
- id: ClearSheetDrawingTransformerOperation.id,
299
- params: [unitId]
300
- },
301
- ...intercepted.undos
302
- ];
303
- if ((0, _univerjs_core.sequenceExecute)(redoMutations, commandService).result) {
304
- undoRedoService.pushUndoRedo({
305
- unitID: unitId,
306
- undoMutations,
307
- redoMutations
308
- });
309
- return true;
310
- }
311
- return false;
312
- }
313
- };
314
-
315
- // src/commands/commands/set-drawing-arrange.command.ts
316
- const SetDrawingArrangeCommand = {
317
- id: "sheet.command.set-drawing-arrange",
318
- type: _univerjs_core.CommandType.COMMAND,
319
- handler: (accessor, params) => {
320
- const commandService = accessor.get(_univerjs_core.ICommandService);
321
- const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
322
- if (!params) return false;
323
- const sheetDrawingService = accessor.get(ISheetDrawingService);
324
- const { unitId, subUnitId, drawingIds } = params;
325
- const drawingOrderMapParam = {
326
- unitId,
327
- subUnitId,
328
- drawingIds
329
- };
330
- let jsonOp;
331
- if (params.zOrder !== void 0) jsonOp = sheetDrawingService.getDrawingOrderOp(drawingOrderMapParam, params.zOrder);
332
- else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.forward) jsonOp = sheetDrawingService.getForwardDrawingsOp(drawingOrderMapParam);
333
- else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.backward) jsonOp = sheetDrawingService.getBackwardDrawingOp(drawingOrderMapParam);
334
- else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.front) jsonOp = sheetDrawingService.getFrontDrawingsOp(drawingOrderMapParam);
335
- else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.back) jsonOp = sheetDrawingService.getBackDrawingsOp(drawingOrderMapParam);
336
- if (jsonOp == null) return false;
337
- const { objects, redo, undo } = jsonOp;
338
- if (commandService.syncExecuteCommand(SetDrawingApplyMutation.id, {
339
- op: redo,
340
- unitId,
341
- subUnitId,
342
- objects,
343
- type: 3
344
- })) {
345
- undoRedoService.pushUndoRedo({
346
- unitID: unitId,
347
- undoMutations: [{
348
- id: SetDrawingApplyMutation.id,
349
- params: {
350
- op: undo,
351
- unitId,
352
- subUnitId,
353
- objects,
354
- type: 3
355
- }
356
- }],
357
- redoMutations: [{
358
- id: SetDrawingApplyMutation.id,
359
- params: {
360
- op: redo,
361
- unitId,
362
- subUnitId,
363
- objects,
364
- type: 3
365
- }
366
- }]
367
- });
368
- return true;
369
- }
370
- return false;
371
- }
372
- };
373
-
374
- // src/services/sheet-drawing-placement.ts
375
- const PLACEMENT_ERROR = {
376
- CELL_INVALID: "SHEET_DRAWING_PLACEMENT_CELL_INVALID",
377
- EXTENT_INVALID: "SHEET_DRAWING_PLACEMENT_EXTENT_INVALID",
378
- KIND_INVALID: "SHEET_DRAWING_PLACEMENT_KIND_INVALID",
379
- POSITION_INVALID: "SHEET_DRAWING_PLACEMENT_POSITION_INVALID"
380
- };
381
- function getSheetDrawingPlacement(drawing) {
382
- var _drawing$transform5, _drawing$transform6;
383
- const anchorType = drawing.anchorType ?? "0";
384
- if (anchorType === "2") {
385
- var _drawing$transform, _drawing$transform2, _drawing$transform3, _drawing$transform4;
386
- return {
387
- kind: "2",
388
- left: ((_drawing$transform = drawing.transform) === null || _drawing$transform === void 0 ? void 0 : _drawing$transform.left) ?? 0,
389
- top: ((_drawing$transform2 = drawing.transform) === null || _drawing$transform2 === void 0 ? void 0 : _drawing$transform2.top) ?? 0,
390
- width: ((_drawing$transform3 = drawing.transform) === null || _drawing$transform3 === void 0 ? void 0 : _drawing$transform3.width) ?? 0,
391
- height: ((_drawing$transform4 = drawing.transform) === null || _drawing$transform4 === void 0 ? void 0 : _drawing$transform4.height) ?? 0
235
+ function getSheetDrawingPlacement(drawing, skeleton) {
236
+ var _current$transform, _current$transform2;
237
+ const anchorType = drawing.anchorType ?? "0";
238
+ if (anchorType === "2") {
239
+ var _drawing$transform, _drawing$transform2, _drawing$transform3, _drawing$transform4;
240
+ return {
241
+ kind: "2",
242
+ left: ((_drawing$transform = drawing.transform) === null || _drawing$transform === void 0 ? void 0 : _drawing$transform.left) ?? 0,
243
+ top: ((_drawing$transform2 = drawing.transform) === null || _drawing$transform2 === void 0 ? void 0 : _drawing$transform2.top) ?? 0,
244
+ width: ((_drawing$transform3 = drawing.transform) === null || _drawing$transform3 === void 0 ? void 0 : _drawing$transform3.width) ?? 0,
245
+ height: ((_drawing$transform4 = drawing.transform) === null || _drawing$transform4 === void 0 ? void 0 : _drawing$transform4.height) ?? 0
392
246
  };
393
247
  }
248
+ const current = skeleton && !getAxisAlignedDrawingPosition(drawing) ? normalizeSheetDrawing(drawing, skeleton) : drawing;
249
+ const position = getAxisAlignedDrawingPosition(current) ?? current.sheetTransform ?? current.axisAlignSheetTransform;
394
250
  if (anchorType === "1") return {
395
251
  kind: "1",
396
- from: { ...drawing.sheetTransform.from },
397
- to: { ...drawing.sheetTransform.to }
252
+ from: { ...position.from },
253
+ to: { ...position.to }
398
254
  };
399
255
  return {
400
256
  kind: "0",
401
- from: { ...drawing.sheetTransform.from },
402
- width: ((_drawing$transform5 = drawing.transform) === null || _drawing$transform5 === void 0 ? void 0 : _drawing$transform5.width) ?? 0,
403
- height: ((_drawing$transform6 = drawing.transform) === null || _drawing$transform6 === void 0 ? void 0 : _drawing$transform6.height) ?? 0
257
+ from: { ...position.from },
258
+ width: ((_current$transform = current.transform) === null || _current$transform === void 0 ? void 0 : _current$transform.width) ?? 0,
259
+ height: ((_current$transform2 = current.transform) === null || _current$transform2 === void 0 ? void 0 : _current$transform2.height) ?? 0
404
260
  };
405
261
  }
406
262
  function applySheetDrawingPlacement(drawing, input, skeleton) {
407
- return resolveSheetDrawingPlacement(drawing, normalizePlacement(input, skeleton, requiresDrawingArea(drawing)), skeleton);
263
+ return resolveSheetDrawingPlacement(drawing, normalizePlacement(input, skeleton, requiresDrawingArea(drawing)), skeleton, !("bounds" in input));
408
264
  }
409
265
  /** Place a batch at the logical start corner of a Chart Sheet, preserving its relative geometry. */
410
266
  function transformDrawingsToChartSheet(drawings, chartSheetBounds, rightToLeft) {
@@ -420,21 +276,7 @@ function transformDrawingsToChartSheet(drawings, chartSheetBounds, rightToLeft)
420
276
  state.scaleX,
421
277
  state.scaleY
422
278
  ].some((value) => value !== void 0 && !Number.isFinite(value))) return null;
423
- const { width = 0, height = 0, angle = 0 } = state;
424
- const matrix = _univerjs_engine_render.Transform.create().composeMatrix(state);
425
- if (angle) matrix.rotate(-angle).translate(width / 2, height / 2).rotate(angle).translate(-width / 2, -height / 2);
426
- const box = matrix.makeBoundingBoxFromPoints([
427
- new _univerjs_engine_render.Vector2(0, 0),
428
- new _univerjs_engine_render.Vector2(width, 0),
429
- new _univerjs_engine_render.Vector2(width, height),
430
- new _univerjs_engine_render.Vector2(0, height)
431
- ]);
432
- bounds.push({
433
- left: box.left,
434
- top: box.top,
435
- width: box.width,
436
- height: box.height
437
- });
279
+ bounds.push((0, _univerjs_engine_render.getTransformBoundingBox)(state));
438
280
  }
439
281
  const group = (0, _univerjs_engine_render.getGroupState)(0, 0, bounds);
440
282
  const scale = Math.min(1, group.width ? chartSheetBounds.width / group.width : 1, group.height ? chartSheetBounds.height / group.height : 1);
@@ -453,9 +295,8 @@ function refreshSheetDrawingPlacement(drawing, skeleton) {
453
295
  if (!result.ok) throw createPlacementError(result);
454
296
  return result.drawing;
455
297
  }
456
- /** Validate persisted markers before any caller reads them to select a refresh range. */
298
+ /** Validate authoritative markers; a one-cell endpoint can be rebuilt from its fixed extent. */
457
299
  function validateSheetDrawingPlacement(drawing) {
458
- var _drawing$sheetTransfo, _drawing$sheetTransfo2;
459
300
  if (!drawing || typeof drawing !== "object") return {
460
301
  ok: false,
461
302
  reason: PLACEMENT_ERROR.KIND_INVALID
@@ -466,27 +307,46 @@ function validateSheetDrawingPlacement(drawing) {
466
307
  ok: false,
467
308
  reason: PLACEMENT_ERROR.KIND_INVALID
468
309
  };
469
- 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);
470
- if (markerFailure) return markerFailure;
471
- return validatePlacement(getSheetDrawingPlacement(drawing), requiresDrawingArea(drawing));
310
+ if (anchorType === "0") {
311
+ var _drawing$getSheetDraw, _drawing$transform5, _drawing$transform6;
312
+ return validateCellPosition((_drawing$getSheetDraw = drawing[getSheetDrawingPositionAnchorField(drawing)]) === null || _drawing$getSheetDraw === void 0 ? void 0 : _drawing$getSheetDraw.from) ?? validateExtent(((_drawing$transform5 = drawing.transform) === null || _drawing$transform5 === void 0 ? void 0 : _drawing$transform5.width) ?? 0, ((_drawing$transform6 = drawing.transform) === null || _drawing$transform6 === void 0 ? void 0 : _drawing$transform6.height) ?? 0, requiresDrawingArea(drawing));
313
+ }
314
+ const markers = drawing.axisAlignSheetTransform ?? drawing.sheetTransform;
315
+ return validateCellPosition(markers === null || markers === void 0 ? void 0 : markers.from) ?? validateCellPosition(markers === null || markers === void 0 ? void 0 : markers.to);
472
316
  }
473
317
  /** Expected snapshot errors are results; unexpected calculation failures are caught by the task owner. */
474
318
  function tryRefreshSheetDrawingPlacement(drawing, skeleton) {
475
- var _resolved$transform, _resolved$transform2;
476
- const failure = validateSheetDrawingPlacement(drawing);
319
+ var _drawing$transform7, _drawing$transform8, _resolved$transform, _resolved$transform2;
320
+ const deriveFixedExtent = drawing && (drawing.anchorType ?? "0") === "0" && isUnprojectedImage(drawing);
321
+ const failure = validateSheetDrawingPlacement(deriveFixedExtent ? {
322
+ ...drawing,
323
+ anchorType: "1"
324
+ } : drawing);
477
325
  if (failure) return failure;
478
326
  if (drawing.anchorType === "2") return {
479
327
  ok: true,
480
328
  drawing
481
329
  };
482
- const resolved = resolveSheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), skeleton);
483
- 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);
330
+ const resolvesBoth = deriveFixedExtent || drawing.anchorType === "1";
331
+ const axisAnchor = getAxisAlignedDrawingPosition(drawing, resolvesBoth && isUnprojectedImage(drawing));
332
+ const anchor = axisAnchor ?? drawing.sheetTransform;
333
+ const resolved = resolveSheetDrawingPlacement(drawing, resolvesBoth ? {
334
+ kind: "1",
335
+ from: anchor.from,
336
+ to: anchor.to
337
+ } : {
338
+ kind: "0",
339
+ from: anchor.from,
340
+ width: ((_drawing$transform7 = drawing.transform) === null || _drawing$transform7 === void 0 ? void 0 : _drawing$transform7.width) ?? 0,
341
+ height: ((_drawing$transform8 = drawing.transform) === null || _drawing$transform8 === void 0 ? void 0 : _drawing$transform8.height) ?? 0
342
+ }, skeleton, Boolean(axisAnchor));
343
+ 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), !deriveFixedExtent);
484
344
  if (extentFailure) return extentFailure;
485
345
  return {
486
346
  ok: true,
487
347
  drawing: {
488
348
  ...drawing,
489
- sheetTransform: resolved.sheetTransform,
349
+ sheetTransform: void 0,
490
350
  transform: resolved.transform,
491
351
  axisAlignSheetTransform: resolved.axisAlignSheetTransform
492
352
  }
@@ -495,59 +355,108 @@ function tryRefreshSheetDrawingPlacement(drawing, skeleton) {
495
355
  function requiresDrawingArea(drawing) {
496
356
  return drawing.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE || drawing.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_DOM;
497
357
  }
498
- function resolveSheetDrawingPlacement(drawing, placement, skeleton) {
358
+ function isUnprojectedImage(drawing) {
359
+ const { transform, drawingType } = drawing;
360
+ return drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE && (transform === null || transform === void 0 ? void 0 : transform.left) === 0 && transform.top === 0 && transform.width === 0 && transform.height === 0;
361
+ }
362
+ /** Preserve cell orientation when an imported pixel cache is incomplete. */
363
+ function getSheetDrawingTransformWithOrientation(drawing) {
364
+ const transform = { ...drawing.transform };
365
+ if (drawing.groupId) return transform;
366
+ for (const key of [
367
+ "angle",
368
+ "flipX",
369
+ "flipY",
370
+ "skewX",
371
+ "skewY"
372
+ ]) {
373
+ var _drawing$sheetTransfo, _drawing$axisAlignShe, _drawing$sheetTransfo2;
374
+ if (drawing.anchorType === "2" && transform[key] !== void 0) continue;
375
+ const legacy = ((_drawing$sheetTransfo = drawing.sheetTransform) === null || _drawing$sheetTransfo === void 0 ? void 0 : _drawing$sheetTransfo[key]) ?? ((_drawing$axisAlignShe = drawing.axisAlignSheetTransform) === null || _drawing$axisAlignShe === void 0 ? void 0 : _drawing$axisAlignShe[key]);
376
+ const legacySupplied = ((_drawing$sheetTransfo2 = drawing.sheetTransform) === null || _drawing$sheetTransfo2 === void 0 ? void 0 : _drawing$sheetTransfo2[key]) !== void 0;
377
+ if (legacy !== void 0 && (legacySupplied ? legacy || transform[key] !== void 0 : legacy && transform[key] === void 0)) Object.assign(transform, { [key]: legacy });
378
+ }
379
+ return transform;
380
+ }
381
+ function resolveSheetDrawingPlacement(drawing, placement, skeleton, usesAxisMarkers) {
382
+ const existingTransform = getSheetDrawingTransformWithOrientation(drawing);
383
+ const { sheetTransform: _legacy, ...model } = drawing;
499
384
  if (placement.kind === "2") {
500
- const transform = withExistingTransform(drawing.transform, placement);
501
- const sheetTransform = absoluteSheetTransform(placement, drawing.sheetTransform);
385
+ const transform = withExistingTransform(existingTransform, placement);
502
386
  return {
503
- ...drawing,
387
+ ...model,
504
388
  anchorType: "2",
505
389
  transform,
506
- sheetTransform,
507
- axisAlignSheetTransform: sheetTransform
390
+ axisAlignSheetTransform: absoluteSheetTransform(placement)
508
391
  };
509
392
  }
510
393
  if (!skeleton) throw new Error("SHEET_DRAWING_PLACEMENT_SKELETON_REQUIRED");
511
394
  if (placement.kind === "0") {
512
- const converted = (0, _univerjs_sheets.convertPositionCellToSheetOverGrid)(drawing.unitId, drawing.subUnitId, getVisibleCellPosition(placement.from, skeleton), placement.width, placement.height, skeleton);
513
- const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, {
514
- from: placement.from,
515
- to: converted.sheetTransform.to
395
+ const { width, height } = placement;
396
+ const origin = projectCellMarker(placement.from, skeleton);
397
+ const swapped = isDrawingAxisSwapped(existingTransform.angle);
398
+ if (usesAxisMarkers && swapped) {
399
+ origin.left = (0, _univerjs_engine_render.precisionTo)(origin.left + (height - width) / 2, 6);
400
+ origin.top = (0, _univerjs_engine_render.precisionTo)(origin.top + (width - height) / 2, 6);
401
+ }
402
+ const transform = withExistingTransform(existingTransform, {
403
+ ...origin,
404
+ width,
405
+ height
516
406
  });
517
- const transform = withExistingTransform(drawing.transform, converted.transform);
407
+ const axis = transformToAxisAlignPosition(transform, skeleton);
518
408
  return {
519
- ...drawing,
409
+ ...model,
520
410
  anchorType: "0",
521
- sheetTransform,
522
411
  transform,
523
- axisAlignSheetTransform: withExistingSheetTransform(drawing.axisAlignSheetTransform, transformToAxisAlignPosition(transform, skeleton))
412
+ axisAlignSheetTransform: {
413
+ from: { ...usesAxisMarkers || !swapped ? placement.from : axis.from },
414
+ to: axis.to
415
+ }
524
416
  };
525
417
  }
526
- const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, {
527
- from: placement.from,
528
- to: placement.to
529
- });
530
- const bounds = (0, _univerjs_sheets.convertPositionSheetOverGridToAbsolute)(drawing.unitId, drawing.subUnitId, {
531
- from: getVisibleCellPosition(placement.from, skeleton),
532
- to: getVisibleCellPosition(placement.to, skeleton)
533
- }, skeleton);
534
- const transform = withExistingTransform(drawing.transform, bounds);
418
+ const swapped = isDrawingAxisSwapped(existingTransform.angle);
419
+ const from = projectCellMarker(placement.from, skeleton);
420
+ const to = projectCellMarker(placement.to, skeleton);
421
+ const bounds = {
422
+ left: from.left,
423
+ top: from.top,
424
+ width: (0, _univerjs_engine_render.precisionTo)(to.left - from.left, 6),
425
+ height: (0, _univerjs_engine_render.precisionTo)(to.top - from.top, 6)
426
+ };
427
+ let transform = withExistingTransform(existingTransform, bounds);
428
+ if (usesAxisMarkers && swapped) transform = {
429
+ ...transform,
430
+ left: (0, _univerjs_engine_render.precisionTo)(bounds.left + bounds.width / 2 - bounds.height / 2, 6),
431
+ top: (0, _univerjs_engine_render.precisionTo)(bounds.top + bounds.height / 2 - bounds.width / 2, 6),
432
+ width: bounds.height,
433
+ height: bounds.width
434
+ };
435
+ const markers = usesAxisMarkers || !swapped ? placement : transformToAxisAlignPosition(transform, skeleton);
535
436
  return {
536
- ...drawing,
437
+ ...model,
537
438
  anchorType: "1",
538
- sheetTransform,
539
439
  transform,
540
- axisAlignSheetTransform: withExistingSheetTransform(drawing.axisAlignSheetTransform, transformToAxisAlignPosition(transform, skeleton))
440
+ axisAlignSheetTransform: {
441
+ from: { ...markers.from },
442
+ to: { ...markers.to }
443
+ }
541
444
  };
542
445
  }
543
- function getVisibleCellPosition(position, skeleton) {
446
+ function projectCellMarker(position, skeleton) {
544
447
  const cell = skeleton.getNoMergeCellWithCoordByIndex(position.row, position.column);
448
+ const { worksheet } = skeleton;
449
+ const lastColumn = position.column === worksheet.getColumnCount() - 1;
450
+ const lastRow = position.row === worksheet.getRowCount() - 1;
545
451
  return {
546
- ...position,
547
- columnOffset: cell.startX === cell.endX ? 0 : position.columnOffset,
548
- rowOffset: cell.startY === cell.endY ? 0 : position.rowOffset
452
+ left: (0, _univerjs_engine_render.precisionTo)(cell.startX + projectCellOffset(position.columnOffset, cell.endX - cell.startX, lastColumn), 6),
453
+ top: (0, _univerjs_engine_render.precisionTo)(cell.startY + projectCellOffset(position.rowOffset, cell.endY - cell.startY, lastRow), 6)
549
454
  };
550
455
  }
456
+ function projectCellOffset(offset, extent, isLastCell) {
457
+ if (extent === 0) return 0;
458
+ return isLastCell ? offset : Math.min(offset, extent);
459
+ }
551
460
  /**
552
461
  * Normalize exact markers or model-space bounds to the authoritative
553
462
  * Position, Both, or None Placement.
@@ -584,13 +493,6 @@ function normalizePlacement(input, skeleton, requiresArea) {
584
493
  };
585
494
  throw new Error(PLACEMENT_ERROR.KIND_INVALID);
586
495
  }
587
- function withExistingSheetTransform(current, placement) {
588
- return {
589
- ...current,
590
- from: { ...placement.from },
591
- to: { ...placement.to }
592
- };
593
- }
594
496
  function withExistingTransform(current, bounds) {
595
497
  return {
596
498
  ...current,
@@ -600,9 +502,8 @@ function withExistingTransform(current, bounds) {
600
502
  height: bounds.height
601
503
  };
602
504
  }
603
- function absoluteSheetTransform(placement, current) {
505
+ function absoluteSheetTransform(placement) {
604
506
  return {
605
- ...current,
606
507
  from: {
607
508
  column: 0,
608
509
  columnOffset: placement.left,
@@ -627,42 +528,493 @@ function validatePlacement(placement, requiresArea) {
627
528
  };
628
529
  return validateExtent(placement.width, placement.height, requiresArea);
629
530
  }
630
- return {
631
- ok: false,
632
- reason: PLACEMENT_ERROR.KIND_INVALID
633
- };
634
- }
635
- function validateBounds(bounds, requiresArea) {
636
- if (!bounds || !Number.isFinite(bounds.left) || !Number.isFinite(bounds.top)) return {
637
- ok: false,
638
- reason: PLACEMENT_ERROR.POSITION_INVALID
639
- };
640
- return validateExtent(bounds.width, bounds.height, requiresArea);
641
- }
642
- function validateCellPosition(position) {
643
- 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 {
644
- ok: false,
645
- reason: PLACEMENT_ERROR.CELL_INVALID
646
- };
647
- }
648
- function validateExtent(width, height, requiresArea, allowCollapsed = false) {
649
- const hasInvalidZeroExtent = !allowCollapsed && (requiresArea ? width === 0 || height === 0 : width === 0 && height === 0);
650
- if (!Number.isFinite(width) || !Number.isFinite(height) || width < 0 || height < 0 || hasInvalidZeroExtent) return {
651
- ok: false,
652
- reason: PLACEMENT_ERROR.EXTENT_INVALID,
653
- details: {
654
- width,
655
- height
531
+ return {
532
+ ok: false,
533
+ reason: PLACEMENT_ERROR.KIND_INVALID
534
+ };
535
+ }
536
+ function validateBounds(bounds, requiresArea) {
537
+ if (!bounds || !Number.isFinite(bounds.left) || !Number.isFinite(bounds.top)) return {
538
+ ok: false,
539
+ reason: PLACEMENT_ERROR.POSITION_INVALID
540
+ };
541
+ return validateExtent(bounds.width, bounds.height, requiresArea);
542
+ }
543
+ function validateCellPosition(position) {
544
+ 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 {
545
+ ok: false,
546
+ reason: PLACEMENT_ERROR.CELL_INVALID
547
+ };
548
+ }
549
+ function validateExtent(width, height, requiresArea, allowCollapsed = false) {
550
+ const hasInvalidZeroExtent = !allowCollapsed && (requiresArea ? width === 0 || height === 0 : width === 0 && height === 0);
551
+ if (!Number.isFinite(width) || !Number.isFinite(height) || width < 0 || height < 0 || hasInvalidZeroExtent) return {
552
+ ok: false,
553
+ reason: PLACEMENT_ERROR.EXTENT_INVALID,
554
+ details: {
555
+ width,
556
+ height
557
+ }
558
+ };
559
+ }
560
+ function assertValidPlacement(failure) {
561
+ if (failure) throw createPlacementError(failure);
562
+ }
563
+ function createPlacementError(failure) {
564
+ const error = failure.reason === PLACEMENT_ERROR.POSITION_INVALID ? new TypeError(failure.reason) : new Error(failure.reason);
565
+ return Object.assign(error, failure.details);
566
+ }
567
+
568
+ // src/services/sheet-drawing-changeset.ts
569
+ function isLegacyDrawing(value) {
570
+ return value !== void 0 && value !== null && typeof value === "object" && "sheetTransform" in value;
571
+ }
572
+ function hasLegacyDrawingInInsert(value, path) {
573
+ if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
574
+ if (path.length === 4) return path[2] === "data" && isLegacyDrawing(value);
575
+ if (path.length === 3) return path[2] === "data" && Object.values(value).some(isLegacyDrawing);
576
+ if (path.length === 2) return value.data !== void 0 && hasLegacyDrawingInInsert(value.data, [...path, "data"]);
577
+ return Object.entries(value).some(([key, child]) => hasLegacyDrawingInInsert(child, [...path, key]));
578
+ }
579
+ /** Only snapshot replay may apply updates authored against the old drawing format. */
580
+ function assertCurrentSheetDrawingEdit({ op, reference }) {
581
+ if ((reference === null || reference === void 0 ? void 0 : reference.legacyPositionDrawingIds) !== void 0) throw new Error("Live sheet drawing edits require the current anchor format.");
582
+ const cursor = _univerjs_core.JSON1.type.readCursor(op);
583
+ cursor.traverse(null, (component) => {
584
+ const path = cursor.getPath();
585
+ if (path[2] === "data" && path[4] === "sheetTransform" || path.length <= 4 && component.i !== void 0 && hasLegacyDrawingInInsert(component.i, path)) throw new Error("Live sheet drawing edits require the current anchor format.");
586
+ });
587
+ }
588
+ /** Translate old marker edits in persisted history against a detached view. */
589
+ function normalizeHistoricalSheetDrawingEdit(op, unitId, subUnitId, getDrawing, getSkeleton) {
590
+ _univerjs_core.JSON1.type.checkValidOp(op);
591
+ const cursor = _univerjs_core.JSON1.type.readCursor(op);
592
+ const legacy = /* @__PURE__ */ new Map();
593
+ const authoredAxis = /* @__PURE__ */ new Set();
594
+ cursor.traverse(null, (component) => {
595
+ const path = cursor.getPath();
596
+ const drawingId = getDrawingId(path, unitId, subUnitId);
597
+ if (drawingId === void 0) return;
598
+ const field = path[4];
599
+ if (field === "axisAlignSheetTransform") authoredAxis.add(drawingId);
600
+ if (field === "sheetTransform") legacy.set(drawingId, Boolean(legacy.get(drawingId) || path.length > 5 || component.r !== void 0));
601
+ });
602
+ if (!legacy.size) return op;
603
+ const skeleton = getSkeleton();
604
+ const canonical = _univerjs_core.JSON1.type.writeCursor();
605
+ const legacyOps = new Map(Array.from(legacy.keys(), (id) => [id, _univerjs_core.JSON1.type.writeCursor()]));
606
+ cursor.traverse(null, (component) => {
607
+ const path = cursor.getPath();
608
+ const drawingId = getDrawingId(path, unitId, subUnitId);
609
+ const writer = drawingId === void 0 ? void 0 : legacyOps.get(drawingId);
610
+ if (writer) writer.mergeTree([...path.slice(4), component]);
611
+ else canonical.mergeTree([...path, component]);
612
+ });
613
+ for (const [drawingId, writer] of legacyOps) {
614
+ const current = getDrawing(drawingId);
615
+ if (!current) throw new Error("Missing drawing for legacy placement edit.");
616
+ const view = { ...current };
617
+ if (!view.sheetTransform && legacy.get(drawingId) && skeleton) view.sheetTransform = getLegacySheetDrawingPosition(current, skeleton);
618
+ const updated = { ..._univerjs_core.JSON1.type.apply(view, writer.get()) };
619
+ if (updated.sheetTransform && !authoredAxis.has(drawingId)) Reflect.deleteProperty(updated, "axisAlignSheetTransform");
620
+ const { sheetTransform: _legacy, ...drawing } = skeleton && !updated.groupId && updated.anchorType !== "2" ? refreshSheetDrawingPlacement(updated, skeleton) : normalizeSheetDrawing(updated);
621
+ canonical.mergeTree([
622
+ unitId,
623
+ subUnitId,
624
+ "data",
625
+ drawingId,
626
+ {
627
+ r: true,
628
+ i: drawing
629
+ }
630
+ ]);
631
+ }
632
+ return canonical.get();
633
+ }
634
+ function getDrawingId(path, unitId, subUnitId) {
635
+ const [unit, sheet, root, id] = path;
636
+ return unit === unitId && sheet === subUnitId && root === "data" && typeof id === "string" ? id : void 0;
637
+ }
638
+
639
+ // src/commands/mutations/set-drawing-apply.mutation.ts
640
+ let DrawingApplyType = /* @__PURE__ */ function(DrawingApplyType) {
641
+ DrawingApplyType[DrawingApplyType["INSERT"] = 0] = "INSERT";
642
+ DrawingApplyType[DrawingApplyType["REMOVE"] = 1] = "REMOVE";
643
+ DrawingApplyType[DrawingApplyType["UPDATE"] = 2] = "UPDATE";
644
+ DrawingApplyType[DrawingApplyType["ARRANGE"] = 3] = "ARRANGE";
645
+ DrawingApplyType[DrawingApplyType["GROUP"] = 4] = "GROUP";
646
+ DrawingApplyType[DrawingApplyType["UNGROUP"] = 5] = "UNGROUP";
647
+ return DrawingApplyType;
648
+ }({});
649
+ function needsPlacementHydration(drawing) {
650
+ var _drawing$transform, _drawing$transform2;
651
+ const oneCell = (drawing.anchorType ?? "0") === "0";
652
+ return Boolean(drawing.sheetTransform) || !((_drawing$transform = drawing.transform) === null || _drawing$transform === void 0 ? void 0 : _drawing$transform.width) && !((_drawing$transform2 = drawing.transform) === null || _drawing$transform2 === void 0 ? void 0 : _drawing$transform2.height) || oneCell && Boolean(validateSheetDrawingPlacement({
653
+ ...drawing,
654
+ anchorType: "1"
655
+ }));
656
+ }
657
+ function refreshReceivedDrawings(accessor, params, hydrateOnly, legacyPositionDrawings) {
658
+ var _accessor$get;
659
+ if (params.type === 1 || params.type === 3 || !Array.isArray(params.objects) || !params.objects.length) return;
660
+ const skeleton = (_accessor$get = accessor.get(_univerjs_sheets.SheetSkeletonService, _univerjs_core.Quantity.OPTIONAL)) === null || _accessor$get === void 0 ? void 0 : _accessor$get.ensureSkeleton(params.unitId, params.subUnitId);
661
+ if (!skeleton) return;
662
+ const dimensionsChanged = skeleton.rowHeightAccumulation.length !== skeleton.worksheet.getRowCount() || skeleton.columnWidthAccumulation.length !== skeleton.worksheet.getColumnCount();
663
+ if (params.recalculate || params.reference && dimensionsChanged) skeleton.makeDirty(true);
664
+ skeleton.calculate();
665
+ const service = accessor.get(ISheetDrawingService);
666
+ const drawings = [];
667
+ const objects = params.type === 4 || params.type === 5 ? params.objects.flatMap(({ parent, children }) => [parent, ...children]) : params.objects;
668
+ for (const object of objects) {
669
+ const drawing = service.getDrawingByParam(object);
670
+ if (!drawing) continue;
671
+ if (hydrateOnly && !needsPlacementHydration(drawing)) continue;
672
+ try {
673
+ if (drawing.groupId || drawing.anchorType === "2") {
674
+ const normalized = normalizeSheetDrawing(drawing);
675
+ if (normalized !== drawing) drawings.push({
676
+ ...normalized,
677
+ sheetTransform: void 0
678
+ });
679
+ continue;
680
+ }
681
+ let placementSource = drawing;
682
+ if (drawing.sheetTransform && legacyPositionDrawings.includes(drawing.drawingId)) {
683
+ placementSource = { ...drawing };
684
+ Reflect.deleteProperty(placementSource, "axisAlignSheetTransform");
685
+ }
686
+ const result = tryRefreshSheetDrawingPlacement(placementSource, skeleton);
687
+ if (result.ok) drawings.push(result.drawing);
688
+ else accessor.get(_univerjs_core.ILogService).warn("[SetDrawingApplyMutation]", "Skipping invalid drawing placement", object, result);
689
+ } catch (error) {
690
+ accessor.get(_univerjs_core.ILogService).error("[SetDrawingApplyMutation]", "Drawing placement refresh failed", object, error);
691
+ }
692
+ }
693
+ if (drawings.length) {
694
+ service.refreshTransform(drawings, false);
695
+ accessor.get(_univerjs_drawing.IDrawingManagerService).refreshTransform(drawings, false);
696
+ }
697
+ }
698
+ const SetDrawingApplyMutation = {
699
+ id: "sheet.mutation.set-drawing-apply",
700
+ type: _univerjs_core.CommandType.MUTATION,
701
+ handler: (accessor, params, options) => {
702
+ const drawingManagerService = accessor.get(_univerjs_drawing.IDrawingManagerService);
703
+ const sheetDrawingService = accessor.get(ISheetDrawingService);
704
+ const { unitId, subUnitId, type, objects } = params;
705
+ if (params.reference !== void 0) {
706
+ const { legacyPositionDrawingIds } = params.reference;
707
+ if (legacyPositionDrawingIds !== void 0 && (!Array.isArray(legacyPositionDrawingIds) || legacyPositionDrawingIds.some((id) => typeof id !== "string"))) throw new Error("Invalid drawing reference change.");
708
+ transformSheetDrawingReference({
709
+ row: 0,
710
+ column: 0,
711
+ rowOffset: 0,
712
+ columnOffset: 0
713
+ }, params.reference);
714
+ }
715
+ if (params.recalculate !== void 0 && typeof params.recalculate !== "boolean") throw new Error("Invalid drawing reference change.");
716
+ const replay = (options === null || options === void 0 ? void 0 : options.fromChangeset) === true && options.fromCollab !== true;
717
+ if (!replay) assertCurrentSheetDrawingEdit(params);
718
+ const op = replay ? normalizeHistoricalSheetDrawingEdit(params.op, unitId, subUnitId, (drawingId) => sheetDrawingService.getDrawingByParam({
719
+ unitId,
720
+ subUnitId,
721
+ drawingId
722
+ }) ?? void 0, () => {
723
+ var _accessor$get2;
724
+ return (_accessor$get2 = accessor.get(_univerjs_sheets.SheetSkeletonService, _univerjs_core.Quantity.OPTIONAL)) === null || _accessor$get2 === void 0 ? void 0 : _accessor$get2.ensureSkeleton(unitId, subUnitId);
725
+ }) : params.op;
726
+ drawingManagerService.applyJson1(unitId, subUnitId, op);
727
+ sheetDrawingService.applyJson1(unitId, subUnitId, op);
728
+ const importedOrientation = type === 0 && objects.some((object) => {
729
+ const drawing = sheetDrawingService.getDrawingByParam(object);
730
+ return drawing && needsPlacementHydration(drawing);
731
+ });
732
+ const received = Boolean((options === null || options === void 0 ? void 0 : options.fromCollab) || replay || params.reference || params.recalculate);
733
+ if (received || importedOrientation) {
734
+ var _params$reference;
735
+ refreshReceivedDrawings(accessor, params, !received, ((_params$reference = params.reference) === null || _params$reference === void 0 ? void 0 : _params$reference.legacyPositionDrawingIds) ?? []);
736
+ }
737
+ switch (type) {
738
+ case 0:
739
+ drawingManagerService.addNotification(objects);
740
+ sheetDrawingService.addNotification(objects);
741
+ break;
742
+ case 1:
743
+ drawingManagerService.removeNotification(objects);
744
+ sheetDrawingService.removeNotification(objects);
745
+ break;
746
+ case 2:
747
+ drawingManagerService.updateNotification(objects);
748
+ sheetDrawingService.updateNotification(objects);
749
+ break;
750
+ case 3:
751
+ drawingManagerService.orderNotification(objects);
752
+ sheetDrawingService.orderNotification(objects);
753
+ break;
754
+ case 4:
755
+ drawingManagerService.groupUpdateNotification(objects);
756
+ sheetDrawingService.groupUpdateNotification(objects);
757
+ break;
758
+ case 5:
759
+ drawingManagerService.ungroupUpdateNotification(objects);
760
+ sheetDrawingService.ungroupUpdateNotification(objects);
761
+ }
762
+ return true;
763
+ }
764
+ };
765
+
766
+ // src/commands/operations/clear-drawing-transformer.operation.ts
767
+ const ClearSheetDrawingTransformerOperation = {
768
+ id: "sheet.operation.clear-drawing-transformer",
769
+ type: _univerjs_core.CommandType.MUTATION,
770
+ handler: (accessor, params) => {
771
+ const renderManagerService = accessor.get(_univerjs_engine_render.IRenderManagerService);
772
+ params.forEach((unitId) => {
773
+ var _renderManagerService;
774
+ (_renderManagerService = renderManagerService.getRenderUnitById(unitId)) === null || _renderManagerService === void 0 || (_renderManagerService = _renderManagerService.scene.getTransformer()) === null || _renderManagerService === void 0 || _renderManagerService.debounceRefreshControls();
775
+ });
776
+ return true;
777
+ }
778
+ };
779
+
780
+ // src/commands/commands/insert-sheet-drawing.command.ts
781
+ const InsertSheetDrawingCommand = {
782
+ id: "sheet.command.insert-sheet-image",
783
+ type: _univerjs_core.CommandType.COMMAND,
784
+ handler: (accessor, params) => {
785
+ if (!params) return false;
786
+ const commandService = accessor.get(_univerjs_core.ICommandService);
787
+ const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
788
+ const sheetDrawingService = accessor.get(ISheetDrawingService);
789
+ const sheetInterceptorService = accessor.get(_univerjs_sheets.SheetInterceptorService);
790
+ const drawings = params.drawings.map((drawing) => {
791
+ const transform = getSheetDrawingTransformWithOrientation(drawing);
792
+ return [
793
+ "angle",
794
+ "flipX",
795
+ "flipY",
796
+ "skewX",
797
+ "skewY"
798
+ ].some((key) => {
799
+ var _drawing$transform;
800
+ return transform[key] !== ((_drawing$transform = drawing.transform) === null || _drawing$transform === void 0 ? void 0 : _drawing$transform[key]);
801
+ }) ? {
802
+ ...drawing,
803
+ transform
804
+ } : drawing;
805
+ });
806
+ const { unitId, subUnitId, undo, redo, objects } = sheetDrawingService.getBatchAddOp(drawings);
807
+ const intercepted = sheetInterceptorService.onCommandExecute({
808
+ id: InsertSheetDrawingCommand.id,
809
+ params: {
810
+ ...params,
811
+ drawings
812
+ }
813
+ });
814
+ const redoMutations = [
815
+ ...intercepted.preRedos ?? [],
816
+ {
817
+ id: SetDrawingApplyMutation.id,
818
+ params: {
819
+ unitId,
820
+ subUnitId,
821
+ op: redo,
822
+ objects,
823
+ type: 0
824
+ }
825
+ },
826
+ {
827
+ id: ClearSheetDrawingTransformerOperation.id,
828
+ params: [unitId]
829
+ },
830
+ ...intercepted.redos
831
+ ];
832
+ const undoMutations = [
833
+ ...intercepted.preUndos ?? [],
834
+ {
835
+ id: SetDrawingApplyMutation.id,
836
+ params: {
837
+ unitId,
838
+ subUnitId,
839
+ op: undo,
840
+ objects,
841
+ type: 1
842
+ }
843
+ },
844
+ {
845
+ id: ClearSheetDrawingTransformerOperation.id,
846
+ params: [unitId]
847
+ },
848
+ ...intercepted.undos
849
+ ];
850
+ if ((0, _univerjs_core.sequenceExecute)(redoMutations, commandService).result) {
851
+ undoRedoService.pushUndoRedo({
852
+ unitID: unitId,
853
+ undoMutations,
854
+ redoMutations
855
+ });
856
+ return true;
857
+ }
858
+ return false;
859
+ }
860
+ };
861
+
862
+ // src/commands/commands/remove-sheet-drawing.command.ts
863
+ function expandDrawingRemovalParams(service, requested) {
864
+ const drawings = [];
865
+ const visit = (search, ancestors) => {
866
+ if (ancestors.has(search.drawingId)) throw new _univerjs_core.CustomCommandExecutionError(RemoveSheetDrawingCommand.id);
867
+ if (drawings.some((drawing) => drawing.unitId === search.unitId && drawing.subUnitId === search.subUnitId && drawing.drawingId === search.drawingId)) return;
868
+ const current = service.getDrawingByParam(search);
869
+ drawings.push({
870
+ unitId: search.unitId,
871
+ subUnitId: search.subUnitId,
872
+ drawingId: search.drawingId,
873
+ drawingType: (current === null || current === void 0 ? void 0 : current.drawingType) ?? search.drawingType
874
+ });
875
+ if (!current) return;
876
+ const children = Object.values(service.getDrawingData(search.unitId, search.subUnitId)).filter((drawing) => current.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_GROUP && drawing.groupId === search.drawingId);
877
+ const nextAncestors = new Set(ancestors);
878
+ nextAncestors.add(search.drawingId);
879
+ children.forEach((drawing) => visit({
880
+ unitId: search.unitId,
881
+ subUnitId: search.subUnitId,
882
+ drawingId: drawing.drawingId,
883
+ drawingType: drawing.drawingType
884
+ }, nextAncestors));
885
+ };
886
+ requested.forEach((drawing) => visit(drawing, /* @__PURE__ */ new Set()));
887
+ return drawings;
888
+ }
889
+ const RemoveSheetDrawingCommand = {
890
+ id: "sheet.command.remove-sheet-image",
891
+ type: _univerjs_core.CommandType.COMMAND,
892
+ handler: (accessor, params) => {
893
+ if (!params) return false;
894
+ const commandService = accessor.get(_univerjs_core.ICommandService);
895
+ const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
896
+ const sheetInterceptorService = accessor.get(_univerjs_sheets.SheetInterceptorService);
897
+ const sheetDrawingService = accessor.get(ISheetDrawingService);
898
+ const normalizedParams = {
899
+ ...params,
900
+ drawings: expandDrawingRemovalParams(sheetDrawingService, params.drawings)
901
+ };
902
+ if (!accessor.get(_univerjs_drawing.IDrawingManagerService).canExecuteCommand({
903
+ id: RemoveSheetDrawingCommand.id,
904
+ params: normalizedParams
905
+ })) return false;
906
+ const intercepted = sheetInterceptorService.onCommandExecute({
907
+ id: RemoveSheetDrawingCommand.id,
908
+ params: normalizedParams
909
+ });
910
+ const { unitId, subUnitId, undo, redo, objects } = sheetDrawingService.getBatchRemoveOp(normalizedParams.drawings);
911
+ if (Array.isArray(objects) && objects.length === 0) return false;
912
+ const redoMutations = [
913
+ ...intercepted.preRedos ?? [],
914
+ {
915
+ id: SetDrawingApplyMutation.id,
916
+ params: {
917
+ unitId,
918
+ subUnitId,
919
+ op: redo,
920
+ objects,
921
+ type: 1
922
+ }
923
+ },
924
+ {
925
+ id: ClearSheetDrawingTransformerOperation.id,
926
+ params: [unitId]
927
+ },
928
+ ...intercepted.redos
929
+ ];
930
+ const undoMutations = [
931
+ ...intercepted.preUndos ?? [],
932
+ {
933
+ id: SetDrawingApplyMutation.id,
934
+ params: {
935
+ unitId,
936
+ subUnitId,
937
+ op: undo,
938
+ objects,
939
+ type: 0
940
+ }
941
+ },
942
+ {
943
+ id: ClearSheetDrawingTransformerOperation.id,
944
+ params: [unitId]
945
+ },
946
+ ...intercepted.undos
947
+ ];
948
+ if ((0, _univerjs_core.sequenceExecute)(redoMutations, commandService).result) {
949
+ undoRedoService.pushUndoRedo({
950
+ unitID: unitId,
951
+ undoMutations,
952
+ redoMutations
953
+ });
954
+ return true;
955
+ }
956
+ return false;
957
+ }
958
+ };
959
+
960
+ // src/commands/commands/set-drawing-arrange.command.ts
961
+ const SetDrawingArrangeCommand = {
962
+ id: "sheet.command.set-drawing-arrange",
963
+ type: _univerjs_core.CommandType.COMMAND,
964
+ handler: (accessor, params) => {
965
+ const commandService = accessor.get(_univerjs_core.ICommandService);
966
+ const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
967
+ if (!params) return false;
968
+ const sheetDrawingService = accessor.get(ISheetDrawingService);
969
+ const { unitId, subUnitId, drawingIds } = params;
970
+ const drawingOrderMapParam = {
971
+ unitId,
972
+ subUnitId,
973
+ drawingIds
974
+ };
975
+ let jsonOp;
976
+ if (params.zOrder !== void 0) jsonOp = sheetDrawingService.getDrawingOrderOp(drawingOrderMapParam, params.zOrder);
977
+ else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.forward) jsonOp = sheetDrawingService.getForwardDrawingsOp(drawingOrderMapParam);
978
+ else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.backward) jsonOp = sheetDrawingService.getBackwardDrawingOp(drawingOrderMapParam);
979
+ else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.front) jsonOp = sheetDrawingService.getFrontDrawingsOp(drawingOrderMapParam);
980
+ else if (params.arrangeType === _univerjs_core.ArrangeTypeEnum.back) jsonOp = sheetDrawingService.getBackDrawingsOp(drawingOrderMapParam);
981
+ if (jsonOp == null) return false;
982
+ const { objects, redo, undo } = jsonOp;
983
+ if (commandService.syncExecuteCommand(SetDrawingApplyMutation.id, {
984
+ op: redo,
985
+ unitId,
986
+ subUnitId,
987
+ objects,
988
+ type: 3
989
+ })) {
990
+ undoRedoService.pushUndoRedo({
991
+ unitID: unitId,
992
+ undoMutations: [{
993
+ id: SetDrawingApplyMutation.id,
994
+ params: {
995
+ op: undo,
996
+ unitId,
997
+ subUnitId,
998
+ objects,
999
+ type: 3
1000
+ }
1001
+ }],
1002
+ redoMutations: [{
1003
+ id: SetDrawingApplyMutation.id,
1004
+ params: {
1005
+ op: redo,
1006
+ unitId,
1007
+ subUnitId,
1008
+ objects,
1009
+ type: 3
1010
+ }
1011
+ }]
1012
+ });
1013
+ return true;
656
1014
  }
657
- };
658
- }
659
- function assertValidPlacement(failure) {
660
- if (failure) throw createPlacementError(failure);
661
- }
662
- function createPlacementError(failure) {
663
- const error = failure.reason === PLACEMENT_ERROR.POSITION_INVALID ? new TypeError(failure.reason) : new Error(failure.reason);
664
- return Object.assign(error, failure.details);
665
- }
1015
+ return false;
1016
+ }
1017
+ };
666
1018
 
667
1019
  // src/commands/commands/set-sheet-drawing-placement.command.ts
668
1020
  const SetSheetDrawingPlacementCommand = {
@@ -691,7 +1043,29 @@ const SetSheetDrawingPlacementCommand = {
691
1043
  id: SetSheetDrawingPlacementCommand.id,
692
1044
  params
693
1045
  });
694
- const { unitId, subUnitId, undo, redo, objects } = drawingService.getBatchUpdateOp(updatedDrawings);
1046
+ const { unitId, subUnitId, objects, ...batch } = drawingService.getBatchUpdateOp(updatedDrawings);
1047
+ let { undo, redo } = batch;
1048
+ for (const drawing of updatedDrawings) {
1049
+ const original = drawingService.getDrawingByParam(drawing);
1050
+ if (original.anchorType === drawing.anchorType) continue;
1051
+ for (const endpoint of ["from", "to"]) for (const axis of ["row", "column"]) {
1052
+ var _original$axisAlignSh, _drawing$axisAlignShe;
1053
+ const before = (_original$axisAlignSh = original.axisAlignSheetTransform) === null || _original$axisAlignSh === void 0 || (_original$axisAlignSh = _original$axisAlignSh[endpoint]) === null || _original$axisAlignSh === void 0 ? void 0 : _original$axisAlignSh[axis];
1054
+ const after = (_drawing$axisAlignShe = drawing.axisAlignSheetTransform) === null || _drawing$axisAlignShe === void 0 || (_drawing$axisAlignShe = _drawing$axisAlignShe[endpoint]) === null || _drawing$axisAlignShe === void 0 ? void 0 : _drawing$axisAlignShe[axis];
1055
+ if (before === void 0 || after === void 0) continue;
1056
+ const path = [
1057
+ unitId,
1058
+ subUnitId,
1059
+ "data",
1060
+ drawing.drawingId,
1061
+ "axisAlignSheetTransform",
1062
+ endpoint,
1063
+ axis
1064
+ ];
1065
+ redo = _univerjs_core.JSON1.type.compose(redo, _univerjs_core.JSON1.replaceOp(path, after, after));
1066
+ undo = _univerjs_core.JSON1.type.compose(undo, _univerjs_core.JSON1.replaceOp(path, before, before));
1067
+ }
1068
+ }
695
1069
  const redoMutations = [
696
1070
  ...intercepted.preRedos ?? [],
697
1071
  {
@@ -799,7 +1173,45 @@ const SetSheetDrawingCommand = {
799
1173
  const sheetDrawingService = accessor.get(ISheetDrawingService);
800
1174
  const sheetInterceptorService = accessor.get(_univerjs_sheets.SheetInterceptorService);
801
1175
  const { drawings } = params;
802
- const normalizedDrawings = drawings.map((drawing) => normalizeNonRotatableAngleUpdate(drawing, sheetDrawingService));
1176
+ const normalizedDrawings = drawings.map((drawing) => {
1177
+ const normalized = normalizeNonRotatableAngleUpdate(drawing, sheetDrawingService);
1178
+ if (!normalized.unitId || !normalized.subUnitId || !normalized.drawingId) return normalized;
1179
+ const current = sheetDrawingService.getDrawingByParam({
1180
+ unitId: normalized.unitId,
1181
+ subUnitId: normalized.subUnitId,
1182
+ drawingId: normalized.drawingId
1183
+ });
1184
+ if (!current || !normalized.transform) return normalized;
1185
+ const transform = {
1186
+ ...getSheetDrawingTransformWithOrientation(current),
1187
+ ...normalized.transform
1188
+ };
1189
+ const patch = {
1190
+ ...normalized,
1191
+ transform
1192
+ };
1193
+ if (current.groupId || current.anchorType === "2") return patch;
1194
+ if (![
1195
+ "left",
1196
+ "top",
1197
+ "width",
1198
+ "height",
1199
+ "angle",
1200
+ "flipX",
1201
+ "flipY",
1202
+ "skewX",
1203
+ "skewY"
1204
+ ].some((key) => {
1205
+ var _normalized$transform, _current$transform;
1206
+ return ((_normalized$transform = normalized.transform) === null || _normalized$transform === void 0 ? void 0 : _normalized$transform[key]) !== void 0 && normalized.transform[key] !== ((_current$transform = current.transform) === null || _current$transform === void 0 ? void 0 : _current$transform[key]);
1207
+ })) return patch;
1208
+ const skeleton = accessor.get(_univerjs_sheets.SheetSkeletonService).ensureSkeleton(current.unitId, current.subUnitId);
1209
+ if (!skeleton) return normalized;
1210
+ return {
1211
+ ...patch,
1212
+ axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton)
1213
+ };
1214
+ });
803
1215
  const normalizedParams = {
804
1216
  ...params,
805
1217
  drawings: normalizedDrawings
@@ -915,21 +1327,6 @@ const SetWorksheetBackgroundImageCommand = {
915
1327
  }
916
1328
  };
917
1329
 
918
- // \0@oxc-project+runtime@0.157.0/helpers/esm/decorateParam.js
919
- function __decorateParam(paramIndex, decorator) {
920
- return function(target, key) {
921
- decorator(target, key, paramIndex);
922
- };
923
- }
924
-
925
- // \0@oxc-project+runtime@0.157.0/helpers/esm/decorate.js
926
- function __decorate(decorators, target, key, desc) {
927
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
928
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
929
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
930
- return c > 3 && r && Object.defineProperty(target, key, r), r;
931
- }
932
-
933
1330
  // src/controllers/sheet-drawing.controller.ts
934
1331
  const SHEET_DRAWING_PLUGIN = "SHEET_DRAWING_PLUGIN";
935
1332
  function getDrawingsInOrder(drawingData, drawingOrder) {
@@ -948,7 +1345,7 @@ function getDrawingsInOrder(drawingData, drawingOrder) {
948
1345
  return drawings;
949
1346
  }
950
1347
  let SheetsDrawingLoadController = class SheetsDrawingLoadController extends _univerjs_core.Disposable {
951
- constructor(_sheetInterceptorService, _univerInstanceService, _commandService, _sheetDrawingService, _drawingManagerService, _resourceManagerService) {
1348
+ constructor(_sheetInterceptorService, _univerInstanceService, _commandService, _sheetDrawingService, _drawingManagerService, _resourceManagerService, _sheetSkeletonService) {
952
1349
  super();
953
1350
  this._sheetInterceptorService = _sheetInterceptorService;
954
1351
  this._univerInstanceService = _univerInstanceService;
@@ -956,6 +1353,7 @@ let SheetsDrawingLoadController = class SheetsDrawingLoadController extends _uni
956
1353
  this._sheetDrawingService = _sheetDrawingService;
957
1354
  this._drawingManagerService = _drawingManagerService;
958
1355
  this._resourceManagerService = _resourceManagerService;
1356
+ this._sheetSkeletonService = _sheetSkeletonService;
959
1357
  this._initCommands();
960
1358
  this._initSnapshot();
961
1359
  this._initSheetChange();
@@ -997,6 +1395,11 @@ let SheetsDrawingLoadController = class SheetsDrawingLoadController extends _uni
997
1395
  this._drawingManagerService.removeDrawingDataForUnit(unitId);
998
1396
  },
999
1397
  onLoad: (unitId, value) => {
1398
+ for (const [subUnitId, sheet] of Object.entries(value)) {
1399
+ const drawings = Object.entries(sheet.data);
1400
+ const skeleton = drawings.some(([, drawing]) => drawing.sheetTransform) ? this._sheetSkeletonService.ensureSkeleton(unitId, subUnitId) : void 0;
1401
+ for (const [drawingId, drawing] of drawings) sheet.data[drawingId] = normalizeSheetDrawing(drawing, skeleton);
1402
+ }
1000
1403
  this._sheetDrawingService.registerDrawingData(unitId, value);
1001
1404
  this._drawingManagerService.registerDrawingData(unitId, value);
1002
1405
  }
@@ -1099,12 +1502,13 @@ SheetsDrawingLoadController = __decorate([
1099
1502
  __decorateParam(2, _univerjs_core.ICommandService),
1100
1503
  __decorateParam(3, ISheetDrawingService),
1101
1504
  __decorateParam(4, _univerjs_drawing.IDrawingManagerService),
1102
- __decorateParam(5, _univerjs_core.IResourceManagerService)
1505
+ __decorateParam(5, _univerjs_core.IResourceManagerService),
1506
+ __decorateParam(6, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetSkeletonService))
1103
1507
  ], SheetsDrawingLoadController);
1104
1508
 
1105
1509
  // package.json
1106
1510
  var name = "@univerjs/sheets-drawing";
1107
- var version = "1.5.2";
1511
+ var version = "1.6.0";
1108
1512
 
1109
1513
  // src/config/config.ts
1110
1514
  /**
@@ -1126,7 +1530,7 @@ const SHEETS_DRAWING_PLUGIN_CONFIG_KEY = "sheets-drawing.config";
1126
1530
  const configSymbol = Symbol(SHEETS_DRAWING_PLUGIN_CONFIG_KEY);
1127
1531
  const defaultPluginConfig = {};
1128
1532
 
1129
- // \0@oxc-project+runtime@0.157.0/helpers/esm/typeof.js
1533
+ // \0@oxc-project+runtime@0.158.0/helpers/esm/typeof.js
1130
1534
  function _typeof(o) {
1131
1535
  "@babel/helpers - typeof";
1132
1536
  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -1136,7 +1540,7 @@ function _typeof(o) {
1136
1540
  }, _typeof(o);
1137
1541
  }
1138
1542
 
1139
- // \0@oxc-project+runtime@0.157.0/helpers/esm/toPrimitive.js
1543
+ // \0@oxc-project+runtime@0.158.0/helpers/esm/toPrimitive.js
1140
1544
  function toPrimitive(t, e) {
1141
1545
  if ("object" != _typeof(t) || !t) return t;
1142
1546
  var r;
@@ -1148,13 +1552,13 @@ function toPrimitive(t, e) {
1148
1552
  return ("string" === e ? String : Number)(t);
1149
1553
  }
1150
1554
 
1151
- // \0@oxc-project+runtime@0.157.0/helpers/esm/toPropertyKey.js
1555
+ // \0@oxc-project+runtime@0.158.0/helpers/esm/toPropertyKey.js
1152
1556
  function toPropertyKey(t) {
1153
1557
  var i = toPrimitive(t, "string");
1154
1558
  return "symbol" == _typeof(i) ? i : i + "";
1155
1559
  }
1156
1560
 
1157
- // \0@oxc-project+runtime@0.157.0/helpers/esm/defineProperty.js
1561
+ // \0@oxc-project+runtime@0.158.0/helpers/esm/defineProperty.js
1158
1562
  function _defineProperty(e, r, t) {
1159
1563
  return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
1160
1564
  value: t,
@@ -1256,7 +1660,12 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1256
1660
  undos: []
1257
1661
  };
1258
1662
  this._currentCommand = commandInfo;
1259
- if (id === _univerjs_sheets.InsertRowCommand.id) return this._moveRowInterceptor(params, "insert");
1663
+ if ([
1664
+ _univerjs_sheets.InsertRowCommand.id,
1665
+ _univerjs_sheets.InsertColCommand.id,
1666
+ _univerjs_sheets.RemoveRowCommand.id,
1667
+ _univerjs_sheets.RemoveColCommand.id
1668
+ ].includes(id)) return this._moveRowOrColInterceptor(params, commandInfo);
1260
1669
  else if ([
1261
1670
  _univerjs_sheets.MoveColsCommand.id,
1262
1671
  _univerjs_sheets.MoveRowsCommand.id,
@@ -1281,10 +1690,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1281
1690
  const { unitId, subUnitId } = target;
1282
1691
  const { fromRange, toRange } = params;
1283
1692
  return this._moveRangeInterceptor(unitId, subUnitId, fromRange, toRange);
1284
- } else if (id === _univerjs_sheets.InsertColCommand.id) return this._moveColInterceptor(params, "insert");
1285
- else if (id === _univerjs_sheets.RemoveRowCommand.id) return this._moveRowInterceptor(params, "remove");
1286
- else if (id === _univerjs_sheets.RemoveColCommand.id) return this._moveColInterceptor(params, "remove");
1287
- else if (id === _univerjs_sheets.DeleteRangeMoveLeftCommand.id) {
1693
+ } else if (id === _univerjs_sheets.DeleteRangeMoveLeftCommand.id) {
1288
1694
  const { range } = params;
1289
1695
  return this._getRangeMoveUndo(range, 0);
1290
1696
  } else if (id === _univerjs_sheets.DeleteRangeMoveUpCommand.id) {
@@ -1298,7 +1704,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1298
1704
  return this._getRangeMoveUndo(range, 3);
1299
1705
  } 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) {
1300
1706
  const { unitId, subUnitId, ranges } = params;
1301
- return this._getDrawingUndoForRowAndColSize(unitId, subUnitId, ranges);
1707
+ return this._refreshDrawingForRowAndColSize(unitId, subUnitId, ranges);
1302
1708
  }
1303
1709
  return {
1304
1710
  redos: [],
@@ -1328,23 +1734,37 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1328
1734
  if (!patch.drawingId) return;
1329
1735
  const original = originals.get(patch.drawingId);
1330
1736
  if (!original) return;
1331
- plan.updates.set(patch.drawingId, {
1737
+ const candidate = {
1332
1738
  ...original,
1333
1739
  ...patch,
1334
1740
  transform: {
1335
1741
  ...original.transform,
1336
1742
  ...patch.transform
1337
1743
  },
1338
- sheetTransform: patch.sheetTransform ?? original.sheetTransform,
1339
- axisAlignSheetTransform: patch.axisAlignSheetTransform ?? original.axisAlignSheetTransform
1340
- });
1744
+ axisAlignSheetTransform: { ...patch.axisAlignSheetTransform ?? original.axisAlignSheetTransform }
1745
+ };
1746
+ for (const key of [
1747
+ "angle",
1748
+ "flipX",
1749
+ "flipY",
1750
+ "skewX",
1751
+ "skewY"
1752
+ ]) {
1753
+ var _original$transform;
1754
+ const value = (_original$transform = original.transform) === null || _original$transform === void 0 ? void 0 : _original$transform[key];
1755
+ if (value === void 0) delete candidate.transform[key];
1756
+ else Object.assign(candidate.transform, { [key]: value });
1757
+ }
1758
+ plan.updates.set(patch.drawingId, candidate);
1341
1759
  });
1342
1760
  const feature = this._transformPlanService.transform(plan);
1343
1761
  if (mode === "refresh") {
1344
1762
  const changed = [...plan.updates.values()].filter((drawing) => JSON.stringify(originals.get(drawing.drawingId)) !== JSON.stringify(drawing));
1345
1763
  if (changed.length) {
1346
- this._sheetDrawingService.refreshTransform(changed);
1347
- this._drawingManagerService.refreshTransform(changed);
1764
+ this._sheetDrawingService.refreshTransform(changed, false);
1765
+ this._drawingManagerService.refreshTransform(changed, false);
1766
+ this._sheetDrawingService.refreshTransformNotification(changed);
1767
+ this._drawingManagerService.refreshTransformNotification(changed);
1348
1768
  this._commandService.syncExecuteCommand(ClearSheetDrawingTransformerOperation.id, [unitId]);
1349
1769
  }
1350
1770
  return {
@@ -1366,8 +1786,40 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1366
1786
  const redos = [...feature.preRedos];
1367
1787
  const undos = [...feature.preUndos];
1368
1788
  const updates = [...plan.updates.values()].filter(({ drawingId }) => !plan.deletes.has(drawingId));
1369
- if (updates.length) {
1370
- const { undo, redo, objects } = this._sheetDrawingService.getBatchUpdateOp(updates);
1789
+ const reference = this._getStructuralReference(plan.command, plan.skeleton);
1790
+ if (updates.length || reference) {
1791
+ const batch = updates.length ? this._sheetDrawingService.getBatchUpdateOp(updates) : {
1792
+ undo: null,
1793
+ redo: null,
1794
+ objects: []
1795
+ };
1796
+ let { undo, redo } = batch;
1797
+ const { objects } = batch;
1798
+ if (reference) for (const drawing of updates) {
1799
+ const original = plan.originals.get(drawing.drawingId);
1800
+ for (const endpoint of ["from", "to"]) {
1801
+ var _original$axisAlignSh, _drawing$axisAlignShe;
1802
+ const before = original === null || original === void 0 || (_original$axisAlignSh = original.axisAlignSheetTransform) === null || _original$axisAlignSh === void 0 || (_original$axisAlignSh = _original$axisAlignSh[endpoint]) === null || _original$axisAlignSh === void 0 ? void 0 : _original$axisAlignSh[reference.axis];
1803
+ const after = (_drawing$axisAlignShe = drawing.axisAlignSheetTransform) === null || _drawing$axisAlignShe === void 0 || (_drawing$axisAlignShe = _drawing$axisAlignShe[endpoint]) === null || _drawing$axisAlignShe === void 0 ? void 0 : _drawing$axisAlignShe[reference.axis];
1804
+ if (before === void 0 || after === void 0) continue;
1805
+ const path = [
1806
+ unitId,
1807
+ subUnitId,
1808
+ "data",
1809
+ drawing.drawingId,
1810
+ "axisAlignSheetTransform",
1811
+ endpoint,
1812
+ reference.axis
1813
+ ];
1814
+ redo = _univerjs_core.JSON1.type.compose(redo, _univerjs_core.JSON1.replaceOp(path, after, after));
1815
+ undo = _univerjs_core.JSON1.type.compose(undo, _univerjs_core.JSON1.replaceOp(path, before, before));
1816
+ }
1817
+ }
1818
+ const inverseReference = reference ? {
1819
+ ...reference,
1820
+ action: reference.action === "insert" ? "remove" : "insert",
1821
+ limit: reference.limit + (reference.action === "insert" ? -1 : 1) * (reference.end - reference.start + 1)
1822
+ } : void 0;
1371
1823
  redos.push({
1372
1824
  id: SetDrawingApplyMutation.id,
1373
1825
  params: {
@@ -1375,7 +1827,8 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1375
1827
  subUnitId,
1376
1828
  op: redo,
1377
1829
  objects,
1378
- type: 2
1830
+ type: 2,
1831
+ ...reference ? { reference } : {}
1379
1832
  }
1380
1833
  });
1381
1834
  undos.push({
@@ -1385,7 +1838,8 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1385
1838
  subUnitId,
1386
1839
  op: undo,
1387
1840
  objects,
1388
- type: 2
1841
+ type: 2,
1842
+ ...inverseReference ? { reference: inverseReference } : {}
1389
1843
  }
1390
1844
  });
1391
1845
  }
@@ -1419,7 +1873,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1419
1873
  }
1420
1874
  redos.push(...feature.redos);
1421
1875
  undos.push(...feature.undos);
1422
- if (redos.length || undos.length) {
1876
+ if (updates.length || plan.deletes.size || feature.preRedos.length || feature.redos.length || feature.preUndos.length || feature.undos.length) {
1423
1877
  redos.push({
1424
1878
  id: ClearSheetDrawingTransformerOperation.id,
1425
1879
  params: [unitId]
@@ -1434,6 +1888,65 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1434
1888
  undos
1435
1889
  };
1436
1890
  }
1891
+ _getStructuralReference(command, skeleton) {
1892
+ const { id, params } = command;
1893
+ const row = id === _univerjs_sheets.InsertRowCommand.id || id === _univerjs_sheets.RemoveRowCommand.id;
1894
+ if (!row && id !== _univerjs_sheets.InsertColCommand.id && id !== _univerjs_sheets.RemoveColCommand.id) return;
1895
+ const { range } = params;
1896
+ const limit = row ? skeleton.worksheet.getRowCount() : skeleton.worksheet.getColumnCount();
1897
+ const cell = skeleton.getNoMergeCellWithCoordByIndex(row ? limit - 1 : 0, row ? 0 : limit - 1);
1898
+ return {
1899
+ axis: row ? "row" : "column",
1900
+ action: id === _univerjs_sheets.InsertRowCommand.id || id === _univerjs_sheets.InsertColCommand.id ? "insert" : "remove",
1901
+ start: row ? range.startRow : range.startColumn,
1902
+ end: row ? range.endRow : range.endColumn,
1903
+ limit,
1904
+ boundaryOffset: row ? cell.endY - cell.startY : cell.endX - cell.startX
1905
+ };
1906
+ }
1907
+ _transformDrawingReference(drawing, reference, skeleton) {
1908
+ if (validateSheetDrawingPlacement(drawing)) {
1909
+ this._logService.warn("[SheetDrawingTransformAffectedController]", "Skipping invalid structural drawing anchor", { drawingId: drawing.drawingId });
1910
+ return;
1911
+ }
1912
+ const { axis } = reference;
1913
+ const { axisAlignSheetTransform } = drawing;
1914
+ let candidate;
1915
+ if (drawing.anchorType === "1") {
1916
+ const anchor = axisAlignSheetTransform;
1917
+ if (anchor.to[axis] < reference.start) return;
1918
+ if (reference.action === "remove" && anchor.from[axis] >= reference.start && anchor.to[axis] <= reference.end) return null;
1919
+ const mapPosition = (position) => ({
1920
+ ...position,
1921
+ from: transformSheetDrawingReference(position.from, reference),
1922
+ to: transformSheetDrawingReference(position.to, reference)
1923
+ });
1924
+ candidate = {
1925
+ ...drawing,
1926
+ axisAlignSheetTransform: mapPosition(anchor)
1927
+ };
1928
+ } else {
1929
+ const field = getSheetDrawingPositionAnchorField(drawing);
1930
+ const { from, to } = drawing[field];
1931
+ if (Math.max(from[axis], (to === null || to === void 0 ? void 0 : to[axis]) ?? 1e400) < reference.start) return;
1932
+ candidate = {
1933
+ ...drawing,
1934
+ [field]: {
1935
+ ...drawing[field],
1936
+ from: transformSheetDrawingReference(from, reference)
1937
+ }
1938
+ };
1939
+ }
1940
+ const result = tryRefreshSheetDrawingPlacement(candidate, skeleton);
1941
+ if (result.ok) return {
1942
+ ...result.drawing,
1943
+ anchorType: drawing.anchorType
1944
+ };
1945
+ this._logService.warn("[SheetDrawingTransformAffectedController]", "Skipping invalid structural drawing placement", {
1946
+ drawingId: drawing.drawingId,
1947
+ result
1948
+ });
1949
+ }
1437
1950
  _getRangeMoveUndo(range, type) {
1438
1951
  const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService);
1439
1952
  if (!target) return {
@@ -1459,9 +1972,14 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1459
1972
  _getUpdateOrDeleteDrawings(range, type, drawing) {
1460
1973
  const updateDrawings = [];
1461
1974
  const deleteDrawings = [];
1462
- const { sheetTransform, anchorType = "0", transform, unitId, subUnitId, drawingId } = drawing;
1975
+ const { anchorType = "0", transform, unitId, subUnitId, drawingId } = drawing;
1463
1976
  const sheetSkeletonParam = this._sheetSkeletonService.getSkeletonParam(unitId, subUnitId);
1464
- if (anchorType === "2" || !sheetTransform || !transform || !sheetSkeletonParam) return {
1977
+ if (anchorType === "2" || !transform || !sheetSkeletonParam) return {
1978
+ updateDrawings,
1979
+ deleteDrawings
1980
+ };
1981
+ const sheetTransform = anchorType === "0" ? drawing[getSheetDrawingPositionAnchorField(drawing)] : getLegacySheetDrawingPosition(drawing, sheetSkeletonParam.skeleton);
1982
+ if (!(sheetTransform === null || sheetTransform === void 0 ? void 0 : sheetTransform.from) || !sheetTransform.to) return {
1465
1983
  updateDrawings,
1466
1984
  deleteDrawings
1467
1985
  };
@@ -1480,6 +1998,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1480
1998
  });
1481
1999
  else {
1482
2000
  const param = this._shrinkCol(startColumn, endColumn, {
2001
+ drawing,
1483
2002
  sheetSkeletonParam,
1484
2003
  sheetTransform,
1485
2004
  transform,
@@ -1497,6 +2016,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1497
2016
  });
1498
2017
  else {
1499
2018
  const param = this._shrinkRow(startRow, endRow, {
2019
+ drawing,
1500
2020
  sheetSkeletonParam,
1501
2021
  sheetTransform,
1502
2022
  transform,
@@ -1527,9 +2047,8 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1527
2047
  newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
1528
2048
  axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
1529
2049
  }
1530
- if (newSheetTransform && newTransform) updateDrawings.push({
2050
+ if (newSheetTransform && newTransform && axisAlignSheetTransform) updateDrawings.push({
1531
2051
  ...drawing,
1532
- sheetTransform: newSheetTransform,
1533
2052
  transform: newTransform,
1534
2053
  axisAlignSheetTransform
1535
2054
  });
@@ -1538,10 +2057,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1538
2057
  deleteDrawings
1539
2058
  };
1540
2059
  }
1541
- _createUndoAndRedoMutation(unitId, subUnitId, updateDrawings) {
1542
- return this._finalizePlan(unitId, subUnitId, updateDrawings);
1543
- }
1544
- _getDrawingUndoForRowAndColSize(unitId, subUnitId, ranges) {
2060
+ _refreshDrawingForRowAndColSize(unitId, subUnitId, ranges) {
1545
2061
  const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
1546
2062
  if (!sheetSkeletonParam) return {
1547
2063
  redos: [],
@@ -1552,7 +2068,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1552
2068
  const updateDrawings = [];
1553
2069
  Object.keys(drawingData).forEach((drawingId) => {
1554
2070
  const drawing = drawingData[drawingId];
1555
- if ((drawing === null || drawing === void 0 ? void 0 : drawing.anchorType) === "2") return;
2071
+ if ((drawing === null || drawing === void 0 ? void 0 : drawing.anchorType) === "2" || (drawing === null || drawing === void 0 ? void 0 : drawing.groupId)) return;
1556
2072
  const refreshed = this._tryRefreshDrawingPlacement(drawing, skeleton, this._currentCommand.id, ({ to }) => ranges.some(({ startRow, startColumn }) => to.row >= startRow && to.column >= startColumn));
1557
2073
  if (refreshed) updateDrawings.push(refreshed);
1558
2074
  });
@@ -1560,16 +2076,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1560
2076
  redos: [],
1561
2077
  undos: []
1562
2078
  };
1563
- return this._createUndoAndRedoMutation(unitId, subUnitId, updateDrawings);
1564
- }
1565
- _getUnitIdAndSubUnitId(params) {
1566
- const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, params);
1567
- if (!target) return;
1568
- const { unitId, subUnitId } = target;
1569
- return {
1570
- unitId,
1571
- subUnitId
1572
- };
2079
+ return this._finalizePlan(unitId, subUnitId, updateDrawings, [], "refresh");
1573
2080
  }
1574
2081
  _moveRangeInterceptor(unitId, subUnitId, fromRange, toRange) {
1575
2082
  const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
@@ -1588,7 +2095,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1588
2095
  const containedDrawings = [];
1589
2096
  Object.keys(drawings).forEach((drawingId) => {
1590
2097
  const drawing = drawings[drawingId];
1591
- if (drawing.anchorType !== "1") return;
2098
+ if (drawing.anchorType !== "1" || drawing.groupId) return;
1592
2099
  const { transform } = drawing;
1593
2100
  if (!transform) return;
1594
2101
  const { left = 0, top = 0, width = 0, height = 0 } = transform;
@@ -1602,166 +2109,60 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1602
2109
  });
1603
2110
  const rowOffset = toRange.startRow - fromRange.startRow;
1604
2111
  const colOffset = toRange.startColumn - fromRange.startColumn;
1605
- const updateDrawings = containedDrawings.map((drawing) => {
1606
- const oldSheetTransform = drawing.sheetTransform;
1607
- const sheetTransform = {
1608
- to: {
1609
- ...oldSheetTransform.to,
1610
- row: oldSheetTransform.to.row + rowOffset,
1611
- column: oldSheetTransform.to.column + colOffset
1612
- },
1613
- from: {
1614
- ...oldSheetTransform.from,
1615
- row: oldSheetTransform.from.row + rowOffset,
1616
- column: oldSheetTransform.from.column + colOffset
1617
- }
1618
- };
1619
- const transform = drawingPositionToTransform(sheetTransform, sheetSkeletonParam);
1620
- return {
1621
- unitId,
1622
- subUnitId,
1623
- drawingId: drawing.drawingId,
1624
- transform,
1625
- sheetTransform
1626
- };
2112
+ const movePosition = (position) => ({
2113
+ ...position,
2114
+ from: {
2115
+ ...position.from,
2116
+ row: position.from.row + rowOffset,
2117
+ column: position.from.column + colOffset
2118
+ },
2119
+ to: {
2120
+ ...position.to,
2121
+ row: position.to.row + rowOffset,
2122
+ column: position.to.column + colOffset
2123
+ }
2124
+ });
2125
+ const updateDrawings = containedDrawings.flatMap((drawing) => {
2126
+ const result = tryRefreshSheetDrawingPlacement({
2127
+ ...drawing,
2128
+ axisAlignSheetTransform: movePosition(drawing.axisAlignSheetTransform)
2129
+ }, skeleton);
2130
+ if (result.ok) return [result.drawing];
2131
+ this._logSkippedDrawingRefresh(drawing, this._currentCommand.id, result);
2132
+ return [];
1627
2133
  });
1628
2134
  return this._finalizePlan(unitId, subUnitId, updateDrawings);
1629
2135
  }
1630
- _moveRowInterceptor(params, type) {
1631
- const target = this._getUnitIdAndSubUnitId(params);
2136
+ _moveRowOrColInterceptor(params, command) {
2137
+ const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, params);
1632
2138
  if (!target) return {
1633
2139
  redos: [],
1634
2140
  undos: []
1635
2141
  };
1636
2142
  const { unitId, subUnitId } = target;
1637
- const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
1638
- if (!sheetSkeletonParam) return {
1639
- redos: [],
1640
- undos: []
1641
- };
1642
- const { range } = params;
1643
- const rowStartIndex = range.startRow;
1644
- const rowEndIndex = range.endRow;
1645
- const data = this._sheetDrawingService.getDrawingData(unitId, subUnitId);
1646
- const updateDrawings = [];
1647
- const deleteDrawings = [];
1648
- Object.keys(data).forEach((drawingId) => {
1649
- const { sheetTransform, transform, anchorType = "0" } = data[drawingId];
1650
- if (!sheetTransform || !transform) return;
1651
- let newSheetTransform;
1652
- let newTransform;
1653
- let axisAlignSheetTransform;
1654
- if (type === "insert") {
1655
- const param = this._expandRow(rowStartIndex, rowEndIndex, {
1656
- sheetSkeletonParam,
1657
- sheetTransform,
1658
- transform,
1659
- anchorType
1660
- });
1661
- newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
1662
- newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
1663
- axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
1664
- } else {
1665
- const { from, to } = sheetTransform;
1666
- const { row: fromRow } = from;
1667
- const { row: toRow } = to;
1668
- if (anchorType === "1" && fromRow >= rowStartIndex && toRow <= rowEndIndex) deleteDrawings.push({
1669
- unitId,
1670
- subUnitId,
1671
- drawingId
1672
- });
1673
- else {
1674
- const param = this._shrinkRow(rowStartIndex, rowEndIndex, {
1675
- sheetSkeletonParam,
1676
- sheetTransform,
1677
- transform,
1678
- anchorType
1679
- });
1680
- newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
1681
- newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
1682
- axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
1683
- }
1684
- }
1685
- if (!newSheetTransform || !newTransform) return;
1686
- const params = {
1687
- unitId,
1688
- subUnitId,
1689
- drawingId,
1690
- transform: newTransform,
1691
- sheetTransform: newSheetTransform,
1692
- axisAlignSheetTransform
1693
- };
1694
- updateDrawings.push(params);
1695
- });
1696
- return this._finalizePlan(unitId, subUnitId, updateDrawings, deleteDrawings);
1697
- }
1698
- _moveColInterceptor(params, type) {
1699
- const target = this._getUnitIdAndSubUnitId(params);
1700
- if (!target) return {
2143
+ const skeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
2144
+ if (!skeletonParam) return {
1701
2145
  redos: [],
1702
2146
  undos: []
1703
2147
  };
1704
- const { unitId, subUnitId } = target;
1705
- const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);
1706
- if (!sheetSkeletonParam) return {
2148
+ const reference = this._getStructuralReference(command, skeletonParam.skeleton);
2149
+ if (!reference) return {
1707
2150
  redos: [],
1708
2151
  undos: []
1709
2152
  };
1710
- const { range } = params;
1711
- const colStartIndex = range.startColumn;
1712
- const colEndIndex = range.endColumn;
1713
- const data = this._sheetDrawingService.getDrawingData(unitId, subUnitId);
1714
- const updateDrawings = [];
1715
- const deleteDrawings = [];
1716
- Object.keys(data).forEach((drawingId) => {
1717
- const { sheetTransform, transform, anchorType = "0" } = data[drawingId];
1718
- if (!sheetTransform || !transform) return;
1719
- let newSheetTransform;
1720
- let newTransform;
1721
- let axisAlignSheetTransform;
1722
- if (type === "insert") {
1723
- const param = this._expandCol(colStartIndex, colEndIndex, {
1724
- sheetSkeletonParam,
1725
- sheetTransform,
1726
- transform,
1727
- anchorType
1728
- });
1729
- newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
1730
- newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
1731
- axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
1732
- } else {
1733
- const { from, to } = sheetTransform;
1734
- const { column: fromColumn } = from;
1735
- const { column: toColumn } = to;
1736
- if (anchorType === "1" && fromColumn >= colStartIndex && toColumn <= colEndIndex) deleteDrawings.push({
1737
- unitId,
1738
- subUnitId,
1739
- drawingId
1740
- });
1741
- else {
1742
- const param = this._shrinkCol(colStartIndex, colEndIndex, {
1743
- sheetSkeletonParam,
1744
- sheetTransform,
1745
- transform,
1746
- anchorType
1747
- });
1748
- newSheetTransform = param === null || param === void 0 ? void 0 : param.newSheetTransform;
1749
- newTransform = param === null || param === void 0 ? void 0 : param.newTransform;
1750
- axisAlignSheetTransform = (param === null || param === void 0 ? void 0 : param.axisAlignSheetTransform) ?? void 0;
1751
- }
1752
- }
1753
- if (!newSheetTransform || !newTransform) return;
1754
- const params = {
2153
+ const updates = [];
2154
+ const deletes = [];
2155
+ for (const drawing of Object.values(this._sheetDrawingService.getDrawingData(unitId, subUnitId))) {
2156
+ if (drawing.anchorType === "2" || drawing.groupId || !drawing.transform) continue;
2157
+ const result = this._transformDrawingReference(drawing, reference, skeletonParam.skeleton);
2158
+ if (result === null) deletes.push({
1755
2159
  unitId,
1756
2160
  subUnitId,
1757
- drawingId,
1758
- transform: newTransform,
1759
- sheetTransform: newSheetTransform,
1760
- axisAlignSheetTransform
1761
- };
1762
- updateDrawings.push(params);
1763
- });
1764
- return this._finalizePlan(unitId, subUnitId, updateDrawings, deleteDrawings);
2161
+ drawingId: drawing.drawingId
2162
+ });
2163
+ else if (result) updates.push(result);
2164
+ }
2165
+ return this._finalizePlan(unitId, subUnitId, updates, deletes, "command", command);
1765
2166
  }
1766
2167
  _expandCol(colStartIndex, colEndIndex, options) {
1767
2168
  const { sheetSkeletonParam, sheetTransform, transform, anchorType = "0" } = options;
@@ -1835,7 +2236,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1835
2236
  column: toColumn - colCount
1836
2237
  }
1837
2238
  };
1838
- if (anchorType === "0") return this._resolveShiftedPositionDrawing(newSheetTransform, transform, sheetSkeletonParam);
2239
+ if (anchorType === "0") return this._resolveShiftedPositionDrawing(newSheetTransform.from, options.drawing, skeleton);
1839
2240
  newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
1840
2241
  } else if (anchorType === "1" && fromColumn >= colStartIndex && toColumn <= colEndIndex) return null;
1841
2242
  else if (fromColumn < colStartIndex && toColumn > colEndIndex) {
@@ -1869,13 +2270,10 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1869
2270
  newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
1870
2271
  axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
1871
2272
  } else return this._resolveShiftedPositionDrawing({
1872
- ...sheetTransform,
1873
- from: {
1874
- ...from,
1875
- column: colStartIndex,
1876
- columnOffset: 0
1877
- }
1878
- }, transform, sheetSkeletonParam);
2273
+ ...from,
2274
+ column: colStartIndex,
2275
+ columnOffset: 0
2276
+ }, options.drawing, skeleton);
1879
2277
  } else if (toColumn >= colStartIndex && toColumn <= colEndIndex && anchorType === "1") {
1880
2278
  const boundaryColumn = Math.min(colStartIndex, skeleton.worksheet.getColumnCount() - 1);
1881
2279
  const boundaryCell = skeleton.getNoMergeCellWithCoordByIndex(from.row, boundaryColumn);
@@ -1963,7 +2361,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1963
2361
  row: toRow - rowCount
1964
2362
  }
1965
2363
  };
1966
- if (anchorType === "0") return this._resolveShiftedPositionDrawing(newSheetTransform, transform, sheetSkeletonParam);
2364
+ if (anchorType === "0") return this._resolveShiftedPositionDrawing(newSheetTransform.from, options.drawing, skeleton);
1967
2365
  newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
1968
2366
  } else if (anchorType === "1" && fromRow >= rowStartIndex && toRow <= rowEndIndex) return null;
1969
2367
  else if (fromRow < rowStartIndex && toRow > rowEndIndex) {
@@ -1997,13 +2395,10 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
1997
2395
  newTransform = drawingPositionToTransform(newSheetTransform, sheetSkeletonParam);
1998
2396
  axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton);
1999
2397
  } else return this._resolveShiftedPositionDrawing({
2000
- ...sheetTransform,
2001
- from: {
2002
- ...from,
2003
- row: rowStartIndex,
2004
- rowOffset: 0
2005
- }
2006
- }, transform, sheetSkeletonParam);
2398
+ ...from,
2399
+ row: rowStartIndex,
2400
+ rowOffset: 0
2401
+ }, options.drawing, skeleton);
2007
2402
  } else if (toRow >= rowStartIndex && toRow <= rowEndIndex && anchorType === "1") {
2008
2403
  const boundaryRow = Math.min(rowStartIndex, skeleton.worksheet.getRowCount() - 1);
2009
2404
  const boundaryCell = skeleton.getNoMergeCellWithCoordByIndex(boundaryRow, from.column);
@@ -2019,16 +2414,22 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
2019
2414
  }
2020
2415
  return this._getStructuralDrawingResult(newSheetTransform, newTransform, axisAlignSheetTransform, skeleton);
2021
2416
  }
2022
- _resolveShiftedPositionDrawing(sheetTransform, transform, { unitId, sheetId, skeleton }) {
2023
- const converted = (0, _univerjs_sheets.convertPositionCellToSheetOverGrid)(unitId, sheetId, sheetTransform.from, transform.width ?? 0, transform.height ?? 0, skeleton);
2024
- const newTransform = {
2025
- ...transform,
2026
- ...converted.transform
2417
+ _resolveShiftedPositionDrawing(from, drawing, skeleton) {
2418
+ const field = getSheetDrawingPositionAnchorField(drawing);
2419
+ const result = tryRefreshSheetDrawingPlacement({
2420
+ ...drawing,
2421
+ [field]: {
2422
+ ...drawing[field],
2423
+ from
2424
+ }
2425
+ }, skeleton);
2426
+ if (!result.ok) return null;
2427
+ const { transform: newTransform, axisAlignSheetTransform } = result.drawing;
2428
+ return {
2429
+ newSheetTransform: getLegacySheetDrawingPosition(result.drawing, skeleton),
2430
+ newTransform,
2431
+ axisAlignSheetTransform
2027
2432
  };
2028
- return this._getStructuralDrawingResult({
2029
- ...sheetTransform,
2030
- ...transformToDrawingPosition(newTransform, skeleton)
2031
- }, newTransform, null, skeleton);
2032
2433
  }
2033
2434
  _getStructuralDrawingResult(newSheetTransform, newTransform, axisAlignSheetTransform, skeleton) {
2034
2435
  if (!newSheetTransform || !newTransform) return null;
@@ -2053,8 +2454,23 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
2053
2454
  this._logSkippedDrawingRefresh(drawing, commandId, failure);
2054
2455
  return;
2055
2456
  }
2056
- if (shouldRefresh && !shouldRefresh(drawing.sheetTransform)) return;
2057
- const result = tryRefreshSheetDrawingPlacement(drawing, skeleton);
2457
+ const oneCell = (drawing.anchorType ?? "0") === "0";
2458
+ const rebuilt = oneCell && validateSheetDrawingPlacement({
2459
+ ...drawing,
2460
+ anchorType: "1"
2461
+ }) ? tryRefreshSheetDrawingPlacement(drawing, skeleton) : void 0;
2462
+ if (rebuilt && !rebuilt.ok) {
2463
+ this._logSkippedDrawingRefresh(drawing, commandId, rebuilt);
2464
+ return;
2465
+ }
2466
+ const candidate = (rebuilt === null || rebuilt === void 0 ? void 0 : rebuilt.ok) ? rebuilt.drawing : drawing;
2467
+ const anchor = oneCell ? candidate[getSheetDrawingPositionAnchorField(candidate)] : candidate.axisAlignSheetTransform ?? candidate.sheetTransform;
2468
+ const { from } = anchor;
2469
+ if (shouldRefresh && !shouldRefresh({
2470
+ from,
2471
+ to: anchor.to ?? from
2472
+ })) return (rebuilt === null || rebuilt === void 0 ? void 0 : rebuilt.ok) ? rebuilt.drawing : void 0;
2473
+ const result = rebuilt ?? tryRefreshSheetDrawingPlacement(candidate, skeleton);
2058
2474
  if (result.ok) return result.drawing;
2059
2475
  this._logSkippedDrawingRefresh(drawing, commandId, result);
2060
2476
  } catch (error) {
@@ -2068,37 +2484,35 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
2068
2484
  drawingId: drawing === null || drawing === void 0 ? void 0 : drawing.drawingId,
2069
2485
  commandId,
2070
2486
  transform: drawing === null || drawing === void 0 ? void 0 : drawing.transform,
2071
- sheetTransform: drawing === null || drawing === void 0 ? void 0 : drawing.sheetTransform,
2487
+ axisAlignSheetTransform: drawing === null || drawing === void 0 ? void 0 : drawing.axisAlignSheetTransform,
2072
2488
  failure
2073
2489
  });
2074
2490
  }
2075
2491
  _sheetRefreshListener() {
2076
2492
  this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
2077
2493
  if (!REFRESH_MUTATIONS.includes(command.id)) return;
2078
- queueMicrotask(() => {
2079
- if (this._disposed) return;
2080
- try {
2081
- const params = command.params;
2082
- const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, params);
2083
- if (!target) return;
2084
- const { unitId, subUnitId, worksheet } = target;
2085
- let ranges = [];
2086
- if ("ranges" in params) ranges = params.ranges;
2087
- else if ("rowsAutoHeightInfo" in params) ranges = params.rowsAutoHeightInfo.map((info) => ({
2088
- startRow: info.row,
2089
- endRow: info.row,
2090
- startColumn: 0,
2091
- endColumn: worksheet.getColumnCount() - 1
2092
- }));
2093
- this._refreshDrawingTransform(command, unitId, subUnitId, ranges);
2094
- } catch (error) {
2095
- this._logService.error("[SheetDrawingTransformAffectedController]", "Drawing layout refresh failed", {
2096
- commandId: command.id,
2097
- params: command.params,
2098
- error
2099
- });
2100
- }
2101
- });
2494
+ if (this._disposed) return;
2495
+ try {
2496
+ const params = command.params;
2497
+ const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, params);
2498
+ if (!target) return;
2499
+ const { unitId, subUnitId, worksheet } = target;
2500
+ let ranges = [];
2501
+ if ("ranges" in params) ranges = params.ranges;
2502
+ else if ("rowsAutoHeightInfo" in params) ranges = params.rowsAutoHeightInfo.map((info) => ({
2503
+ startRow: info.row,
2504
+ endRow: info.row,
2505
+ startColumn: 0,
2506
+ endColumn: worksheet.getColumnCount() - 1
2507
+ }));
2508
+ this._refreshDrawingTransform(command, unitId, subUnitId, ranges);
2509
+ } catch (error) {
2510
+ this._logService.error("[SheetDrawingTransformAffectedController]", "Drawing layout refresh failed", {
2511
+ commandId: command.id,
2512
+ params: command.params,
2513
+ error
2514
+ });
2515
+ }
2102
2516
  }));
2103
2517
  }
2104
2518
  _refreshDrawingTransform(command, unitId, subUnitId, ranges) {
@@ -2108,7 +2522,7 @@ let SheetDrawingTransformAffectedController = class SheetDrawingTransformAffecte
2108
2522
  const updateDrawings = [];
2109
2523
  Object.keys(drawingData).forEach((drawingId) => {
2110
2524
  const drawing = drawingData[drawingId];
2111
- if ((drawing === null || drawing === void 0 ? void 0 : drawing.anchorType) === "2") return;
2525
+ if ((drawing === null || drawing === void 0 ? void 0 : drawing.anchorType) === "2" || (drawing === null || drawing === void 0 ? void 0 : drawing.groupId)) return;
2112
2526
  const refreshed = this._tryRefreshDrawingPlacement(drawing, sheetSkeletonParam.skeleton, command.id, ({ from, to }) => {
2113
2527
  const { row: fromRow, column: fromColumn } = from;
2114
2528
  const { row: toRow, column: toColumn } = to;
@@ -2187,7 +2601,12 @@ exports.SetSheetDrawingPlacementCommand = SetSheetDrawingPlacementCommand;
2187
2601
  exports.SetWorksheetBackgroundImageCommand = SetWorksheetBackgroundImageCommand;
2188
2602
  exports.SetWorksheetBackgroundImageMutation = SetWorksheetBackgroundImageMutation;
2189
2603
  exports.SheetDrawingAnchorType = SheetDrawingAnchorType;
2190
- exports.SheetDrawingService = SheetDrawingService;
2604
+ Object.defineProperty(exports, "SheetDrawingService", {
2605
+ enumerable: true,
2606
+ get: function () {
2607
+ return SheetDrawingService;
2608
+ }
2609
+ });
2191
2610
  exports.SheetDrawingTransformPlanService = SheetDrawingTransformPlanService;
2192
2611
  Object.defineProperty(exports, "UniverSheetsDrawingPlugin", {
2193
2612
  enumerable: true,
@@ -2196,12 +2615,15 @@ Object.defineProperty(exports, "UniverSheetsDrawingPlugin", {
2196
2615
  }
2197
2616
  });
2198
2617
  exports.applySheetDrawingPlacement = applySheetDrawingPlacement;
2618
+ exports.assertCurrentSheetDrawingEdit = assertCurrentSheetDrawingEdit;
2199
2619
  exports.drawingPositionToTransform = drawingPositionToTransform;
2620
+ exports.getLegacySheetDrawingPosition = getLegacySheetDrawingPosition;
2200
2621
  exports.getSheetDrawingPlacement = getSheetDrawingPlacement;
2201
2622
  exports.isKnownSheetNonRotatableDrawingType = isKnownSheetNonRotatableDrawingType;
2202
2623
  exports.normalizeSheetDrawingPlacement = normalizeSheetDrawingPlacement;
2203
2624
  exports.refreshSheetDrawingPlacement = refreshSheetDrawingPlacement;
2204
2625
  exports.resolveSheetDrawingRotateEnabled = resolveSheetDrawingRotateEnabled;
2205
2626
  exports.transformDrawingsToChartSheet = transformDrawingsToChartSheet;
2627
+ exports.transformSheetDrawingReference = transformSheetDrawingReference;
2206
2628
  exports.transformToAxisAlignPosition = transformToAxisAlignPosition;
2207
2629
  exports.transformToDrawingPosition = transformToDrawingPosition;