Compare commits
10 Commits
master
...
zsviczian-
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c1f8eca7de | ||
![]() |
340b9757c3 | ||
![]() |
6035ebe95f | ||
![]() |
1a877fa8c7 | ||
![]() |
956228f4a1 | ||
![]() |
cfb9f8d8c7 | ||
![]() |
da06e8ad27 | ||
![]() |
27c7e75761 | ||
![]() |
2b8d69c65d | ||
![]() |
6d071a8a13 |
@ -11,7 +11,7 @@ import {
|
|||||||
isBoundToContainer,
|
isBoundToContainer,
|
||||||
isTextElement,
|
isTextElement,
|
||||||
} from "./typeChecks";
|
} from "./typeChecks";
|
||||||
import { CLASSES, isFirefox, isSafari, VERTICAL_ALIGN } from "../constants";
|
import { CLASSES, VERTICAL_ALIGN } from "../constants";
|
||||||
import {
|
import {
|
||||||
ExcalidrawElement,
|
ExcalidrawElement,
|
||||||
ExcalidrawLinearElement,
|
ExcalidrawLinearElement,
|
||||||
@ -270,12 +270,10 @@ export const textWysiwyg = ({
|
|||||||
const lineHeight = updatedTextElement.containerId
|
const lineHeight = updatedTextElement.containerId
|
||||||
? approxLineHeight
|
? approxLineHeight
|
||||||
: updatedTextElement.height / lines.length;
|
: updatedTextElement.height / lines.length;
|
||||||
|
|
||||||
if (!container) {
|
if (!container) {
|
||||||
maxWidth = (appState.width - 8 - viewportX) / appState.zoom.value;
|
maxWidth = (appState.width - 8 - viewportX) / appState.zoom.value;
|
||||||
textElementWidth = Math.min(textElementWidth, maxWidth);
|
textElementWidth = Math.min(textElementWidth, maxWidth);
|
||||||
} else if (isFirefox || isSafari) {
|
|
||||||
// As firefox, Safari needs little higher dimensions on DOM
|
|
||||||
textElementWidth += 0.5;
|
|
||||||
}
|
}
|
||||||
// Make sure text editor height doesn't go beyond viewport
|
// Make sure text editor height doesn't go beyond viewport
|
||||||
const editorMaxHeight =
|
const editorMaxHeight =
|
||||||
@ -348,7 +346,32 @@ export const textWysiwyg = ({
|
|||||||
overflowWrap: "break-word",
|
overflowWrap: "break-word",
|
||||||
boxSizing: "content-box",
|
boxSizing: "content-box",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const magicOffset =
|
||||||
|
(excalidrawContainer
|
||||||
|
? parseFloat(getComputedStyle(excalidrawContainer).fontSize)
|
||||||
|
: 16) / 16;
|
||||||
|
|
||||||
|
const onEditableInput = () => {
|
||||||
|
const updatedTextElement = Scene.getScene(element)?.getElement(
|
||||||
|
id,
|
||||||
|
) as ExcalidrawTextElement;
|
||||||
|
const font = getFontString(updatedTextElement);
|
||||||
|
if (isBoundToContainer(element)) {
|
||||||
|
const container = getContainerElement(element);
|
||||||
|
const wrappedText = wrapText(
|
||||||
|
normalizeText(editable.value),
|
||||||
|
font,
|
||||||
|
getMaxContainerWidth(container!),
|
||||||
|
);
|
||||||
|
const { width, height } = measureText(wrappedText, font);
|
||||||
|
editable.style.width = `${width + magicOffset}px`;
|
||||||
|
editable.style.height = `${height}px`;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
updateWysiwygStyle();
|
updateWysiwygStyle();
|
||||||
|
onEditableInput();
|
||||||
|
|
||||||
if (onChange) {
|
if (onChange) {
|
||||||
editable.onpaste = async (event) => {
|
editable.onpaste = async (event) => {
|
||||||
@ -378,21 +401,7 @@ export const textWysiwyg = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
editable.oninput = () => {
|
editable.oninput = () => {
|
||||||
const updatedTextElement = Scene.getScene(element)?.getElement(
|
onEditableInput();
|
||||||
id,
|
|
||||||
) as ExcalidrawTextElement;
|
|
||||||
const font = getFontString(updatedTextElement);
|
|
||||||
if (isBoundToContainer(element)) {
|
|
||||||
const container = getContainerElement(element);
|
|
||||||
const wrappedText = wrapText(
|
|
||||||
normalizeText(editable.value),
|
|
||||||
font,
|
|
||||||
getMaxContainerWidth(container!),
|
|
||||||
);
|
|
||||||
const { width, height } = measureText(wrappedText, font);
|
|
||||||
editable.style.width = `${width}px`;
|
|
||||||
editable.style.height = `${height}px`;
|
|
||||||
}
|
|
||||||
onChange(normalizeText(editable.value));
|
onChange(normalizeText(editable.value));
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user