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
refactor: add remix body component (#2612)
Bogdan Chadkin98f0c348e8af
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 376e741549..9f028a6f71 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -1,7 +1,6 @@import { useMemo, useEffect, useState } from "react";import { useStore } from "@nanostores/react";import { computed } from "nanostores";-import { Scripts, ScrollRestoration } from "@remix-run/react";import type { Instances, Page } from "@webstudio-is/sdk";import {type Params,@@ -122,12 +121,6 @@ const useElementsTree = (? WebstudioComponentPreview: WebstudioComponentCanvas,components,- scripts: (- <>- <ScrollRestoration />- <Scripts />- </>- ),})}</WebstudioComponentContext.Provider>);@@ -231,12 +224,7 @@ export const Canvas = ({}, []);if (components.size === 0 || instances.size === 0) {- return (- <body>- <ScrollRestoration />- <Scripts />- </body>- );+ return <remixComponents.Body />;}return (diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsxindex 2a1e46de7c..890e45899d 100644--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx@@ -4,10 +4,8 @@import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";-import {- Body as Body,- Heading as Heading,-} from "@webstudio-is/sdk-components-react";+import { Body as Body } from "@webstudio-is/sdk-components-react-remix";+import { Heading as Heading } from "@webstudio-is/sdk-components-react";export const fontAssets: Asset[] = [];export const imageAssets: ImageAsset[] = [@@ -45,13 +43,12 @@ export const user: { email: string | null } | undefined = {};export const projectId = "0d856812-61d8-4014-a20a-82e01c0eb8ee";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {return (<Body data-ws-id="ibXgMoi9_ipHx1gVrvii0" data-ws-component="Body"><Heading data-ws-id="7pwqBSgrfuuOfk1JblWcL" data-ws-component="Heading">{"DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES"}</Heading>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsxindex 89f25e2896..e672abcbc3 100644--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsxindex 932d9058b7..152cb5a2f6 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx@@ -4,8 +4,8 @@import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {- Body as Body,Heading as Heading,Text as Text,} from "@webstudio-is/sdk-components-react";@@ -27,7 +27,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {return (<Body data-ws-id="MMimeobf_zi4ZkRGXapju" data-ws-component="Body"><Heading data-ws-id="MYDt0guk1-vzc7yzqyN6A" data-ws-component="Heading">@@ -36,7 +36,6 @@ const Page = (props: { scripts?: ReactNode }) => {<Text data-ws-id="BMJfjOzunWs8XkQgvvx1e" data-ws-component="Text">{"Please don't change directly in the fixture"}</Text>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsxindex 89f25e2896..e672abcbc3 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsxindex 932d9058b7..152cb5a2f6 100644--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx@@ -4,8 +4,8 @@import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {- Body as Body,Heading as Heading,Text as Text,} from "@webstudio-is/sdk-components-react";@@ -27,7 +27,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {return (<Body data-ws-id="MMimeobf_zi4ZkRGXapju" data-ws-component="Body"><Heading data-ws-id="MYDt0guk1-vzc7yzqyN6A" data-ws-component="Heading">@@ -36,7 +36,6 @@ const Page = (props: { scripts?: ReactNode }) => {<Text data-ws-id="BMJfjOzunWs8XkQgvvx1e" data-ws-component="Text">{"Please don't change directly in the fixture"}</Text>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsxindex 89f25e2896..e672abcbc3 100644--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsxindex 4a6a425a06..91caec93bb 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx@@ -4,10 +4,8 @@import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";-import {- Body as Body,- Image as Image,-} from "@webstudio-is/sdk-components-react";+import { Body as Body } from "@webstudio-is/sdk-components-react-remix";+import { Image as Image } from "@webstudio-is/sdk-components-react";export const fontAssets: Asset[] = [];export const imageAssets: ImageAsset[] = [@@ -65,7 +63,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {return (<Body data-ws-id="EDEfpMPRqDejthtwkH7ws" data-ws-component="Body"><Image@@ -73,7 +71,6 @@ const Page = (props: { scripts?: ReactNode }) => {data-ws-component="Image"src={"/assets/small-avif-kitty_FnabJsioMWpBtXZSGf4DR.webp"}/>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex 054c59e03e..49e8c50d35 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -6,13 +6,15 @@ import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";import {Body as Body,+ Form as Form,+} from "@webstudio-is/sdk-components-react-remix";+import {Box as Box,Label as Label,Input as Input,Button as Button,Heading as Heading,} from "@webstudio-is/sdk-components-react";-import { Form as Form } from "@webstudio-is/sdk-components-react-remix";export const fontAssets: Asset[] = [];export const imageAssets: ImageAsset[] = [@@ -70,7 +72,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [formState, set$formState] = useState<any>("initial");let [formState_1, set$formState_1] = useState<any>("initial");let onStateChange = (state: any) => {@@ -185,7 +187,6 @@ const Page = (props: { scripts?: ReactNode }) => {</Box>)}</Form>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsxindex 6b6789b314..9ca4a9c50f 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx@@ -4,10 +4,8 @@import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";-import {- Body as Body,- Heading as Heading,-} from "@webstudio-is/sdk-components-react";+import { Body as Body } from "@webstudio-is/sdk-components-react-remix";+import { Heading as Heading } from "@webstudio-is/sdk-components-react";export const fontAssets: Asset[] = [];export const imageAssets: ImageAsset[] = [@@ -65,7 +63,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {return (<Body data-ws-id="O-ljaGZQ0iRNTlEshMkgE" data-ws-component="Body"><Heading@@ -75,7 +73,6 @@ const Page = (props: { scripts?: ReactNode }) => {>{"Heading you can edit"}</Heading>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex c785cca01c..3b78515a80 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -4,12 +4,7 @@import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";-import {- Body as Body,- Text as Text,- Box as Box,- HtmlEmbed as HtmlEmbed,-} from "@webstudio-is/sdk-components-react";+import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {Accordion as Accordion,AccordionItem as AccordionItem,@@ -17,6 +12,11 @@ import {AccordionTrigger as AccordionTrigger,AccordionContent as AccordionContent,} from "@webstudio-is/sdk-components-react-radix";+import {+ Text as Text,+ Box as Box,+ HtmlEmbed as HtmlEmbed,+} from "@webstudio-is/sdk-components-react";export const fontAssets: Asset[] = [];export const imageAssets: ImageAsset[] = [@@ -79,7 +79,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [accordionValue, set$accordionValue] = useState<any>("0");let onValueChange = (value: any) => {accordionValue = value;@@ -201,7 +201,6 @@ const Page = (props: { scripts?: ReactNode }) => {</AccordionContent></AccordionItem></Accordion>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxindex 3f6a2d62d8..d78f4c8d4a 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -6,13 +6,15 @@ import type { PageData } from "~/routes/_index";import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";import {Body as Body,+ Link as Link,+} from "@webstudio-is/sdk-components-react-remix";+import {Heading as Heading,Box as Box,Paragraph as Paragraph,Image as Image,Text as Text,} from "@webstudio-is/sdk-components-react";-import { Link as Link } from "@webstudio-is/sdk-components-react-remix";export const fontAssets: Asset[] = [];export const imageAssets: ImageAsset[] = [@@ -75,7 +77,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {return (<Body data-ws-id="On9cvWCxr5rdZtY9O1Bv0" data-ws-component="Body"><Heading data-ws-id="nVMWvMsaLCcb0o1wuNQgg" data-ws-component="Heading">@@ -144,7 +146,6 @@ const Page = (props: { scripts?: ReactNode }) => {/></Box></Box>- {props.scripts}</Body>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsxindex 825a849dae..2b46605b28 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsxindex 7cdc7dad8b..3572a137dc 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsxindex 6b6d04e955..223b464106 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsxindex e621c44302..21d4eb5573 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex 89f25e2896..e672abcbc3 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/packages/cli/__generated__/index.tsx b/packages/cli/__generated__/index.tsxindex a96d8ebfdb..2a6be1aa13 100644--- a/packages/cli/__generated__/index.tsx+++ b/packages/cli/__generated__/index.tsx@@ -1,7 +1,6 @@/*** The only intent of this file is to support typings inside ../templates/route-template for easier development.**/-import type { ReactNode } from "react";import type { PageData } from "../templates/route-template";import type { Asset, ImageAsset } from "@webstudio-is/sdk";@@ -29,7 +28,7 @@ export const user: { email: string | null } | undefined = {};export const projectId = "project-id";-const Page = (_props: { scripts: ReactNode }) => {+const Page = () => {return <></>;};diff --git a/packages/cli/templates/route-template.tsx b/packages/cli/templates/route-template.tsxindex 3fe8eea60c..28602055ff 100644--- a/packages/cli/templates/route-template.tsx+++ b/packages/cli/templates/route-template.tsx@@ -10,7 +10,6 @@ import {import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,pageData,@@ -292,14 +291,7 @@ const Outlet = () => {pagesPaths,}}>- <Page- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <Page /></ReactSdkContext.Provider>);};diff --git a/packages/react-sdk/src/component-generator.test.ts b/packages/react-sdk/src/component-generator.test.tsindex 038c4c87b9..4afc2bb283 100644--- a/packages/react-sdk/src/component-generator.test.ts+++ b/packages/react-sdk/src/component-generator.test.ts@@ -599,7 +599,7 @@ test("generate page component with variables and actions", () => {})).toEqual(clear(`- const Page = (props: { scripts?: ReactNode }) => {+ const Page = () => {let [variableName, set$variableName] = useState<any>("initial")let onChange = (value: any) => {variableName = value@@ -614,7 +614,6 @@ test("generate page component with variables and actions", () => {data-ws-index="0"value={variableName}onChange={onChange} />- {props.scripts}</Body>}`)@@ -666,7 +665,7 @@ test("avoid generating collection parameter variable as state", () => {})).toEqual(clear(`- const Page = (props: { scripts?: ReactNode }) => {+ const Page = () => {let [data, set$data] = useState<any>(["apple","orange","mango"])return <Bodydata-ws-id="body"@@ -675,7 +674,6 @@ test("avoid generating collection parameter variable as state", () => {<Fragment key={index}></Fragment>)}- {props.scripts}</Body>}`)diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.tsindex 58ec2882b7..723d85deb5 100644--- a/packages/react-sdk/src/component-generator.ts+++ b/packages/react-sdk/src/component-generator.ts@@ -175,10 +175,6 @@ export const generateJsxElement = ({return generatedElement;};-/**- * Jsx element and children are generated separately to be able- * to inject some scripts into Body if necessary- */export const generateJsxChildren = ({scope,children,@@ -271,19 +267,18 @@ export const generatePageComponent = ({props,dataSources,indexesWithinAncestors,- children:- generateJsxChildren({- scope,- children: instance.children,- instances,- props,- dataSources,- indexesWithinAncestors,- }) + "{props.scripts}\n",+ children: generateJsxChildren({+ scope,+ children: instance.children,+ instances,+ props,+ dataSources,+ indexesWithinAncestors,+ }),});let generatedComponent = "";- generatedComponent += `const Page = (props: { scripts?: ReactNode }) => {\n`;+ generatedComponent += `const Page = () => {\n`;generatedComponent += `${generatedDataSources}`;generatedComponent += `return ${generatedJsx}`;generatedComponent += `}\n`;diff --git a/packages/react-sdk/src/tree/create-elements-tree.tsx b/packages/react-sdk/src/tree/create-elements-tree.tsxindex 7694a5f6e0..c70d58abbe 100644--- a/packages/react-sdk/src/tree/create-elements-tree.tsx+++ b/packages/react-sdk/src/tree/create-elements-tree.tsx@@ -1,9 +1,4 @@-import {- Fragment,- type ForwardRefExoticComponent,- type RefAttributes,- type ReactNode,-} from "react";+import type { ForwardRefExoticComponent, RefAttributes } from "react";import type { Instance, Instances } from "@webstudio-is/sdk";import type { Components } from "../components/components-utils";import { type Params, ReactSdkContext } from "../context";@@ -21,7 +16,6 @@ export const createElementsTree = ({rootInstanceId,Component,components,- scripts,}: Params & {instances: Instances;imageLoader: ImageLoader;@@ -31,7 +25,6 @@ export const createElementsTree = ({WebstudioComponentProps & RefAttributes<HTMLElement>>;components: Components;- scripts?: ReactNode;}) => {const rootInstance = instances.get(rootInstanceId);if (rootInstance === undefined) {@@ -50,12 +43,7 @@ export const createElementsTree = ({Component,instance: rootInstance,instanceSelector: rootInstanceSelector,- children: [- <Fragment key="children">- {children}- {scripts}- </Fragment>,- ],+ children,components,});return (diff --git a/packages/sdk-cli/src/generate-stories.ts b/packages/sdk-cli/src/generate-stories.tsindex f406ad5842..ea9c3d4945 100644--- a/packages/sdk-cli/src/generate-stories.ts+++ b/packages/sdk-cli/src/generate-stories.ts@@ -69,9 +69,8 @@ const generateComponentImports = ({return componentImports;};-const getStoriesImports = ({ hasState }: { hasState: boolean }) => `-import { type ReactNode${hasState ? `, useState` : ""} } from "react";-`;+const getStoriesImports = ({ hasState }: { hasState: boolean }) =>+ hasState ? `import { useState } from "react";\n` : "";const getStoriesExports = (name: string, css: string) => `export default {@@ -146,13 +145,7 @@ export const generateStories = async () => {usedMetas.set(instance.component, meta);}}- const scope = createScope([- "Page",- "Story",- "props",- "ReactNode",- "useState",- ]);+ const scope = createScope(["Page", "Story", "props", "useState"]);let content = "";content += getStoriesImports({hasState: data.dataSources.some(diff --git a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsxindex 85ea8ac9bd..b72af3eabc 100644--- a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,Text as Text,@@ -12,7 +12,7 @@ import {AccordionContent as AccordionContent,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [accordionValue, set$accordionValue] = useState<any>("0");let onValueChange = (value: any) => {accordionValue = value;@@ -125,7 +125,6 @@ const Page = (props: { scripts?: ReactNode }) => {</AccordionContent></AccordionItem></Accordion>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsxindex 7506c06bd2..7bc4012b34 100644--- a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,HtmlEmbed as HtmlEmbed,@@ -10,7 +10,7 @@ import {CheckboxIndicator as CheckboxIndicator,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [checkboxChecked, set$checkboxChecked] = useState<any>(false);let onCheckedChange = (checked: any) => {checkboxChecked = checked;@@ -42,7 +42,6 @@ const Page = (props: { scripts?: ReactNode }) => {{"Checkbox"}</Text></Label>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsxindex bbe65ee5b2..27bc1d712b 100644--- a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,Button as Button,@@ -10,7 +10,7 @@ import {CollapsibleContent as CollapsibleContent,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [collapsibleOpen, set$collapsibleOpen] = useState<any>(false);let onOpenChange = (open: any) => {collapsibleOpen = open;@@ -41,7 +41,6 @@ const Page = (props: { scripts?: ReactNode }) => {</Text></CollapsibleContent></Collapsible>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsxindex b2abcb0c08..d23f5a1b5b 100644--- a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,Button as Button,@@ -15,7 +15,7 @@ import {DialogClose as DialogClose,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [dialogOpen, set$dialogOpen] = useState<any>(false);let onOpenChange = (open: any) => {dialogOpen = open;@@ -62,7 +62,6 @@ const Page = (props: { scripts?: ReactNode }) => {</DialogContent></DialogOverlay></Dialog>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsxindex 25484720ea..a92d7f0218 100644--- a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx@@ -1,14 +1,12 @@-import { type ReactNode } from "react";import { Box as Box } from "@webstudio-is/sdk-components-react";import { Label as Label } from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {return (<Box data-ws-id="root" data-ws-component="Box"><Label data-ws-id="1" data-ws-component="Label">{"Form Label"}</Label>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsxindex b35ccf13a5..00a8b87aab 100644--- a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,Button as Button,@@ -17,7 +17,7 @@ import {NavigationMenuViewport as NavigationMenuViewport,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [menuValue, set$menuValue] = useState<any>("");let onValueChange = (value: any) => {menuValue = value;@@ -303,7 +303,6 @@ const Page = (props: { scripts?: ReactNode }) => {/></Box></NavigationMenu>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsxindex f340e562fa..c3640bb7e4 100644--- a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,Button as Button,@@ -10,7 +10,7 @@ import {PopoverContent as PopoverContent,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [popoverOpen, set$popoverOpen] = useState<any>(false);let onOpenChange = (open: any) => {popoverOpen = open;@@ -35,7 +35,6 @@ const Page = (props: { scripts?: ReactNode }) => {</Text></PopoverContent></Popover>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsxindex d57b356e13..187c559d9d 100644--- a/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,HtmlEmbed as HtmlEmbed,@@ -11,7 +11,7 @@ import {RadioGroupIndicator as RadioGroupIndicator,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [radioGroupValue, set$radioGroupValue] = useState<any>("");let onValueChange = (value: any) => {radioGroupValue = value;@@ -95,7 +95,6 @@ const Page = (props: { scripts?: ReactNode }) => {</Text></Label></RadioGroup>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsxindex b902e075d4..3e8fd33ff7 100644--- a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,HtmlEmbed as HtmlEmbed,@@ -14,7 +14,7 @@ import {SelectItemText as SelectItemText,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [selectValue, set$selectValue] = useState<any>("");let [selectOpen, set$selectOpen] = useState<any>(false);let onValueChange = (value: any) => {@@ -119,7 +119,6 @@ const Page = (props: { scripts?: ReactNode }) => {</SelectViewport></SelectContent></Select>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsxindex 23a13e1cce..ce16ca53f6 100644--- a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,Button as Button,@@ -15,7 +15,7 @@ import {DialogClose as DialogClose,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [sheetOpen, set$sheetOpen] = useState<any>(false);let onOpenChange = (open: any) => {sheetOpen = open;@@ -75,7 +75,6 @@ const Page = (props: { scripts?: ReactNode }) => {</DialogContent></DialogOverlay></Dialog>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsxindex e45f1e3de9..66b39ae704 100644--- a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx@@ -1,8 +1,8 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import { Box as Box } from "@webstudio-is/sdk-components-react";import { Switch as Switch, SwitchThumb as SwitchThumb } from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [switchChecked, set$switchChecked] = useState<any>(false);let onCheckedChange = (checked: any) => {switchChecked = checked;@@ -18,7 +18,6 @@ const Page = (props: { scripts?: ReactNode }) => {><SwitchThumb data-ws-id="6" data-ws-component="SwitchThumb" /></Switch>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsxindex 4f5d9da31e..30f055f98e 100644--- a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import { Box as Box } from "@webstudio-is/sdk-components-react";import {Tabs as Tabs,@@ -7,7 +7,7 @@ import {TabsContent as TabsContent,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [tabsValue, set$tabsValue] = useState<any>("0");let onValueChange = (value: any) => {tabsValue = value;@@ -52,7 +52,6 @@ const Page = (props: { scripts?: ReactNode }) => {{"Change your password here."}</TabsContent></Tabs>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsxindex 65955beae1..d43498c84b 100644--- a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { useState } from "react";import {Box as Box,Button as Button,@@ -10,7 +10,7 @@ import {TooltipContent as TooltipContent,} from "../components";-const Page = (props: { scripts?: ReactNode }) => {+const Page = () => {let [tooltipOpen, set$tooltipOpen] = useState<any>(false);let onOpenChange = (open: any) => {tooltipOpen = open;@@ -35,7 +35,6 @@ const Page = (props: { scripts?: ReactNode }) => {</Text></TooltipContent></Tooltip>- {props.scripts}</Box>);};diff --git a/packages/sdk-components-react-remix/src/body.tsx b/packages/sdk-components-react-remix/src/body.tsxnew file mode 100644index 0000000000..eb42bf4586--- /dev/null+++ b/packages/sdk-components-react-remix/src/body.tsx@@ -0,0 +1,14 @@+import { forwardRef, type ElementRef, type ComponentProps } from "react";+import { Scripts, ScrollRestoration } from "@remix-run/react";++export const Body = forwardRef<ElementRef<"body">, ComponentProps<"body">>(+ ({ children, ...props }, ref) => (+ <body {...props} ref={ref}>+ {children}+ <Scripts />+ <ScrollRestoration />+ </body>+ )+);++Body.displayName = "Body";diff --git a/packages/sdk-components-react-remix/src/body.ws.tsx b/packages/sdk-components-react-remix/src/body.ws.tsxnew file mode 100644index 0000000000..cf6b7d7802--- /dev/null+++ b/packages/sdk-components-react-remix/src/body.ws.tsx@@ -0,0 +1,2 @@+export { Body as meta } from "@webstudio-is/sdk-components-react/metas";+export { Body as propsMeta } from "@webstudio-is/sdk-components-react/props";diff --git a/packages/sdk-components-react-remix/src/components.ts b/packages/sdk-components-react-remix/src/components.tsindex 9572d51030..f91f3892b0 100644--- a/packages/sdk-components-react-remix/src/components.ts+++ b/packages/sdk-components-react-remix/src/components.ts@@ -1,3 +1,4 @@+export { Body } from "./body";export { Link } from "./link";export { RichTextLink } from "./rich-text-link";export { Form } from "./form";diff --git a/packages/sdk-components-react-remix/src/metas.ts b/packages/sdk-components-react-remix/src/metas.tsindex e72d4c4420..1e3173b7c2 100644--- a/packages/sdk-components-react-remix/src/metas.ts+++ b/packages/sdk-components-react-remix/src/metas.ts@@ -1,3 +1,4 @@+export { meta as Body } from "./body.ws";export { meta as Link } from "./link.ws";export { meta as RichTextLink } from "./rich-text-link.ws";export { meta as Form } from "./form.ws";diff --git a/packages/sdk-components-react-remix/src/props.ts b/packages/sdk-components-react-remix/src/props.tsindex fbcb638adc..98daf244a6 100644--- a/packages/sdk-components-react-remix/src/props.ts+++ b/packages/sdk-components-react-remix/src/props.ts@@ -1,3 +1,4 @@+export { propsMeta as Body } from "./body.ws";export { propsMeta as Link } from "./link.ws";export { propsMeta as RichTextLink } from "./rich-text-link.ws";export { propsMeta as Form } from "./form.ws";