github.com/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-02-18 13:29:36 +01:00
Code Releases Wiki Activity

fix: always make sure we render bound text above containers (#7880)

Browse Source
This commit is contained in:
David Luzar 2024-04-12 21:50:02 +02:00 committed by GitHub
parent afcde542f9
commit f59b4f6af4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/excalidraw/renderer/staticScene.ts
View File

@ -9,6 +9,7 @@ import {
import {
isEmbeddableElement,
isIframeLikeElement,
isTextElement,
} from "../element/typeChecks";
import { renderElement } from "../renderer/renderElement";
import { createPlaceholderEmbeddableLabel } from "../element/embeddable";
@ -28,6 +29,7 @@ import {
} from "../components/hyperlink/helpers";
import { bootstrapCanvas, getNormalizedCanvasDimensions } from "./helpers";
import { throttleRAF } from "../utils";
import { getBoundTextElement } from "../element/textElement";
const strokeGrid = (
context: CanvasRenderingContext2D,
@ -236,13 +238,22 @@ const _renderStaticScene = ({
try {
const frameId = element.frameId || appState.frameToHighlight?.id;
if (
isTextElement(element) &&
element.containerId &&
elementsMap.has(element.containerId)
) {
// will be rendered with the container
return;
}
context.save();
if (
frameId &&
appState.frameRendering.enabled &&
appState.frameRendering.clip
) {
context.save();
const frame = getTargetFrame(element, elementsMap, appState);
// TODO do we need to check isElementInFrame here?
@ -258,7 +269,6 @@ const _renderStaticScene = ({
renderConfig,
appState,
);
context.restore();
} else {
renderElement(
element,
@ -270,6 +280,22 @@ const _renderStaticScene = ({
appState,
);
}
const boundTextElement = getBoundTextElement(element, allElementsMap);
if (boundTextElement) {
renderElement(
boundTextElement,
elementsMap,
allElementsMap,
rc,
context,
renderConfig,
appState,
);
}
context.restore();
if (!isExporting) {
renderLinkIcon(element, context, appState, elementsMap);
}

23
packages/excalidraw/renderer/staticSvgScene.ts
View File

@ -618,6 +618,15 @@ export const renderSceneToSvg = (
.filter((el) => !isIframeLikeElement(el))
.forEach((element) => {
if (!element.isDeleted) {
if (
isTextElement(element) &&
element.containerId &&
elementsMap.has(element.containerId)
) {
// will be rendered with the container
return;
}
try {
renderElementToSvg(
element,
@ -629,6 +638,20 @@ export const renderSceneToSvg = (
element.y + renderConfig.offsetY,
renderConfig,
);
const boundTextElement = getBoundTextElement(element, elementsMap);
if (boundTextElement) {
renderElementToSvg(
boundTextElement,
elementsMap,
rsvg,
svgRoot,
files,
boundTextElement.x + renderConfig.offsetX,
boundTextElement.y + renderConfig.offsetY,
renderConfig,
);
}
} catch (error: any) {
console.error(error);
}