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.

Assets copy-paste (#1636)

Roman Pominov68243c6876ff
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index 2acc901263..64d003067f 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -9,10 +9,7 @@ import { useSyncServer } from "./shared/sync/sync-server";
import { useSharedShortcuts } from "~/shared/shortcuts";
import { SidebarLeft, Navigator } from "./features/sidebar-left";
import { Inspector } from "./features/inspector";
-import {
- isCanvasPointerEventsEnabledStore,
- useProject,
-} from "./shared/nano-states";
+import { isCanvasPointerEventsEnabledStore } from "./shared/nano-states";
import { Topbar } from "./features/topbar";
import builderStyles from "./builder.css";
import { Footer } from "./features/footer";
@@ -23,6 +20,7 @@ import {
} from "./features/workspace";
import { usePublishShortcuts } from "./shared/shortcuts";
import {
+ projectStore,
selectedPageIdStore,
useIsPreviewMode,
useSetAssets,
@@ -60,10 +58,9 @@ export const links = () => {
};
const useSetProject = (project: Project) => {
- const [, setProject] = useProject();
useEffect(() => {
- setProject(project);
- }, [project, setProject]);
+ projectStore.set(project);
+ }, [project]);
};
const useNavigatorLayout = () => {
@@ -74,7 +71,7 @@ const useNavigatorLayout = () => {
};
const useSetWindowTitle = () => {
- const [project] = useProject();
+ const project = useStore(projectStore);
useEffect(() => {
document.title = `${project?.title} | Webstudio`;
}, [project?.title]);
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index f166452d5e..7b2f21310c 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -8,9 +8,12 @@ import { sanitizeS3Key } from "@webstudio-is/asset-uploader";
import { restAssetsUploadPath, restAssetsPath } from "~/shared/router-utils";
import type { AssetContainer, PreviewAsset } from "./types";
import type { ActionData } from "~/builder/shared/assets";
-import { assetsStore, authTokenStore } from "~/shared/nano-states";
+import {
+ assetsStore,
+ authTokenStore,
+ projectStore,
+} from "~/shared/nano-states";
import { atom, computed } from "nanostores";
-import { projectContainer } from "../nano-states";
export const deleteAssets = (assetIds: Asset["id"][]) => {
store.createTransaction([assetsStore], (assets) => {
@@ -176,7 +179,7 @@ export const useUploadAsset = () => {
};
const uploadAssets = (type: AssetType, files: File[]) => {
- const projectId = projectContainer.get()?.id;
+ const projectId = projectStore.get()?.id;
const authToken = authTokenStore.get();
if (projectId === undefined) {
return;
diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.ts
index 4409424c96..cc3878d2ac 100644
--- a/apps/builder/app/builder/shared/nano-states/index.ts
+++ b/apps/builder/app/builder/shared/nano-states/index.ts
@@ -1,6 +1,5 @@
import { atom, computed, type WritableAtom } from "nanostores";
import { useStore } from "@nanostores/react";
-import type { Project } from "@webstudio-is/project";
const useValue = <T>(atom: WritableAtom<T>) => {
const value = useStore(atom);
@@ -18,9 +17,6 @@ export const useCanvasWidth = () => useValue(canvasWidthStore);
export const canvasRectStore = atom<DOMRect | undefined>();
-export const projectContainer = atom<Project | undefined>();
-export const useProject = () => useValue(projectContainer);
-
export const isCanvasPointerEventsEnabledStore = atom<boolean>(true);
export const workspaceRectStore = atom<DOMRect | undefined>();
diff --git a/apps/builder/app/shared/array-utils.ts b/apps/builder/app/shared/array-utils.ts
index 52fbbff7c3..e1a34f32b7 100644
--- a/apps/builder/app/shared/array-utils.ts
+++ b/apps/builder/app/shared/array-utils.ts
@@ -16,10 +16,10 @@ export const getMapValuesByKeysSet = <Key, Value>(
map: Map<Key, Value>,
keys: Set<Key>
) => {
- const values: Value[] = [];
+ const values: NonNullable<Value>[] = [];
for (const key of keys) {
const value = map.get(key);
- if (value !== undefined) {
+ if (value != null) {
values.push(value);
}
}
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index db33163cfb..08ad64d0df 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -20,6 +20,8 @@ import {
selectedPageStore,
breakpointsStore,
selectedStyleSourceSelectorStore,
+ assetsStore,
+ projectStore,
} from "../nano-states";
import {
type InstanceSelector,
@@ -34,6 +36,7 @@ import {
} from "../tree-utils";
import { deleteInstance } from "../instance-utils";
import { getMapValuesBy, getMapValuesByKeysSet } from "../array-utils";
+import { Asset } from "@webstudio-is/asset-uploader";
const version = "@webstudio/instance/v0.1";
@@ -44,6 +47,7 @@ const InstanceData = z.object({
styleSourceSelections: z.array(StyleSourceSelection),
styleSources: z.array(StyleSource),
styles: z.array(StyleDecl),
+ assets: z.array(Asset),
});
type InstanceData = z.infer<typeof InstanceData>;
@@ -65,6 +69,79 @@ const findTreeStyleSourceIds = (
return treeStyleSourceIds;
};
+const getAssetsUsedInStyle = (
+ style: StyleDecl[],
+ foundAssetsIds = new Set<Asset["id"]>()
+) => {
+ const fontFamilies = new Set<string>();
+
+ const processValues = (values: StyleDecl["value"][]) => {
+ for (const value of values) {
+ if (value.type === "fontFamily") {
+ for (const fontFamily of value.value) {
+ fontFamilies.add(fontFamily);
+ }
+ continue;
+ }
+ if (value.type === "image") {
+ if (value.value.type === "asset") {
+ foundAssetsIds.add(value.value.value);
+ }
+ continue;
+ }
+ if (value.type === "var") {
+ processValues(value.fallbacks);
+ continue;
+ }
+ if (value.type === "tuple" || value.type === "layers") {
+ processValues(value.value);
+ continue;
+ }
+ if (
+ value.type === "unit" ||
+ value.type === "keyword" ||
+ value.type === "unparsed" ||
+ value.type === "invalid" ||
+ value.type === "unset" ||
+ value.type === "rgb"
+ ) {
+ continue;
+ }
+ value satisfies never;
+ }
+ };
+
+ processValues(style.map(({ value }) => value));
+
+ for (const asset of assetsStore.get().values()) {
+ if (asset?.type === "font" && fontFamilies.has(asset.meta.family)) {
+ foundAssetsIds.add(asset.id);
+ }
+ }
+
+ return foundAssetsIds;
+};
+
+const getAssetsUsedInProps = (props: Prop[], foundAssetsIds = new Set()) => {
+ for (const prop of props) {
+ if (prop.type === "asset") {
+ foundAssetsIds.add(prop.value);
+ continue;
+ }
+ if (
+ prop.type === "number" ||
+ prop.type === "string" ||
+ prop.type === "boolean" ||
+ prop.type === "page" ||
+ prop.type === "string[]"
+ ) {
+ continue;
+ }
+ prop satisfies never;
+ }
+ return foundAssetsIds;
+};
+
const getTreeData = (targetInstanceSelector: InstanceSelector) => {
// @todo tell user they can't copy or cut root
if (targetInstanceSelector.length === 1) {
@@ -110,6 +187,11 @@ const getTreeData = (targetInstanceSelector: InstanceSelector) => {
treeBreapointIds
);
+ const treeAssets = getMapValuesByKeysSet(
+ assetsStore.get(),
+ getAssetsUsedInProps(treeProps, getAssetsUsedInStyle(treeStyles))
+ );
+
return {
breakpoints: treeBreapoints,
instances: treeInstances,
@@ -117,6 +199,7 @@ const getTreeData = (targetInstanceSelector: InstanceSelector) => {
props: treeProps,
styleSourceSelections: treeStyleSourceSelections,
styles: treeStyles,
+ assets: treeAssets,
};
};
@@ -139,10 +222,18 @@ export const mimeType = "application/json";
export const onPaste = (clipboardData: string) => {
const data = parse(clipboardData);
+
const selectedPage = selectedPageStore.get();
- if (data === undefined || selectedPage === undefined) {
+ const project = projectStore.get();
+
+ if (
+ data === undefined ||
+ selectedPage === undefined ||
+ project === undefined
+ ) {
return;
}
+
// paste to the root if nothing is selected
const instanceSelector = selectedInstanceSelectorStore.get() ?? [
selectedPage.rootInstanceId,
@@ -156,6 +247,7 @@ export const onPaste = (clipboardData: string) => {
if (dropTarget === undefined) {
return;
}
+
store.createTransaction(
[
breakpointsStore,
@@ -164,6 +256,7 @@ export const onPaste = (clipboardData: string) => {
propsStore,
styleSourceSelectionsStore,
stylesStore,
+ assetsStore,
],
(
breakpoints,
@@ -171,8 +264,17 @@ export const onPaste = (clipboardData: string) => {
styleSources,
props,
styleSourceSelections,
- styles
+ styles,
+ assets
) => {
+ for (const asset of data.assets) {
+ // asset can be already present if pasting to the same project
+ if (assets.has(asset.id) === false) {
+ // we use the same asset.id so the references are preserved
+ assets.set(asset.id, { ...asset, projectId: project.id });
+ }
+ }
+
const mergedBreakpointIds = mergeNewBreakpointsMutable(
breakpoints,
data.breakpoints
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index 8cab4ab3e6..39f2d36aaf 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -28,6 +28,7 @@ import { breakpointsStore } from "./breakpoints";
import { instancesStore, selectedInstanceSelectorStore } from "./instances";
import { selectedPageStore } from "./pages";
import type { UnitSizes } from "~/builder/features/style-panel/shared/css-value-input/convert-units";
+import type { Project } from "@webstudio-is/project";
const useValue = <T>(atom: WritableAtom<T>) => {
const value = useStore(atom);
@@ -46,6 +47,8 @@ const useValue = <T>(atom: WritableAtom<T>) => {
return [value, set] as const;
};
+export const projectStore = atom<Project | undefined>();
+
export const rootInstanceStore = computed(
[instancesStore, selectedPageStore],
(instances, selectedPage) => {
diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.ts
index efa5b2b151..8f909d8e95 100644
--- a/apps/builder/app/shared/pages/use-switch-page.ts
+++ b/apps/builder/app/shared/pages/use-switch-page.ts
@@ -1,9 +1,9 @@
import { useNavigate } from "@remix-run/react";
import type { Page } from "@webstudio-is/project-build";
-import { projectContainer } from "~/builder/shared/nano-states";
import {
authTokenStore,
pagesStore,
+ projectStore,
selectedInstanceSelectorStore,
} from "~/shared/nano-states";
import { builderPath } from "~/shared/router-utils";
@@ -16,7 +16,7 @@ export const useSwitchPage = () => {
* If no `pageId` provided, switches to default page (home)
*/
return (pageId?: Page["id"]) => {
- const project = projectContainer.get();
+ const project = projectStore.get();
const pages = pagesStore.get();
if (project === undefined || pages === undefined) {
diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.ts
index 47f69ba470..cf2327e4cc 100644
--- a/apps/builder/app/shared/sync/sync-stores.ts
+++ b/apps/builder/app/shared/sync/sync-stores.ts
@@ -4,6 +4,7 @@ import { atom, type WritableAtom } from "nanostores";
import { useEffect } from "react";
import { type Publish, subscribe } from "~/shared/pubsub";
import {
+ projectStore,
pagesStore,
instancesStore,
propsStore,
@@ -65,6 +66,7 @@ export const registerContainers = () => {
store.register("props", propsStore);
store.register("assets", assetsStore);
// synchronize whole states
+ clientStores.set("project", projectStore);
clientStores.set("selectedPageId", selectedPageIdStore);
clientStores.set("selectedInstanceSelector", selectedInstanceSelectorStore);
clientStores.set(
diff --git a/packages/asset-uploader/src/patch.ts b/packages/asset-uploader/src/patch.ts
index 0cc5b5b067..c93f135655 100644
--- a/packages/asset-uploader/src/patch.ts
+++ b/packages/asset-uploader/src/patch.ts
@@ -57,18 +57,27 @@ export const patchAssets = async (
}
}
if (addedAssets.length !== 0) {
+ const files = await prisma.file.findMany({
+ where: { name: { in: addedAssets.map((asset) => asset.name) } },
+ });
+
+ const fileNames = new Set(files.map((file) => file.name));
+
await prisma.asset.createMany({
- data: addedAssets.map((asset) => ({
- id: asset.id,
- projectId: asset.projectId,
- name: asset.name,
- // @todo remove once legacy fields are removed from schema
- location: asset.location,
- size: asset.size,
- format: asset.format,
- meta: JSON.stringify(asset.meta),
- status: "UPLOADED",
- })),
+ data: addedAssets
+ // making sure corresponding file exist before creating an asset that references it
+ .filter((asset) => fileNames.has(asset.name))
+ .map((asset) => ({
+ id: asset.id,
+ projectId: asset.projectId,
+ name: asset.name,
+ // @todo remove once legacy fields are removed from schema
+ location: asset.location,
+ size: asset.size,
+ format: asset.format,
+ meta: JSON.stringify(asset.meta),
+ status: "UPLOADED",
+ })),
});
}
};