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: Copy from Webflow 12 (#3631)
Oleg Isonenfa9d2276cd17
diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.tsindex 48a29efb42..5418d9ef9f 100644--- a/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts@@ -3133,7 +3133,14 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",+ value: {+ type: "keyword",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",value: {type: "keyword",value: "nowrap",@@ -7862,7 +7869,14 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",+ value: {+ type: "keyword",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",value: {type: "keyword",value: "nowrap",@@ -7930,10 +7944,17 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",value: {type: "keyword",- value: "normal",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",+ value: {+ type: "keyword",+ value: "wrap",},},{@@ -8963,7 +8984,14 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",+ value: {+ type: "keyword",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",value: {type: "keyword",value: "nowrap",@@ -9070,7 +9098,14 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",+ value: {+ type: "keyword",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",value: {type: "keyword",value: "nowrap",@@ -9213,7 +9248,14 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",+ value: {+ type: "keyword",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",value: {type: "keyword",value: "nowrap",@@ -9528,10 +9570,17 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",value: {type: "keyword",- value: "normal",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",+ value: {+ type: "keyword",+ value: "wrap",},},{@@ -10048,7 +10097,14 @@ export const styles = {},},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",+ value: {+ type: "keyword",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",value: {type: "keyword",value: "nowrap",@@ -10432,7 +10488,14 @@ export const styles = {],"w-lightbox-strip": [{- property: "whiteSpace",+ property: "whiteSpaceCollapse",+ value: {+ type: "keyword",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",value: {type: "keyword",value: "nowrap",@@ -11293,10 +11356,17 @@ export const styles = {state: ":after",},{- property: "whiteSpace",+ property: "whiteSpaceCollapse",value: {type: "keyword",- value: "initial",+ value: "collapse",+ },+ },+ {+ property: "textWrapMode",+ value: {+ type: "keyword",+ value: "wrap",},},],diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/instances-properties.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/instances-properties.tsindex 7d66f79892..93a5a33e9a 100644--- a/apps/builder/app/shared/copy-paste/plugin-webflow/instances-properties.ts+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/instances-properties.ts@@ -4,8 +4,7 @@ import type { WfElementNode, WfNode } from "./schema";const toFragment = (wfNode: WfElementNode,- instanceId: Instance["id"],- wfNodes: Map<WfNode["_id"], WfNode>+ instanceId: Instance["id"]): WebstudioFragment | undefined => {const fragment: WebstudioFragment = {children: [],@@ -77,6 +76,9 @@ const toFragment = (}switch (component) {+ case "LineBreak": {+ return fragment;+ }case "Heading": {addProp("tag", wfNode.tag);addInstance(component);@@ -93,7 +95,8 @@ const toFragment = (case "Paragraph":case "Superscript":case "Subscript":- case "Blockquote": {+ case "Blockquote":+ case "Span": {addInstance(component);return fragment;}@@ -131,6 +134,7 @@ const toFragment = (addInstance(component);return fragment;}+ case "Container":case "BlockContainer": {const component = "Box";addInstance(component);@@ -352,7 +356,7 @@ export const addInstanceAndProperties = (return;}const instanceId = nanoid();- const nextFragment = toFragment(wfNode, instanceId, wfNodes);+ const nextFragment = toFragment(wfNode, instanceId);if (nextFragment === undefined) {// Skip this node and its children.@@ -369,10 +373,17 @@ export const addInstanceAndProperties = (if (wfChildNode === undefined) {continue;}- if ("text" in wfChildNode) {+ const value =+ "text" in wfChildNode+ ? wfChildNode.v+ : wfChildNode.type === "LineBreak"+ ? "\n"+ : undefined;++ if (value !== undefined) {children.push({type: "text",- value: wfChildNode.v,+ value,});doneNodes.set(wfChildId, instanceId);continue;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 8503f96fce..58bb6e3eb5 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@@ -1556,6 +1556,55 @@ test("FormSelect", async () => {);});+test("Multiline text", async () => {+ const fragment = await toWebstudioFragment({+ type: "@webflow/XscpData",+ payload: {+ nodes: [+ {+ _id: "da7b8e40-a038-735c-bde8-0016079a5502",+ type: "Block",+ tag: "div",+ classes: [],+ children: [+ "629fa602-de2f-b70b-ba5e-a74de823cfff",+ "b6a2a455-8ece-d70b-c88b-2f7b7dd39445",+ "49a4d697-0430-6739-9179-e75c1dbec765",+ ],+ },+ {+ _id: "629fa602-de2f-b70b-ba5e-a74de823cfff",+ text: true,+ v: "a",+ },+ {+ _id: "b6a2a455-8ece-d70b-c88b-2f7b7dd39445",+ type: "LineBreak",+ tag: "br",+ classes: [],+ children: [],+ },+ {+ _id: "49a4d697-0430-6739-9179-e75c1dbec765",+ text: true,+ v: "b",+ },+ ],+ styles: [],+ assets: [],+ },+ });++ equalFragment(+ fragment,+ <$.Box>+ {"a"}+ {"\n"}+ {"b"}+ </$.Box>+ );+});+describe("Custom attributes", () => {test("Basic", async () => {const fragment = await toWebstudioFragment({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 dbece143e9..8a3dc8034a 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@@ -14,7 +14,13 @@ import {$selectedPage,$project,} from "../../nano-states";-import { WfData, WfNode, WfStyle, wfNodeTypes, type WfAsset } from "./schema";+import {+ WfData,+ wfNodeTypes,+ type WfNode,+ type WfStyle,+ type WfAsset,+} from "./schema";import { addInstanceAndProperties } from "./instances-properties";import { addStyles } from "./styles";import { builderApi } from "~/shared/builder-api";diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/schema.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/schema.tsindex 5168ea3a63..6c618d581f 100644--- a/apps/builder/app/shared/copy-paste/plugin-webflow/schema.ts+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/schema.ts@@ -37,6 +37,7 @@ export const wfNodeTypes = ["Subscript","Section","BlockContainer",+ "Container","Layout","Cell","VFlex",@@ -61,9 +62,11 @@ export const wfNodeTypes = ["FormRadioWrapper","FormRadioInput","FormSelect",+ "LineBreak",+ "Span",] as const;-export const WfElementNode = z.union([+const WfElementNode = z.union([WfBaseNode.extend({ type: z.enum(["Heading"]) }),WfBaseNode.extend({type: z.enum(["Block"]),@@ -95,6 +98,7 @@ export const WfElementNode = z.union([WfBaseNode.extend({ type: z.enum(["Subscript"]) }),WfBaseNode.extend({ type: z.enum(["Section"]) }),WfBaseNode.extend({ type: z.enum(["BlockContainer"]) }),+ WfBaseNode.extend({ type: z.enum(["Container"]) }),WfBaseNode.extend({ type: z.enum(["Layout"]) }),WfBaseNode.extend({ type: z.enum(["Cell"]) }),WfBaseNode.extend({ type: z.enum(["VFlex"]) }),@@ -231,6 +235,8 @@ export const WfElementNode = z.union([}),}),}),+ WfBaseNode.extend({ type: z.enum(["LineBreak"]) }),+ WfBaseNode.extend({ type: z.enum(["Span"]) }),]);export type WfElementNode = z.infer<typeof WfElementNode>;@@ -240,10 +246,10 @@ export type WfElementNode = z.infer<typeof WfElementNode>;//@todo verify the other way around too//(typeof WfElementNode)["type"] satisfies typeof wfNodeTypes[number]-export const WfNode = z.union([WfElementNode, WfTextNode]);+const WfNode = z.union([WfElementNode, WfTextNode]);export type WfNode = z.infer<typeof WfNode>;-export const WfStyle = z.object({+const WfStyle = z.object({_id: z.string(),type: z.enum(["class"]),name: z.string(),@@ -261,6 +267,17 @@ export const WfStyle = z.object({});export type WfStyle = z.infer<typeof WfStyle>;+const WfErrorAssetVariant = z.object({+ origFileName: z.string(),+ fileName: z.string(),+ format: z.string(),+ size: z.number(),+ width: z.number(),+ quality: z.number(),+ error: z.string(),+ _id: z.string(),+});+const WfAssetVariant = z.object({origFileName: z.string(),fileName: z.string(),@@ -282,7 +299,7 @@ const WfAsset = z.object({createdOn: z.string(),origFileName: z.string(),fileHash: z.string(),- variants: z.array(WfAssetVariant),+ variants: z.array(z.union([WfAssetVariant, WfErrorAssetVariant])),mimeType: z.string(),s3Url: z.string().url(),thumbUrl: z.string(),