tests

Author: fdamhaut

packages/o-spreadsheet-engine/src/helpers/text_helper.ts

@@ -438,6 +438,10 @@ export function sliceTextToFitWidth(
   return slicedText ? slicedText + ellipsis : "";
 }
 
+/**
+ * Return the position to draw text on a rotated canvas to ensure that the rotated text alignment correspond
+ * with to original's text vertical and horizontal alignment.
+ */
 export function computeRotationPosition(rect: BoxTextContent, style: Style): PixelPosition {
   if (!style.rotation) return rect;
   let { x, y } = rect;

tests/figures/chart/gauge/gauge_rendering.test.ts

@@ -52,17 +52,17 @@ describe("Gauge rendering config", () => {
     expect(config.width).toEqual(testChartRect.width);
   });
 
-  /* In the following test, textPosition.y is expected to be NaN as the vertical position of the
+  /* In the following test, textPosition.y is expected to be 23 as the vertical position of the
      title is computed according to the title height, and fontBoundingBoxAscent and
-     fontBoundingBoxDescent are not implemented by js-dom so not available here.
+     fontBoundingBoxDescent are not implemented by js-dom so not available here, they are mocked to set values.
   */
   test("Chart title", () => {
     expect(getRenderingConfig(testRuntime).title).toEqual({
       label: testRuntime.title.text,
       fontSize: CHART_TITLE_FONT_SIZE,
       textPosition: {
         x: CHART_PADDING,
-        y: NaN,
+        y: 23,
       },
       color: chartMutedFontColor(testRuntime.background),
     });

tests/formats/formatting_plugin.test.ts

@@ -15,7 +15,12 @@ import { functionRegistry } from "@odoo/o-spreadsheet-engine/functions/function_
 import { toScalar } from "@odoo/o-spreadsheet-engine/functions/helper_matrices";
 import { toString } from "@odoo/o-spreadsheet-engine/functions/helpers";
 import { Model } from "@odoo/o-spreadsheet-engine/model";
-import { fontSizeInPixels, getCellContentHeight, toCartesian } from "../../src/helpers";
+import {
+  fontSizeInPixels,
+  getCellContentHeight,
+  positionToZone,
+  toCartesian,
+} from "../../src/helpers";
 import { CommandResult, Format, SetDecimalStep, UID } from "../../src/types";
 import {
   createSheet,
@@ -824,4 +829,58 @@ describe("Autoresize", () => {
     expect(getCellContent(model, "A1")).toEqual("-7");
     expect(model.getters.getRowSize(sheetId, 0)).toEqual(initialSize);
   });
+
+  test.each([
+    0,
+    -Math.PI / 2,
+    -Math.PI / 3,
+    -Math.PI / 4,
+    0,
+    Math.PI / 4,
+    Math.PI / 3,
+    Math.PI / 2,
+  ])("Autoresize work with rotated text %s", (rotation) => {
+    model.dispatch("SET_FORMATTING", {
+      sheetId,
+      target: [positionToZone(toCartesian("A2"))],
+      style: { rotation, fontSize: 20 },
+    });
+
+    const cos = Math.abs(Math.cos(rotation));
+    const sin = Math.abs(Math.sin(rotation));
+    let width, height;
+
+    setCellContent(model, "A1", "ABC");
+    ({ width, height } = model.getters.getMultilineTextSize(["ABC"], { rotation, fontSize: 20 }));
+    model.dispatch("AUTORESIZE_COLUMNS", { sheetId, cols: [0] });
+    expect(model.getters.getColSize(sheetId, 0)).toEqual(
+      cos * width + sin * height + 2 * PADDING_AUTORESIZE_HORIZONTAL
+    );
+    model.dispatch("AUTORESIZE_ROWS", { sheetId, rows: [0] });
+    expect(model.getters.getRowSize(sheetId, 0)).toEqual(
+      sin * width + cos * height + 2 * PADDING_AUTORESIZE_VERTICAL
+    );
+
+    setCellContent(model, "A1", "ABC\n123");
+    ({ width, height } = model.getters.getMultilineTextSize(["ABC", "123"], { rotation }));
+    model.dispatch("AUTORESIZE_COLUMNS", { sheetId, cols: [0] });
+    expect(model.getters.getColSize(sheetId, 0)).toEqual(
+      cos * width + sin * height + 2 * PADDING_AUTORESIZE_HORIZONTAL
+    );
+    model.dispatch("AUTORESIZE_ROWS", { sheetId, rows: [0] });
+    expect(model.getters.getRowSize(sheetId, 0)).toEqual(
+      sin * width + cos * height + 2 * PADDING_AUTORESIZE_VERTICAL
+    );
+
+    setCellContent(model, "A1", "ABC-123");
+    ({ width, height } = model.getters.getMultilineTextSize(["ABC-123"], { rotation }));
+    model.dispatch("AUTORESIZE_COLUMNS", { sheetId, cols: [0] });
+    expect(model.getters.getColSize(sheetId, 0)).toEqual(
+      cos * width + sin * height + 2 * PADDING_AUTORESIZE_HORIZONTAL
+    );
+    model.dispatch("AUTORESIZE_ROWS", { sheetId, rows: [0] });
+    expect(model.getters.getRowSize(sheetId, 0)).toEqual(
+      sin * width + cos * height + 2 * PADDING_AUTORESIZE_VERTICAL
+    );
+  });
 });

tests/renderer/cell_animations.test.ts

@@ -68,7 +68,11 @@ beforeEach(() => {
   rendererStore = container.get(RendererStore);
   jest
     .spyOn(MockCanvasRenderingContext2D.prototype, "measureText")
-    .mockImplementation((text: string) => ({ width: text.length }));
+    .mockImplementation((text: string) => ({
+      width: text.length,
+      fontBoundingBoxAscent: 1,
+      fontBoundingBoxDescent: 1,
+    }));
 
   const ctx = new MockGridRenderingContext(model, 1000, 1000, {});
   drawGrid = () => rendererStore.draw(ctx);

tests/renderer/renderer_store.test.ts

@@ -56,6 +56,8 @@ import { makeStoreWithModel } from "../test_helpers/stores";
 MockCanvasRenderingContext2D.prototype.measureText = function (text: string) {
   return {
     width: text.length,
+    fontBoundingBoxAscent: 1,
+    fontBoundingBoxDescent: 1,
   };
 };
 

tests/setup/canvas.mock.ts

@@ -24,6 +24,8 @@ export class MockCanvasRenderingContext2D {
     const fontSize = getContextFontSize(this.font);
     return {
       width: fontSize * text.length || 0,
+      fontBoundingBoxAscent: fontSize / 2,
+      fontBoundingBoxDescent: fontSize / 2,
     };
   }
   drawImage() {}

tests/test_helpers/renderer_helpers.ts

@@ -4,7 +4,7 @@ import { GridRenderingContext, Viewport, Zone } from "../../src/types";
 import { MockCanvasRenderingContext2D } from "../setup/canvas.mock";
 
 MockCanvasRenderingContext2D.prototype.measureText = function () {
-  return { width: 100 };
+  return { width: 100, fontBoundingBoxAscent: 1, fontBoundingBoxDescent: 1 };
 };
 
 interface ContextObserver {