Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheets-drawing-ui): guard getAllFloatDoms against float doms without a backing drawing param (#7241)

Matt Van Horn6efa2634790a
diff --git a/packages/sheets-drawing-ui/src/facade/__tests__/f-worksheet.spec.ts b/packages/sheets-drawing-ui/src/facade/__tests__/f-worksheet.spec.ts
index aaee96d5e5..572f94d663 100644
--- a/packages/sheets-drawing-ui/src/facade/__tests__/f-worksheet.spec.ts
+++ b/packages/sheets-drawing-ui/src/facade/__tests__/f-worksheet.spec.ts
@@ -306,6 +306,22 @@ function createRender(skeleton: SpreadsheetSkeleton, scene: Scene): IRender {
} as unknown as IRender;
}
+function createDrawingUITestBedWithRender() {
+ const testBed = createDrawingUITestBed([
+ [IRenderManagerService, { useClass: TestRenderManagerService }],
+ ]);
+ const modelWorksheet = testBed.workbook.getActiveSheet();
+ const skeleton = testBed.injector.createInstance(
+ SpreadsheetSkeleton,
+ modelWorksheet,
+ testBed.workbook.getStyles()
+ ).calculate() as SpreadsheetSkeleton;
+ const renderManager = testBed.injector.get(IRenderManagerService) as unknown as TestRenderManagerService;
+ renderManager.configure(createRender(skeleton, new TestRenderScene() as unknown as Scene));
+
+ return testBed;
+}
+
describe('sheets-drawing-ui facade', () => {
let univer: Univer;
let injector: Injector;
@@ -384,21 +400,11 @@ describe('sheets-drawing-ui facade', () => {
it('adds, reads, updates, batch updates and disposes float doms through the worksheet facade', async () => {
univer.dispose();
- const testBed = createDrawingUITestBed([
- [IRenderManagerService, { useClass: TestRenderManagerService }],
- ]);
+ const testBed = createDrawingUITestBedWithRender();
univer = testBed.univer;
injector = testBed.injector;
univerAPI = FUniver.newAPI(injector);
- const modelWorksheet = testBed.workbook.getActiveSheet();
- const skeleton = injector.createInstance(
- SpreadsheetSkeleton,
- modelWorksheet,
- testBed.workbook.getStyles()
- ).calculate() as SpreadsheetSkeleton;
- const renderManager = injector.get(IRenderManagerService) as unknown as TestRenderManagerService;
- renderManager.configure(createRender(skeleton, new TestRenderScene() as unknown as Scene));
const sheetDrawingService = injector.get(ISheetDrawingService);
const worksheet = univerAPI.getActiveWorkbook()!.getActiveSheet();
@@ -532,6 +538,32 @@ describe('sheets-drawing-ui facade', () => {
expect(worksheet.getAllFloatDoms()).toEqual([]);
});
+ it('omits float doms without backing drawing params', async () => {
+ univer.dispose();
+ const testBed = createDrawingUITestBedWithRender();
+ univer = testBed.univer;
+ injector = testBed.injector;
+ univerAPI = FUniver.newAPI(injector);
+
+ const worksheet = univerAPI.getActiveWorkbook()!.getActiveSheet();
+ const sheetDrawingService = injector.get(ISheetDrawingService);
+ worksheet.addFloatDomToPosition({
+ componentKey: 'OrderCard',
+ initPosition: { startX: 20, startY: 30, endX: 140, endY: 90 },
+ }, 'order-card');
+ worksheet.addFloatDomToPosition({
+ componentKey: 'MissingCard',
+ initPosition: { startX: 40, startY: 50, endX: 160, endY: 110 },
+ }, 'missing-card');
+ await Promise.resolve();
+
+ const drawingData = sheetDrawingService.getDrawingData('test', 'sheet1');
+ delete drawingData['missing-card'];
+
+ expect(sheetDrawingService.getDrawingByParam({ unitId: 'test', subUnitId: 'sheet1', drawingId: 'missing-card' })).toBeUndefined();
+ expect(worksheet.getAllFloatDoms().map((dom) => dom.id)).toEqual(['order-card']);
+ });
+
it('saves cell images from range and worksheet selections', async () => {
const worksheet = univerAPI.getActiveWorkbook()!.getActiveSheet();
const savedFiles: string[] = [];
diff --git a/packages/sheets-drawing-ui/src/facade/f-worksheet.ts b/packages/sheets-drawing-ui/src/facade/f-worksheet.ts
index 1d49545e25..9338678d33 100644
--- a/packages/sheets-drawing-ui/src/facade/f-worksheet.ts
+++ b/packages/sheets-drawing-ui/src/facade/f-worksheet.ts
@@ -463,7 +463,7 @@ export class FWorksheetDrawingUIMixin extends FWorksheet implements IFWorksheetD
const subUnitId = this._worksheet.getSheetId();
return Array.from(floatDomService.getFloatDomsBySubUnitId(unitId, subUnitId).values())
- .map((info) => {
+ .map((info): IFCanvasFloatDomResult | null => {
const { rect } = info;
const drawingParm = this._injector.get(ISheetDrawingService).getDrawingByParam({
drawingId: info.id,
@@ -471,6 +471,8 @@ export class FWorksheetDrawingUIMixin extends FWorksheet implements IFWorksheetD
subUnitId,
})! as ISheetFloatDom;
+ if (!drawingParm) return null;
+
const { left, top, width, height, flipX, flipY, angle, skewX, skewY } = rect.getState();
return {
@@ -490,7 +492,8 @@ export class FWorksheetDrawingUIMixin extends FWorksheet implements IFWorksheetD
data: drawingParm.data,
id: info.id,
};
- });
+ })
+ .filter((dom): dom is IFCanvasFloatDomResult => dom != null);
}
override updateFloatDom(id: string, config: Partial<Omit<IFCanvasFloatDomResult, 'id'>>): this {