smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-04-14 16:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

introduce DOM baseline in canvas rendering instead

Browse source
This commit is contained in:
Aakansha Doshi 2023-03-31 11:50:04 +05:30
parent 9dab749dfd
commit 974745b9e5
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/element/textWysiwyg.tsx
View file

@ -272,17 +272,8 @@ export const textWysiwyg = ({
} else {
textElementWidth += 0.5;
}
const baseline = measureBaseline(
updatedTextElement.text,
getFontString(updatedTextElement),
updatedTextElement.lineHeight,
!!container,
);
const offset =
(updatedTextElement.height - baseline - 8) * appState.zoom.value;
const top = viewportY + offset;
const top = viewportY;
// Make sure text editor height doesn't go beyond viewport
const editorMaxHeight =
(appState.height - viewportY) / appState.zoom.value;

11
src/renderer/renderElement.ts
View file

@ -34,7 +34,6 @@ import { AppState, BinaryFiles, Zoom } from "../types";
import { getDefaultAppState } from "../appState";
import {
BOUND_TEXT_PADDING,
FONT_FAMILY,
MAX_DECIMALS_FOR_SVG_EXPORT,
MIME_TYPES,
SVG_NS,
@ -47,6 +46,7 @@ import {
getLineHeightInPx,
getMaxContainerHeight,
getMaxContainerWidth,
measureBaseline,
} from "../element/textElement";
import { LinearElementEditor } from "../element/linearElementEditor";
@ -307,6 +307,13 @@ const drawElementOnCanvas = (
// "magenta",
// context,
// );
const container = getContainerElement(element);
const baseline = measureBaseline(
element.text,
getFontString(element),
element.lineHeight,
!!container,
);
context.fillStyle = element.strokeColor;
context.textAlign = element.textAlign as CanvasTextAlign;
@ -324,7 +331,7 @@ const drawElementOnCanvas = (
element.fontSize,
element.lineHeight,
);
const verticalOffset = 8;
const verticalOffset = element.height - baseline;
for (let index = 0; index < lines.length; index++) {
context.fillText(