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
feat: use body element on new pages (#5222)
Bogdan Chadkinfa875ab5c180
diff --git a/apps/builder/app/builder/features/marketplace/templates.tsx b/apps/builder/app/builder/features/marketplace/templates.tsxindex 099cfdb5ee..4789bf30c1 100644--- a/apps/builder/app/builder/features/marketplace/templates.tsx+++ b/apps/builder/app/builder/features/marketplace/templates.tsx@@ -12,6 +12,7 @@ import {} from "@webstudio-is/design-system";import { ChevronLeftIcon, ExternalLinkIcon } from "@webstudio-is/icons";import {+ elementComponent,ROOT_FOLDER_ID,type Asset,type Page,@@ -50,9 +51,12 @@ const insertSection = ({);// remove body and use its children as root insrancesif (body) {- fragment.instances = fragment.instances.filter(- (instance) => instance.component !== "Body"- );+ fragment.instances = fragment.instances.filter((instance) => {+ const isBody =+ instance.component === "Body" ||+ (instance.component === elementComponent && instance.tag === "body");+ return !isBody;+ });fragment.children = body.children;}const insertable = findClosestInsertable(fragment);diff --git a/apps/builder/app/builder/features/pages/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings.tsxindex d44f22559e..d0c51da0a7 100644--- a/apps/builder/app/builder/features/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/pages/page-settings.tsx@@ -29,6 +29,7 @@ import {isLiteralExpression,documentTypes,isRootFolder,+ elementComponent,} from "@webstudio-is/sdk";import {theme,@@ -1307,7 +1308,8 @@ const createPage = (pageId: Page["id"], values: Values) => {instances.set(rootInstanceId, {type: "instance",id: rootInstanceId,- component: "Body",+ component: elementComponent,+ tag: "body",children: [],});registerFolderChildMutable(pages.folders, pageId, values.parentFolderId);diff --git a/apps/builder/app/builder/features/settings-panel/controls/tag-control.tsx b/apps/builder/app/builder/features/settings-panel/controls/tag-control.tsxindex 9f86a379ac..993f0e47e3 100644--- a/apps/builder/app/builder/features/settings-panel/controls/tag-control.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/tag-control.tsx@@ -46,7 +46,11 @@ export const TagControl = ({ meta, prop }: ControlProps<"tag">) => {const instanceTag = instance?.tag;const defaultTag = meta.options[0];const computedTag = instanceTag ?? propTag ?? defaultTag;- const satisfyingTags = useStore($satisfyingTags);+ let satisfyingTags = useStore($satisfyingTags);+ // forbid changing tag on body element+ if (computedTag === "body") {+ satisfyingTags = ["body"];+ }const options = meta.options.filter((tag) => satisfyingTags.includes(tag));const [value, setValue] = useState<undefined | string>();const updateTag = (value: string) => {diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 0db362e372..0db6362aba 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -71,7 +71,6 @@ import { subscribeSelected } from "./instance-selected";import { subscribeScrollNewInstanceIntoView } from "./shared/scroll-new-instance-into-view";import { $selectedPage } from "~/shared/awareness";import { createInstanceElement } from "./elements";-import { Body } from "./shared/body";import { subscribeScrollbarSize } from "./scrollbar-width";import { compareMedia } from "@webstudio-is/css-engine";import { builderApi } from "~/shared/builder-api";@@ -248,15 +247,6 @@ export const Canvas = () => {hooks: baseComponentHooks,templates: baseComponentTemplates,});- registerComponentLibrary({- components: {- // override only canvas specific body component- // not related to sdk-components-react-remix anymore- Body,- },- metas: {},- templates: {},- });registerComponentLibrary({namespace: "@webstudio-is/sdk-components-react-radix",components: radixComponents,@@ -321,7 +311,7 @@ export const Canvas = () => {}, []);if (components.size === 0 || instances.size === 0) {- return <Body />;+ return;}return (diff --git a/apps/builder/app/canvas/shared/body.tsx b/apps/builder/app/canvas/shared/body.tsxdeleted file mode 100644index eb42bf4586..0000000000--- a/apps/builder/app/canvas/shared/body.tsx+++ /dev/null@@ -1,14 +0,0 @@-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/apps/builder/app/routes/_canvas.canvas.tsx b/apps/builder/app/routes/_canvas.canvas.tsxindex f55679b46f..b6f0cf3d7b 100644--- a/apps/builder/app/routes/_canvas.canvas.tsx+++ b/apps/builder/app/routes/_canvas.canvas.tsx@@ -1,8 +1,8 @@import { lazy } from "react";-import { type LoaderFunctionArgs } from "@remix-run/server-runtime";+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";+import { Scripts, ScrollRestoration } from "@remix-run/react";import { isCanvas } from "~/shared/router-utils";import { ClientOnly } from "~/shared/client-only";-import { Body } from "~/canvas/shared/body";export { ErrorBoundary } from "~/shared/error/error-boundary";@@ -22,7 +22,16 @@ const Canvas = lazy(async () => {const CanvasRoute = () => {return (- <ClientOnly fallback={<Body />}>+ // this setup remix scripts on canvas and after rendering a website+ // scripts will continue to work even though removed from dom+ <ClientOnly+ fallback={+ <body>+ <Scripts />+ <ScrollRestoration />+ </body>+ }+ ><Canvas /></ClientOnly>);diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.tsindex a6ef58c3ea..33037b0c3f 100644--- a/packages/project-build/src/db/build.ts+++ b/packages/project-build/src/db/build.ts@@ -20,6 +20,7 @@ import {type StyleDecl,Pages,initialBreakpoints,+ elementComponent,} from "@webstudio-is/sdk";import type { Build, CompactBuild } from "../types";import { parseDeployment } from "./deployment";@@ -229,7 +230,8 @@ const createNewPageInstances = (): Build["instances"] => {{type: "instance",id: instanceId,- component: "Body",+ component: elementComponent,+ tag: "body",children: [],},],