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.

refactor: stop importing remix overrides on canvas (#4466)

Bogdan Chadkin766551fc0c57
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index 95c416051c..fd59d393c5 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -13,7 +13,6 @@ import * as baseComponents from "@webstudio-is/sdk-components-react";
import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";
import * as baseComponentPropsMetas from "@webstudio-is/sdk-components-react/props";
import { hooks as baseComponentHooks } from "@webstudio-is/sdk-components-react/hooks";
-import * as remixComponents from "@webstudio-is/sdk-components-react-remix";
import * as remixComponentMetas from "@webstudio-is/sdk-components-react-remix/metas";
import * as remixComponentPropsMetas from "@webstudio-is/sdk-components-react-remix/props";
import * as radixComponents from "@webstudio-is/sdk-components-react-radix";
@@ -73,6 +72,7 @@ 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";
registerContainers();
@@ -244,7 +244,11 @@ export const Canvas = ({ params, imageLoader }: CanvasProps) => {
hooks: baseComponentHooks,
});
registerComponentLibrary({
- components: remixComponents,
+ components: {
+ // override only canvas specific body component
+ // not related to sdk-components-react-remix anymore
+ Body,
+ },
metas: remixComponentMetas,
propsMetas: remixComponentPropsMetas,
});
@@ -310,7 +314,7 @@ export const Canvas = ({ params, imageLoader }: CanvasProps) => {
}, []);
if (components.size === 0 || instances.size === 0) {
- return <remixComponents.Body />;
+ return <Body />;
}
return (
diff --git a/apps/builder/app/canvas/shared/body.tsx b/apps/builder/app/canvas/shared/body.tsx
new file mode 100644
index 0000000000..eb42bf4586
--- /dev/null
+++ b/apps/builder/app/canvas/shared/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";