Merge remote-tracking branch 'origin/release' into danieljgeiger-mathjax

src/element/textElement.ts

@@ -323,7 +323,8 @@ export const measureText = (
   container.appendChild(span);
   // Baseline is important for positioning text on canvas
   const baseline = span.offsetTop + span.offsetHeight;
-  const width = container.offsetWidth;
+  // since we are adding a span of width 1px
+  const width = container.offsetWidth + 1;
   const height = container.offsetHeight;
   document.body.removeChild(container);
   if (isTestEnv()) {

src/element/textWysiwyg.test.tsx

@@ -878,7 +878,7 @@ describe("textWysiwyg", () => {
       resize(rectangle, "ne", [rectangle.x + 100, rectangle.y - 100]);
       expect([h.elements[1].x, h.elements[1].y]).toMatchInlineSnapshot(`
         Array [
-          110,
+          109.5,
           17,
         ]
       `);
@@ -926,7 +926,7 @@ describe("textWysiwyg", () => {
       resize(rectangle, "ne", [rectangle.x + 100, rectangle.y - 100]);
       expect([h.elements[1].x, h.elements[1].y]).toMatchInlineSnapshot(`
         Array [
-          425,
+          424,
           -539,
         ]
       `);
@@ -1042,7 +1042,7 @@ describe("textWysiwyg", () => {
       mouse.up(rectangle.x + 100, rectangle.y + 50);
       expect(rectangle.x).toBe(80);
       expect(rectangle.y).toBe(85);
-      expect(text.x).toBe(90);
+      expect(text.x).toBe(89.5);
       expect(text.y).toBe(90);
 
       Keyboard.withModifierKeys({ ctrl: true }, () => {

src/element/textWysiwyg.tsx

@@ -306,6 +306,7 @@ export const textWysiwyg = ({
           : textAlign === "center"
           ? offWidth / 2
           : 0;
+      const { width: w, height: h } = updatedTextElement;
 
       // Make sure text editor height doesn't go beyond viewport
       const editorMaxHeight =
@@ -318,8 +319,7 @@ export const textWysiwyg = ({
         height: `${textElementHeight}px`,
         left: `${viewportX}px`,
         top: `${viewportY}px`,
-        transformOrigin: `${updatedTextElement.width / 2}px
-          ${updatedTextElement.height / 2}px`,
+        transformOrigin: `${w / 2}px ${h / 2}px`,
         transform: getTransform(
           offsetX,
           updatedTextElement.width,