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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
experimental: Paste from webflow 14 (#3687)
Oleg Isonen915de5c46d18
diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsxindex 38b57c99a0..f264ab55b5 100644--- a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx@@ -16,6 +16,8 @@ import {$breakpoints,$project,$registeredComponentMetas,+ $styleSources,+ $styles,} from "../../nano-states";import invariant from "tiny-invariant";import { WfData } from "./schema";@@ -2513,6 +2515,32 @@ describe("Styles", () => {});test("Combo class", async () => {+ $styleSources.set(+ new Map([+ [+ "uuBw1PRC_uE8RhTmwxaH8",+ {+ id: "uuBw1PRC_uE8RhTmwxaH8",+ type: "token",+ name: "button",+ },+ ],+ ])+ );+ $styles.set(+ new Map([+ [+ "uuBw1PRC_uE8RhTmwxaH8",+ {+ styleSourceId: "uuBw1PRC_uE8RhTmwxaH8",+ breakpointId: "base",+ property: "color",+ value: { type: "keyword", value: "green" },+ },+ ],+ ])+ );+const fragment = await toWebstudioFragment({type: "@webflow/XscpData",payload: {@@ -2563,18 +2591,18 @@ describe("Styles", () => {{type: "token",id: expect.any(String),- name: "button",- },- {- type: "token",- id: expect.any(String),- name: "is-secondary",+ name: "button.is-secondary",},]);+expect(fragment.styleSourceSelections).toEqual([{instanceId: expect.any(String),- values: [expect.any(String), expect.any(String), expect.any(String)],+ values: [+ "uu1p3Xdvlq_AZOxnzDvAv",+ "uuBw1PRC_uE8RhTmwxaH8",+ "uuFc5tqBSacRR9VpjbFi1",+ ],},]);@@ -2589,10 +2617,8 @@ describe("Styles", () => {a:hover {outline: 0 none currentColor}- button {- text-align: center- }- is-secondary {+ button.is-secondary {+ text-align: center;background-color: transparent}}"@@ -2959,7 +2985,7 @@ describe("Styles", () => {(style) => style.property === "backgroundImage");- expect(bgStyle).not.toBeNull();+ expect(bgStyle).toBeDefined();expect(bgStyle?.value.type).toEqual("layers");const layers = bgStyle?.value;diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.tsindex 8a3dc8034a..550910e5f0 100644--- a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.ts+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.ts@@ -78,14 +78,14 @@ const toWebstudioFragment = async (wfData: WfData) => {return nanoHash(`${projectId}-${sourceData}`);};- await addStyles(+ await addStyles({wfNodes,wfStyles,wfAssets,doneNodes,fragment,- generateStyleSourceId- );+ generateStyleSourceId,+ });// First node should be always the root node in theory, if not// we need to find a node that is not a child of any other node.const rootWfNode = wfData.payload.nodes[0];diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/styles.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/styles.tsindex 393814ba65..e3d22d976b 100644--- a/apps/builder/app/shared/copy-paste/plugin-webflow/styles.ts+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/styles.ts@@ -6,7 +6,7 @@ import type {} from "@webstudio-is/sdk";import type { WfAsset, WfElementNode, WfNode, WfStyle } from "./schema";import { nanoid } from "nanoid";-import { $breakpoints } from "~/shared/nano-states";+import { $breakpoints, $styleSources } from "~/shared/nano-states";import {parseCss,pseudoElements,@@ -226,6 +226,24 @@ const addNodeStyles = ({}};+const addStyleSource = (+ styleSourceId: string,+ instanceId: Instance["id"],+ fragment: WebstudioFragment+) => {+ let styleSourceSelection = fragment.styleSourceSelections.find(+ (selection) => selection.instanceId === instanceId+ );+ if (styleSourceSelection === undefined) {+ styleSourceSelection = { instanceId, values: [] };+ fragment.styleSourceSelections.push(styleSourceSelection);+ }++ if (styleSourceSelection.values.includes(styleSourceId) === false) {+ styleSourceSelection.values.push(styleSourceId);+ }+};+const addNodeTokenStyles = ({styleSourceId,name,@@ -247,14 +265,7 @@ const addNodeTokenStyles = ({name,});- let styleSourceSelection = fragment.styleSourceSelections.find(- (selection) => selection.instanceId === instanceId- );- if (styleSourceSelection === undefined) {- styleSourceSelection = { instanceId, values: [] };- fragment.styleSourceSelections.push(styleSourceSelection);- }- styleSourceSelection.values.push(styleSourceId);+ addStyleSource(styleSourceId, instanceId, fragment);addNodeStyles({styleSourceId,@@ -415,14 +426,50 @@ const mapComponentAndPresetStyles = (return presetStyles;};-export const addStyles = async (- wfNodes: Map<WfNode["_id"], WfNode>,- wfStyles: Map<WfStyle["_id"], WfStyle>,- wfAssets: Map<WfAsset["_id"], WfAsset>,- doneNodes: Map<WfNode["_id"], Instance["id"] | false>,- fragment: WebstudioFragment,- generateStyleSourceId: (sourceData: string) => Promise<string>-) => {+const mergeComboStyles = (styles: Array<WfStyle>) => {+ const mergedStyles: Array<WfStyle> = [];+ const mergedClasses = new Set<string>();+ for (const style of styles) {+ if (style.comb) {+ // Child style can be skipped, as it will be already merged into parent+ continue;+ }+ const mergedStyle = { variants: {}, ...style };+ mergedStyles.push(mergedStyle);+ for (const childId of style.children ?? []) {+ const childStyle = styles.find((style) => style._id === childId);+ if (childStyle) {+ mergedClasses.add(style.name);+ mergedClasses.add(childStyle.name);+ mergedStyle.styleLess += childStyle.styleLess;+ for (const key in childStyle.variants) {+ if (key in childStyle.variants === false) {+ mergedStyle.variants[key] = { styleLess: "" };+ }+ mergedStyle.variants[key].styleLess += childStyle.variants[key];+ }+ mergedStyle.name += "." + childStyle.name;+ }+ }+ }+ return { mergedStyles, mergedClasses };+};++export const addStyles = async ({+ wfNodes,+ wfStyles,+ wfAssets,+ doneNodes,+ fragment,+ generateStyleSourceId,+}: {+ wfNodes: Map<WfNode["_id"], WfNode>;+ wfStyles: Map<WfStyle["_id"], WfStyle>;+ wfAssets: Map<WfAsset["_id"], WfAsset>;+ doneNodes: Map<WfNode["_id"], Instance["id"] | false>;+ fragment: WebstudioFragment;+ generateStyleSourceId: (sourceData: string) => Promise<string>;+}) => {const { styles: stylePresets } = await import("./__generated__/style-presets");@@ -481,20 +528,23 @@ export const addStyles = async (continue;}- for (const classId of wfNode.classes) {- const style = wfStyles.get(classId);- if (style === undefined) {- continue;- }+ let wfNodeStyles = wfNode.classes+ .map((classId) => wfStyles.get(classId))+ .filter(<T>(value: T): value is NonNullable<T> => value !== undefined);++ const comboStylesMerge = mergeComboStyles(wfNodeStyles);+ wfNodeStyles = comboStylesMerge.mergedStyles;++ for (const wfStyle of wfNodeStyles) {if (instance && instance.label === undefined) {- instance.label = style.name;+ instance.label = wfStyle.name;}const variants = new Map();variants.set("base",- replaceAtImages(replaceAtVariables(style.styleLess), wfAssets)+ replaceAtImages(replaceAtVariables(wfStyle.styleLess), wfAssets));- const wfVariants = style.variants ?? {};+ const wfVariants = wfStyle.variants ?? {};Object.keys(wfVariants).forEach((breakpointName) => {const variant = wfVariants[breakpointName as keyof typeof wfVariants];if (variant && "styleLess" in variant) {@@ -505,9 +555,17 @@ export const addStyles = async (}});+ // We need to see if the individual classes have already existed in the system+ // and if so, add them to the selection, because webflow relies on combo class logic and we merge the combo into one.+ for (const childClass of comboStylesMerge.mergedClasses) {+ const wsStyleSourceId = await generateStyleSourceId(childClass);+ if ($styleSources.get().has(wsStyleSourceId)) {+ addStyleSource(wsStyleSourceId, instanceId, fragment);+ }+ }addNodeTokenStyles({- styleSourceId: await generateStyleSourceId(classId),- name: style.name,+ styleSourceId: await generateStyleSourceId(wfStyle.name),+ name: wfStyle.name,variants,instanceId,fragment,