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
fix: prevent self-hosted animation rerenders (#5813)
Oleg Isonenbb467312437d
diff --git a/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx b/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsxindex b2fa65b703..9dd77cf5e3 100644--- a/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx+++ b/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx@@ -1,3 +1,4 @@+import { type ComponentProps, memo, useMemo } from "react";import type { PageContext } from "vike/types";import {PageSettingsMeta,@@ -12,21 +13,40 @@ import {siteName,} from "../../app/__generated__/[another-page]._index";+const getPageKey = (url: string) => {+ const { origin, pathname, search } = new URL(url);+ return `${origin}${pathname}${search}`;+};++const PageBoundary = memo(+ ({ pageKey, system }: ComponentProps<typeof Page> & { pageKey: string }) => {+ // Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages+ return <Page key={pageKey} system={system} />;+ },+ // Vike can rerender the current page during client-side navigation and+ // hash-only URL updates. Keep the generated page out of that render path,+ // but let actual page URL changes remount it.+ (prevProps, nextProps) => prevProps.pageKey === nextProps.pageKey+);+const PageComponent = ({ data }: { data: PageContext["data"] }) => {const { system, resources, url, pageMeta } = data;+ const pageKey = getPageKey(url);+ const sdkContext = useMemo(+ () => ({+ imageLoader,+ assetBaseUrl,+ resources,+ breakpoints,+ onError: console.error,+ }),+ [resources]+ );+return (- <ReactSdkContext.Provider- value={{- imageLoader,- assetBaseUrl,- resources,- breakpoints,- onError: console.error,- }}- >+ <ReactSdkContext.Provider value={sdkContext}><LinkCurrentUrlContext.Provider value={url}>- {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}- <Page key={url} system={system} />+ <PageBoundary pageKey={pageKey} system={system} /></LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}diff --git a/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx b/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsxindex 0a55084475..f65c32c477 100644--- a/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx+++ b/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx@@ -1,3 +1,4 @@+import { type ComponentProps, memo, useMemo } from "react";import type { PageContext } from "vike/types";import {PageSettingsMeta,@@ -8,21 +9,40 @@ import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";import { Page, breakpoints, siteName } from "../../app/__generated__/_index";+const getPageKey = (url: string) => {+ const { origin, pathname, search } = new URL(url);+ return `${origin}${pathname}${search}`;+};++const PageBoundary = memo(+ ({ pageKey, system }: ComponentProps<typeof Page> & { pageKey: string }) => {+ // Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages+ return <Page key={pageKey} system={system} />;+ },+ // Vike can rerender the current page during client-side navigation and+ // hash-only URL updates. Keep the generated page out of that render path,+ // but let actual page URL changes remount it.+ (prevProps, nextProps) => prevProps.pageKey === nextProps.pageKey+);+const PageComponent = ({ data }: { data: PageContext["data"] }) => {const { system, resources, url, pageMeta } = data;+ const pageKey = getPageKey(url);+ const sdkContext = useMemo(+ () => ({+ imageLoader,+ assetBaseUrl,+ resources,+ breakpoints,+ onError: console.error,+ }),+ [resources]+ );+return (- <ReactSdkContext.Provider- value={{- imageLoader,- assetBaseUrl,- resources,- breakpoints,- onError: console.error,- }}- >+ <ReactSdkContext.Provider value={sdkContext}><LinkCurrentUrlContext.Provider value={url}>- {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}- <Page key={url} system={system} />+ <PageBoundary pageKey={pageKey} system={system} /></LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}diff --git a/fixtures/ssg-cloudflare-pages/renderer/+onRenderClient.tsx b/fixtures/ssg-cloudflare-pages/renderer/+onRenderClient.tsxindex d1c62273d7..19105dd16d 100644--- a/fixtures/ssg-cloudflare-pages/renderer/+onRenderClient.tsx+++ b/fixtures/ssg-cloudflare-pages/renderer/+onRenderClient.tsx@@ -1,4 +1,4 @@-import { type Root, createRoot } from "react-dom/client";+import { type Root, hydrateRoot } from "react-dom/client";import type { OnRenderClientSync } from "vike/types";let root: Root;@@ -19,7 +19,8 @@ export const onRenderClient: OnRenderClientSync = (pageContext) => {</>);if (root === undefined) {- root = createRoot(document.documentElement);+ root = hydrateRoot(document.documentElement, htmlContent);+ return;}document.documentElement.lang = lang;root.render(htmlContent);diff --git a/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx b/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsxindex 0a55084475..f65c32c477 100644--- a/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx+++ b/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx@@ -1,3 +1,4 @@+import { type ComponentProps, memo, useMemo } from "react";import type { PageContext } from "vike/types";import {PageSettingsMeta,@@ -8,21 +9,40 @@ import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";import { Page, breakpoints, siteName } from "../../app/__generated__/_index";+const getPageKey = (url: string) => {+ const { origin, pathname, search } = new URL(url);+ return `${origin}${pathname}${search}`;+};++const PageBoundary = memo(+ ({ pageKey, system }: ComponentProps<typeof Page> & { pageKey: string }) => {+ // Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages+ return <Page key={pageKey} system={system} />;+ },+ // Vike can rerender the current page during client-side navigation and+ // hash-only URL updates. Keep the generated page out of that render path,+ // but let actual page URL changes remount it.+ (prevProps, nextProps) => prevProps.pageKey === nextProps.pageKey+);+const PageComponent = ({ data }: { data: PageContext["data"] }) => {const { system, resources, url, pageMeta } = data;+ const pageKey = getPageKey(url);+ const sdkContext = useMemo(+ () => ({+ imageLoader,+ assetBaseUrl,+ resources,+ breakpoints,+ onError: console.error,+ }),+ [resources]+ );+return (- <ReactSdkContext.Provider- value={{- imageLoader,- assetBaseUrl,- resources,- breakpoints,- onError: console.error,- }}- >+ <ReactSdkContext.Provider value={sdkContext}><LinkCurrentUrlContext.Provider value={url}>- {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}- <Page key={url} system={system} />+ <PageBoundary pageKey={pageKey} system={system} /></LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}diff --git a/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsx b/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsxindex 2a06e73658..25a295f44b 100644--- a/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsx+++ b/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsx@@ -1,3 +1,4 @@+import { type ComponentProps, memo, useMemo } from "react";import type { PageContext } from "vike/types";import {PageSettingsMeta,@@ -12,21 +13,40 @@ import {siteName,} from "../../app/__generated__/[redirect]._index";+const getPageKey = (url: string) => {+ const { origin, pathname, search } = new URL(url);+ return `${origin}${pathname}${search}`;+};++const PageBoundary = memo(+ ({ pageKey, system }: ComponentProps<typeof Page> & { pageKey: string }) => {+ // Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages+ return <Page key={pageKey} system={system} />;+ },+ // Vike can rerender the current page during client-side navigation and+ // hash-only URL updates. Keep the generated page out of that render path,+ // but let actual page URL changes remount it.+ (prevProps, nextProps) => prevProps.pageKey === nextProps.pageKey+);+const PageComponent = ({ data }: { data: PageContext["data"] }) => {const { system, resources, url, pageMeta } = data;+ const pageKey = getPageKey(url);+ const sdkContext = useMemo(+ () => ({+ imageLoader,+ assetBaseUrl,+ resources,+ breakpoints,+ onError: console.error,+ }),+ [resources]+ );+return (- <ReactSdkContext.Provider- value={{- imageLoader,- assetBaseUrl,- resources,- breakpoints,- onError: console.error,- }}- >+ <ReactSdkContext.Provider value={sdkContext}><LinkCurrentUrlContext.Provider value={url}>- {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}- <Page key={url} system={system} />+ <PageBoundary pageKey={pageKey} system={system} /></LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}diff --git a/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsx b/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsxindex d1c62273d7..19105dd16d 100644--- a/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsx+++ b/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsx@@ -1,4 +1,4 @@-import { type Root, createRoot } from "react-dom/client";+import { type Root, hydrateRoot } from "react-dom/client";import type { OnRenderClientSync } from "vike/types";let root: Root;@@ -19,7 +19,8 @@ export const onRenderClient: OnRenderClientSync = (pageContext) => {</>);if (root === undefined) {- root = createRoot(document.documentElement);+ root = hydrateRoot(document.documentElement, htmlContent);+ return;}document.documentElement.lang = lang;root.render(htmlContent);diff --git a/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx b/packages/cli/templates/ssg/app/route-templates/html/+Page.tsxindex d959cb6a32..1778f4f606 100644--- a/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx+++ b/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx@@ -1,3 +1,4 @@+import { type ComponentProps, memo, useMemo } from "react";import type { PageContext } from "vike/types";import {PageSettingsMeta,@@ -8,21 +9,40 @@ import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "__CONSTANTS__";import { Page, breakpoints, siteName } from "__CLIENT__";+const getPageKey = (url: string) => {+ const { origin, pathname, search } = new URL(url);+ return `${origin}${pathname}${search}`;+};++const PageBoundary = memo(+ ({ pageKey, system }: ComponentProps<typeof Page> & { pageKey: string }) => {+ // Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages+ return <Page key={pageKey} system={system} />;+ },+ // Vike can rerender the current page during client-side navigation and+ // hash-only URL updates. Keep the generated page out of that render path,+ // but let actual page URL changes remount it.+ (prevProps, nextProps) => prevProps.pageKey === nextProps.pageKey+);+const PageComponent = ({ data }: { data: PageContext["data"] }) => {const { system, resources, url, pageMeta } = data;+ const pageKey = getPageKey(url);+ const sdkContext = useMemo(+ () => ({+ imageLoader,+ assetBaseUrl,+ resources,+ breakpoints,+ onError: console.error,+ }),+ [resources]+ );+return (- <ReactSdkContext.Provider- value={{- imageLoader,- assetBaseUrl,- resources,- breakpoints,- onError: console.error,- }}- >+ <ReactSdkContext.Provider value={sdkContext}><LinkCurrentUrlContext.Provider value={url}>- {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}- <Page key={url} system={system} />+ <PageBoundary pageKey={pageKey} system={system} /></LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}diff --git a/packages/cli/templates/ssg/renderer/+onRenderClient.tsx b/packages/cli/templates/ssg/renderer/+onRenderClient.tsxindex d1c62273d7..19105dd16d 100644--- a/packages/cli/templates/ssg/renderer/+onRenderClient.tsx+++ b/packages/cli/templates/ssg/renderer/+onRenderClient.tsx@@ -1,4 +1,4 @@-import { type Root, createRoot } from "react-dom/client";+import { type Root, hydrateRoot } from "react-dom/client";import type { OnRenderClientSync } from "vike/types";let root: Root;@@ -19,7 +19,8 @@ export const onRenderClient: OnRenderClientSync = (pageContext) => {</>);if (root === undefined) {- root = createRoot(document.documentElement);+ root = hydrateRoot(document.documentElement, htmlContent);+ return;}document.documentElement.lang = lang;root.render(htmlContent);diff --git a/packages/sdk-components-animation/private-src b/packages/sdk-components-animation/private-srcindex aceca8f788..29181fed16 160000--- a/packages/sdk-components-animation/private-src+++ b/packages/sdk-components-animation/private-src@@ -1 +1 @@-Subproject commit aceca8f788bbaa307414bb4374287883eb5cb26c+Subproject commit 29181fed16686af08e67123a7931e8ef00a81f7d