From 83780b91d2cd7980ddfcb99b662a14b1378fe5ff Mon Sep 17 00:00:00 2001 From: Aakansha Doshi Date: Mon, 6 Mar 2023 15:31:38 +0530 Subject: [PATCH] rename getContainerCoords -> computeBoundTextElementCoords --- src/element/textElement.test.ts | 10 +++++----- src/element/textElement.ts | 12 ++++-------- src/element/textWysiwyg.tsx | 4 ++-- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/element/textElement.test.ts b/src/element/textElement.test.ts index 87219b298..987218c4a 100644 --- a/src/element/textElement.test.ts +++ b/src/element/textElement.test.ts @@ -2,7 +2,7 @@ import { BOUND_TEXT_PADDING } from "../constants"; import { API } from "../tests/helpers/api"; import { computeContainerHeightForBoundText, - getContainerCoords, + computeBoundTextElementCoords, getMaxContainerWidth, getMaxContainerHeight, wrapText, @@ -177,7 +177,7 @@ break it now`, }); describe("Test measureText", () => { - describe("Test getContainerCoords", () => { + describe("Test computeBoundTextElementCoords", () => { const params = { width: 200, height: 100, x: 10, y: 20 }; it("should compute coords correctly when ellipse", () => { @@ -185,7 +185,7 @@ describe("Test measureText", () => { type: "ellipse", ...params, }); - expect(getContainerCoords(element)).toEqual({ + expect(computeBoundTextElementCoords(element)).toEqual({ x: 44.2893218813452455, y: 39.64466094067262, }); @@ -196,7 +196,7 @@ describe("Test measureText", () => { type: "rectangle", ...params, }); - expect(getContainerCoords(element)).toEqual({ + expect(computeBoundTextElementCoords(element)).toEqual({ x: 15, y: 25, }); @@ -207,7 +207,7 @@ describe("Test measureText", () => { type: "diamond", ...params, }); - expect(getContainerCoords(element)).toEqual({ + expect(computeBoundTextElementCoords(element)).toEqual({ x: 65, y: 50, }); diff --git a/src/element/textElement.ts b/src/element/textElement.ts index cd27d5b34..5134c76f2 100644 --- a/src/element/textElement.ts +++ b/src/element/textElement.ts @@ -244,7 +244,7 @@ const computeBoundTextPosition = ( container: ExcalidrawElement, boundTextElement: ExcalidrawTextElementWithContainer, ) => { - const containerCoords = getContainerCoords(container); + const containerCoords = computeBoundTextElementCoords(container); const maxContainerHeight = getMaxContainerHeight(container); const maxContainerWidth = getMaxContainerWidth(container); @@ -614,7 +614,9 @@ export const getContainerCenter = ( return { x: midSegmentMidpoint[0], y: midSegmentMidpoint[1] }; }; -export const getContainerCoords = (container: NonDeletedExcalidrawElement) => { +export const computeBoundTextElementCoords = ( + container: NonDeletedExcalidrawElement, +) => { let offsetX = BOUND_TEXT_PADDING; let offsetY = BOUND_TEXT_PADDING; @@ -810,9 +812,3 @@ export const getMaxContainerHeight = (container: ExcalidrawElement) => { } return height - BOUND_TEXT_PADDING * 2; }; - -// export const computeContainerCoordsFromBoundText = ( -// boundText: ExcalidrawTextElementWithContainer, -// ) => { - -// }; diff --git a/src/element/textWysiwyg.tsx b/src/element/textWysiwyg.tsx index bbe87ed23..4baac3d49 100644 --- a/src/element/textWysiwyg.tsx +++ b/src/element/textWysiwyg.tsx @@ -24,7 +24,7 @@ import { mutateElement } from "./mutateElement"; import { getApproxLineHeight, getBoundTextElementId, - getContainerCoords, + computeBoundTextElementCoords, getContainerDims, getContainerElement, getTextElementAngle, @@ -233,7 +233,7 @@ export const textWysiwyg = ({ // Start pushing text upward until a diff of 30px (padding) // is reached else { - const containerCoords = getContainerCoords(container); + const containerCoords = computeBoundTextElementCoords(container); // vertically center align the text if (verticalAlign === VERTICAL_ALIGN.MIDDLE) {