diff --git a/dev-docs/docs/@excalidraw/excalidraw/api/children-components/welcome-screen.mdx b/dev-docs/docs/@excalidraw/excalidraw/api/children-components/welcome-screen.mdx
index 8150508b..88348706 100644
--- a/dev-docs/docs/@excalidraw/excalidraw/api/children-components/welcome-screen.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/children-components/welcome-screen.mdx
@@ -31,7 +31,7 @@ The welcome screen consists of two main groups of subcomponents:
![Excalidraw logo: Sketch handrawn like diagrams.]({require("@site/static/img/welcome-screen-overview.png").default})
### Center
diff --git a/dev-docs/docs/@excalidraw/excalidraw/api/constants.mdx b/dev-docs/docs/@excalidraw/excalidraw/api/constants.mdx
index 029f5b05..411cbb44 100644
--- a/dev-docs/docs/@excalidraw/excalidraw/api/constants.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/constants.mdx
@@ -12,7 +12,7 @@ import { FONT_FAMILY } from "@excalidraw/excalidraw";
| Font Family | Description |
| ----------- | ---------------------- |
-| `Virgil` | The `handwritten` font |
+| `Virgil` | The `Hand-drawn` font |
| `Helvetica` | The `Normal` Font |
| `Cascadia` | The `Code` Font |
diff --git a/excalidraw-app/index.html b/excalidraw-app/index.html
index 02f153d8..e1a319d0 100644
--- a/excalidraw-app/index.html
+++ b/excalidraw-app/index.html
@@ -133,7 +133,7 @@
diff --git a/excalidraw-app/vite.config.mts b/excalidraw-app/vite.config.mts
index 264ae9fb..e9aac957 100644
--- a/excalidraw-app/vite.config.mts
+++ b/excalidraw-app/vite.config.mts
@@ -25,8 +25,14 @@ export default defineConfig({
output: {
assetFileNames(chunkInfo) {
if (chunkInfo?.name?.endsWith(".woff2")) {
+ // TODO: consider splitting all fonts similar to Xiaolai
+ // fonts don't change often, so hash is not necessary
// put on root so we are flexible about the CDN path
- return "[name]-[hash][extname]";
+ if (chunkInfo.name.includes("Xiaolai")) {
+ return "[name][extname]";
+ } else {
+ return "[name]-[hash][extname]";
+ }
}
return "assets/[name]-[hash][extname]";
@@ -75,17 +81,21 @@ export default defineConfig({
},
workbox: {
- // Don't push fonts, locales and wasm to app precache
- globIgnores: ["fonts.css", "**/locales/**", "service-worker.js", "**/*.wasm-*.js"],
+ // don't precache fonts, locales and separate chunks
+ globIgnores: ["fonts.css", "**/locales/**", "service-worker.js", "**/*.chunk-*.js"],
runtimeCaching: [
{
- urlPattern: new RegExp("/.+.(ttf|woff2|otf)"),
- handler: "CacheFirst",
+ urlPattern: new RegExp(".+.woff2"),
+ handler: 'CacheFirst',
options: {
- cacheName: "fonts",
+ cacheName: 'fonts',
expiration: {
- maxEntries: 50,
- maxAgeSeconds: 60 * 60 * 24 * 90, // <== 90 days
+ maxEntries: 1000,
+ maxAgeSeconds: 60 * 60 * 24 * 90, // 90 days
+ },
+ cacheableResponse: {
+ // 0 to cache "opaque" responses from cross-origin requests (i.e. CDN)
+ statuses: [0, 200],
},
},
},
@@ -111,10 +121,10 @@ export default defineConfig({
},
},
{
- urlPattern: new RegExp(".wasm-.+.js"),
+ urlPattern: new RegExp(".chunk-.+.js"),
handler: "CacheFirst",
options: {
- cacheName: "wasm",
+ cacheName: "chunk",
expiration: {
maxEntries: 50,
maxAgeSeconds: 60 * 60 * 24 * 90, // <== 90 days
diff --git a/packages/excalidraw/CHANGELOG.md b/packages/excalidraw/CHANGELOG.md
index b4dcb575..ab3edeba 100644
--- a/packages/excalidraw/CHANGELOG.md
+++ b/packages/excalidraw/CHANGELOG.md
@@ -15,6 +15,8 @@ Please add the latest change on the top under the correct section.
### Features
+- Added hand-drawn font for Chinese, Japanese and Korean (CJK) as a fallback for Excalifont. Improved overal text wrapping algorithm, not only accounting for CJK, but covering various edge cases with white spaces and text-align center/right. Added support for multi-codepoint emojis wrapping. Offloaded SVG export to Web Workers, with an automatic fallback to the main thread if not supported or not desired.[#8530](https://github.com/excalidraw/excalidraw/pull/8530)
+
- Prefer user defined coordinates and dimensions when creating a frame using [`convertToExcalidrawElements`](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/api/excalidraw-element-skeleton#converttoexcalidrawelements) [#8517](https://github.com/excalidraw/excalidraw/pull/8517)
- `props.initialData` can now be a function that returns `ExcalidrawInitialDataState` or `Promise`. [#8107](https://github.com/excalidraw/excalidraw/pull/8135)
diff --git a/packages/excalidraw/actions/actionClipboard.tsx b/packages/excalidraw/actions/actionClipboard.tsx
index 4d34bf96..0956747b 100644
--- a/packages/excalidraw/actions/actionClipboard.tsx
+++ b/packages/excalidraw/actions/actionClipboard.tsx
@@ -147,14 +147,32 @@ export const actionCopyAsSvg = register({
name: app.getName(),
},
);
+
+ const selectedElements = app.scene.getSelectedElements({
+ selectedElementIds: appState.selectedElementIds,
+ includeBoundTextElement: true,
+ includeElementsInFrames: true,
+ });
+
return {
+ appState: {
+ toast: {
+ message: t("toast.copyToClipboardAsSvg", {
+ exportSelection: selectedElements.length
+ ? t("toast.selection")
+ : t("toast.canvas"),
+ exportColorScheme: appState.exportWithDarkMode
+ ? t("buttons.darkMode")
+ : t("buttons.lightMode"),
+ }),
+ },
+ },
storeAction: StoreAction.NONE,
};
} catch (error: any) {
console.error(error);
return {
appState: {
- ...appState,
errorMessage: error.message,
},
storeAction: StoreAction.NONE,
@@ -164,6 +182,7 @@ export const actionCopyAsSvg = register({
predicate: (elements) => {
return probablySupportsClipboardWriteText && elements.length > 0;
},
+ keyTest: (event) => event.code === CODES.C && event.ctrlKey && event.shiftKey,
keywords: ["svg", "clipboard", "copy"],
});
diff --git a/packages/excalidraw/actions/shortcuts.ts b/packages/excalidraw/actions/shortcuts.ts
index 025d9103..1f424fb5 100644
--- a/packages/excalidraw/actions/shortcuts.ts
+++ b/packages/excalidraw/actions/shortcuts.ts
@@ -88,7 +88,7 @@ const shortcutMap: Record = {
: getShortcutKey("CtrlOrCmd+Shift+]"),
],
copyAsPng: [getShortcutKey("Shift+Alt+C")],
- copyAsSvg: [],
+ copyAsSvg: [getShortcutKey("Shift+Ctrl+C")],
group: [getShortcutKey("CtrlOrCmd+G")],
ungroup: [getShortcutKey("CtrlOrCmd+Shift+G")],
gridMode: [getShortcutKey("CtrlOrCmd+'")],
diff --git a/packages/excalidraw/actions/types.ts b/packages/excalidraw/actions/types.ts
index 15364d21..bef3dfca 100644
--- a/packages/excalidraw/actions/types.ts
+++ b/packages/excalidraw/actions/types.ts
@@ -10,7 +10,6 @@ import type {
BinaryFiles,
UIAppState,
} from "../types";
-import type { MarkOptional } from "../utility-types";
import type { StoreActionType } from "../store";
export type ActionSource =
@@ -24,10 +23,7 @@ export type ActionSource =
export type ActionResult =
| {
elements?: readonly ExcalidrawElement[] | null;
- appState?: MarkOptional<
- AppState,
- "offsetTop" | "offsetLeft" | "width" | "height"
- > | null;
+ appState?: Partial | null;
files?: BinaryFiles | null;
storeAction: StoreActionType;
replaceFiles?: boolean;
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
index b5f59265..db11c1ed 100644
--- a/packages/excalidraw/components/App.tsx
+++ b/packages/excalidraw/components/App.tsx
@@ -2150,11 +2150,12 @@ class App extends React.Component {
editingTextElement = null;
}
- this.setState((state) => {
- // using Object.assign instead of spread to fool TS 4.2.2+ into
- // regarding the resulting type as not containing undefined
- // (which the following expression will never contain)
- return Object.assign(actionResult.appState || {}, {
+ this.setState((prevAppState) => {
+ const actionAppState = actionResult.appState || {};
+
+ return {
+ ...prevAppState,
+ ...actionAppState,
// NOTE this will prevent opening context menu using an action
// or programmatically from the host, so it will need to be
// rewritten later
@@ -2165,7 +2166,7 @@ class App extends React.Component {
theme,
name,
errorMessage,
- });
+ };
});
didUpdate = true;
diff --git a/packages/excalidraw/components/FontPicker/FontPicker.tsx b/packages/excalidraw/components/FontPicker/FontPicker.tsx
index e32c952d..4585c584 100644
--- a/packages/excalidraw/components/FontPicker/FontPicker.tsx
+++ b/packages/excalidraw/components/FontPicker/FontPicker.tsx
@@ -21,7 +21,7 @@ export const DEFAULT_FONTS = [
value: FONT_FAMILY.Excalifont,
icon: FreedrawIcon,
text: t("labels.handDrawn"),
- testId: "font-family-handrawn",
+ testId: "font-family-hand-drawn",
},
{
value: FONT_FAMILY.Nunito,
diff --git a/packages/excalidraw/components/FontPicker/FontPickerList.tsx b/packages/excalidraw/components/FontPicker/FontPickerList.tsx
index 91d537eb..6e1bf56c 100644
--- a/packages/excalidraw/components/FontPicker/FontPickerList.tsx
+++ b/packages/excalidraw/components/FontPicker/FontPickerList.tsx
@@ -21,6 +21,7 @@ import { t } from "../../i18n";
import { fontPickerKeyHandler } from "./keyboardNavHandlers";
import { Fonts } from "../../fonts";
import type { ValueOf } from "../../utility-types";
+import { FontFamilyNormalIcon } from "../icons";
export interface FontDescriptor {
value: number;
@@ -62,12 +63,14 @@ export const FontPickerList = React.memo(
const allFonts = useMemo(
() =>
Array.from(Fonts.registered.entries())
- .filter(([_, { metadata }]) => !metadata.serverSide)
- .map(([familyId, { metadata, fonts }]) => {
+ .filter(
+ ([_, { metadata }]) => !metadata.serverSide && !metadata.fallback,
+ )
+ .map(([familyId, { metadata, fontFaces }]) => {
const fontDescriptor = {
value: familyId,
- icon: metadata.icon,
- text: fonts[0].fontFace.family,
+ icon: metadata.icon ?? FontFamilyNormalIcon,
+ text: fontFaces[0]?.fontFace?.family ?? "Unknown",
};
if (metadata.deprecated) {
@@ -89,7 +92,7 @@ export const FontPickerList = React.memo(
);
const sceneFamilies = useMemo(
- () => new Set(fonts.getSceneFontFamilies()),
+ () => new Set(fonts.getSceneFamilies()),
// cache per selected font family, so hover re-render won't mess it up
// eslint-disable-next-line react-hooks/exhaustive-deps
[selectedFontFamily],
diff --git a/packages/excalidraw/components/HelpDialog.tsx b/packages/excalidraw/components/HelpDialog.tsx
index 886c7bb7..7b0dff79 100644
--- a/packages/excalidraw/components/HelpDialog.tsx
+++ b/packages/excalidraw/components/HelpDialog.tsx
@@ -374,6 +374,10 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
shortcuts={[getShortcutKey("Shift+Alt+C")]}
/>
)}
+
=> {
+ switch (fontFamily) {
+ case FONT_FAMILY.Excalifont:
+ return [CJK_HAND_DRAWN_FALLBACK_FONT, WINDOWS_EMOJI_FALLBACK_FONT];
+ default:
+ return [WINDOWS_EMOJI_FALLBACK_FONT];
+ }
+};
+
export const THEME = {
LIGHT: "light",
DARK: "dark",
@@ -157,8 +176,6 @@ export const FRAME_STYLE = {
nameLineHeight: 1.25,
};
-export const WINDOWS_EMOJI_FALLBACK_FONT = "Segoe UI Emoji";
-
export const MIN_FONT_SIZE = 1;
export const DEFAULT_FONT_SIZE = 20;
export const DEFAULT_FONT_FAMILY: FontFamilyValues = FONT_FAMILY.Excalifont;
diff --git a/packages/excalidraw/data/__snapshots__/transform.test.ts.snap b/packages/excalidraw/data/__snapshots__/transform.test.ts.snap
index 967de923..2ab3ee1f 100644
--- a/packages/excalidraw/data/__snapshots__/transform.test.ts.snap
+++ b/packages/excalidraw/data/__snapshots__/transform.test.ts.snap
@@ -2171,7 +2171,7 @@ exports[`Test Transform > should transform to labelled arrows when label provide
"strokeColor": "#1098ad",
"strokeStyle": "solid",
"strokeWidth": 2,
- "text": "ANOTHER STYLED
+ "text": "ANOTHER STYLED
LABELLED ARROW",
"textAlign": "center",
"type": "text",
@@ -2179,8 +2179,8 @@ LABELLED ARROW",
"version": 3,
"versionNonce": Any,
"verticalAlign": "middle",
- "width": 150,
- "x": 75,
+ "width": 140,
+ "x": 80,
"y": 275,
}
`;
@@ -2213,7 +2213,7 @@ exports[`Test Transform > should transform to labelled arrows when label provide
"strokeColor": "#099268",
"strokeStyle": "solid",
"strokeWidth": 2,
- "text": "ANOTHER STYLED
+ "text": "ANOTHER STYLED
LABELLED ARROW",
"textAlign": "center",
"type": "text",
@@ -2221,8 +2221,8 @@ LABELLED ARROW",
"version": 3,
"versionNonce": Any,
"verticalAlign": "middle",
- "width": 150,
- "x": 75,
+ "width": 140,
+ "x": 80,
"y": 375,
}
`;
@@ -2518,7 +2518,7 @@ exports[`Test Transform > should transform to text containers when label provide
"strokeColor": "#1e1e1e",
"strokeStyle": "solid",
"strokeWidth": 2,
- "text": "ELLIPSE TEXT
+ "text": "ELLIPSE TEXT
CONTAINER",
"textAlign": "center",
"type": "text",
@@ -2526,8 +2526,8 @@ CONTAINER",
"version": 3,
"versionNonce": Any,
"verticalAlign": "middle",
- "width": 130,
- "x": 534.7893218813452,
+ "width": 120,
+ "x": 539.7893218813452,
"y": 117.44796179957173,
}
`;
@@ -2562,7 +2562,7 @@ TEXT CONTAINER",
"strokeStyle": "solid",
"strokeWidth": 2,
"text": "DIAMOND
-TEXT
+TEXT
CONTAINER",
"textAlign": "center",
"type": "text",
@@ -2646,8 +2646,8 @@ exports[`Test Transform > should transform to text containers when label provide
"strokeColor": "#c2255c",
"strokeStyle": "solid",
"strokeWidth": 2,
- "text": "TOP LEFT ALIGNED
-RECTANGLE TEXT
+ "text": "TOP LEFT ALIGNED
+RECTANGLE TEXT
CONTAINER",
"textAlign": "left",
"type": "text",
@@ -2655,7 +2655,7 @@ CONTAINER",
"version": 3,
"versionNonce": Any,
"verticalAlign": "top",
- "width": 170,
+ "width": 160,
"x": 505,
"y": 305,
}
@@ -2689,8 +2689,8 @@ exports[`Test Transform > should transform to text containers when label provide
"strokeColor": "#c2255c",
"strokeStyle": "solid",
"strokeWidth": 2,
- "text": "STYLED
-ELLIPSE TEXT
+ "text": "STYLED
+ELLIPSE TEXT
CONTAINER",
"textAlign": "center",
"type": "text",
@@ -2698,8 +2698,8 @@ CONTAINER",
"version": 3,
"versionNonce": Any,
"verticalAlign": "middle",
- "width": 130,
- "x": 534.7893218813452,
+ "width": 120,
+ "x": 539.7893218813452,
"y": 522.5735931288071,
}
`;
diff --git a/packages/excalidraw/element/textElement.test.ts b/packages/excalidraw/element/textElement.test.ts
index 178b30cd..59727c22 100644
--- a/packages/excalidraw/element/textElement.test.ts
+++ b/packages/excalidraw/element/textElement.test.ts
@@ -14,20 +14,23 @@ import {
import type { ExcalidrawTextElementWithContainer, FontString } from "./types";
describe("Test wrapText", () => {
- const font = "20px Cascadia, width: Segoe UI Emoji" as FontString;
+ // font is irrelevant as jsdom does not support FontFace API
+ // `measureText` width is mocked to return `text.length` by `jest-canvas-mock`
+ // https://github.com/hustcc/jest-canvas-mock/blob/master/src/classes/TextMetrics.js
+ const font = "10px Cascadia, Segoe UI Emoji" as FontString;
- it("shouldn't add new lines for trailing spaces", () => {
- const text = "Hello whats up ";
- const maxWidth = 200 - BOUND_TEXT_PADDING * 2;
- const res = wrapText(text, font, maxWidth);
- expect(res).toBe(text);
+ it("should wrap the text correctly when word length is exactly equal to max width", () => {
+ const text = "Hello Excalidraw";
+ // Length of "Excalidraw" is 100 and exacty equal to max width
+ const res = wrapText(text, font, 100);
+ expect(res).toEqual(`Hello\nExcalidraw`);
});
- it("should work with emojis", () => {
- const text = "😀";
- const maxWidth = 1;
- const res = wrapText(text, font, maxWidth);
- expect(res).toBe("😀");
+ it("should return the text as is if max width is invalid", () => {
+ const text = "Hello Excalidraw";
+ expect(wrapText(text, font, NaN)).toEqual(text);
+ expect(wrapText(text, font, -1)).toEqual(text);
+ expect(wrapText(text, font, Infinity)).toEqual(text);
});
it("should show the text correctly when max width reached", () => {
@@ -37,6 +40,237 @@ describe("Test wrapText", () => {
expect(res).toBe("H\ne\nl\nl\no\n😀");
});
+ it("should not wrap number when wrapping line", () => {
+ const text = "don't wrap this number 99,100.99";
+ const maxWidth = 300;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("don't wrap this number\n99,100.99");
+ });
+
+ it("should support multiple (multi-codepoint) emojis", () => {
+ const text = "😀🗺🔥👩🏽🦰👨👩👧👦🇨🇿";
+ const maxWidth = 1;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("😀\n🗺\n🔥\n👩🏽🦰\n👨👩👧👦\n🇨🇿");
+ });
+
+ it("should wrap the text correctly when text contains hyphen", () => {
+ let text =
+ "Wikipedia is hosted by Wikimedia- Foundation, a non-profit organization that also hosts a range-of other projects";
+ const res = wrapText(text, font, 110);
+ expect(res).toBe(
+ `Wikipedia\nis hosted\nby\nWikimedia-\nFoundation,\na non-\nprofit\norganizatio\nn that also\nhosts a\nrange-of\nother\nprojects`,
+ );
+
+ text = "Hello thereusing-now";
+ expect(wrapText(text, font, 100)).toEqual("Hello\nthereusing\n-now");
+ });
+
+ it("should support wrapping nested lists", () => {
+ const text = `\tA) one tab\t\t- two tabs - 8 spaces`;
+
+ const maxWidth = 100;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe(`\tA) one\ntab\t\t- two\ntabs\n- 8 spaces`);
+
+ const maxWidth2 = 50;
+ const res2 = wrapText(text, font, maxWidth2);
+ expect(res2).toBe(`\tA)\none\ntab\n- two\ntabs\n- 8\nspace\ns`);
+ });
+
+ describe("When text is CJK", () => {
+ it("should break each CJK character when width is very small", () => {
+ // "안녕하세요" (Hangul) + "こんにちは世界" (Hiragana, Kanji) + "ｺﾝﾆﾁハ" (Katakana) + "你好" (Han) = "Hello Hello World Hello Hi"
+ const text = "안녕하세요こんにちは世界ｺﾝﾆﾁハ你好";
+ const maxWidth = 10;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe(
+ "안\n녕\n하\n세\n요\nこ\nん\nに\nち\nは\n世\n界\nｺ\nﾝ\nﾆ\nﾁ\nハ\n你\n好",
+ );
+ });
+
+ it("should break CJK text into longer segments when width is larger", () => {
+ // "안녕하세요" (Hangul) + "こんにちは世界" (Hiragana, Kanji) + "ｺﾝﾆﾁハ" (Katakana) + "你好" (Han) = "Hello Hello World Hello Hi"
+ const text = "안녕하세요こんにちは世界ｺﾝﾆﾁハ你好";
+ const maxWidth = 30;
+ const res = wrapText(text, font, maxWidth);
+
+ // measureText is mocked, so it's not precisely what would happen in prod
+ expect(res).toBe("안녕하\n세요こ\nんにち\nは世界\nｺﾝﾆ\nﾁハ你\n好");
+ });
+
+ it("should handle a combination of CJK, latin, emojis and whitespaces", () => {
+ const text = `a醫 醫 bb 你好 world-i-😀🗺🔥`;
+
+ const maxWidth = 150;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe(`a醫 醫 bb 你\n好 world-i-😀🗺\n🔥`);
+
+ const maxWidth2 = 50;
+ const res2 = wrapText(text, font, maxWidth2);
+ expect(res2).toBe(`a醫 醫\nbb 你\n好\nworld\n-i-😀\n🗺🔥`);
+
+ const maxWidth3 = 30;
+ const res3 = wrapText(text, font, maxWidth3);
+ expect(res3).toBe(`a醫\n醫\nbb\n你好\nwor\nld-\ni-\n😀\n🗺\n🔥`);
+ });
+
+ it("should break before and after a regular CJK character", () => {
+ const text = "HelloたWorld";
+ const maxWidth1 = 50;
+ const res1 = wrapText(text, font, maxWidth1);
+ expect(res1).toBe("Hello\nた\nWorld");
+
+ const maxWidth2 = 60;
+ const res2 = wrapText(text, font, maxWidth2);
+ expect(res2).toBe("Helloた\nWorld");
+ });
+
+ it("should break before and after certain CJK symbols", () => {
+ const text = "こんにちは〃世界";
+ const maxWidth1 = 50;
+ const res1 = wrapText(text, font, maxWidth1);
+ expect(res1).toBe("こんにちは\n〃世界");
+
+ const maxWidth2 = 60;
+ const res2 = wrapText(text, font, maxWidth2);
+ expect(res2).toBe("こんにちは〃\n世界");
+ });
+
+ it("should break after, not before for certain CJK pairs", () => {
+ const text = "Hello た。";
+ const maxWidth = 70;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("Hello\nた。");
+ });
+
+ it("should break before, not after for certain CJK pairs", () => {
+ const text = "Hello「たWorld」";
+ const maxWidth = 60;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("Hello\n「た\nWorld」");
+ });
+
+ it("should break after, not before for certain CJK character pairs", () => {
+ const text = "「Helloた」World";
+ const maxWidth = 70;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("「Hello\nた」World");
+ });
+
+ it("should break Chinese sentences", () => {
+ const text = `中国你好！这是一个测试。
+我们来看看：人民币¥1234「很贵」
+（括号）、逗号，句号。空格 换行 全角符号…—`;
+
+ const maxWidth1 = 80;
+ const res1 = wrapText(text, font, maxWidth1);
+ expect(res1).toBe(`中国你好！这是一\n个测试。
+我们来看看：人民\n币¥1234「很\n贵」
+（括号）、逗号，\n句号。空格 换行\n全角符号…—`);
+
+ const maxWidth2 = 50;
+ const res2 = wrapText(text, font, maxWidth2);
+ expect(res2).toBe(`中国你好！\n这是一个测\n试。
+我们来看\n看：人民币\n¥1234\n「很贵」
+（括号）、\n逗号，句\n号。空格\n换行 全角\n符号…—`);
+ });
+ });
+
+ it("should break Japanese sentences", () => {
+ const text = `日本こんにちは！これはテストです。
+ 見てみましょう：円￥1234「高い」
+ （括弧）、読点、句点。
+ 空白 改行 全角記号…ー`;
+
+ const maxWidth1 = 80;
+ const res1 = wrapText(text, font, maxWidth1);
+ expect(res1).toBe(`日本こんにちは！\nこれはテストで\nす。
+ 見てみましょ\nう：円￥1234\n「高い」
+ （括弧）、読\n点、句点。
+ 空白 改行\n全角記号…ー`);
+
+ const maxWidth2 = 50;
+ const res2 = wrapText(text, font, maxWidth2);
+ expect(res2).toBe(`日本こんに\nちは！これ\nはテストで\nす。
+ 見てみ\nましょう：\n円\n￥1234\n「高い」
+ （括\n弧）、読\n点、句点。
+ 空白\n改行 全角\n記号…ー`);
+ });
+
+ it("should break Korean sentences", () => {
+ const text = `한국 안녕하세요! 이것은 테스트입니다.
+우리 보자: 원화₩1234「비싸다」
+(괄호), 쉼표, 마침표.
+공백 줄바꿈 전각기호…—`;
+
+ const maxWidth1 = 80;
+ const res1 = wrapText(text, font, maxWidth1);
+ expect(res1).toBe(`한국 안녕하세\n요! 이것은 테\n스트입니다.
+우리 보자: 원\n화₩1234「비\n싸다」
+(괄호), 쉼\n표, 마침표.
+공백 줄바꿈 전\n각기호…—`);
+
+ const maxWidth2 = 60;
+ const res2 = wrapText(text, font, maxWidth2);
+ expect(res2).toBe(`한국 안녕하\n세요! 이것\n은 테스트입\n니다.
+우리 보자:\n원화\n₩1234\n「비싸다」
+(괄호),\n쉼표, 마침\n표.
+공백 줄바꿈\n전각기호…—`);
+ });
+
+ describe("When text contains leading whitespaces", () => {
+ const text = " \t Hello world";
+
+ it("should preserve leading whitespaces", () => {
+ const maxWidth = 120;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe(" \t Hello\nworld");
+ });
+
+ it("should break and collapse leading whitespaces when line breaks", () => {
+ const maxWidth = 60;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("\nHello\nworld");
+ });
+
+ it("should break and collapse leading whitespaces whe words break", () => {
+ const maxWidth = 30;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("\nHel\nlo\nwor\nld");
+ });
+ });
+
+ describe("When text contains trailing whitespaces", () => {
+ it("shouldn't add new lines for trailing spaces", () => {
+ const text = "Hello whats up ";
+ const maxWidth = 200 - BOUND_TEXT_PADDING * 2;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe(text);
+ });
+
+ it("should ignore trailing whitespaces when line breaks", () => {
+ const text = "Hippopotomonstrosesquippedaliophobia ??????";
+ const maxWidth = 400;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("Hippopotomonstrosesquippedaliophobia\n??????");
+ });
+
+ it("should not ignore trailing whitespaces when word breaks", () => {
+ const text = "Hippopotomonstrosesquippedaliophobia ??????";
+ const maxWidth = 300;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("Hippopotomonstrosesquippedalio\nphobia ??????");
+ });
+
+ it("should ignore trailing whitespaces when word breaks and line breaks", () => {
+ const text = "Hippopotomonstrosesquippedaliophobia ??????";
+ const maxWidth = 180;
+ const res = wrapText(text, font, maxWidth);
+ expect(res).toBe("Hippopotomonstrose\nsquippedaliophobia\n??????");
+ });
+ });
+
describe("When text doesn't contain new lines", () => {
const text = "Hello whats up";
@@ -44,7 +278,7 @@ describe("Test wrapText", () => {
{
desc: "break all words when width of each word is less than container width",
width: 80,
- res: `Hello \nwhats \nup`,
+ res: `Hello\nwhats\nup`,
},
{
desc: "break all characters when width of each character is less than container width",
@@ -66,7 +300,7 @@ p`,
desc: "break words as per the width",
width: 140,
- res: `Hello whats \nup`,
+ res: `Hello whats\nup`,
},
{
desc: "fit the container",
@@ -96,7 +330,7 @@ whats up`;
{
desc: "break all words when width of each word is less than container width",
width: 80,
- res: `Hello\nwhats \nup`,
+ res: `Hello\nwhats\nup`,
},
{
desc: "break all characters when width of each character is less than container width",
@@ -142,26 +376,24 @@ whats up`,
{
desc: "fit characters of long string as per container width",
width: 170,
- res: `hellolongtextth\nisiswhatsupwith\nyouIamtypingggg\ngandtypinggg \nbreak it now`,
+ res: `hellolongtextthi\nsiswhatsupwithyo\nuIamtypingggggan\ndtypinggg break\nit now`,
},
-
{
desc: "fit characters of long string as per container width and break words as per the width",
width: 130,
- res: `hellolongte
-xtthisiswha
-tsupwithyou
-Iamtypinggg
-ggandtyping
-gg break it
-now`,
+ res: `hellolongtex
+tthisiswhats
+upwithyouIam
+typingggggan
+dtypinggg
+break it now`,
},
{
desc: "fit the long text when container width is greater than text length and move the rest to next line",
width: 600,
- res: `hellolongtextthisiswhatsupwithyouIamtypingggggandtypinggg \nbreak it now`,
+ res: `hellolongtextthisiswhatsupwithyouIamtypingggggandtypinggg\nbreak it now`,
},
].forEach((data) => {
it(`should ${data.desc}`, () => {
@@ -171,68 +403,243 @@ now`,
});
});
- it("should wrap the text correctly when word length is exactly equal to max width", () => {
- const text = "Hello Excalidraw";
- // Length of "Excalidraw" is 100 and exacty equal to max width
- const res = wrapText(text, font, 100);
- expect(res).toEqual(`Hello \nExcalidraw`);
- });
+ describe("Test parseTokens", () => {
+ it("should tokenize latin", () => {
+ let text = "Excalidraw is a virtual collaborative whiteboard";
+
+ expect(parseTokens(text)).toEqual([
+ "Excalidraw",
+ " ",
+ "is",
+ " ",
+ "a",
+ " ",
+ "virtual",
+ " ",
+ "collaborative",
+ " ",
+ "whiteboard",
+ ]);
+
+ text =
+ "Wikipedia is hosted by Wikimedia- Foundation, a non-profit organization that also hosts a range-of other projects";
+ expect(parseTokens(text)).toEqual([
+ "Wikipedia",
+ " ",
+ "is",
+ " ",
+ "hosted",
+ " ",
+ "by",
+ " ",
+ "Wikimedia-",
+ " ",
+ "Foundation,",
+ " ",
+ "a",
+ " ",
+ "non-",
+ "profit",
+ " ",
+ "organization",
+ " ",
+ "that",
+ " ",
+ "also",
+ " ",
+ "hosts",
+ " ",
+ "a",
+ " ",
+ "range-",
+ "of",
+ " ",
+ "other",
+ " ",
+ "projects",
+ ]);
+ });
- it("should return the text as is if max width is invalid", () => {
- const text = "Hello Excalidraw";
- expect(wrapText(text, font, NaN)).toEqual(text);
- expect(wrapText(text, font, -1)).toEqual(text);
- expect(wrapText(text, font, Infinity)).toEqual(text);
- });
+ it("should not tokenize number", () => {
+ const text = "99,100.99";
+ const tokens = parseTokens(text);
+ expect(tokens).toEqual(["99,100.99"]);
+ });
- it("should wrap the text correctly when text contains hyphen", () => {
- let text =
- "Wikipedia is hosted by Wikimedia- Foundation, a non-profit organization that also hosts a range-of other projects";
- const res = wrapText(text, font, 110);
- expect(res).toBe(
- `Wikipedia \nis hosted \nby \nWikimedia-\nFoundation,\na non-\nprofit \norganizati\non that \nalso hosts\na range-of\nother \nprojects`,
- );
+ it("should tokenize joined emojis", () => {
+ const text = `😬🌍🗺🔥☂️👩🏽🦰👨👩👧👦👩🏾🔬🏳️🌈🧔♀️🧑🤝🧑🙅🏽♂️✅0️⃣🇨🇿🦅`;
+ const tokens = parseTokens(text);
+
+ expect(tokens).toEqual([
+ "😬",
+ "🌍",
+ "🗺",
+ "🔥",
+ "☂️",
+ "👩🏽🦰",
+ "👨👩👧👦",
+ "👩🏾🔬",
+ "🏳️🌈",
+ "🧔♀️",
+ "🧑🤝🧑",
+ "🙅🏽♂️",
+ "✅",
+ "0️⃣",
+ "🇨🇿",
+ "🦅",
+ ]);
+ });
- text = "Hello thereusing-now";
- expect(wrapText(text, font, 100)).toEqual("Hello \nthereusin\ng-now");
- });
-});
+ it("should tokenize emojis mixed with mixed text", () => {
+ const text = `😬a🌍b🗺c🔥d☂️《👩🏽🦰》👨👩👧👦德👩🏾🔬こ🏳️🌈안🧔♀️g🧑🤝🧑h🙅🏽♂️e✅f0️⃣g🇨🇿10🦅#hash`;
+ const tokens = parseTokens(text);
+
+ expect(tokens).toEqual([
+ "😬",
+ "a",
+ "🌍",
+ "b",
+ "🗺",
+ "c",
+ "🔥",
+ "d",
+ "☂️",
+ "《",
+ "👩🏽🦰",
+ "》",
+ "👨👩👧👦",
+ "德",
+ "👩🏾🔬",
+ "こ",
+ "🏳️🌈",
+ "안",
+ "🧔♀️",
+ "g",
+ "🧑🤝🧑",
+ "h",
+ "🙅🏽♂️",
+ "e",
+ "✅",
+ "f0️⃣g", // bummer, but ok, as we traded kecaps not breaking (less common) for hash and numbers not breaking (more common)
+ "🇨🇿",
+ "10", // nice! do not break the number, as it's by default matched by \p{Emoji}
+ "🦅",
+ "#hash", // nice! do not break the hash, as it's by default matched by \p{Emoji}
+ ]);
+ });
-describe("Test parseTokens", () => {
- it("should split into tokens correctly", () => {
- let text = "Excalidraw is a virtual collaborative whiteboard";
- expect(parseTokens(text)).toEqual([
- "Excalidraw",
- "is",
- "a",
- "virtual",
- "collaborative",
- "whiteboard",
- ]);
-
- text =
- "Wikipedia is hosted by Wikimedia- Foundation, a non-profit organization that also hosts a range-of other projects";
- expect(parseTokens(text)).toEqual([
- "Wikipedia",
- "is",
- "hosted",
- "by",
- "Wikimedia-",
- "",
- "Foundation,",
- "a",
- "non-",
- "profit",
- "organization",
- "that",
- "also",
- "hosts",
- "a",
- "range-",
- "of",
- "other",
- "projects",
- ]);
+ it("should tokenize decomposed chars into their composed variants", () => {
+ // each input character is in a decomposed form
+ const text = "čでäぴέ다й한";
+ expect(text.normalize("NFC").length).toEqual(8);
+ expect(text).toEqual(text.normalize("NFD"));
+
+ const tokens = parseTokens(text);
+ expect(tokens.length).toEqual(8);
+ expect(tokens).toEqual(["č", "で", "ä", "ぴ", "έ", "다", "й", "한"]);
+ });
+
+ it("should tokenize artificial CJK", () => {
+ const text = `《道德經》醫-醫こんにちは世界！안녕하세요세계；다.다...원/달(((다)))[[1]]〚({((한))>)〛た…[Hello] World？ニューヨーク・￥3700.55す。090-1234-5678￥1,000〜＄5,000「素晴らしい！」〔重要〕＃１：Taro君30％は、（たなばた）〰￥110±￥570で20℃〜9:30〜10:00【一番】`;
+
+ // [
+ // '《道', '德', '經》', '醫-',
+ // '醫', 'こ', 'ん', 'に',
+ // 'ち', 'は', '世', '界！',
+ // '안', '녕', '하', '세',
+ // '요', '세', '계；', '다.',
+ // '다...', '원/', '달', '(((다)))',
+ // '[[1]]', '〚({((한))>)〛', 'た…', '[Hello]',
+ // ' ', 'World？', 'ニ', 'ュ',
+ // 'ー', 'ヨ', 'ー', 'ク・',
+ // '￥3700.55', 'す。', '090-', '1234-',
+ // '5678￥1,000', '〜', '＄5,000', '「素',
+ // '晴', 'ら', 'し', 'い！」',
+ // '〔重', '要〕', '＃', '１：',
+ // 'Taro', '君', '30％', 'は、',
+ // '（た', 'な', 'ば', 'た）',
+ // '〰', '￥110±', '￥570', 'で',
+ // '20℃', '〜', '9:30', '〜',
+ // '10:00', '【一', '番】'
+ // ]
+ const tokens = parseTokens(text);
+
+ // Latin
+ expect(tokens).toContain("[[1]]");
+ expect(tokens).toContain("[Hello]");
+ expect(tokens).toContain("World？");
+ expect(tokens).toContain("Taro");
+
+ // Chinese
+ expect(tokens).toContain("《道");
+ expect(tokens).toContain("德");
+ expect(tokens).toContain("經》");
+ expect(tokens).toContain("醫-");
+ expect(tokens).toContain("醫");
+
+ // Japanese
+ expect(tokens).toContain("こ");
+ expect(tokens).toContain("ん");
+ expect(tokens).toContain("に");
+ expect(tokens).toContain("ち");
+ expect(tokens).toContain("は");
+ expect(tokens).toContain("世");
+ expect(tokens).toContain("ニ");
+ expect(tokens).toContain("ク・");
+ expect(tokens).toContain("界！");
+ expect(tokens).toContain("た…");
+ expect(tokens).toContain("す。");
+ expect(tokens).toContain("ュ");
+ expect(tokens).toContain("ー");
+ expect(tokens).toContain("「素");
+ expect(tokens).toContain("晴");
+ expect(tokens).toContain("ら");
+ expect(tokens).toContain("し");
+ expect(tokens).toContain("い！」");
+ expect(tokens).toContain("君");
+ expect(tokens).toContain("は、");
+ expect(tokens).toContain("（た");
+ expect(tokens).toContain("な");
+ expect(tokens).toContain("ば");
+ expect(tokens).toContain("た）");
+ expect(tokens).toContain("で");
+ expect(tokens).toContain("【一");
+ expect(tokens).toContain("番】");
+
+ // Check for Korean
+ expect(tokens).toContain("안");
+ expect(tokens).toContain("녕");
+ expect(tokens).toContain("하");
+ expect(tokens).toContain("세");
+ expect(tokens).toContain("요");
+ expect(tokens).toContain("세");
+ expect(tokens).toContain("계；");
+ expect(tokens).toContain("다.");
+ expect(tokens).toContain("다...");
+ expect(tokens).toContain("원/");
+ expect(tokens).toContain("달");
+ expect(tokens).toContain("(((다)))");
+ expect(tokens).toContain("〚({((한))>)〛");
+
+ // Numbers and units
+ expect(tokens).toContain("￥3700.55");
+ expect(tokens).toContain("090-");
+ expect(tokens).toContain("1234-");
+ expect(tokens).toContain("5678￥1,000");
+ expect(tokens).toContain("＄5,000");
+ expect(tokens).toContain("１：");
+ expect(tokens).toContain("30％");
+ expect(tokens).toContain("￥110±");
+ expect(tokens).toContain("￥570");
+ expect(tokens).toContain("20℃");
+ expect(tokens).toContain("9:30");
+ expect(tokens).toContain("10:00");
+
+ // Punctuation and symbols
+ expect(tokens).toContain("〜");
+ expect(tokens).toContain("〰");
+ expect(tokens).toContain("＃");
+ });
});
});
diff --git a/packages/excalidraw/element/textElement.ts b/packages/excalidraw/element/textElement.ts
index 9abebc35..7618dba8 100644
--- a/packages/excalidraw/element/textElement.ts
+++ b/packages/excalidraw/element/textElement.ts
@@ -16,6 +16,7 @@ import {
BOUND_TEXT_PADDING,
DEFAULT_FONT_FAMILY,
DEFAULT_FONT_SIZE,
+ ENV,
TEXT_ALIGN,
VERTICAL_ALIGN,
} from "../constants";
@@ -30,6 +31,172 @@ import {
} from "./containerCache";
import type { ExtractSetType } from "../utility-types";
+/**
+ * Matches various emoji types.
+ *
+ * 1. basic emojis (😀, 🌍)
+ * 2. flags (🇨🇿)
+ * 3. multi-codepoint emojis:
+ * - skin tones (👍🏽)
+ * - variation selectors (☂️)
+ * - keycaps (1️⃣)
+ * - tag sequences (🏴)
+ * - emoji sequences (👨👩👧👦, 👩🚀, 🏳️🌈)
+ *
+ * Unicode points:
+ * - \uFE0F: presentation selector
+ * - \u20E3: enclosing keycap
+ * - \u200D: ZWJ (zero width joiner)
+ * - \u{E0020}-\u{E007E}: tags
+ * - \u{E007F}: cancel tag
+ *
+ * @see https://unicode.org/reports/tr51/#EBNF_and_Regex, with changes:
+ * - replaced \p{Emoji} with [\p{Extended_Pictographic}\p{Emoji_Presentation}], see more in `should tokenize emojis mixed with mixed text` test
+ * - replaced \p{Emod} with \p{Emoji_Modifier} as some do not understand the abbreviation (i.e. https://devina.io/redos-checker)
+ */
+const _EMOJI_CHAR =
+ /(\p{RI}\p{RI}|[\p{Extended_Pictographic}\p{Emoji_Presentation}](?:\p{Emoji_Modifier}|\uFE0F\u20E3?|[\u{E0020}-\u{E007E}]+\u{E007F})?(?:\u200D(?:\p{RI}\p{RI}|[\p{Emoji}](?:\p{Emoji_Modifier}|\uFE0F\u20E3?|[\u{E0020}-\u{E007E}]+\u{E007F})?))*)/u;
+
+/**
+ * Detect a CJK char, though does not include every possible char used in CJK texts,
+ * such as symbols and punctuations.
+ *
+ * By default every CJK is a breaking point, though CJK has additional breaking points,
+ * including full width punctuations or symbols (Chinese and Japanese) and western punctuations (Korean).
+ *
+ * Additional CJK breaking point rules:
+ * - expect a break before (lookahead), but not after (negative lookbehind), i.e. "(" or "("
+ * - expect a break after (lookbehind), but not before (negative lookahead), i.e. "）" or ")"
+ * - expect a break always (lookahead and lookbehind), i.e. "〃"
+ */
+const _CJK_CHAR =
+ /\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}/u;
+
+/**
+ * Following characters break only with CJK, not with alphabetic characters.
+ * This is essential for Korean, as it uses alphabetic punctuation, but expects CJK-like breaking points.
+ *
+ * Hello((た)) → ["Hello", "((た))"]
+ * Hello((World)) → ["Hello((World))"]
+ */
+const _CJK_BREAK_NOT_AFTER_BUT_BEFORE = /<\(\[\{/u;
+const _CJK_BREAK_NOT_BEFORE_BUT_AFTER = />\)\]\}.,:;\?!/u;
+const _CJK_BREAK_ALWAYS = / 〃〜～〰＃＆＊＋－ー／＝｜￢￣￤/u;
+const _CJK_SYMBOLS_AND_PUNCTUATION =
+ /（）［］｛｝〈〉《》｟｠｢｣「」『』【】〖〗〔〕〘〙〚〛＜＞〝〞＇〟・。ﾟﾞ，、．：；？！％ー/u;
+
+/**
+ * Following characters break with any character, even though are mostly used with CJK.
+ *
+ * Hello た。→ ["Hello", "た。"]
+ * ↑ DON'T BREAK "た。" (negative lookahead)
+ * Hello「た」 World → ["Hello", "「た」", "World"]
+ * ↑ DON'T BREAK "「た" (negative lookbehind)
+ * ↑ DON'T BREAK "た」"(negative lookahead)
+ * ↑ BREAK BEFORE "「" (lookahead)
+ * ↑ BREAK AFTER "」" (lookbehind)
+ */
+const _ANY_BREAK_NOT_AFTER_BUT_BEFORE = /（［｛〈《｟｢「『【〖〔〘〚＜〝/u;
+const _ANY_BREAK_NOT_BEFORE_BUT_AFTER =
+ /）］｝〉》｠｣」』】〗〕〙〛＞〞＇〟・。ﾟﾞ，、．：；？！％±‥…\//u;
+
+/**
+ * Natural breaking points for any grammars.
+ *
+ * Hello-world
+ * ↑ BREAK AFTER "-" → ["Hello-", "world"]
+ * Hello world
+ * ↑ BREAK ALWAYS " " → ["Hello", " ", "world"]
+ */
+const _ANY_BREAK_AFTER = /-/u;
+const _ANY_BREAK_ALWAYS = /\s/u;
+
+/**
+ * Simple fallback for browsers (mainly Safari < 16.4) that don't support "Lookbehind assertion".
+ *
+ * Browser support as of 10/2024:
+ * - 91% Lookbehind assertion https://caniuse.com/mdn-javascript_regular_expressions_lookbehind_assertion
+ * - 94% Unicode character class escape https://caniuse.com/mdn-javascript_regular_expressions_unicode_character_class_escape
+ *
+ * Does not include advanced CJK breaking rules, but covers most of the core cases, especially for latin.
+ */
+const BREAK_LINE_REGEX_SIMPLE = new RegExp(
+ `${_EMOJI_CHAR.source}|([${_ANY_BREAK_ALWAYS.source}${_CJK_CHAR.source}${_CJK_BREAK_ALWAYS.source}${_ANY_BREAK_AFTER.source}])`,
+ "u",
+);
+
+// Hello World → ["Hello", " World"]
+// ↑ BREAK BEFORE " "
+// HelloたWorld → ["Hello", "たWorld"]
+// ↑ BREAK BEFORE "た"
+// Hello「World」→ ["Hello", "「World」"]
+// ↑ BREAK BEFORE "「"
+const getLookaheadBreakingPoints = () => {
+ const ANY_BREAKING_POINT = `(? {
+ const ANY_BREAKING_POINT = `(?![${_ANY_BREAK_NOT_BEFORE_BUT_AFTER.source}])(?<=[${_ANY_BREAK_NOT_BEFORE_BUT_AFTER.source}${_ANY_BREAK_ALWAYS.source}${_ANY_BREAK_AFTER.source}])`;
+ const CJK_BREAKING_POINT = `(?![${_ANY_BREAK_NOT_BEFORE_BUT_AFTER.source}${_CJK_BREAK_NOT_BEFORE_BUT_AFTER.source}${_ANY_BREAK_AFTER.source}])(?<=[${_CJK_CHAR.source}${_CJK_BREAK_ALWAYS.source}][${_CJK_BREAK_NOT_BEFORE_BUT_AFTER.source}]*)`;
+ return new RegExp(`(?:${ANY_BREAKING_POINT}|${CJK_BREAKING_POINT})`, "u");
+};
+
+/**
+ * Break a line based on the whitespaces, CJK / emoji chars and language specific breaking points,
+ * like hyphen for alphabetic and various full-width codepoints for CJK - especially Japanese, e.g.:
+ *
+ * "Hello 世界。🌎🗺" → ["Hello", " ", "世", "界。", "🌎", "🗺"]
+ * "Hello-world" → ["Hello-", "world"]
+ * "「Hello World」" → ["「Hello", " ", "World」"]
+ */
+const getBreakLineRegexAdvanced = () =>
+ new RegExp(
+ `${_EMOJI_CHAR.source}|${getLookaheadBreakingPoints().source}|${
+ getLookbehindBreakingPoints().source
+ }`,
+ "u",
+ );
+
+let cachedBreakLineRegex: RegExp | undefined;
+
+// Lazy-load for browsers that don't support "Lookbehind assertion"
+const getBreakLineRegex = () => {
+ if (!cachedBreakLineRegex) {
+ try {
+ cachedBreakLineRegex = getBreakLineRegexAdvanced();
+ } catch {
+ cachedBreakLineRegex = BREAK_LINE_REGEX_SIMPLE;
+ }
+ }
+
+ return cachedBreakLineRegex;
+};
+
+const CJK_REGEX = new RegExp(
+ `[${_CJK_CHAR.source}${_CJK_BREAK_ALWAYS.source}${_CJK_SYMBOLS_AND_PUNCTUATION.source}]`,
+ "u",
+);
+
+const EMOJI_REGEX = new RegExp(`${_EMOJI_CHAR.source}`, "u");
+
+export const containsCJK = (text: string) => {
+ return CJK_REGEX.test(text);
+};
+
+export const containsEmoji = (text: string) => {
+ return EMOJI_REGEX.test(text);
+};
+
export const normalizeText = (text: string) => {
return (
normalizeEOL(text)
@@ -408,22 +575,132 @@ export const getTextHeight = (
return getLineHeightInPx(fontSize, lineHeight) * lineCount;
};
-export const parseTokens = (text: string) => {
- // Splitting words containing "-" as those are treated as separate words
- // by css wrapping algorithm eg non-profit => non-, profit
- const words = text.split("-");
- if (words.length > 1) {
- // non-proft org => ['non-', 'profit org']
- words.forEach((word, index) => {
- if (index !== words.length - 1) {
- words[index] = word += "-";
- }
- });
+export const parseTokens = (line: string) => {
+ const breakLineRegex = getBreakLineRegex();
+
+ // normalizing to single-codepoint composed chars due to canonical equivalence of multi-codepoint versions for chars like č, で (~ so that we don't break a line in between c and ˇ)
+ // filtering due to multi-codepoint chars like 👨👩👧👦, 👩🏽🦰
+ return line.normalize("NFC").split(breakLineRegex).filter(Boolean);
+};
+
+// handles multi-byte chars (é, 中) and purposefully does not handle multi-codepoint char (👨👩👧👦, 👩🏽🦰)
+const isSingleCharacter = (maybeSingleCharacter: string) => {
+ return (
+ maybeSingleCharacter.codePointAt(0) !== undefined &&
+ maybeSingleCharacter.codePointAt(1) === undefined
+ );
+};
+
+const satisfiesWordInvariant = (word: string) => {
+ if (import.meta.env.MODE === ENV.TEST || import.meta.env.DEV) {
+ if (/\s/.test(word)) {
+ throw new Error("Word should not contain any whitespaces!");
+ }
+ }
+};
+
+const wrapWord = (
+ word: string,
+ font: FontString,
+ maxWidth: number,
+): Array => {
+ // multi-codepoint emojis are already broken apart and shouldn't be broken further
+ if (EMOJI_REGEX.test(word)) {
+ return [word];
+ }
+
+ satisfiesWordInvariant(word);
+
+ const lines: Array = [];
+ const chars = Array.from(word);
+
+ let currentLine = "";
+ let currentLineWidth = 0;
+
+ for (const char of chars) {
+ const _charWidth = charWidth.calculate(char, font);
+ const testLineWidth = currentLineWidth + _charWidth;
+
+ if (testLineWidth <= maxWidth) {
+ currentLine = currentLine + char;
+ currentLineWidth = testLineWidth;
+ continue;
+ }
+
+ if (currentLine) {
+ lines.push(currentLine);
+ }
+
+ currentLine = char;
+ currentLineWidth = _charWidth;
+ }
+
+ if (currentLine) {
+ lines.push(currentLine);
+ }
+
+ return lines;
+};
+
+const wrapLine = (
+ line: string,
+ font: FontString,
+ maxWidth: number,
+): string[] => {
+ const lines: Array = [];
+ const tokens = parseTokens(line);
+ const tokenIterator = tokens[Symbol.iterator]();
+
+ let currentLine = "";
+ let currentLineWidth = 0;
+
+ let iterator = tokenIterator.next();
+
+ while (!iterator.done) {
+ const token = iterator.value;
+ const testLine = currentLine + token;
+
+ // cache single codepoint whitespace, CJK or emoji width calc. as kerning should not apply here
+ const testLineWidth = isSingleCharacter(token)
+ ? currentLineWidth + charWidth.calculate(token, font)
+ : getLineWidth(testLine, font, true);
+
+ // build up the current line, skipping length check for possibly trailing whitespaces
+ if (/\s/.test(token) || testLineWidth <= maxWidth) {
+ currentLine = testLine;
+ currentLineWidth = testLineWidth;
+ iterator = tokenIterator.next();
+ continue;
+ }
+
+ // current line is empty => just the token (word) is longer than `maxWidth` and needs to be wrapped
+ if (!currentLine) {
+ const wrappedWord = wrapWord(token, font, maxWidth);
+ const trailingLine = wrappedWord[wrappedWord.length - 1] ?? "";
+ const precedingLines = wrappedWord.slice(0, -1);
+
+ lines.push(...precedingLines);
+
+ // trailing line of the wrapped word might still be joined with next token/s
+ currentLine = trailingLine;
+ currentLineWidth = getLineWidth(trailingLine, font, true);
+ iterator = tokenIterator.next();
+ } else {
+ // push & reset, but don't iterate on the next token, as we didn't use it yet!
+ lines.push(currentLine.trimEnd());
+
+ // purposefully not iterating and not setting `currentLine` to `token`, so that we could use a simple !currentLine check above
+ currentLine = "";
+ currentLineWidth = 0;
+ }
+ }
+
+ // iterator done, push the trailing line if exists
+ if (currentLine) {
+ lines.push(currentLine.trimEnd());
}
- // Joining the words with space and splitting them again with space to get the
- // final list of tokens
- // ['non-', 'profit org'] =>,'non- proft org' => ['non-','profit','org']
- return words.join(" ").split(" ");
+
+ return lines;
};
export const wrapText = (
@@ -440,134 +717,17 @@ export const wrapText = (
const lines: Array = [];
const originalLines = text.split("\n");
- const spaceAdvanceWidth = getLineWidth(" ", font, true);
-
- let currentLine = "";
- let currentLineWidthTillNow = 0;
-
- const push = (str: string) => {
- if (str.trim()) {
- lines.push(str);
- }
- };
-
- const resetParams = () => {
- currentLine = "";
- currentLineWidthTillNow = 0;
- };
for (const originalLine of originalLines) {
const currentLineWidth = getLineWidth(originalLine, font, true);
- // Push the line if its <= maxWidth
if (currentLineWidth <= maxWidth) {
lines.push(originalLine);
continue;
}
- const words = parseTokens(originalLine);
- resetParams();
-
- let index = 0;
-
- while (index < words.length) {
- const currentWordWidth = getLineWidth(words[index], font, true);
-
- // This will only happen when single word takes entire width
- if (currentWordWidth === maxWidth) {
- push(words[index]);
- index++;
- }
-
- // Start breaking longer words exceeding max width
- else if (currentWordWidth > maxWidth) {
- // push current line since the current word exceeds the max width
- // so will be appended in next line
- push(currentLine);
-
- resetParams();
-
- while (words[index].length > 0) {
- const currentChar = String.fromCodePoint(
- words[index].codePointAt(0)!,
- );
-
- const line = currentLine + currentChar;
- // use advance width instead of the actual width as it's closest to the browser wapping algo
- // use width of the whole line instead of calculating individual chars to accomodate for kerning
- const lineAdvanceWidth = getLineWidth(line, font, true);
- const charAdvanceWidth = charWidth.calculate(currentChar, font);
-
- currentLineWidthTillNow = lineAdvanceWidth;
- words[index] = words[index].slice(currentChar.length);
-
- if (currentLineWidthTillNow >= maxWidth) {
- push(currentLine);
- currentLine = currentChar;
- currentLineWidthTillNow = charAdvanceWidth;
- } else {
- currentLine = line;
- }
- }
- // push current line if appending space exceeds max width
- if (currentLineWidthTillNow + spaceAdvanceWidth >= maxWidth) {
- push(currentLine);
- resetParams();
- // space needs to be appended before next word
- // as currentLine contains chars which couldn't be appended
- // to previous line unless the line ends with hyphen to sync
- // with css word-wrap
- } else if (!currentLine.endsWith("-")) {
- currentLine += " ";
- currentLineWidthTillNow += spaceAdvanceWidth;
- }
- index++;
- } else {
- // Start appending words in a line till max width reached
- while (currentLineWidthTillNow < maxWidth && index < words.length) {
- const word = words[index];
- currentLineWidthTillNow = getLineWidth(
- currentLine + word,
- font,
- true,
- );
-
- if (currentLineWidthTillNow > maxWidth) {
- push(currentLine);
- resetParams();
-
- break;
- }
- index++;
-
- // if word ends with "-" then we don't need to add space
- // to sync with css word-wrap
- const shouldAppendSpace = !word.endsWith("-");
- currentLine += word;
-
- if (shouldAppendSpace) {
- currentLine += " ";
- }
-
- // Push the word if appending space exceeds max width
- if (currentLineWidthTillNow + spaceAdvanceWidth >= maxWidth) {
- if (shouldAppendSpace) {
- lines.push(currentLine.slice(0, -1));
- } else {
- lines.push(currentLine);
- }
- resetParams();
- break;
- }
- }
- }
- }
-
- if (currentLine.slice(-1) === " ") {
- // only remove last trailing space which we have added when joining words
- currentLine = currentLine.slice(0, -1);
- push(currentLine);
- }
+ const wrappedLine = wrapLine(originalLine, font, maxWidth);
+ lines.push(...wrappedLine);
}
return lines.join("\n");
@@ -577,24 +737,30 @@ export const charWidth = (() => {
const cachedCharWidth: { [key: FontString]: Array } = {};
const calculate = (char: string, font: FontString) => {
- const ascii = char.charCodeAt(0);
+ const unicode = char.charCodeAt(0);
if (!cachedCharWidth[font]) {
cachedCharWidth[font] = [];
}
- if (!cachedCharWidth[font][ascii]) {
+ if (!cachedCharWidth[font][unicode]) {
const width = getLineWidth(char, font, true);
- cachedCharWidth[font][ascii] = width;
+ cachedCharWidth[font][unicode] = width;
}
- return cachedCharWidth[font][ascii];
+ return cachedCharWidth[font][unicode];
};
const getCache = (font: FontString) => {
return cachedCharWidth[font];
};
+
+ const clearCache = (font: FontString) => {
+ cachedCharWidth[font] = [];
+ };
+
return {
calculate,
getCache,
+ clearCache,
};
})();
diff --git a/packages/excalidraw/element/textWysiwyg.test.tsx b/packages/excalidraw/element/textWysiwyg.test.tsx
index ea57ca19..2dc397a2 100644
--- a/packages/excalidraw/element/textWysiwyg.test.tsx
+++ b/packages/excalidraw/element/textWysiwyg.test.tsx
@@ -917,7 +917,7 @@ describe("textWysiwyg", () => {
Keyboard.exitTextEditor(editor);
text = h.elements[1] as ExcalidrawTextElementWithContainer;
- expect(text.text).toBe("Hello \nWorld!");
+ expect(text.text).toBe("Hello\nWorld!");
expect(text.originalText).toBe("Hello World!");
expect(text.y).toBe(
rectangle.y + h.elements[0].height / 2 - text.height / 2,
@@ -1220,7 +1220,7 @@ describe("textWysiwyg", () => {
);
expect((h.elements[1] as ExcalidrawTextElementWithContainer).text).toBe(
- "Online \nwhitebo\nard \ncollabo\nration \nmade \neasy",
+ "Online\nwhiteboa\nrd\ncollabor\nation\nmade\neasy",
);
fireEvent.contextMenu(GlobalTestState.interactiveCanvas, {
button: 2,
diff --git a/packages/excalidraw/errors.ts b/packages/excalidraw/errors.ts
index 705ba7a6..8509deb5 100644
--- a/packages/excalidraw/errors.ts
+++ b/packages/excalidraw/errors.ts
@@ -36,3 +36,28 @@ export class ImageSceneDataError extends Error {
export class InvalidFractionalIndexError extends Error {
public code = "ELEMENT_HAS_INVALID_INDEX" as const;
}
+
+type WorkerErrorCodes = "WORKER_URL_NOT_DEFINED" | "WORKER_IN_THE_MAIN_CHUNK";
+
+export class WorkerUrlNotDefinedError extends Error {
+ public code;
+ constructor(
+ message = "Worker URL is not defined!",
+ code: WorkerErrorCodes = "WORKER_URL_NOT_DEFINED",
+ ) {
+ super(message);
+ this.name = "WorkerUrlNotDefinedError";
+ this.code = code;
+ }
+}
+export class WorkerInTheMainChunkError extends Error {
+ public code;
+ constructor(
+ message = "Worker has to be in a separate chunk!",
+ code: WorkerErrorCodes = "WORKER_IN_THE_MAIN_CHUNK",
+ ) {
+ super(message);
+ this.name = "WorkerInTheMainChunkError";
+ this.code = code;
+ }
+}
diff --git a/packages/excalidraw/fonts/ExcalidrawFont.ts b/packages/excalidraw/fonts/ExcalidrawFont.ts
deleted file mode 100644
index 51d6578c..00000000
--- a/packages/excalidraw/fonts/ExcalidrawFont.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import {
- base64ToArrayBuffer,
- stringToBase64,
- toByteString,
-} from "../data/encode";
-import { LOCAL_FONT_PROTOCOL } from "./metadata";
-import loadWoff2 from "./wasm/woff2.loader";
-import loadHbSubset from "./wasm/hb-subset.loader";
-
-export interface Font {
- urls: URL[];
- fontFace: FontFace;
- getContent(codePoints: ReadonlySet): Promise;
-}
-export const UNPKG_FALLBACK_URL = `https://unpkg.com/${
- import.meta.env.VITE_PKG_NAME
- ? `${import.meta.env.VITE_PKG_NAME}@${import.meta.env.PKG_VERSION}` // should be provided by vite during package build
- : "@excalidraw/excalidraw" // fallback to latest package version (i.e. for app)
-}/dist/prod/`;
-
-export class ExcalidrawFont implements Font {
- public readonly urls: URL[];
- public readonly fontFace: FontFace;
-
- constructor(family: string, uri: string, descriptors?: FontFaceDescriptors) {
- this.urls = ExcalidrawFont.createUrls(uri);
-
- const sources = this.urls
- .map((url) => `url(${url}) ${ExcalidrawFont.getFormat(url)}`)
- .join(", ");
-
- this.fontFace = new FontFace(family, sources, {
- display: "swap",
- style: "normal",
- weight: "400",
- ...descriptors,
- });
- }
-
- /**
- * Tries to fetch woff2 content, based on the registered urls (from first to last, treated as fallbacks).
- *
- * NOTE: assumes usage of `dataurl` outside the browser environment
- *
- * @returns base64 with subsetted glyphs based on the passed codepoint, last defined url otherwise
- */
- public async getContent(codePoints: ReadonlySet): Promise {
- let i = 0;
- const errorMessages = [];
-
- while (i < this.urls.length) {
- const url = this.urls[i];
-
- // it's dataurl (server), the font is inlined as base64, no need to fetch
- if (url.protocol === "data:") {
- const arrayBuffer = base64ToArrayBuffer(url.toString().split(",")[1]);
-
- const base64 = await ExcalidrawFont.subsetGlyphsByCodePoints(
- arrayBuffer,
- codePoints,
- );
-
- return base64;
- }
-
- try {
- const response = await fetch(url, {
- headers: {
- Accept: "font/woff2",
- },
- });
-
- if (response.ok) {
- const arrayBuffer = await response.arrayBuffer();
- const base64 = await ExcalidrawFont.subsetGlyphsByCodePoints(
- arrayBuffer,
- codePoints,
- );
-
- return base64;
- }
-
- // response not ok, try to continue
- errorMessages.push(
- `"${url.toString()}" returned status "${response.status}"`,
- );
- } catch (e) {
- errorMessages.push(`"${url.toString()}" returned error "${e}"`);
- }
-
- i++;
- }
-
- console.error(
- `Failed to fetch font "${
- this.fontFace.family
- }" from urls "${this.urls.toString()}`,
- JSON.stringify(errorMessages, undefined, 2),
- );
-
- // in case of issues, at least return the last url as a content
- // defaults to unpkg for bundled fonts (so that we don't have to host them forever) and http url for others
- return this.urls.length ? this.urls[this.urls.length - 1].toString() : "";
- }
-
- /**
- * Tries to subset glyphs in a font based on the used codepoints, returning the font as daturl.
- *
- * @param arrayBuffer font data buffer, preferrably in the woff2 format, though others should work as well
- * @param codePoints codepoints used to subset the glyphs
- *
- * @returns font with subsetted glyphs (all glyphs in case of errors) converted into a dataurl
- */
- private static async subsetGlyphsByCodePoints(
- arrayBuffer: ArrayBuffer,
- codePoints: ReadonlySet,
- ): Promise {
- try {
- // lazy loaded wasm modules to avoid multiple initializations in case of concurrent triggers
- const { compress, decompress } = await loadWoff2();
- const { subset } = await loadHbSubset();
-
- const decompressedBinary = decompress(arrayBuffer).buffer;
- const subsetSnft = subset(decompressedBinary, codePoints);
- const compressedBinary = compress(subsetSnft.buffer);
-
- return ExcalidrawFont.toBase64(compressedBinary.buffer);
- } catch (e) {
- console.error("Skipped glyph subsetting", e);
- // Fallback to encoding whole font in case of errors
- return ExcalidrawFont.toBase64(arrayBuffer);
- }
- }
-
- private static async toBase64(arrayBuffer: ArrayBuffer) {
- let base64: string;
-
- if (typeof Buffer !== "undefined") {
- // node + server-side
- base64 = Buffer.from(arrayBuffer).toString("base64");
- } else {
- base64 = await stringToBase64(await toByteString(arrayBuffer), true);
- }
-
- return `data:font/woff2;base64,${base64}`;
- }
-
- private static createUrls(uri: string): URL[] {
- if (uri.startsWith(LOCAL_FONT_PROTOCOL)) {
- // no url for local fonts
- return [];
- }
-
- if (uri.startsWith("http") || uri.startsWith("data")) {
- // one url for http imports or data url
- return [new URL(uri)];
- }
-
- // absolute assets paths, which are found in tests and excalidraw-app build, won't work with base url, so we are stripping initial slash away
- const assetUrl: string = uri.replace(/^\/+/, "");
- const urls: URL[] = [];
-
- if (typeof window.EXCALIDRAW_ASSET_PATH === "string") {
- const normalizedBaseUrl = this.normalizeBaseUrl(
- window.EXCALIDRAW_ASSET_PATH,
- );
-
- urls.push(new URL(assetUrl, normalizedBaseUrl));
- } else if (Array.isArray(window.EXCALIDRAW_ASSET_PATH)) {
- window.EXCALIDRAW_ASSET_PATH.forEach((path) => {
- const normalizedBaseUrl = this.normalizeBaseUrl(path);
- urls.push(new URL(assetUrl, normalizedBaseUrl));
- });
- }
-
- // fallback url for bundled fonts
- urls.push(new URL(assetUrl, UNPKG_FALLBACK_URL));
-
- return urls;
- }
-
- private static getFormat(url: URL) {
- try {
- const parts = new URL(url).pathname.split(".");
-
- if (parts.length === 1) {
- return "";
- }
-
- return `format('${parts.pop()}')`;
- } catch (error) {
- return "";
- }
- }
-
- private static normalizeBaseUrl(baseUrl: string) {
- let result = baseUrl;
-
- // in case user passed a root-relative url (~absolute path),
- // like "/" or "/some/path", or relative (starts with "./"),
- // prepend it with `location.origin`
- if (/^\.?\//.test(result)) {
- result = new URL(
- result.replace(/^\.?\/+/, ""),
- window?.location?.origin,
- ).toString();
- }
-
- // ensure there is a trailing slash, otherwise url won't be correctly concatenated
- result = `${result.replace(/\/+$/, "")}/`;
-
- return result;
- }
-}
diff --git a/packages/excalidraw/fonts/ExcalidrawFontFace.ts b/packages/excalidraw/fonts/ExcalidrawFontFace.ts
new file mode 100644
index 00000000..182b8e50
--- /dev/null
+++ b/packages/excalidraw/fonts/ExcalidrawFontFace.ts
@@ -0,0 +1,213 @@
+import { promiseTry } from "../utils";
+import { LOCAL_FONT_PROTOCOL } from "./metadata";
+import { subsetWoff2GlyphsByCodepoints } from "./subset/subset-main";
+
+type DataURL = string;
+
+export interface IExcalidrawFontFace {
+ urls: URL[] | DataURL[];
+ fontFace: FontFace;
+ toCSS(
+ characters: string,
+ codePoints: Array,
+ ): Promise | undefined;
+}
+
+export class ExcalidrawFontFace implements IExcalidrawFontFace {
+ public readonly urls: URL[] | DataURL[];
+ public readonly fontFace: FontFace;
+
+ private static readonly UNPKG_FALLBACK_URL = `https://unpkg.com/${
+ import.meta.env.VITE_PKG_NAME
+ ? `${import.meta.env.VITE_PKG_NAME}@${import.meta.env.PKG_VERSION}` // should be provided by vite during package build
+ : "@excalidraw/excalidraw" // fallback to latest package version (i.e. for app)
+ }/dist/prod/`;
+
+ constructor(family: string, uri: string, descriptors?: FontFaceDescriptors) {
+ this.urls = ExcalidrawFontFace.createUrls(uri);
+
+ const sources = this.urls
+ .map((url) => `url(${url}) ${ExcalidrawFontFace.getFormat(url)}`)
+ .join(", ");
+
+ this.fontFace = new FontFace(family, sources, {
+ display: "swap",
+ style: "normal",
+ weight: "400",
+ ...descriptors,
+ });
+ }
+
+ /**
+ * Generates CSS `@font-face` definition with the (subsetted) font source as a data url for the characters within the unicode range.
+ *
+ * Retrieves `undefined` otherwise.
+ */
+ public toCSS(
+ characters: string,
+ codePoints: Array,
+ ): Promise | undefined {
+ // quick exit in case the characters are not within this font face's unicode range
+ if (!this.getUnicodeRangeRegex().test(characters)) {
+ return;
+ }
+
+ return this.getContent(codePoints).then(
+ (content) =>
+ `@font-face { font-family: ${this.fontFace.family}; src: url(${content}); }`,
+ );
+ }
+
+ /**
+ * Tries to fetch woff2 content, based on the registered urls (from first to last, treated as fallbacks).
+ *
+ * @returns base64 with subsetted glyphs based on the passed codepoint, last defined url otherwise
+ */
+ public async getContent(codePoints: Array): Promise {
+ let i = 0;
+ const errorMessages = [];
+
+ while (i < this.urls.length) {
+ const url = this.urls[i];
+
+ try {
+ const arrayBuffer = await this.fetchFont(url);
+ const base64 = await subsetWoff2GlyphsByCodepoints(
+ arrayBuffer,
+ codePoints,
+ );
+
+ return base64;
+ } catch (e) {
+ errorMessages.push(`"${url.toString()}" returned error "${e}"`);
+ }
+
+ i++;
+ }
+
+ console.error(
+ `Failed to fetch font family "${this.fontFace.family}"`,
+ JSON.stringify(errorMessages, undefined, 2),
+ );
+
+ // in case of issues, at least return the last url as a content
+ // defaults to unpkg for bundled fonts (so that we don't have to host them forever) and http url for others
+ return this.urls.length ? this.urls[this.urls.length - 1].toString() : "";
+ }
+
+ public fetchFont(url: URL | DataURL): Promise {
+ return promiseTry(async () => {
+ const response = await fetch(url, {
+ headers: {
+ Accept: "font/woff2",
+ },
+ });
+
+ if (!response.ok) {
+ const urlString = url instanceof URL ? url.toString() : "dataurl";
+ throw new Error(
+ `Failed to fetch "${urlString}": ${response.statusText}`,
+ );
+ }
+
+ const arrayBuffer = await response.arrayBuffer();
+ return arrayBuffer;
+ });
+ }
+
+ private getUnicodeRangeRegex() {
+ // using \u{h} or \u{hhhhh} to match any number of hex digits,
+ // otherwise we would get an "Invalid Unicode escape" error
+ // e.g. U+0-1007F -> \u{0}-\u{1007F}
+ const unicodeRangeRegex = this.fontFace.unicodeRange
+ .split(/,\s*/)
+ .map((range) => {
+ const [start, end] = range.replace("U+", "").split("-");
+ if (end) {
+ return `\\u{${start}}-\\u{${end}}`;
+ }
+
+ return `\\u{${start}}`;
+ })
+ .join("");
+
+ return new RegExp(`[${unicodeRangeRegex}]`, "u");
+ }
+
+ private static createUrls(uri: string): URL[] | DataURL[] {
+ if (uri.startsWith("data")) {
+ // don't create the URL instance, as parsing the huge dataurl string is expensive
+ return [uri];
+ }
+
+ if (uri.startsWith(LOCAL_FONT_PROTOCOL)) {
+ // no url for local fonts
+ return [];
+ }
+
+ if (uri.startsWith("http")) {
+ // one url for http imports or data url
+ return [new URL(uri)];
+ }
+
+ // absolute assets paths, which are found in tests and excalidraw-app build, won't work with base url, so we are stripping initial slash away
+ const assetUrl: string = uri.replace(/^\/+/, "");
+ const urls: URL[] = [];
+
+ if (typeof window.EXCALIDRAW_ASSET_PATH === "string") {
+ const normalizedBaseUrl = this.normalizeBaseUrl(
+ window.EXCALIDRAW_ASSET_PATH,
+ );
+
+ urls.push(new URL(assetUrl, normalizedBaseUrl));
+ } else if (Array.isArray(window.EXCALIDRAW_ASSET_PATH)) {
+ window.EXCALIDRAW_ASSET_PATH.forEach((path) => {
+ const normalizedBaseUrl = this.normalizeBaseUrl(path);
+ urls.push(new URL(assetUrl, normalizedBaseUrl));
+ });
+ }
+
+ // fallback url for bundled fonts
+ urls.push(new URL(assetUrl, ExcalidrawFontFace.UNPKG_FALLBACK_URL));
+
+ return urls;
+ }
+
+ private static getFormat(url: URL | DataURL) {
+ if (!(url instanceof URL)) {
+ // format is irrelevant for data url
+ return "";
+ }
+
+ try {
+ const parts = new URL(url).pathname.split(".");
+
+ if (parts.length === 1) {
+ return "";
+ }
+
+ return `format('${parts.pop()}')`;
+ } catch (error) {
+ return "";
+ }
+ }
+
+ private static normalizeBaseUrl(baseUrl: string) {
+ let result = baseUrl;
+
+ // in case user passed a root-relative url (~absolute path),
+ // like "/" or "/some/path", or relative (starts with "./"),
+ // prepend it with `location.origin`
+ if (/^\.?\//.test(result)) {
+ result = new URL(
+ result.replace(/^\.?\/+/, ""),
+ window?.location?.origin,
+ ).toString();
+ }
+
+ // ensure there is a trailing slash, otherwise url won't be correctly concatenated
+ result = `${result.replace(/\/+$/, "")}/`;
+
+ return result;
+ }
+}
diff --git a/packages/excalidraw/fonts/assets/fonts.css b/packages/excalidraw/fonts/css/fonts.css
similarity index 68%
rename from packages/excalidraw/fonts/assets/fonts.css
rename to packages/excalidraw/fonts/css/fonts.css
index 09bb0cd3..8a8fec34 100644
--- a/packages/excalidraw/fonts/assets/fonts.css
+++ b/packages/excalidraw/fonts/css/fonts.css
@@ -4,7 +4,7 @@
@font-face {
font-family: "Assistant";
- src: url(./Assistant-Regular.woff2) format("woff2");
+ src: url(../woff2/Assistant/Assistant-Regular.woff2) format("woff2");
font-weight: 400;
style: normal;
display: swap;
@@ -12,7 +12,7 @@
@font-face {
font-family: "Assistant";
- src: url(./Assistant-Medium.woff2) format("woff2");
+ src: url(../woff2/Assistant/Assistant-Medium.woff2) format("woff2");
font-weight: 500;
style: normal;
display: swap;
@@ -20,7 +20,7 @@
@font-face {
font-family: "Assistant";
- src: url(./Assistant-SemiBold.woff2) format("woff2");
+ src: url(../woff2/Assistant/Assistant-SemiBold.woff2) format("woff2");
font-weight: 600;
style: normal;
display: swap;
@@ -28,7 +28,7 @@
@font-face {
font-family: "Assistant";
- src: url(./Assistant-Bold.woff2) format("woff2");
+ src: url(../woff2/Assistant/Assistant-Bold.woff2) format("woff2");
font-weight: 700;
style: normal;
display: swap;
diff --git a/packages/excalidraw/fonts/index.ts b/packages/excalidraw/fonts/index.ts
index 1de1f99c..82568847 100644
--- a/packages/excalidraw/fonts/index.ts
+++ b/packages/excalidraw/fonts/index.ts
@@ -8,30 +8,28 @@ import type {
import { ShapeCache } from "../scene/ShapeCache";
import { isTextElement } from "../element";
import { getFontString } from "../utils";
-import { FONT_FAMILY } from "../constants";
import {
- LOCAL_FONT_PROTOCOL,
- FONT_METADATA,
- RANGES,
- type FontMetadata,
-} from "./metadata";
-import { ExcalidrawFont, type Font } from "./ExcalidrawFont";
-import { getContainerElement } from "../element/textElement";
-
-import Virgil from "./assets/Virgil-Regular.woff2";
-import Excalifont from "./assets/Excalifont-Regular.woff2";
-import Cascadia from "./assets/CascadiaCode-Regular.woff2";
-import ComicShanns from "./assets/ComicShanns-Regular.woff2";
-import LiberationSans from "./assets/LiberationSans-Regular.woff2";
-
-import LilitaLatin from "./assets/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYEF8RXi4EwQ.woff2";
-import LilitaLatinExt from "./assets/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYE98RXi4EwSsbg.woff2";
-
-import NunitoLatin from "./assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTQ3j6zbXWjgeg.woff2";
-import NunitoLatinExt from "./assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTo3j6zbXWjgevT5.woff2";
-import NunitoCyrilic from "./assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTA3j6zbXWjgevT5.woff2";
-import NunitoCyrilicExt from "./assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTk3j6zbXWjgevT5.woff2";
-import NunitoVietnamese from "./assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTs3j6zbXWjgevT5.woff2";
+ FONT_FAMILY,
+ FONT_FAMILY_FALLBACKS,
+ WINDOWS_EMOJI_FALLBACK_FONT,
+ CJK_HAND_DRAWN_FALLBACK_FONT,
+} from "../constants";
+import { FONT_METADATA, type FontMetadata } from "./metadata";
+import { charWidth, getContainerElement } from "../element/textElement";
+import {
+ ExcalidrawFontFace,
+ type IExcalidrawFontFace,
+} from "./ExcalidrawFontFace";
+import { CascadiaFontFaces } from "./woff2/Cascadia";
+import { ComicFontFaces } from "./woff2/Comic";
+import { ExcalifontFontFaces } from "./woff2/Excalifont";
+import { HelveticaFontFaces } from "./woff2/Helvetica";
+import { LiberationFontFaces } from "./woff2/Liberation";
+import { LilitaFontFaces } from "./woff2/Lilita";
+import { NunitoFontFaces } from "./woff2/Nunito";
+import { VirgilFontFaces } from "./woff2/Virgil";
+import { XiaolaiFontFaces } from "./woff2/Xiaolai";
+import { EmojiFontFaces } from "./woff2/Emoji";
export class Fonts {
// it's ok to track fonts across multiple instances only once, so let's use
@@ -43,7 +41,7 @@ export class Fonts {
number,
{
metadata: FontMetadata;
- fonts: Font[];
+ fontFaces: IExcalidrawFontFace[];
}
>
| undefined;
@@ -85,20 +83,23 @@ export class Fonts {
* of the supplied fontFaces has not already been processed.
*/
public onLoaded = (fontFaces: readonly FontFace[]) => {
- if (
- // bail if all fonts with have been processed. We're checking just a
- // subset of the font properties (though it should be enough), so it
- // can technically bail on a false positive.
- fontFaces.every((fontFace) => {
- const sig = `${fontFace.family}-${fontFace.style}-${fontFace.weight}-${fontFace.unicodeRange}`;
- if (Fonts.loadedFontsCache.has(sig)) {
- return true;
- }
+ // bail if all fonts with have been processed. We're checking just a
+ // subset of the font properties (though it should be enough), so it
+ // can technically bail on a false positive.
+ let shouldBail = true;
+
+ for (const fontFace of fontFaces) {
+ const sig = `${fontFace.family}-${fontFace.style}-${fontFace.weight}-${fontFace.unicodeRange}`;
+
+ // make sure to update our cache with all the loaded font faces
+ if (!Fonts.loadedFontsCache.has(sig)) {
Fonts.loadedFontsCache.add(sig);
- return false;
- })
- ) {
- return false;
+ shouldBail = false;
+ }
+ }
+
+ if (shouldBail) {
+ return;
}
let didUpdate = false;
@@ -109,6 +110,10 @@ export class Fonts {
if (isTextElement(element)) {
didUpdate = true;
ShapeCache.delete(element);
+
+ // clear the width cache, so that we don't perform subsequent wrapping based on the stale fallback font metrics
+ charWidth.clearCache(getFontString(element));
+
const container = getContainerElement(element, elementsMap);
if (container) {
ShapeCache.delete(container);
@@ -125,26 +130,27 @@ export class Fonts {
* Load font faces for a given scene and trigger scene update.
*/
public loadSceneFonts = async (): Promise => {
- const sceneFamilies = this.getSceneFontFamilies();
+ const sceneFamilies = this.getSceneFamilies();
const loaded = await Fonts.loadFontFaces(sceneFamilies);
this.onLoaded(loaded);
return loaded;
};
/**
- * Gets all the font families for the given scene.
+ * Load all registered font faces.
*/
- public getSceneFontFamilies = () => {
- return Fonts.getFontFamilies(this.scene.getNonDeletedElements());
+ public static loadAllFonts = async (): Promise => {
+ const allFamilies = Fonts.getAllFamilies();
+ return Fonts.loadFontFaces(allFamilies);
};
/**
* Load font faces for passed elements - use when the scene is unavailable (i.e. export).
*/
- public static loadFontsForElements = async (
+ public static loadElementsFonts = async (
elements: readonly ExcalidrawElement[],
): Promise => {
- const fontFamilies = Fonts.getFontFamilies(elements);
+ const fontFamilies = Fonts.getElementsFamilies(elements);
return await Fonts.loadFontFaces(fontFamilies);
};
@@ -152,13 +158,13 @@ export class Fonts {
fontFamilies: Array,
) {
// add all registered font faces into the `document.fonts` (if not added already)
- for (const { fonts, metadata } of Fonts.registered.values()) {
+ for (const { fontFaces, metadata } of Fonts.registered.values()) {
// skip registering font faces for local fonts (i.e. Helvetica)
if (metadata.local) {
continue;
}
- for (const { fontFace } of fonts) {
+ for (const { fontFace } of fontFaces) {
if (!window.document.fonts.has(fontFace)) {
window.document.fonts.add(fontFace);
}
@@ -183,7 +189,7 @@ export class Fonts {
console.error(
`Failed to load font "${fontString}" from urls "${Fonts.registered
.get(fontFamily)
- ?.fonts.map((x) => x.urls)}"`,
+ ?.fontFaces.map((x) => x.urls)}"`,
e,
);
}
@@ -202,82 +208,58 @@ export class Fonts {
private static init() {
const fonts = {
registered: new Map<
- ValueOf,
- { metadata: FontMetadata; fonts: Font[] }
+ ValueOf,
+ { metadata: FontMetadata; fontFaces: IExcalidrawFontFace[] }
>(),
};
- // TODO: let's tweak this once we know how `register` will be exposed as part of the custom fonts API
- const _register = register.bind(fonts);
+ const init = (
+ family: keyof typeof FONT_FAMILY | keyof typeof FONT_FAMILY_FALLBACKS,
+ ...fontFacesDescriptors: ExcalidrawFontFaceDescriptor[]
+ ) => {
+ const fontFamily =
+ FONT_FAMILY[family as keyof typeof FONT_FAMILY] ??
+ FONT_FAMILY_FALLBACKS[family as keyof typeof FONT_FAMILY_FALLBACKS];
- _register("Virgil", FONT_METADATA[FONT_FAMILY.Virgil], {
- uri: Virgil,
- });
+ // default to Excalifont metrics
+ const metadata =
+ FONT_METADATA[fontFamily] ?? FONT_METADATA[FONT_FAMILY.Excalifont];
- _register("Excalifont", FONT_METADATA[FONT_FAMILY.Excalifont], {
- uri: Excalifont,
- });
+ register.call(fonts, family, metadata, ...fontFacesDescriptors);
+ };
+ init("Cascadia", ...CascadiaFontFaces);
+ init("Comic Shanns", ...ComicFontFaces);
+ init("Excalifont", ...ExcalifontFontFaces);
// keeping for backwards compatibility reasons, uses system font (Helvetica on MacOS, Arial on Win)
- _register("Helvetica", FONT_METADATA[FONT_FAMILY.Helvetica], {
- uri: LOCAL_FONT_PROTOCOL,
- });
-
+ init("Helvetica", ...HelveticaFontFaces);
// used for server-side pdf & png export instead of helvetica (technically does not need metrics, but kept in for consistency)
- _register(
- "Liberation Sans",
- FONT_METADATA[FONT_FAMILY["Liberation Sans"]],
- {
- uri: LiberationSans,
- },
- );
+ init("Liberation Sans", ...LiberationFontFaces);
+ init("Lilita One", ...LilitaFontFaces);
+ init("Nunito", ...NunitoFontFaces);
+ init("Virgil", ...VirgilFontFaces);
- _register("Cascadia", FONT_METADATA[FONT_FAMILY.Cascadia], {
- uri: Cascadia,
- });
-
- _register("Comic Shanns", FONT_METADATA[FONT_FAMILY["Comic Shanns"]], {
- uri: ComicShanns,
- });
-
- _register(
- "Lilita One",
- FONT_METADATA[FONT_FAMILY["Lilita One"]],
- { uri: LilitaLatinExt, descriptors: { unicodeRange: RANGES.LATIN_EXT } },
- { uri: LilitaLatin, descriptors: { unicodeRange: RANGES.LATIN } },
- );
-
- _register(
- "Nunito",
- FONT_METADATA[FONT_FAMILY.Nunito],
- {
- uri: NunitoCyrilicExt,
- descriptors: { unicodeRange: RANGES.CYRILIC_EXT, weight: "500" },
- },
- {
- uri: NunitoCyrilic,
- descriptors: { unicodeRange: RANGES.CYRILIC, weight: "500" },
- },
- {
- uri: NunitoVietnamese,
- descriptors: { unicodeRange: RANGES.VIETNAMESE, weight: "500" },
- },
- {
- uri: NunitoLatinExt,
- descriptors: { unicodeRange: RANGES.LATIN_EXT, weight: "500" },
- },
- {
- uri: NunitoLatin,
- descriptors: { unicodeRange: RANGES.LATIN, weight: "500" },
- },
- );
+ // fallback font faces
+ init(CJK_HAND_DRAWN_FALLBACK_FONT, ...XiaolaiFontFaces);
+ init(WINDOWS_EMOJI_FALLBACK_FONT, ...EmojiFontFaces);
Fonts._initialized = true;
return fonts.registered;
}
- private static getFontFamilies(
+ /**
+ * Gets all the font families for the given scene.
+ */
+ public getSceneFamilies = () => {
+ return Fonts.getElementsFamilies(this.scene.getNonDeletedElements());
+ };
+
+ private static getAllFamilies() {
+ return Array.from(Fonts.registered.keys());
+ }
+
+ private static getElementsFamilies(
elements: ReadonlyArray,
): Array {
return Array.from(
@@ -296,30 +278,34 @@ export class Fonts {
*
* @param family font family
* @param metadata font metadata
- * @param params array of the rest of the FontFace parameters [uri: string, descriptors: FontFaceDescriptors?] ,
+ * @param fontFacesDecriptors font faces descriptors
*/
function register(
this:
| Fonts
| {
registered: Map<
- ValueOf,
- { metadata: FontMetadata; fonts: Font[] }
+ number,
+ { metadata: FontMetadata; fontFaces: IExcalidrawFontFace[] }
>;
},
family: string,
metadata: FontMetadata,
- ...params: Array<{ uri: string; descriptors?: FontFaceDescriptors }>
+ ...fontFacesDecriptors: ExcalidrawFontFaceDescriptor[]
) {
- // TODO: likely we will need to abandon number "id" in order to support custom fonts
- const familyId = FONT_FAMILY[family as keyof typeof FONT_FAMILY];
- const registeredFamily = this.registered.get(familyId);
+ // TODO: likely we will need to abandon number value in order to support custom fonts
+ const fontFamily =
+ FONT_FAMILY[family as keyof typeof FONT_FAMILY] ??
+ FONT_FAMILY_FALLBACKS[family as keyof typeof FONT_FAMILY_FALLBACKS];
+
+ const registeredFamily = this.registered.get(fontFamily);
if (!registeredFamily) {
- this.registered.set(familyId, {
+ this.registered.set(fontFamily, {
metadata,
- fonts: params.map(
- ({ uri, descriptors }) => new ExcalidrawFont(family, uri, descriptors),
+ fontFaces: fontFacesDecriptors.map(
+ ({ uri, descriptors }) =>
+ new ExcalidrawFontFace(family, uri, descriptors),
),
});
}
@@ -357,3 +343,8 @@ export const getLineHeight = (fontFamily: FontFamilyValues) => {
return lineHeight as ExcalidrawTextElement["lineHeight"];
};
+
+export interface ExcalidrawFontFaceDescriptor {
+ uri: string;
+ descriptors?: FontFaceDescriptors;
+}
diff --git a/packages/excalidraw/fonts/metadata.ts b/packages/excalidraw/fonts/metadata.ts
index 0dec8e42..a7d21157 100644
--- a/packages/excalidraw/fonts/metadata.ts
+++ b/packages/excalidraw/fonts/metadata.ts
@@ -4,7 +4,7 @@ import {
FontFamilyNormalIcon,
FreedrawIcon,
} from "../components/icons";
-import { FONT_FAMILY } from "../constants";
+import { FONT_FAMILY, FONT_FAMILY_FALLBACKS } from "../constants";
/**
* Encapsulates font metrics with additional font metadata.
@@ -22,13 +22,15 @@ export interface FontMetadata {
lineHeight: number;
};
/** element to be displayed as an icon */
- icon: JSX.Element;
+ icon?: JSX.Element;
/** flag to indicate a deprecated font */
deprecated?: true;
/** flag to indicate a server-side only font */
serverSide?: true;
/** flag to indiccate a local-only font */
local?: true;
+ /** flag to indicate a fallback font */
+ fallback?: true;
}
export const FONT_METADATA: Record = {
@@ -106,13 +108,32 @@ export const FONT_METADATA: Record = {
descender: -434,
lineHeight: 1.15,
},
- icon: FontFamilyNormalIcon,
serverSide: true,
},
+ [FONT_FAMILY_FALLBACKS.Xiaolai]: {
+ metrics: {
+ unitsPerEm: 1000,
+ ascender: 880,
+ descender: -144,
+ lineHeight: 1.15,
+ },
+ fallback: true,
+ },
+ [FONT_FAMILY_FALLBACKS["Segoe UI Emoji"]]: {
+ metrics: {
+ // reusing Excalifont metrics
+ unitsPerEm: 1000,
+ ascender: 886,
+ descender: -374,
+ lineHeight: 1.25,
+ },
+ local: true,
+ fallback: true,
+ },
};
-/** Unicode ranges */
-export const RANGES = {
+/** Unicode ranges defined by google fonts */
+export const GOOGLE_FONTS_RANGES = {
LATIN:
"U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD",
LATIN_EXT:
diff --git a/packages/excalidraw/fonts/subset/subset-main.ts b/packages/excalidraw/fonts/subset/subset-main.ts
new file mode 100644
index 00000000..1cbf66fb
--- /dev/null
+++ b/packages/excalidraw/fonts/subset/subset-main.ts
@@ -0,0 +1,131 @@
+import {
+ WorkerInTheMainChunkError,
+ WorkerUrlNotDefinedError,
+} from "../../errors";
+import { isServerEnv, promiseTry } from "../../utils";
+import { WorkerPool } from "../../workers";
+import type { Commands } from "./subset-shared.chunk";
+
+let shouldUseWorkers = typeof Worker !== "undefined";
+
+/**
+ * Tries to subset glyphs in a font based on the used codepoints, returning the font as dataurl.
+ * Under the hood utilizes worker threads (Web Workers, if available), otherwise fallbacks to the main thread.
+ *
+ * Check the following diagram for details: link.excalidraw.com/readonly/MbbnWPSWXgadXdtmzgeO
+ *
+ * @param arrayBuffer font data buffer in the woff2 format
+ * @param codePoints codepoints used to subset the glyphs
+ *
+ * @returns font with subsetted glyphs (all glyphs in case of errors) converted into a dataurl
+ */
+export const subsetWoff2GlyphsByCodepoints = async (
+ arrayBuffer: ArrayBuffer,
+ codePoints: Array,
+): Promise => {
+ const { Commands, subsetToBase64, toBase64 } =
+ await lazyLoadSharedSubsetChunk();
+
+ if (!shouldUseWorkers) {
+ return subsetToBase64(arrayBuffer, codePoints);
+ }
+
+ return promiseTry(async () => {
+ try {
+ const workerPool = await getOrCreateWorkerPool();
+ // copy the buffer to avoid working on top of the detached array buffer in the fallback
+ // i.e. in case the worker throws, the array buffer does not get automatically detached, even if the worker is terminated
+ const arrayBufferCopy = arrayBuffer.slice(0);
+ const result = await workerPool.postMessage(
+ {
+ command: Commands.Subset,
+ arrayBuffer: arrayBufferCopy,
+ codePoints,
+ } as const,
+ { transfer: [arrayBufferCopy] },
+ );
+
+ // encode on the main thread to avoid copying large binary strings (as dataurl) between threads
+ return toBase64(result);
+ } catch (e) {
+ // don't use workers if they are failing
+ shouldUseWorkers = false;
+
+ if (
+ // don't log the expected errors server-side
+ !(
+ isServerEnv() &&
+ (e instanceof WorkerUrlNotDefinedError ||
+ e instanceof WorkerInTheMainChunkError)
+ )
+ ) {
+ // eslint-disable-next-line no-console
+ console.error(
+ "Failed to use workers for subsetting, falling back to the main thread.",
+ e,
+ );
+ }
+
+ // fallback to the main thread
+ return subsetToBase64(arrayBuffer, codePoints);
+ }
+ });
+};
+
+// lazy-loaded and cached chunks
+let subsetWorker: Promise | null = null;
+let subsetShared: Promise | null = null;
+
+const lazyLoadWorkerSubsetChunk = async () => {
+ if (!subsetWorker) {
+ subsetWorker = import("./subset-worker.chunk");
+ }
+
+ return subsetWorker;
+};
+
+const lazyLoadSharedSubsetChunk = async () => {
+ if (!subsetShared) {
+ // load dynamically to force create a shared chunk reused between main thread and the worker thread
+ subsetShared = import("./subset-shared.chunk");
+ }
+
+ return subsetShared;
+};
+
+// could be extended with multiple commands in the future
+type SubsetWorkerData = {
+ command: typeof Commands.Subset;
+ arrayBuffer: ArrayBuffer;
+ codePoints: Array;
+};
+
+type SubsetWorkerResult =
+ T extends typeof Commands.Subset ? ArrayBuffer : never;
+
+let workerPool: Promise<
+ WorkerPool>
+> | null = null;
+
+/**
+ * Lazy initialize or get the worker pool singleton.
+ *
+ * @throws implicitly if anything goes wrong - worker pool creation, loading wasm, initializing worker, etc.
+ */
+const getOrCreateWorkerPool = () => {
+ if (!workerPool) {
+ // immediate concurrent-friendly return, to ensure we have only one pool instance
+ workerPool = promiseTry(async () => {
+ const { WorkerUrl } = await lazyLoadWorkerSubsetChunk();
+
+ const pool = WorkerPool.create<
+ SubsetWorkerData,
+ SubsetWorkerResult
+ >(WorkerUrl);
+
+ return pool;
+ });
+ }
+
+ return workerPool;
+};
diff --git a/packages/excalidraw/fonts/subset/subset-shared.chunk.ts b/packages/excalidraw/fonts/subset/subset-shared.chunk.ts
new file mode 100644
index 00000000..ddaf6cec
--- /dev/null
+++ b/packages/excalidraw/fonts/subset/subset-shared.chunk.ts
@@ -0,0 +1,81 @@
+/**
+ * DON'T depend on anything from the outside like `promiseTry`, as this module is part of a separate lazy-loaded chunk.
+ *
+ * Including anything from the main chunk would include the whole chunk by default.
+ * Even it it would be tree-shaken during build, it won't be tree-shaken in dev.
+ *
+ * In the future consider separating common utils into a separate shared chunk.
+ */
+
+import loadWoff2 from "../wasm/woff2-loader";
+import loadHbSubset from "../wasm/hb-subset-loader";
+
+/**
+ * Shared commands between the main thread and worker threads.
+ */
+export const Commands = {
+ Subset: "SUBSET",
+} as const;
+
+/**
+ * Used by browser (main thread), node and jsdom, to subset the font based on the passed codepoints.
+ *
+ * @returns woff2 font as a base64 encoded string
+ */
+export const subsetToBase64 = async (
+ arrayBuffer: ArrayBuffer,
+ codePoints: Array,
+): Promise => {
+ try {
+ const buffer = await subsetToBinary(arrayBuffer, codePoints);
+ return toBase64(buffer);
+ } catch (e) {
+ console.error("Skipped glyph subsetting", e);
+ // Fallback to encoding whole font in case of errors
+ return toBase64(arrayBuffer);
+ }
+};
+
+/**
+ * Used by browser (worker thread) and as part of `subsetToBase64`, to subset the font based on the passed codepoints.
+ *
+ * @eturns woff2 font as an ArrayBuffer, to avoid copying large strings between worker threads and the main thread.
+ */
+export const subsetToBinary = async (
+ arrayBuffer: ArrayBuffer,
+ codePoints: Array,
+): Promise => {
+ // lazy loaded wasm modules to avoid multiple initializations in case of concurrent triggers
+ // IMPORTANT: could be expensive, as each new worker instance lazy loads these to their own memory ~ keep the # of workes small!
+ const { compress, decompress } = await loadWoff2();
+ const { subset } = await loadHbSubset();
+
+ const decompressedBinary = decompress(arrayBuffer).buffer;
+ const snftSubset = subset(decompressedBinary, new Set(codePoints));
+ const compressedBinary = compress(snftSubset.buffer);
+
+ return compressedBinary.buffer;
+};
+
+/**
+ * Util for isomoprhic browser (main thread), node and jsdom usage.
+ *
+ * Isn't used inside the worker to avoid copying large binary strings (as dataurl) between worker threads and the main thread.
+ */
+export const toBase64 = async (arrayBuffer: ArrayBuffer) => {
+ let base64: string;
+
+ if (typeof Buffer !== "undefined") {
+ // node, jsdom
+ base64 = Buffer.from(arrayBuffer).toString("base64");
+ } else {
+ // browser (main thread)
+ // it's perfectly fine to treat each byte independently,
+ // as we care only about turning individual bytes into codepoints,
+ // not about multi-byte unicode characters
+ const byteString = String.fromCharCode(...new Uint8Array(arrayBuffer));
+ base64 = btoa(byteString);
+ }
+
+ return `data:font/woff2;base64,${base64}`;
+};
diff --git a/packages/excalidraw/fonts/subset/subset-worker.chunk.ts b/packages/excalidraw/fonts/subset/subset-worker.chunk.ts
new file mode 100644
index 00000000..5f4e92bf
--- /dev/null
+++ b/packages/excalidraw/fonts/subset/subset-worker.chunk.ts
@@ -0,0 +1,42 @@
+/**
+ * DON'T depend on anything from the outside like `promiseTry`, as this module is part of a separate lazy-loaded chunk.
+ *
+ * Including anything from the main chunk would include the whole chunk by default.
+ * Even it it would be tree-shaken during build, it won't be tree-shaken in dev.
+ *
+ * In the future consider separating common utils into a separate shared chunk.
+ */
+
+import { Commands, subsetToBinary } from "./subset-shared.chunk";
+
+/**
+ * Due to this export (and related dynamic import), this worker code will be included in the bundle automatically (as a separate chunk),
+ * without the need for esbuild / vite /rollup plugins and special browser / server treatment.
+ *
+ * `import.meta.url` is undefined in nodejs
+ */
+export const WorkerUrl: URL | undefined = import.meta.url
+ ? new URL(import.meta.url)
+ : undefined;
+
+// run only in the worker context
+if (typeof window === "undefined" && typeof self !== "undefined") {
+ self.onmessage = async (e: {
+ data: {
+ command: typeof Commands.Subset;
+ arrayBuffer: ArrayBuffer;
+ codePoints: Array;
+ };
+ }) => {
+ switch (e.data.command) {
+ case Commands.Subset:
+ const buffer = await subsetToBinary(
+ e.data.arrayBuffer,
+ e.data.codePoints,
+ );
+
+ self.postMessage(buffer, { transfer: [buffer] });
+ break;
+ }
+ };
+}
diff --git a/packages/excalidraw/fonts/wasm/hb-subset.bindings.ts b/packages/excalidraw/fonts/wasm/hb-subset-bindings.ts
similarity index 100%
rename from packages/excalidraw/fonts/wasm/hb-subset.bindings.ts
rename to packages/excalidraw/fonts/wasm/hb-subset-bindings.ts
diff --git a/packages/excalidraw/fonts/wasm/hb-subset-loader.ts b/packages/excalidraw/fonts/wasm/hb-subset-loader.ts
new file mode 100644
index 00000000..353b24f4
--- /dev/null
+++ b/packages/excalidraw/fonts/wasm/hb-subset-loader.ts
@@ -0,0 +1,57 @@
+/**
+ * DON'T depend on anything from the outside like `promiseTry`, as this module is part of a separate lazy-loaded chunk.
+ *
+ * Including anything from the main chunk would include the whole chunk by default.
+ * Even it it would be tree-shaken during build, it won't be tree-shaken in dev.
+ *
+ * In the future consider separating common utils into a separate shared chunk.
+ */
+
+import binary from "./hb-subset-wasm";
+import bindings from "./hb-subset-bindings";
+
+/**
+ * Lazy loads wasm and respective bindings for font subsetting based on the harfbuzzjs.
+ */
+let loadedWasm: ReturnType | null = null;
+
+// TODO: consider adding support for fetching the wasm from an URL (external CDN, data URL, etc.)
+const load = (): Promise<{
+ subset: (
+ fontBuffer: ArrayBuffer,
+ codePoints: ReadonlySet,
+ ) => Uint8Array;
+}> => {
+ return new Promise(async (resolve, reject) => {
+ try {
+ const module = await WebAssembly.instantiate(binary);
+ const harfbuzzJsWasm = module.instance.exports;
+ // @ts-expect-error since `.buffer` is custom prop
+ const heapu8 = new Uint8Array(harfbuzzJsWasm.memory.buffer);
+
+ const hbSubset = {
+ subset: (fontBuffer: ArrayBuffer, codePoints: ReadonlySet) => {
+ return bindings.subset(
+ harfbuzzJsWasm,
+ heapu8,
+ fontBuffer,
+ codePoints,
+ );
+ },
+ };
+
+ resolve(hbSubset);
+ } catch (e) {
+ reject(e);
+ }
+ });
+};
+
+// lazy load the default export
+export default (): ReturnType => {
+ if (!loadedWasm) {
+ loadedWasm = load();
+ }
+
+ return loadedWasm;
+};
diff --git a/packages/excalidraw/fonts/wasm/hb-subset.wasm.ts b/packages/excalidraw/fonts/wasm/hb-subset-wasm.ts
similarity index 100%
rename from packages/excalidraw/fonts/wasm/hb-subset.wasm.ts
rename to packages/excalidraw/fonts/wasm/hb-subset-wasm.ts
diff --git a/packages/excalidraw/fonts/wasm/hb-subset.loader.ts b/packages/excalidraw/fonts/wasm/hb-subset.loader.ts
deleted file mode 100644
index a9a3035b..00000000
--- a/packages/excalidraw/fonts/wasm/hb-subset.loader.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Lazy loads wasm and respective bindings for font subsetting based on the harfbuzzjs.
- */
-let loadedWasm: ReturnType | null = null;
-
-// TODO: add support for fetching the wasm from an URL (external CDN, data URL, etc.)
-const load = (): Promise<{
- subset: (
- fontBuffer: ArrayBuffer,
- codePoints: ReadonlySet,
- ) => Uint8Array;
-}> => {
- return new Promise(async (resolve, reject) => {
- try {
- const [binary, bindings] = await Promise.all([
- import("./hb-subset.wasm"),
- import("./hb-subset.bindings"),
- ]);
-
- WebAssembly.instantiate(binary.default).then((module) => {
- try {
- const harfbuzzJsWasm = module.instance.exports;
- // @ts-expect-error since `.buffer` is custom prop
- const heapu8 = new Uint8Array(harfbuzzJsWasm.memory.buffer);
-
- const hbSubset = {
- subset: (
- fontBuffer: ArrayBuffer,
- codePoints: ReadonlySet,
- ) => {
- return bindings.default.subset(
- harfbuzzJsWasm,
- heapu8,
- fontBuffer,
- codePoints,
- );
- },
- };
-
- resolve(hbSubset);
- } catch (e) {
- reject(e);
- }
- });
- } catch (error) {
- reject(error);
- }
- });
-};
-
-// lazy load the default export
-export default (): ReturnType => {
- if (!loadedWasm) {
- loadedWasm = load();
- }
-
- return loadedWasm;
-};
diff --git a/packages/excalidraw/fonts/wasm/woff2.bindings.ts b/packages/excalidraw/fonts/wasm/woff2-bindings.ts
similarity index 99%
rename from packages/excalidraw/fonts/wasm/woff2.bindings.ts
rename to packages/excalidraw/fonts/wasm/woff2-bindings.ts
index 16b3fa14..a861de68 100644
--- a/packages/excalidraw/fonts/wasm/woff2.bindings.ts
+++ b/packages/excalidraw/fonts/wasm/woff2-bindings.ts
@@ -47,6 +47,7 @@ const Module = (function () {
moduleOverrides[key] = Module[key];
}
}
+
let arguments_ = [];
let thisProgram = "./this.program";
let quit_ = function (status, toThrow) {
@@ -4046,3 +4047,5 @@ const Module = (function () {
})();
export default Module;
+
+
diff --git a/packages/excalidraw/fonts/wasm/woff2-loader.ts b/packages/excalidraw/fonts/wasm/woff2-loader.ts
new file mode 100644
index 00000000..446dc9f8
--- /dev/null
+++ b/packages/excalidraw/fonts/wasm/woff2-loader.ts
@@ -0,0 +1,76 @@
+/**
+ * DON'T depend on anything from the outside like `promiseTry`, as this module is part of a separate lazy-loaded chunk.
+ *
+ * Including anything from the main chunk would include the whole chunk by default.
+ * Even it it would be tree-shaken during build, it won't be tree-shaken in dev.
+ *
+ * In the future consider separating common utils into a separate shared chunk.
+ */
+
+import binary from "./woff2-wasm";
+import bindings from "./woff2-bindings";
+
+/**
+ * Lazy loads wasm and respective bindings for woff2 compression and decompression.
+ */
+type Vector = any;
+
+let loadedWasm: ReturnType | null = null;
+
+// re-map from internal vector into byte array
+function convertFromVecToUint8Array(vector: Vector): Uint8Array {
+ const arr = [];
+ for (let i = 0, l = vector.size(); i < l; i++) {
+ arr.push(vector.get(i));
+ }
+
+ return new Uint8Array(arr);
+}
+
+// TODO: consider adding support for fetching the wasm from an URL (external CDN, data URL, etc.)
+const load = (): Promise<{
+ compress: (buffer: ArrayBuffer) => Uint8Array;
+ decompress: (buffer: ArrayBuffer) => Uint8Array;
+}> => {
+ return new Promise((resolve, reject) => {
+ try {
+ // initializing the module manually, so that we could pass in the wasm binary
+ // note that the `bindings.then` is not not promise/A+ compliant, hence the need for another explicit try/catch
+ bindings({ wasmBinary: binary }).then(
+ (module: {
+ woff2Enc: (buffer: ArrayBuffer, byteLength: number) => Vector;
+ woff2Dec: (buffer: ArrayBuffer, byteLength: number) => Vector;
+ }) => {
+ try {
+ // re-exporting only compress and decompress functions (also avoids infinite loop inside emscripten bindings)
+ const woff2 = {
+ compress: (buffer: ArrayBuffer) =>
+ convertFromVecToUint8Array(
+ module.woff2Enc(buffer, buffer.byteLength),
+ ),
+ decompress: (buffer: ArrayBuffer) =>
+ convertFromVecToUint8Array(
+ module.woff2Dec(buffer, buffer.byteLength),
+ ),
+ };
+
+ resolve(woff2);
+ } catch (e) {
+ reject(e);
+ }
+ },
+ );
+ } catch (e) {
+ reject(e);
+ }
+ });
+};
+
+// lazy loaded default export
+export default (): ReturnType => {
+ if (!loadedWasm) {
+ loadedWasm = load();
+ }
+
+ return loadedWasm;
+};
diff --git a/packages/excalidraw/fonts/wasm/woff2.wasm.ts b/packages/excalidraw/fonts/wasm/woff2-wasm.ts
similarity index 100%
rename from packages/excalidraw/fonts/wasm/woff2.wasm.ts
rename to packages/excalidraw/fonts/wasm/woff2-wasm.ts
diff --git a/packages/excalidraw/fonts/wasm/woff2.loader.ts b/packages/excalidraw/fonts/wasm/woff2.loader.ts
deleted file mode 100644
index 4ec44247..00000000
--- a/packages/excalidraw/fonts/wasm/woff2.loader.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Lazy loads wasm and respective bindings for woff2 compression and decompression.
- */
-type Vector = any;
-
-let loadedWasm: ReturnType | null = null;
-
-// TODO: add support for fetching the wasm from an URL (external CDN, data URL, etc.)
-const load = (): Promise<{
- compress: (buffer: ArrayBuffer) => Uint8Array;
- decompress: (buffer: ArrayBuffer) => Uint8Array;
-}> => {
- return new Promise(async (resolve, reject) => {
- try {
- const [binary, bindings] = await Promise.all([
- import("./woff2.wasm"),
- import("./woff2.bindings"),
- ]);
-
- // initializing the module manually, so that we could pass in the wasm binary
- bindings
- .default({ wasmBinary: binary.default })
- .then(
- (module: {
- woff2Enc: (buffer: ArrayBuffer, byteLength: number) => Vector;
- woff2Dec: (buffer: ArrayBuffer, byteLength: number) => Vector;
- }) => {
- try {
- // re-map from internal vector into byte array
- function convertFromVecToUint8Array(vector: Vector): Uint8Array {
- const arr = [];
- for (let i = 0, l = vector.size(); i < l; i++) {
- arr.push(vector.get(i));
- }
-
- return new Uint8Array(arr);
- }
-
- // re-exporting only compress and decompress functions (also avoids infinite loop inside emscripten bindings)
- const woff2 = {
- compress: (buffer: ArrayBuffer) =>
- convertFromVecToUint8Array(
- module.woff2Enc(buffer, buffer.byteLength),
- ),
- decompress: (buffer: ArrayBuffer) =>
- convertFromVecToUint8Array(
- module.woff2Dec(buffer, buffer.byteLength),
- ),
- };
-
- resolve(woff2);
- } catch (e) {
- reject(e);
- }
- },
- );
- } catch (e) {
- reject(e);
- }
- });
-};
-
-// lazy loaded default export
-export default (): ReturnType => {
- if (!loadedWasm) {
- loadedWasm = load();
- }
-
- return loadedWasm;
-};
diff --git a/packages/excalidraw/fonts/assets/Assistant-Bold.woff2 b/packages/excalidraw/fonts/woff2/Assistant/Assistant-Bold.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Assistant-Bold.woff2
rename to packages/excalidraw/fonts/woff2/Assistant/Assistant-Bold.woff2
diff --git a/packages/excalidraw/fonts/assets/Assistant-Medium.woff2 b/packages/excalidraw/fonts/woff2/Assistant/Assistant-Medium.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Assistant-Medium.woff2
rename to packages/excalidraw/fonts/woff2/Assistant/Assistant-Medium.woff2
diff --git a/packages/excalidraw/fonts/assets/Assistant-Regular.woff2 b/packages/excalidraw/fonts/woff2/Assistant/Assistant-Regular.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Assistant-Regular.woff2
rename to packages/excalidraw/fonts/woff2/Assistant/Assistant-Regular.woff2
diff --git a/packages/excalidraw/fonts/assets/Assistant-SemiBold.woff2 b/packages/excalidraw/fonts/woff2/Assistant/Assistant-SemiBold.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Assistant-SemiBold.woff2
rename to packages/excalidraw/fonts/woff2/Assistant/Assistant-SemiBold.woff2
diff --git a/packages/excalidraw/fonts/assets/CascadiaCode-Regular.woff2 b/packages/excalidraw/fonts/woff2/Cascadia/CascadiaCode-Regular.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/CascadiaCode-Regular.woff2
rename to packages/excalidraw/fonts/woff2/Cascadia/CascadiaCode-Regular.woff2
diff --git a/packages/excalidraw/fonts/woff2/Cascadia/index.ts b/packages/excalidraw/fonts/woff2/Cascadia/index.ts
new file mode 100644
index 00000000..65baee52
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Cascadia/index.ts
@@ -0,0 +1,8 @@
+import CascadiaCodeRegular from "./CascadiaCode-Regular.woff2";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const CascadiaFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: CascadiaCodeRegular,
+ },
+];
diff --git a/packages/excalidraw/fonts/assets/ComicShanns-Regular.woff2 b/packages/excalidraw/fonts/woff2/Comic/ComicShanns-Regular.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/ComicShanns-Regular.woff2
rename to packages/excalidraw/fonts/woff2/Comic/ComicShanns-Regular.woff2
diff --git a/packages/excalidraw/fonts/woff2/Comic/index.ts b/packages/excalidraw/fonts/woff2/Comic/index.ts
new file mode 100644
index 00000000..51b1f2c9
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Comic/index.ts
@@ -0,0 +1,8 @@
+import ComicShannsRegular from "./ComicShanns-Regular.woff2";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const ComicFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: ComicShannsRegular,
+ },
+];
diff --git a/packages/excalidraw/fonts/woff2/Emoji/index.ts b/packages/excalidraw/fonts/woff2/Emoji/index.ts
new file mode 100644
index 00000000..491676d5
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Emoji/index.ts
@@ -0,0 +1,8 @@
+import { LOCAL_FONT_PROTOCOL } from "../../metadata";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const EmojiFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: LOCAL_FONT_PROTOCOL,
+ },
+];
diff --git a/packages/excalidraw/fonts/assets/Excalifont-Regular.woff2 b/packages/excalidraw/fonts/woff2/Excalifont/Excalifont-Regular.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Excalifont-Regular.woff2
rename to packages/excalidraw/fonts/woff2/Excalifont/Excalifont-Regular.woff2
diff --git a/packages/excalidraw/fonts/woff2/Excalifont/index.ts b/packages/excalidraw/fonts/woff2/Excalifont/index.ts
new file mode 100644
index 00000000..21514971
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Excalifont/index.ts
@@ -0,0 +1,8 @@
+import Excalifont from "./Excalifont-Regular.woff2";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const ExcalifontFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: Excalifont,
+ },
+];
diff --git a/packages/excalidraw/fonts/woff2/Helvetica/index.ts b/packages/excalidraw/fonts/woff2/Helvetica/index.ts
new file mode 100644
index 00000000..7204b304
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Helvetica/index.ts
@@ -0,0 +1,8 @@
+import { LOCAL_FONT_PROTOCOL } from "../../metadata";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const HelveticaFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: LOCAL_FONT_PROTOCOL,
+ },
+];
diff --git a/packages/excalidraw/fonts/assets/LiberationSans-Regular.woff2 b/packages/excalidraw/fonts/woff2/Liberation/LiberationSans-Regular.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/LiberationSans-Regular.woff2
rename to packages/excalidraw/fonts/woff2/Liberation/LiberationSans-Regular.woff2
diff --git a/packages/excalidraw/fonts/woff2/Liberation/index.ts b/packages/excalidraw/fonts/woff2/Liberation/index.ts
new file mode 100644
index 00000000..df6d3dbf
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Liberation/index.ts
@@ -0,0 +1,8 @@
+import LiberationSansRegular from "./LiberationSans-Regular.woff2";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const LiberationFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: LiberationSansRegular,
+ },
+];
diff --git a/packages/excalidraw/fonts/assets/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYE98RXi4EwSsbg.woff2 b/packages/excalidraw/fonts/woff2/Lilita/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYE98RXi4EwSsbg.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYE98RXi4EwSsbg.woff2
rename to packages/excalidraw/fonts/woff2/Lilita/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYE98RXi4EwSsbg.woff2
diff --git a/packages/excalidraw/fonts/assets/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYEF8RXi4EwQ.woff2 b/packages/excalidraw/fonts/woff2/Lilita/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYEF8RXi4EwQ.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYEF8RXi4EwQ.woff2
rename to packages/excalidraw/fonts/woff2/Lilita/Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYEF8RXi4EwQ.woff2
diff --git a/packages/excalidraw/fonts/woff2/Lilita/index.ts b/packages/excalidraw/fonts/woff2/Lilita/index.ts
new file mode 100644
index 00000000..0a31eb11
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Lilita/index.ts
@@ -0,0 +1,16 @@
+import LilitaLatin from "./Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYEF8RXi4EwQ.woff2";
+import LilitaLatinExt from "./Lilita-Regular-i7dPIFZ9Zz-WBtRtedDbYE98RXi4EwSsbg.woff2";
+
+import { GOOGLE_FONTS_RANGES } from "../../metadata";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const LilitaFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: LilitaLatinExt,
+ descriptors: { unicodeRange: GOOGLE_FONTS_RANGES.LATIN_EXT },
+ },
+ {
+ uri: LilitaLatin,
+ descriptors: { unicodeRange: GOOGLE_FONTS_RANGES.LATIN },
+ },
+];
diff --git a/packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTA3j6zbXWjgevT5.woff2 b/packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTA3j6zbXWjgevT5.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTA3j6zbXWjgevT5.woff2
rename to packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTA3j6zbXWjgevT5.woff2
diff --git a/packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTQ3j6zbXWjgeg.woff2 b/packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTQ3j6zbXWjgeg.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTQ3j6zbXWjgeg.woff2
rename to packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTQ3j6zbXWjgeg.woff2
diff --git a/packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTk3j6zbXWjgevT5.woff2 b/packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTk3j6zbXWjgevT5.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTk3j6zbXWjgevT5.woff2
rename to packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTk3j6zbXWjgevT5.woff2
diff --git a/packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTo3j6zbXWjgevT5.woff2 b/packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTo3j6zbXWjgevT5.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTo3j6zbXWjgevT5.woff2
rename to packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTo3j6zbXWjgevT5.woff2
diff --git a/packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTs3j6zbXWjgevT5.woff2 b/packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTs3j6zbXWjgevT5.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTs3j6zbXWjgevT5.woff2
rename to packages/excalidraw/fonts/woff2/Nunito/Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTs3j6zbXWjgevT5.woff2
diff --git a/packages/excalidraw/fonts/woff2/Nunito/index.ts b/packages/excalidraw/fonts/woff2/Nunito/index.ts
new file mode 100644
index 00000000..9d2edbe9
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Nunito/index.ts
@@ -0,0 +1,37 @@
+import Latin from "./Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTQ3j6zbXWjgeg.woff2";
+import LatinExt from "./Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTo3j6zbXWjgevT5.woff2";
+import Cyrilic from "./Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTA3j6zbXWjgevT5.woff2";
+import CyrilicExt from "./Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTk3j6zbXWjgevT5.woff2";
+import Vietnamese from "./Nunito-Regular-XRXI3I6Li01BKofiOc5wtlZ2di8HDIkhdTs3j6zbXWjgevT5.woff2";
+
+import { GOOGLE_FONTS_RANGES } from "../../metadata";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const NunitoFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: CyrilicExt,
+ descriptors: {
+ unicodeRange: GOOGLE_FONTS_RANGES.CYRILIC_EXT,
+ weight: "500",
+ },
+ },
+ {
+ uri: Cyrilic,
+ descriptors: { unicodeRange: GOOGLE_FONTS_RANGES.CYRILIC, weight: "500" },
+ },
+ {
+ uri: Vietnamese,
+ descriptors: {
+ unicodeRange: GOOGLE_FONTS_RANGES.VIETNAMESE,
+ weight: "500",
+ },
+ },
+ {
+ uri: LatinExt,
+ descriptors: { unicodeRange: GOOGLE_FONTS_RANGES.LATIN_EXT, weight: "500" },
+ },
+ {
+ uri: Latin,
+ descriptors: { unicodeRange: GOOGLE_FONTS_RANGES.LATIN, weight: "500" },
+ },
+];
diff --git a/packages/excalidraw/fonts/assets/Virgil-Regular.woff2 b/packages/excalidraw/fonts/woff2/Virgil/Virgil-Regular.woff2
similarity index 100%
rename from packages/excalidraw/fonts/assets/Virgil-Regular.woff2
rename to packages/excalidraw/fonts/woff2/Virgil/Virgil-Regular.woff2
diff --git a/packages/excalidraw/fonts/woff2/Virgil/index.ts b/packages/excalidraw/fonts/woff2/Virgil/index.ts
new file mode 100644
index 00000000..62c32162
--- /dev/null
+++ b/packages/excalidraw/fonts/woff2/Virgil/index.ts
@@ -0,0 +1,8 @@
+import Virgil from "./Virgil-Regular.woff2";
+import { type ExcalidrawFontFaceDescriptor } from "../..";
+
+export const VirgilFontFaces: ExcalidrawFontFaceDescriptor[] = [
+ {
+ uri: Virgil,
+ },
+];
diff --git a/packages/excalidraw/fonts/woff2/Xiaolai/Xiaolai-Regular-019d66dcad46dc156b162d267f981c20.woff2 b/packages/excalidraw/fonts/woff2/Xiaolai/Xiaolai-Regular-019d66dcad46dc156b162d267f981c20.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..81b95cdbbb700e4422d1201dcfcfca28b59770c4
GIT binary patch
literal 58580
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 ^df0rXb$nlyS(^
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