Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Filter font assets for published apps (#1072)

Ivan Starkov3cc0977d82bf
diff --git a/apps/builder/app/canvas/features/wrapper-component/wrapper-component.tsx b/apps/builder/app/canvas/features/wrapper-component/wrapper-component.tsx
index ed5d7377a3..cc5c07fcd8 100644
--- a/apps/builder/app/canvas/features/wrapper-component/wrapper-component.tsx
+++ b/apps/builder/app/canvas/features/wrapper-component/wrapper-component.tsx
@@ -1,4 +1,4 @@
-import { MouseEvent, FormEvent, useLayoutEffect } from "react";
+import type { MouseEvent, FormEvent } from "react";
import { Suspense, lazy, useCallback, useMemo, useRef } from "react";
import { useStore } from "@nanostores/react";
import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
@@ -20,6 +20,7 @@ import {
import { createInstancesIndex } from "~/shared/tree-utils";
import { useCssRules } from "~/canvas/shared/styles";
import { SelectedInstanceConnector } from "./selected-instance-connector";
+import { useIsomorphicLayoutEffect } from "react-use";
const TextEditor = lazy(() => import("../text-editor"));
@@ -96,7 +97,7 @@ export const WrapperComponentDev = ({
return result;
}, [instanceProps]);
- useLayoutEffect(() => {
+ useIsomorphicLayoutEffect(() => {
setDataCollapsed(instanceElementRef.current);
});
diff --git a/apps/builder/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.ts
index ad48e853bd..0f3fa6543c 100644
--- a/apps/builder/app/shared/db/canvas.server.ts
+++ b/apps/builder/app/shared/db/canvas.server.ts
@@ -41,7 +41,26 @@ export const loadProductionCanvasData = async (
context
);
- pagesCanvasData.push(canvasData);
+ const styles = canvasData.build?.styles ?? [];
+
+ // Find all fonts referenced in styles
+ const fontFamilySet = new Set<string>();
+ for (const [, { value }] of styles) {
+ if (value.type === "fontFamily") {
+ for (const fontFamily of value.value) {
+ fontFamilySet.add(fontFamily);
+ }
+ }
+ }
+
+ // Filter unused font assets
+ const assets = canvasData.assets.filter(
+ (asset) =>
+ asset.type === "image" ||
+ (asset.type === "font" && fontFamilySet.has(asset.meta.family))
+ );
+
+ pagesCanvasData.push({ ...canvasData, assets });
if (otherPages.length > 0) {
for (const page of otherPages) {
@@ -49,7 +68,10 @@ export const loadProductionCanvasData = async (
{ project, env: "prod", pageIdOrPath: page.path },
context
);
- pagesCanvasData.push(canvasData);
+ pagesCanvasData.push({
+ ...canvasData,
+ assets,
+ });
}
}