Virtual whiteboard for sketching hand-drawn like diagrams
fix: line editor points rendering below elements (#5781)
David Luzar02286465079b
diff --git a/src/renderer/renderScene.ts b/src/renderer/renderScene.tsindex 8aebcdcb99..7c089ed53f 100644--- a/src/renderer/renderScene.ts+++ b/src/renderer/renderScene.ts@@ -406,6 +406,8 @@ export const _renderScene = ({}),);+ let editingLinearElement: NonDeleted<ExcalidrawLinearElement> | undefined =+ undefined;visibleElements.forEach((element) => {try {renderElement(element, rc, context, renderConfig);@@ -414,15 +416,10 @@ export const _renderScene = ({// correct element from visible elementsif (appState.editingLinearElement?.elementId === element.id) {if (element) {- renderLinearPointHandles(- context,- appState,- renderConfig,- element as NonDeleted<ExcalidrawLinearElement>,- );+ editingLinearElement =+ element as NonDeleted<ExcalidrawLinearElement>;}}-if (!isExporting) {renderLinkIcon(element, context, appState);}@@ -431,6 +428,15 @@ export const _renderScene = ({}});+ if (editingLinearElement) {+ renderLinearPointHandles(+ context,+ appState,+ renderConfig,+ editingLinearElement,+ );+ }+// Paint selection elementif (appState.selectionElement) {try {diff --git a/src/tests/linearElementEditor.test.tsx b/src/tests/linearElementEditor.test.tsxindex 122bd135ce..56993b72c4 100644--- a/src/tests/linearElementEditor.test.tsx+++ b/src/tests/linearElementEditor.test.tsx@@ -16,7 +16,7 @@ const renderScene = jest.spyOn(Renderer, "renderScene");const { h } = window;-describe(" Test Linear Elements", () => {+describe("Test Linear Elements", () => {let container: HTMLElement;let canvas: HTMLCanvasElement;@@ -89,8 +89,15 @@ describe(" Test Linear Elements", () => {mouse.clickAt(p1[0], p1[1]);};- const enterLineEditingMode = (line: ExcalidrawLinearElement) => {- mouse.clickAt(p1[0], p1[1]);+ const enterLineEditingMode = (+ line: ExcalidrawLinearElement,+ selectProgrammatically = false,+ ) => {+ if (selectProgrammatically) {+ API.setSelectedElements([line]);+ } else {+ mouse.clickAt(p1[0], p1[1]);+ }Keyboard.keyPress(KEYS.ENTER);expect(h.state.editingLinearElement?.elementId).toEqual(line.id);};@@ -604,5 +611,43 @@ describe(" Test Linear Elements", () => {`);});});++ it("in-editor dragging a line point covered by another element", () => {+ createTwoPointerLinearElement("line");+ const line = h.elements[0] as ExcalidrawLinearElement;+ h.elements = [+ line,+ API.createElement({+ type: "rectangle",+ x: line.x - 50,+ y: line.y - 50,+ width: 100,+ height: 100,+ backgroundColor: "red",+ fillStyle: "solid",+ }),+ ];++ const origPoints = line.points.map((point) => [...point]);+ const dragEndPositionOffset = [100, 100] as const;+ API.setSelectedElements([line]);+ enterLineEditingMode(line, true);+ drag(+ [line.points[0][0] + line.x, line.points[0][1] + line.y],+ [dragEndPositionOffset[0] + line.x, dragEndPositionOffset[1] + line.y],+ );+ expect(line.points).toMatchInlineSnapshot(`+ Array [+ Array [+ 0,+ 0,+ ],+ Array [+ ${origPoints[1][0] - dragEndPositionOffset[0]},+ ${origPoints[1][1] - dragEndPositionOffset[1]},+ ],+ ]+ `);+ });});});