Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(sheets-drawing): preserve anchors when hiding rows and columns (#7918)
wpxp123456292c2d690baa
diff --git a/packages/sheets-drawing-ui/src/controllers/__tests__/sheet-drawing-active-render.controller.spec.ts b/packages/sheets-drawing-ui/src/controllers/__tests__/sheet-drawing-active-render.controller.spec.tsindex 4e9fb90320..27fc7f05f0 100644--- a/packages/sheets-drawing-ui/src/controllers/__tests__/sheet-drawing-active-render.controller.spec.ts+++ b/packages/sheets-drawing-ui/src/controllers/__tests__/sheet-drawing-active-render.controller.spec.ts@@ -331,7 +331,8 @@ describe('SheetDrawingActiveRenderController', () => {expect(() => vi.runOnlyPendingTimers()).not.toThrow();expect(removed).toHaveBeenLastCalledWith([drawing]);expect(added).toHaveBeenLastCalledWith([]);- expect(sheetService.getDrawingByParam(drawing)).toEqual(before);+ expect(sheetService.getDrawingByParam(drawing)?.sheetTransform).toEqual(before!.sheetTransform);+ expect(sheetService.getDrawingByParam(drawing)?.transform?.[axis === 'row' ? 'height' : 'width']).toBe(0);for (let index = 3; index < 6; index++) {data[index]!.hd = BooleanNumber.FALSE;}diff --git a/packages/sheets-drawing-ui/src/controllers/render-controllers/__tests__/sheet-drawing.render-controller.spec.ts b/packages/sheets-drawing-ui/src/controllers/render-controllers/__tests__/sheet-drawing.render-controller.spec.tsindex 1364dfb976..e7334b4c6d 100644--- a/packages/sheets-drawing-ui/src/controllers/render-controllers/__tests__/sheet-drawing.render-controller.spec.ts+++ b/packages/sheets-drawing-ui/src/controllers/render-controllers/__tests__/sheet-drawing.render-controller.spec.ts@@ -16,16 +16,99 @@import type { ISheetDrawing } from '@univerjs/sheets-drawing';import type { Subscription } from 'rxjs';-import { DrawingTypeEnum, LocaleType, UniverInstanceType } from '@univerjs/core';+import { DrawingTypeEnum, LocaleType, Tools, UniverInstanceType } from '@univerjs/core';+import { FUniver } from '@univerjs/core/facade';import { IDrawingManagerService } from '@univerjs/drawing';import { CanvasColorService, ICanvasColorService, IRenderManagerService } from '@univerjs/engine-render';-import { SheetSkeletonService } from '@univerjs/sheets';+import { SetWorksheetRowAutoHeightMutation, SheetSkeletonService } from '@univerjs/sheets';import { ISheetDrawingService, SheetDrawingAnchorType } from '@univerjs/sheets-drawing';import { describe, expect, it, vi } from 'vitest';import { createSheetsDrawingUiTestBed } from '../../../__tests__/create-sheets-drawing-ui-test-bed';import { SheetsDrawingRenderController } from '../sheet-drawing.render-controller';+import '@univerjs/sheets/facade';+import '@univerjs/sheets-drawing/facade';describe('SheetsDrawingRenderController', () => {+ it.each([+ ['row', SheetDrawingAnchorType.Position],+ ['column', SheetDrawingAnchorType.Position],+ ['auto height', SheetDrawingAnchorType.Position],+ ['row', undefined],+ ['column', undefined],+ ['auto height', undefined],+ ['collapsed row', SheetDrawingAnchorType.Both],+ ['collapsed column', SheetDrawingAnchorType.Both],+ ] as const)('preserves image anchors and size across %s, save, rendering and show (%s)', async (scenario, anchorType) => {+ const canvasContext = vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue(+ { setTransform: vi.fn(), clearRect: vi.fn() } as unknown as CanvasRenderingContext2D+ );+ const bed = createSheetsDrawingUiTestBed();+ let restored: ReturnType<typeof createSheetsDrawingUiTestBed> | undefined;+ try {+ const book = FUniver.newAPI(bed.univer).getActiveWorkbook()!;+ const sheet = book.getSheets()[0];+ const builder = sheet.newOverGridImage().setSource('https://example.com/drawing.png').setRow(1).setColumn(1).setWidth(180).setHeight(120).setRowOffset(6).setColumnOffset(12);+ if (anchorType !== undefined) {+ builder.setAnchorType(anchorType);+ }+ const image = await builder.buildAsync();+ sheet.insertImages([image]);+ const service = bed.get(ISheetDrawingService);+ const before = Tools.deepClone(service.getDrawingByParam(image)!);+ const rows = scenario === 'row' || scenario === 'collapsed row';+ const count = anchorType === SheetDrawingAnchorType.Both ? 8 : 1;+ const cell = bed.get(SheetSkeletonService).ensureSkeleton('test', 'sheet1')!.getNoMergeCellWithCoordByIndex(1, 1);+ if (scenario === 'auto height') {+ const worksheet = bed.workbook.getActiveSheet()!;+ expect(bed.commandService.syncExecuteCommand(SetWorksheetRowAutoHeightMutation.id, {+ unitId: 'test',+ subUnitId: 'sheet1',+ rowsAutoHeightInfo: [{ row: 2, autoHeight: worksheet.getRowHeight(2) + 30 }],+ })).toBe(true);+ } else if (rows) {+ sheet.hideRows(1, count);+ } else {+ sheet.hideColumns(1, count);+ }+ await Promise.resolve();+ const hidden = Tools.deepClone(service.getDrawingByParam(image)!);+ expect(hidden.sheetTransform.from).toEqual(before.sheetTransform.from);+ if (scenario !== 'auto height') {+ expect(hidden.transform?.[rows ? 'top' : 'left']).toBe(rows ? cell.startY : cell.startX);+ }+ if (anchorType === SheetDrawingAnchorType.Both) {+ expect(hidden.transform?.[rows ? 'height' : 'width']).toBe(0);+ } else {+ expect(hidden.transform).toMatchObject({ width: 180, height: 120 });+ }+ restored = createSheetsDrawingUiTestBed(book.save(), [[ICanvasColorService, { useClass: CanvasColorService }]]);+ restored.get(SheetSkeletonService).ensureSkeleton('test', 'sheet1');+ const manager = restored.get(IRenderManagerService);+ manager.registerRenderModule(UniverInstanceType.UNIVER_SHEET, [SheetsDrawingRenderController]);+ manager.createRender('test').with(SheetsDrawingRenderController);+ const restoredService = restored.get(ISheetDrawingService);+ expect(restoredService.getDrawingByParam(image)).toEqual(hidden);+ const restoredSheet = FUniver.newAPI(restored.univer).getActiveWorkbook()!.getSheets()[0];+ if (scenario === 'auto height') {+ expect(restoredService.getDrawingByParam(image)!.transform).toEqual(before.transform);+ } else {+ if (rows) {+ restoredSheet.showRows(1, count);+ } else {+ restoredSheet.showColumns(1, count);+ }+ await Promise.resolve();+ expect(restoredService.getDrawingByParam(image)).toEqual(before);+ }+ expect(restored.get(IDrawingManagerService).getDrawingByParam(image))+ .toEqual(restoredService.getDrawingByParam(image));+ } finally {+ restored?.univer.dispose();+ bed.univer.dispose();+ canvasContext.mockRestore();+ }+ });+it('renders legacy cell anchors while preserving explicit absolute and group-local bounds', () => {const canvasContext = vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue({ setTransform: vi.fn(), clearRect: vi.fn() } as unknown as CanvasRenderingContext2Ddiff --git a/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-drawing.render-controller.ts b/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-drawing.render-controller.tsindex effd23048d..1db7f7e4aa 100644--- a/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-drawing.render-controller.ts+++ b/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-drawing.render-controller.ts@@ -15,10 +15,16 @@*/import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';+import type { ISheetDrawing } from '@univerjs/sheets-drawing';import { Disposable, DrawingTypeEnum, Inject } from '@univerjs/core';import { IDrawingManagerService } from '@univerjs/drawing';import { SheetSkeletonService } from '@univerjs/sheets';-import { drawingPositionToTransform, ISheetDrawingService, SheetDrawingAnchorType } from '@univerjs/sheets-drawing';+import {+ drawingPositionToTransform,+ ISheetDrawingService,+ refreshSheetDrawingPlacement,+ SheetDrawingAnchorType,+} from '@univerjs/sheets-drawing';export class SheetsDrawingRenderController extends Disposable implements IRenderModule {constructor(@@ -40,6 +46,7 @@ export class SheetsDrawingRenderController extends Disposable implements IRender// initialize drawing data and add to sheet canvasthis._sheetDrawingService.initializeNotification(this._context.unitId);const data = this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId);+ const refreshedDrawings: ISheetDrawing[] = [];for (const subUnit in data) {const subUnitData = data[subUnit];for (const drawingId in subUnitData.data) {@@ -53,18 +60,24 @@ export class SheetsDrawingRenderController extends Disposable implements IRender!drawingData.groupId &&drawingData.anchorType !== SheetDrawingAnchorType.None) {- const transform = drawingPositionToTransform(drawingData.sheetTransform, skeletonParam);- drawingData.transform = transform && drawingData.drawingType === DrawingTypeEnum.DRAWING_GROUP- ? {- ...transform,- left: (transform.left ?? 0) - skeletonParam.skeleton.rowHeaderWidthAndMarginLeft,- top: (transform.top ?? 0) - skeletonParam.skeleton.columnHeaderHeightAndMarginTop,- }- : transform;+ if (drawingData.drawingType === DrawingTypeEnum.DRAWING_GROUP) {+ const transform = drawingPositionToTransform(drawingData.sheetTransform, skeletonParam);+ refreshedDrawings.push({+ ...drawingData,+ transform: transform && {+ ...transform,+ left: (transform.left ?? 0) - skeletonParam.skeleton.rowHeaderWidthAndMarginLeft,+ top: (transform.top ?? 0) - skeletonParam.skeleton.columnHeaderHeightAndMarginTop,+ },+ });+ } else {+ refreshedDrawings.push(refreshSheetDrawingPlacement(drawingData, skeletonParam.skeleton));+ }}}}+ this._sheetDrawingService.refreshTransform(refreshedDrawings);this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId));this._drawingManagerService.initializeNotification(this._context.unitId);}diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-active-render.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-active-render.controller.tsindex 4e540ed537..d7a0bc97cc 100644--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-active-render.controller.ts+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-active-render.controller.ts@@ -18,13 +18,12 @@ import type { ICommandInfo, IDrawingParam, Workbook } from '@univerjs/core';import type { IRenderContext, IRenderModule, SpreadsheetSkeleton } from '@univerjs/engine-render';import type { ISetWorksheetActiveOperationParams } from '@univerjs/sheets';import type { ISheetDrawing } from '@univerjs/sheets-drawing';-import { Disposable, ICommandService, ILogService, Inject } from '@univerjs/core';+import { Disposable, DrawingTypeEnum, ICommandService, ILogService, Inject } from '@univerjs/core';import { IDrawingManagerService } from '@univerjs/drawing';import { SetWorksheetActiveOperation, SheetSkeletonService } from '@univerjs/sheets';import {- applySheetDrawingPlacement,- getSheetDrawingPlacement,ISheetDrawingService,+ refreshSheetDrawingPlacement,SheetDrawingAnchorType,} from '@univerjs/sheets-drawing';@@ -130,11 +129,10 @@ export class SheetDrawingActiveRenderController extends Disposable implements IRconst sheetSkeletonParam = this._sheetSkeletonService.getSkeletonParam(showUnitId, showSubunitId);const subUnitMap = this._drawingManagerService.drawingManagerData[showUnitId] ?? {};const drawingData = subUnitMap[showSubunitId]?.data ?? {};- const { successDrawings, refreshedDrawings, failures } = prepareSheetDrawings(+ const { successDrawings, refreshedDrawings, removeDrawings, failures } = prepareSheetDrawings(Object.values(drawingData) as ISheetDrawing[],sheetSkeletonParam?.skeleton);- const removeDrawings: IDrawingParam[] = failures.map(({ drawingId }) => drawingData[drawingId]);// JSON1 drawing mutations are applied to both stores, so derived geometry must agree.this._sheetDrawingService.refreshTransform(refreshedDrawings);this._drawingManagerService.refreshTransform(refreshedDrawings);@@ -156,13 +154,22 @@ export class SheetDrawingActiveRenderController extends Disposable implements IRfunction prepareSheetDrawings(drawings: ISheetDrawing[], skeleton?: SpreadsheetSkeleton) {const successDrawings: ISheetDrawing[] = [];const refreshedDrawings: ISheetDrawing[] = [];+ const removeDrawings: ISheetDrawing[] = [];const failures: Array<Pick<ISheetDrawing, 'drawingId' | 'drawingType' | 'anchorType'> & { error: unknown }> = [];for (const drawing of drawings) {if (skeleton && drawing.sheetTransform && drawing.anchorType !== SheetDrawingAnchorType.None) {try {- refreshedDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), skeleton));+ const refreshed = refreshSheetDrawingPlacement(drawing, skeleton);+ refreshedDrawings.push(refreshed);+ // Hidden cells can collapse an image or DOM without invalidating its original anchors.+ if ((drawing.drawingType === DrawingTypeEnum.DRAWING_IMAGE || drawing.drawingType === DrawingTypeEnum.DRAWING_DOM)+ && (refreshed.transform?.width === 0 || refreshed.transform?.height === 0)) {+ removeDrawings.push(drawing);+ continue;+ }} catch (error) {+ removeDrawings.push(drawing);failures.push({drawingId: drawing.drawingId,drawingType: drawing.drawingType,@@ -175,5 +182,5 @@ function prepareSheetDrawings(drawings: ISheetDrawing[], skeleton?: SpreadsheetSsuccessDrawings.push(drawing);}- return { successDrawings, refreshedDrawings, failures };+ return { successDrawings, refreshedDrawings, removeDrawings, failures };}diff --git a/packages/sheets-drawing/src/controllers/__tests__/sheet-drawing-transform-affected.controller.spec.ts b/packages/sheets-drawing/src/controllers/__tests__/sheet-drawing-transform-affected.controller.spec.tsindex adc77e1e56..6390e78a1f 100644--- a/packages/sheets-drawing/src/controllers/__tests__/sheet-drawing-transform-affected.controller.spec.ts+++ b/packages/sheets-drawing/src/controllers/__tests__/sheet-drawing-transform-affected.controller.spec.ts@@ -15,8 +15,6 @@*/import type { IWorkbookData, Workbook } from '@univerjs/core';-import type { ISheetDrawingPlacement } from '../../services/sheet-drawing-placement';-import type { ISheetDrawing } from '../../services/sheet-drawing.service';import {Direction,DrawingTypeEnum,@@ -52,12 +50,16 @@ import {SetColWidthCommand,SetRowHeightCommand,SetRowHiddenCommand,+ SetSpecificColsVisibleCommand,+ SetSpecificRowsVisibleCommand,SetWorksheetRowAutoHeightMutation,SheetInterceptorService,SheetSkeletonService,SheetsSelectionsService,} from '@univerjs/sheets';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import type { ISheetDrawingPlacement } from '../../services/sheet-drawing-placement';+import type { ISheetDrawing } from '../../services/sheet-drawing.service';import { createSheetsDrawingTestBed } from '../../__tests__/create-sheets-drawing-test-bed';import { drawingPositionToTransform } from '../../basics/transform-position';import { InsertSheetDrawingCommand } from '../../commands/commands/insert-sheet-drawing.command';@@ -382,8 +384,8 @@ describe('SheetDrawingTransformAffectedController', () => {});});- it('updates both-anchored drawings when hidden rows cut through their top edge', () => {- const skeleton = createSkeleton();+ it('preserves both anchors when hidden rows cut through the drawing top edge', () => {+ const skeleton = createSkeleton({ rowHeights: [20, 0, 0, 20, 20] });const drawing = createDrawing({drawingId: 'row-hidden-top-edge',sheetTransform: {@@ -396,18 +398,15 @@ describe('SheetDrawingTransformAffectedController', () => {drawingData: { [drawing.drawingId]: drawing },});- const result = controller._getDrawingUndoForRowVisible(UNIT_ID, SUB_UNIT_ID, [+ const result = controller._getDrawingUndoForRowAndColSize(UNIT_ID, SUB_UNIT_ID, [{ startRow: 1, endRow: 2, startColumn: 0, endColumn: 9 },]);const updatedDrawing = sheetDrawingService.getBatchUpdateOp.mock.calls[0][0][0];expect(updatedDrawing).toMatchObject({drawingId: 'row-hidden-top-edge',- transform: { left: 10, top: 20, width: 20, height: 20 },- sheetTransform: {- from: { row: 1, column: 1, rowOffset: 0, columnOffset: 0 },- to: { row: 2, column: 3, rowOffset: 0, columnOffset: 0 },- },+ transform: { left: 10, top: 20, width: 20, height: 25 },+ sheetTransform: drawing.sheetTransform,});expect(result.redos).toEqual([{ id: SetDrawingApplyMutation.id, params: { unitId: UNIT_ID, subUnitId: SUB_UNIT_ID, op: 'update-redo', objects: [updatedDrawing], type: DrawingApplyType.UPDATE } },@@ -1122,6 +1121,84 @@ describe('sheet drawing transforms without UI plugins', () => {expect(getDrawing(service)).toEqual(after);});+ it.each([+ [true, SheetDrawingAnchorType.Position],+ [false, SheetDrawingAnchorType.Position],+ [true, undefined],+ [false, undefined],+ [true, SheetDrawingAnchorType.Both],+ [false, SheetDrawingAnchorType.Both],+ [true, SheetDrawingAnchorType.None],+ [false, SheetDrawingAnchorType.None],+ ])('restores row visibility=%s and anchor=%s across commands and saved resources', async (rows, anchorType) => {+ const service = await insertDrawing(anchorType);+ const skeleton = testBed.get(SheetSkeletonService).ensureSkeleton('test', 'sheet1')!;+ const positioned = applySheetDrawingPlacement(getDrawing(service), {+ kind: SheetDrawingAnchorType.Position,+ from: { row: 1, column: 1, rowOffset: 6, columnOffset: 12 },+ width: 180,+ height: 120,+ }, skeleton);+ expect(await testBed.commandService.executeCommand(InsertSheetDrawingCommand.id, {+ unitId: 'test',+ drawings: [{ ...positioned, drawingId: 'offset-image', anchorType }],+ })).toBe(true);+ const readDrawing = (drawingService = service) => Tools.deepClone(drawingService.getDrawingByParam({+ unitId: 'test',+ subUnitId: 'sheet1',+ drawingId: 'offset-image',+ })!);+ const before = readDrawing();+ const cell = skeleton.getNoMergeCellWithCoordByIndex(1, 1);+ const params = {+ unitId: 'test',+ subUnitId: 'sheet1',+ ranges: [{+ startRow: rows ? 1 : 0,+ endRow: rows ? 1 : 19,+ startColumn: rows ? 0 : 1,+ endColumn: rows ? 19 : 1,+ }],+ };+ const hideId = rows ? SetRowHiddenCommand.id : SetColHiddenCommand.id;+ const showId = rows ? SetSpecificRowsVisibleCommand.id : SetSpecificColsVisibleCommand.id;+ expect(await testBed.commandService.executeCommand(hideId, params)).toBe(true);+ const hidden = readDrawing();+ if (anchorType === SheetDrawingAnchorType.None) {+ expect(hidden.transform).toEqual(before.transform);+ } else {+ expect(hidden.sheetTransform.from).toEqual(before.sheetTransform.from);+ expect(hidden.transform?.[rows ? 'top' : 'left']).toBe(rows ? cell.startY : cell.startX);+ if (anchorType === SheetDrawingAnchorType.Both) {+ expect(hidden.sheetTransform.to).toEqual(before.sheetTransform.to);+ expect(hidden.transform?.[rows ? 'height' : 'width'])+ .toBeLessThan(before.transform?.[rows ? 'height' : 'width'] ?? 0);+ } else {+ expect(hidden.transform).toMatchObject({ width: 180, height: 120 });+ expect(hidden.sheetTransform.to).not.toEqual(before.sheetTransform.to);+ }+ }+ expect(await testBed.commandService.executeCommand(UndoCommandId)).toBe(true);+ expect(readDrawing()).toEqual(before);+ expect(await testBed.commandService.executeCommand(RedoCommandId)).toBe(true);+ expect(readDrawing()).toEqual(hidden);++ const snapshot = testBed.get(IResourceLoaderService).saveUnit<IWorkbookData>('test')!;+ const restored = createSheetsDrawingTestBed(snapshot);+ try {+ const restoredService = restored.get(ISheetDrawingService);+ expect(readDrawing(restoredService)).toEqual(hidden);+ expect(await restored.commandService.executeCommand(showId, params)).toBe(true);+ expect(readDrawing(restoredService)).toEqual(before);+ expect(await restored.commandService.executeCommand(UndoCommandId)).toBe(true);+ expect(readDrawing(restoredService)).toEqual(hidden);+ expect(await restored.commandService.executeCommand(RedoCommandId)).toBe(true);+ expect(readDrawing(restoredService)).toEqual(before);+ } finally {+ restored.univer.dispose();+ }+ });+it('refreshes direct auto-height mutations and their inverse without UI', async () => {const service = await insertDrawing(SheetDrawingAnchorType.Both);const before = structuredClone(getDrawing(service));diff --git a/packages/sheets-drawing/src/controllers/sheet-drawing-transform-affected.controller.ts b/packages/sheets-drawing/src/controllers/sheet-drawing-transform-affected.controller.tsindex 543b53e0d3..f621db7d30 100644--- a/packages/sheets-drawing/src/controllers/sheet-drawing-transform-affected.controller.ts+++ b/packages/sheets-drawing/src/controllers/sheet-drawing-transform-affected.controller.ts@@ -16,7 +16,6 @@import type { ICommandInfo, IMutationInfo, IRange, ITransformState, Nullable } from '@univerjs/core';import type { IDrawingJsonUndo1 } from '@univerjs/drawing';-import type { SpreadsheetSkeleton } from '@univerjs/engine-render';import type {IDeleteRangeMoveLeftCommandParams,IDeleteRangeMoveUpCommandParams,@@ -40,11 +39,6 @@ import type {ISetWorksheetRowIsAutoHeightMutationParams,ISheetSkeletonManagerParam,} from '@univerjs/sheets';-import type {- ISheetDrawingTransformExtensionResult,- ISheetDrawingTransformPlan,-} from '../services/sheet-drawing-transform-plan.service';-import type { ISheetDrawing, ISheetDrawingPosition } from '../services/sheet-drawing.service';import { Disposable, ICommandService, Inject, IUniverInstanceService, Rectangle } from '@univerjs/core';import { IDrawingManagerService } from '@univerjs/drawing';import {@@ -80,6 +74,11 @@ import {SheetInterceptorService,SheetSkeletonService,} from '@univerjs/sheets';+import type {+ ISheetDrawingTransformExtensionResult,+ ISheetDrawingTransformPlan,+} from '../services/sheet-drawing-transform-plan.service';+import type { ISheetDrawing, ISheetDrawingPosition } from '../services/sheet-drawing.service';import {drawingPositionToTransform,transformToAxisAlignPosition,@@ -87,7 +86,7 @@ import {} from '../basics/transform-position';import { DrawingApplyType, SetDrawingApplyMutation } from '../commands/mutations/set-drawing-apply.mutation';import { ClearSheetDrawingTransformerOperation } from '../commands/operations/clear-drawing-transformer.operation';-import { applySheetDrawingPlacement, getSheetDrawingPlacement } from '../services/sheet-drawing-placement';+import { refreshSheetDrawingPlacement } from '../services/sheet-drawing-placement';import { SheetDrawingTransformPlanService } from '../services/sheet-drawing-transform-plan.service';import { ISheetDrawingService, SheetDrawingAnchorType } from '../services/sheet-drawing.service';@@ -210,19 +209,23 @@ export class SheetDrawingTransformAffectedController extends Disposable {} else if (id === InsertRangeMoveRightCommand.id) {const { range } = params as IInsertRangeMoveRightCommandParams;return this._getRangeMoveUndo(range, RangeMoveUndoType.insertRight);- } else if (id === SetRowHiddenCommand.id || id === SetSpecificRowsVisibleCommand.id) {- const { unitId, subUnitId, ranges } = params as ISetRowHiddenMutationParams | ISetSpecificRowsVisibleCommandParams;- return this._getDrawingUndoForRowVisible(unitId, subUnitId, ranges);- } else if (id === SetColHiddenCommand.id || id === SetSpecificColsVisibleCommand.id) {- const { unitId, subUnitId, ranges } = params as ISetColHiddenMutationParams | ISetSpecificColsVisibleCommandParams;- return this._getDrawingUndoForColVisible(unitId, subUnitId, ranges);} else if (+ id === SetRowHiddenCommand.id ||+ id === SetSpecificRowsVisibleCommand.id ||+ id === SetColHiddenCommand.id ||+ id === SetSpecificColsVisibleCommand.id ||id === DeltaRowHeightCommand.id ||id === DeltaColumnWidthCommand.id ||id === SetRowHeightCommand.id ||id === SetColWidthCommand.id) {- const { unitId, subUnitId, ranges } = params as ISetWorksheetRowHeightMutationParams | ISetWorksheetColWidthMutationParams;+ const { unitId, subUnitId, ranges } = params as+ | ISetRowHiddenMutationParams+ | ISetSpecificRowsVisibleCommandParams+ | ISetColHiddenMutationParams+ | ISetSpecificColsVisibleCommandParams+ | ISetWorksheetRowHeightMutationParams+ | ISetWorksheetColWidthMutationParams;return this._getDrawingUndoForRowAndColSize(unitId, subUnitId, ranges);}@@ -434,272 +437,10 @@ export class SheetDrawingTransformAffectedController extends Disposable {return { updateDrawings, deleteDrawings };}- private _remainDrawingSize(transform: Nullable<ITransformState>, updateDrawings: ISheetDrawing[], drawing: ISheetDrawing, skeleton: SpreadsheetSkeleton) {- const newSheetTransform = transformToDrawingPosition({ ...transform }, skeleton);- if (newSheetTransform) {- const axisAlignSheetTransform = transformToAxisAlignPosition({ ...transform }, skeleton) as ISheetDrawingPosition;- updateDrawings.push({- ...drawing,- sheetTransform: newSheetTransform,- axisAlignSheetTransform,- });- }- }-- private _getDrawingUndoForColVisible(unitId: string, subUnitId: string, ranges: IRange[]) {- const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);- if (!sheetSkeletonParam) {- return { redos: [], undos: [] };- }- const { skeleton } = sheetSkeletonParam;-- const drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId);- const updateDrawings: ISheetDrawing[] = [];- const preUpdateDrawings: ISheetDrawing[] = [];-- Object.keys(drawingData).forEach((drawingId) => {- const drawing = drawingData[drawingId] as ISheetDrawing;- const { sheetTransform, transform, anchorType = SheetDrawingAnchorType.Position } = drawing;-- if (anchorType === SheetDrawingAnchorType.None) {- this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);- } else {- const { from, to } = sheetTransform;- const { row: fromRow, column: fromColumn } = from;- const { row: toRow, column: toColumn } = to;-- for (let i = 0; i < ranges.length; i++) {- const range = ranges[i];- const { startColumn, endColumn } = range;-- if (toColumn < startColumn) {- continue;- }-- if (anchorType === SheetDrawingAnchorType.Position) {- let newSheetTransform: Nullable<ISheetDrawingPosition> = null;- let newTransform: Nullable<ITransformState> = null;-- if (fromColumn >= startColumn && fromColumn <= endColumn) {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn: fromColumn,- endColumn,- startRow: fromRow,- endRow: toRow,- });- newTransform = { ...transform, left: selectionCell.startX };- }-- if (newTransform) {- newSheetTransform = transformToDrawingPosition(newTransform, skeleton);- const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton) as ISheetDrawingPosition;-- if (newSheetTransform && newTransform) {- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });- break;- }- }-- continue;- }-- if (fromColumn >= startColumn && toColumn <= endColumn) {- continue;- }-- let newSheetTransform: Nullable<ISheetDrawingPosition> = null;- let newTransform: Nullable<ITransformState> = null;-- if (fromColumn >= startColumn && fromColumn <= endColumn) {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn: fromColumn,- endColumn,- startRow: fromRow,- endRow: toRow,- });- newTransform = {- ...transform,- left: (selectionCell?.startX || 0),- width: (transform?.width || 0) - selectionCell.endX + selectionCell.startX,- };- } else if (toColumn >= startColumn && toColumn <= endColumn) {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn,- endColumn: toColumn,- startRow: fromRow,- endRow: toRow,- });- newTransform = {- ...transform,- left: selectionCell.startX - (transform?.width || 0),- };- } else {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn,- endColumn,- startRow: fromRow,- endRow: toRow,- });- newTransform = {- ...transform,- width: (transform?.width || 0) - selectionCell.endX + selectionCell.startX,- };- newSheetTransform = transformToDrawingPosition(newTransform, skeleton);-- if (newSheetTransform && newTransform) {- const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton) as ISheetDrawingPosition;- preUpdateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });- break;- }- }-- if (newTransform) {- newSheetTransform = transformToDrawingPosition(newTransform, skeleton);- }-- if (newTransform && newSheetTransform) {- const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton) as ISheetDrawingPosition;- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });- break;- } else {- this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);- }- }- }- });-- return this._finalizePlan(unitId, subUnitId, [...preUpdateDrawings, ...updateDrawings]);- }-private _createUndoAndRedoMutation(unitId: string, subUnitId: string, updateDrawings: ISheetDrawing[]) {return this._finalizePlan(unitId, subUnitId, updateDrawings);}- private _getDrawingUndoForRowVisible(unitId: string, subUnitId: string, ranges: IRange[]) {- const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);- if (!sheetSkeletonParam) {- return { redos: [], undos: [] };- }- const { skeleton } = sheetSkeletonParam;-- const drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId);- const updateDrawings: ISheetDrawing[] = [];- const preUpdateDrawings: ISheetDrawing[] = [];-- Object.keys(drawingData).forEach((drawingId) => {- const drawing = drawingData[drawingId] as ISheetDrawing;- const { sheetTransform, transform, anchorType = SheetDrawingAnchorType.Position } = drawing;-- if (anchorType === SheetDrawingAnchorType.None) {- this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);- } else {- const { from, to } = sheetTransform;- const { row: fromRow, column: fromColumn } = from;- const { row: toRow, column: toColumn } = to;-- for (let i = 0; i < ranges.length; i++) {- const range = ranges[i];- const { startRow, endRow } = range;-- if (toRow < startRow) {- continue;- }-- if (anchorType === SheetDrawingAnchorType.Position) {- let newSheetTransform: Nullable<ISheetDrawingPosition> = null;- let newTransform: Nullable<ITransformState> = null;-- if (fromRow >= startRow && fromRow <= endRow) {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn: fromColumn,- endColumn: toColumn,- startRow: fromRow,- endRow,- });- newTransform = { ...transform, top: selectionCell.startY };- }-- if (newTransform) {- newSheetTransform = transformToDrawingPosition(newTransform, skeleton);- const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton) as ISheetDrawingPosition;-- if (newSheetTransform && newTransform) {- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });- break;- }- }-- continue;- }-- if (fromRow >= startRow && toRow <= endRow) {- continue;- }-- let newSheetTransform: Nullable<ISheetDrawingPosition> = null;- let newTransform: Nullable<ITransformState> = null;-- if (fromRow >= startRow && fromRow <= endRow) {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn: fromColumn,- endColumn: toColumn,- startRow: fromRow,- endRow,- });- newTransform = {- ...transform,- top: (selectionCell?.startY || 0),- height: (transform?.height || 0) - selectionCell.endY + selectionCell.startY,- };- } else if (toRow >= startRow && toRow <= endRow) {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn: fromColumn,- endColumn: toColumn,- startRow,- endRow: toRow,- });- newTransform = {- ...transform,- top: selectionCell.startY - (transform?.height || 0),- };- } else {- const selectionCell = attachRangeWithCoord(skeleton, {- startColumn: fromColumn,- endColumn: toColumn,- startRow,- endRow,- });- newTransform = {- ...transform,- height: (transform?.height || 0) - selectionCell.endY + selectionCell.startY,- };- newSheetTransform = transformToDrawingPosition(newTransform, skeleton);-- if (newSheetTransform && newTransform) {- const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton) as ISheetDrawingPosition;- preUpdateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });- break;- }- }-- if (newTransform) {- newSheetTransform = transformToDrawingPosition(newTransform, skeleton);- }-- if (newTransform && newSheetTransform) {- const axisAlignSheetTransform = transformToAxisAlignPosition(newTransform, skeleton) as ISheetDrawingPosition;- updateDrawings.push({ ...drawing, sheetTransform: newSheetTransform, transform: newTransform, axisAlignSheetTransform });- break;- } else {- this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);- }- }- }- });-- return this._finalizePlan(unitId, subUnitId, [...preUpdateDrawings, ...updateDrawings]);- }-private _getDrawingUndoForRowAndColSize(unitId: string, subUnitId: string, ranges: IRange[]) {const sheetSkeletonParam = this._getCalculatedSkeletonParam(unitId, subUnitId);if (!sheetSkeletonParam) {@@ -712,11 +453,9 @@ export class SheetDrawingTransformAffectedController extends Disposable {Object.keys(drawingData).forEach((drawingId) => {const drawing = drawingData[drawingId] as ISheetDrawing;- const { sheetTransform, transform, anchorType = SheetDrawingAnchorType.Position } = drawing;+ const { sheetTransform, anchorType = SheetDrawingAnchorType.Position } = drawing;- if (anchorType === SheetDrawingAnchorType.None) {- this._remainDrawingSize(transform, updateDrawings, drawing, skeleton);- } else {+ if (anchorType !== SheetDrawingAnchorType.None) {const { row: toRow, column: toColumn } = sheetTransform.to;for (let i = 0; i < ranges.length; i++) {@@ -727,20 +466,8 @@ export class SheetDrawingTransformAffectedController extends Disposable {continue;}- if (anchorType === SheetDrawingAnchorType.Position) {- updateDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), skeleton));- break;- }-- const newTransform = drawingPositionToTransform({ ...sheetTransform }, sheetSkeletonParam);-- if (newTransform) {- updateDrawings.push({- ...drawing,- transform: newTransform,- });- break;- }+ updateDrawings.push(refreshSheetDrawingPlacement(drawing, skeleton));+ break;}}});@@ -1371,7 +1098,7 @@ export class SheetDrawingTransformAffectedController extends Disposable {Object.keys(drawingData).forEach((drawingId) => {const drawing = drawingData[drawingId] as ISheetDrawing;- const { sheetTransform, transform, anchorType = SheetDrawingAnchorType.Position } = drawing;+ const { sheetTransform, anchorType = SheetDrawingAnchorType.Position } = drawing;if (anchorType === SheetDrawingAnchorType.None) {return true;}@@ -1399,22 +1126,7 @@ export class SheetDrawingTransformAffectedController extends Disposable {endColumn: toColumn,}) || fromRow > endRow || fromColumn > endColumn) {- if (anchorType === SheetDrawingAnchorType.Position) {- updateDrawings.push(applySheetDrawingPlacement(drawing, getSheetDrawingPlacement(drawing), sheetSkeletonParam.skeleton));- break;- }-- const newTransform = drawingPositionToTransform(sheetTransform, sheetSkeletonParam);- updateDrawings.push({- ...drawing,- transform: {- ...transform,- left: newTransform?.left,- top: newTransform?.top,- width: newTransform?.width,- height: newTransform?.height,- },- });+ updateDrawings.push(refreshSheetDrawingPlacement(drawing, sheetSkeletonParam.skeleton));break;}}diff --git a/packages/sheets-drawing/src/index.ts b/packages/sheets-drawing/src/index.tsindex ba67eb2256..d3107a84a4 100644--- a/packages/sheets-drawing/src/index.ts+++ b/packages/sheets-drawing/src/index.ts@@ -44,6 +44,7 @@ export {applySheetDrawingPlacement,getSheetDrawingPlacement,normalizeSheetDrawingPlacement,+ refreshSheetDrawingPlacement,} from './services/sheet-drawing-placement';export type {ISheetDrawingAbsolutePlacement,diff --git a/packages/sheets-drawing/src/services/__tests__/sheet-drawing-placement.spec.ts b/packages/sheets-drawing/src/services/__tests__/sheet-drawing-placement.spec.tsindex f157664089..88f4496156 100644--- a/packages/sheets-drawing/src/services/__tests__/sheet-drawing-placement.spec.ts+++ b/packages/sheets-drawing/src/services/__tests__/sheet-drawing-placement.spec.ts@@ -14,13 +14,23 @@* limitations under the License.*/-import type { ISheetDrawingPlacement } from '../sheet-drawing-placement';-import type { ISheetDrawing } from '../sheet-drawing.service';import { DrawingTypeEnum } from '@univerjs/core';-import { SheetSkeletonService } from '@univerjs/sheets';+import {+ SetColHiddenCommand,+ SetRowHiddenCommand,+ SetSpecificColsVisibleCommand,+ SetSpecificRowsVisibleCommand,+ SheetSkeletonService,+} from '@univerjs/sheets';import { afterEach, beforeEach, describe, expect, it } from 'vitest';+import type { ISheetDrawingPlacement } from '../sheet-drawing-placement';+import type { ISheetDrawing } from '../sheet-drawing.service';import { createSheetsDrawingTestBed } from '../../__tests__/create-sheets-drawing-test-bed';-import { applySheetDrawingPlacement, normalizeSheetDrawingPlacement } from '../sheet-drawing-placement';+import {+ applySheetDrawingPlacement,+ normalizeSheetDrawingPlacement,+ refreshSheetDrawingPlacement,+} from '../sheet-drawing-placement';import { SheetDrawingAnchorType } from '../sheet-drawing.service';describe('sheet drawing placement extents', () => {@@ -62,6 +72,47 @@ describe('sheet drawing placement extents', () => {}});+ it.each([true, false])('restores a fully collapsed two-cell drawing after hiding rows=%s', async (rows) => {+ const skeleton = bed.get(SheetSkeletonService).ensureSkeleton('test', 'sheet1')!;+ const sheetTransform = {+ from: { row: 1, column: 1, rowOffset: 6, columnOffset: 12 },+ to: { row: 4, column: 4, rowOffset: 8, columnOffset: 16 },+ };+ const drawing = applySheetDrawingPlacement({+ unitId: 'test',+ subUnitId: 'sheet1',+ drawingId: 'image',+ drawingType: DrawingTypeEnum.DRAWING_IMAGE,+ sheetTransform,+ axisAlignSheetTransform: sheetTransform,+ } as ISheetDrawing, { kind: SheetDrawingAnchorType.Both, ...sheetTransform }, skeleton);+ const params = {+ unitId: 'test',+ subUnitId: 'sheet1',+ ranges: [{+ startRow: rows ? 1 : 0,+ endRow: rows ? 4 : 19,+ startColumn: rows ? 0 : 1,+ endColumn: rows ? 19 : 4,+ }],+ };+ expect(await bed.commandService.executeCommand(rows ? SetRowHiddenCommand.id : SetColHiddenCommand.id, params))+ .toBe(true);+ skeleton.makeDirty(true);+ skeleton.calculate();+ const hidden = refreshSheetDrawingPlacement(drawing, skeleton);+ expect(hidden.sheetTransform).toEqual(drawing.sheetTransform);+ expect(hidden.transform?.[rows ? 'height' : 'width']).toBe(0);+ expect(refreshSheetDrawingPlacement(hidden, skeleton)).toEqual(hidden);+ expect(await bed.commandService.executeCommand(+ rows ? SetSpecificRowsVisibleCommand.id : SetSpecificColsVisibleCommand.id,+ params+ )).toBe(true);+ skeleton.makeDirty(true);+ skeleton.calculate();+ expect(refreshSheetDrawingPlacement(hidden, skeleton)).toEqual(drawing);+ });+it.each([[0, 0], [-1, 20], [20, -1], [NaN, 20], [20, Infinity]])('rejects an invalid extent of %s by %s',(width, height) => {diff --git a/packages/sheets-drawing/src/services/sheet-drawing-placement.ts b/packages/sheets-drawing/src/services/sheet-drawing-placement.tsindex 1076aca8a4..699d9e1eb2 100644--- a/packages/sheets-drawing/src/services/sheet-drawing-placement.ts+++ b/packages/sheets-drawing/src/services/sheet-drawing-placement.ts@@ -17,14 +17,14 @@import type { IGroupBaseBound, ITransformState } from '@univerjs/core';import type { SpreadsheetSkeleton } from '@univerjs/engine-render';import type { ICellOverGridPosition } from '@univerjs/sheets';+import { DrawingTypeEnum } from '@univerjs/core';+import { convertPositionCellToSheetOverGrid, convertPositionSheetOverGridToAbsolute } from '@univerjs/sheets';import type {ISheetDrawing,ISheetDrawingPosition,ISheetFloatDom,ISheetImage,} from './sheet-drawing.service';-import { DrawingTypeEnum } from '@univerjs/core';-import { convertPositionCellToSheetOverGrid, convertPositionSheetOverGridToAbsolute } from '@univerjs/sheets';import { transformToAxisAlignPosition, transformToDrawingPosition } from '../basics/transform-position';import {SheetDrawingAnchorType,@@ -148,6 +148,35 @@ export function applySheetDrawingPlacement(|| drawing.drawingType === DrawingTypeEnum.DRAWING_DOM;const placement = normalizePlacement(input, skeleton, requiresArea);+ return resolveSheetDrawingPlacement(drawing, placement, skeleton);+}++/** Refresh layout-derived geometry without changing the drawing's anchor semantics. */+export function refreshSheetDrawingPlacement(drawing: ISheetDrawing, skeleton: SpreadsheetSkeleton): ISheetDrawing {+ if (drawing.anchorType === SheetDrawingAnchorType.None) {+ return drawing;+ }++ const placement = getSheetDrawingPlacement(drawing);+ const requiresArea = drawing.drawingType === DrawingTypeEnum.DRAWING_IMAGE+ || drawing.drawingType === DrawingTypeEnum.DRAWING_DOM;+ // A valid two-cell drawing can temporarily collapse when its cells are hidden.+ validatePlacement(placement, requiresArea);+ const resolved = resolveSheetDrawingPlacement(drawing, placement, skeleton);+ validateExtent(resolved.transform?.width ?? 0, resolved.transform?.height ?? 0, requiresArea, true);+ return {+ ...drawing,+ sheetTransform: resolved.sheetTransform,+ transform: resolved.transform,+ axisAlignSheetTransform: resolved.axisAlignSheetTransform,+ };+}++function resolveSheetDrawingPlacement(+ drawing: ISheetDrawing,+ placement: ISheetDrawingPlacement,+ skeleton?: SpreadsheetSkeleton+): ISheetDrawing {if (placement.kind === SheetDrawingAnchorType.None) {const transform = withExistingTransform(drawing.transform, placement);const sheetTransform = absoluteSheetTransform(placement, drawing.sheetTransform);@@ -168,19 +197,25 @@ export function applySheetDrawingPlacement(const converted = convertPositionCellToSheetOverGrid(drawing.unitId,drawing.subUnitId,- placement.from,+ getVisibleCellPosition(placement.from, skeleton),placement.width,placement.height,skeleton);- const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, converted.sheetTransform);+ const sheetTransform = withExistingSheetTransform(drawing.sheetTransform, {+ from: placement.from,+ to: converted.sheetTransform.to,+ });const transform = withExistingTransform(drawing.transform, converted.transform);return {...drawing,anchorType: SheetDrawingAnchorType.Position,sheetTransform,transform,- axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton),+ axisAlignSheetTransform: withExistingSheetTransform(+ drawing.axisAlignSheetTransform,+ transformToAxisAlignPosition(transform, skeleton)+ ),};}@@ -191,7 +226,10 @@ export function applySheetDrawingPlacement(const bounds = convertPositionSheetOverGridToAbsolute(drawing.unitId,drawing.subUnitId,- sheetTransform,+ {+ from: getVisibleCellPosition(placement.from, skeleton),+ to: getVisibleCellPosition(placement.to, skeleton),+ },skeleton);const transform = withExistingTransform(drawing.transform, bounds);@@ -200,7 +238,19 @@ export function applySheetDrawingPlacement(anchorType: SheetDrawingAnchorType.Both,sheetTransform,transform,- axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton),+ axisAlignSheetTransform: withExistingSheetTransform(+ drawing.axisAlignSheetTransform,+ transformToAxisAlignPosition(transform, skeleton)+ ),+ };+}++function getVisibleCellPosition(position: ICellOverGridPosition, skeleton: SpreadsheetSkeleton): ICellOverGridPosition {+ const cell = skeleton.getNoMergeCellWithCoordByIndex(position.row, position.column);+ return {+ ...position,+ columnOffset: cell.startX === cell.endX ? 0 : position.columnOffset,+ rowOffset: cell.startY === cell.endY ? 0 : position.rowOffset,};}@@ -356,10 +406,10 @@ function validateCellPosition(position: ICellOverGridPosition): void {}}-function validateExtent(width: number, height: number, requiresArea: boolean): void {+function validateExtent(width: number, height: number, requiresArea: boolean, allowCollapsed = false): void {// Horizontal and vertical lines have a zero bounding-box extent on one axis;// this is independent of stroke width. Images and floating DOM still require area.- const hasInvalidZeroExtent = requiresArea ? width === 0 || height === 0 : width === 0 && height === 0;+ const hasInvalidZeroExtent = !allowCollapsed && (requiresArea ? width === 0 || height === 0 : width === 0 && height === 0);if (!Number.isFinite(width) || !Number.isFinite(height) || width < 0 || height < 0 || hasInvalidZeroExtent) {// Preserve the error message contract and report the actual checked extent, including converted cell bounds.throw Object.assign(new Error('SHEET_DRAWING_PLACEMENT_EXTENT_INVALID'), { width, height });