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: Render current page state on links in preview mode (#5810)
Oleg Isonenc3d2fa7fa3fd
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 6ba7e9982d..2394df3c2e 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -13,7 +13,7 @@ import { coreTemplates } from "@webstudio-is/sdk/core-templates";import type { Components } from "@webstudio-is/react-sdk";import { wsImageLoader, wsVideoLoader } from "@webstudio-is/image";import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";-import * as baseComponents from "@webstudio-is/sdk-components-react";+import * as baseComponents from "@webstudio-is/sdk-components-react/components";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";import { hooks as baseComponentHooks } from "@webstudio-is/sdk-components-react/hooks";import * as baseComponentTemplates from "@webstudio-is/sdk-components-react/templates";diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsxindex b41d7fe341..80a218744a 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsx@@ -4,7 +4,7 @@import { describe, test, expect } from "vitest";import { __testing__ } from "./webstudio-component";-const { computeComponentKey } = __testing__;+const { computeComponentKey, getPreviewCurrentUrl } = __testing__;describe("computeComponentKey - key generation logic", () => {test("prioritizes assetId over other props", () => {@@ -79,3 +79,23 @@ describe("computeComponentKey - key generation logic", () => {expect(key1).not.toBe(key2);});});++describe("getPreviewCurrentUrl", () => {+ test("builds current preview url from pathname, search, and selected hash", () => {+ const url = getPreviewCurrentUrl(+ {+ pathname: "/my-page",+ search: {+ tag: "blue",+ empty: "",+ missing: undefined,+ },+ },+ "#section"+ );++ expect(url.pathname).toBe("/my-page");+ expect(url.search).toBe("?tag=blue&empty=");+ expect(url.hash).toBe("#section");+ });+});diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 1e1d43fad2..94e6f1a916 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -41,28 +41,20 @@ import {getCollectionEntries,} from "@webstudio-is/react-sdk";import { rawTheme } from "@webstudio-is/design-system";-import { Input, Select, Textarea } from "@webstudio-is/sdk-components-react";--const computeComponentKey = (props: Record<string, unknown>) => {- const assetId = props.$webstudio$canvasOnly$assetId;- const src = props.src;- const defaultValue = props.defaultValue;-- return (- (typeof assetId === "string" ? assetId : undefined) ??- (defaultValue != null ? String(defaultValue) : undefined) ??- (src != null ? String(src) : undefined)- );-};--export const __testing__ = { computeComponentKey };-+import {+ Input,+ Link,+ Select,+ Textarea,+} from "@webstudio-is/sdk-components-react/components";+import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import {$propValuesByInstanceSelectorWithMemoryProps,getIndexedInstanceId,$registeredComponentMetas,$selectedInstanceRenderState,findBlockSelector,+ $selectedPageHash,} from "~/shared/nano-states";import { $props } from "~/shared/sync/data-stores";import { $textEditingInstanceSelector } from "~/shared/nano-states";@@ -77,6 +69,7 @@ import { serverSyncStore } from "~/shared/sync/sync-stores";import { TextEditor } from "../text-editor";import { $selectedPage, getInstanceKey } from "~/shared/nano-states";import { selectInstance } from "~/shared/nano-states";+import { $currentSystem } from "~/shared/system";import {createInstanceChildrenElements,type WebstudioComponentProps,@@ -89,6 +82,57 @@ import {} from "~/canvas/shared/styles";import { richTextPlaceholders } from "~/shared/content-model";+const computeComponentKey = (props: Record<string, unknown>) => {+ const assetId = props.$webstudio$canvasOnly$assetId;+ const src = props.src;+ const defaultValue = props.defaultValue;++ return (+ (typeof assetId === "string" ? assetId : undefined) ??+ (defaultValue != null ? String(defaultValue) : undefined) ??+ (src != null ? String(src) : undefined)+ );+};++const getPreviewCurrentUrl = (+ currentSystem: {+ pathname: string;+ search: Record<string, string | undefined>;+ },+ hash: string+) => {+ // Preview renders inside the builder canvas route, so window.location points+ // at the builder shell, not the page being previewed. Recreate the page URL+ // from the selected page system data so :local-link state matches preview+ // navigation, including query params and hash-only links.+ const currentUrl = new URL(currentSystem.pathname, "https://webstudio.local");+ currentUrl.search = new URLSearchParams(+ Object.entries(currentSystem.search).filter(+ (entry): entry is [string, string] => entry[1] !== undefined+ )+ ).toString();+ currentUrl.hash = hash;+ return currentUrl;+};++export const __testing__ = { computeComponentKey, getPreviewCurrentUrl };++const PreviewLinkCurrentUrlProvider = ({+ children,+}: {+ children: ReactNode;+}) => {+ const currentSystem = useStore($currentSystem);+ const selectedPageHash = useStore($selectedPageHash);+ const currentUrl = getPreviewCurrentUrl(currentSystem, selectedPageHash.hash);++ return (+ <LinkCurrentUrlContext.Provider value={currentUrl}>+ {children}+ </LinkCurrentUrlContext.Provider>+ );+};+const ContentEditable = ({placeholder,renderComponentWithRef,@@ -639,7 +683,11 @@ export const WebstudioComponentPreview = forwardRef<const instances = useStore($instances);const { [showAttribute]: show = true, ...instanceProps } =useInstanceProps(instanceSelector);- const props = {+ const props: {+ [componentAttribute]: string;+ [idAttribute]: string;+ [selectorIdAttribute]: string;+ } & Record<string, unknown> = {...mergeProps(restProps, instanceProps, "merge"),[idAttribute]: instance.id,[componentAttribute]: instance.component,@@ -692,6 +740,9 @@ export const WebstudioComponentPreview = forwardRef<if (Component === "select") {Component = Select as AnyComponent;}+ if (Component === "a") {+ Component = Link as AnyComponent;+ }}if (instance.component === blockComponent) {@@ -705,7 +756,8 @@ export const WebstudioComponentPreview = forwardRef<if (Component === undefined) {return <></>;}- return (++ const element = (<Component {...props} ref={ref}>{getTextContent(instanceProps) ??createInstanceChildrenElements({@@ -717,4 +769,16 @@ export const WebstudioComponentPreview = forwardRef<})}</Component>);++ if (+ instance.component === "Link" ||+ instance.component === "RichTextLink" ||+ (instance.component === elementComponent && instance.tag === "a")+ ) {+ return (+ <PreviewLinkCurrentUrlProvider>{element}</PreviewLinkCurrentUrlProvider>+ );+ }++ return element;});diff --git a/apps/builder/e2e/run.ts b/apps/builder/e2e/run.tsindex 9bf00df126..9963bdad72 100644--- a/apps/builder/e2e/run.ts+++ b/apps/builder/e2e/run.ts@@ -15,6 +15,7 @@ import { logPerf, measure, printPerfSummary } from "./perf";import { e2ePlans } from "./plans";import "./tests/content-mode-editing.e2e";import "./tests/pages-actions.e2e";+import "./tests/preview-links.e2e";import "./tests/share-link-permissions.e2e";const testTimeoutMs =diff --git a/apps/builder/e2e/tests/preview-links.e2e.ts b/apps/builder/e2e/tests/preview-links.e2e.tsnew file mode 100644index 0000000000..5b072b63dc--- /dev/null+++ b/apps/builder/e2e/tests/preview-links.e2e.ts@@ -0,0 +1,406 @@+import type { Locator } from "playwright";+import { openBuilderUrl, waitForCanvasFrame } from "../flows/builder";+import { createContentModeProject } from "../fixtures/content-mode-suite";+import { insertAuthorizationToken, loadDevBuild, updateBuild } from "../db";+import { getProjectBuilderUrl, newIsolatedPage, test } from "../harness";+import type { SeededContentModeProject } from "../fixtures/content-mode-project";++type PageData = {+ id: string;+ name: string;+ title: string;+ rootInstanceId: string;+ path: string;+ meta: Record<string, unknown>;+};++type PagesData = {+ homePageId: string;+ rootFolderId?: string;+ pages: PageData[];+ folders?: Array<{ id: string; children?: string[] }>;+};++type InstanceData = {+ type: "instance";+ id: string;+ component: string;+ tag?: string;+ label?: string;+ children: Array<{ type: "id" | "text"; value: string }>;+};++type PropData = {+ id: string;+ instanceId: string;+ name: string;+ type: "string";+ value: string;+};++let fixture: SeededContentModeProject;++const previewLinkText = {+ homeLink: "Preview home link",+ pageLink: "Preview page link",+ richTextLink: "Preview rich text link",+ pageAnchor: "Preview page anchor",+ pageQueryLink: "Preview page query link",+ hashLink: "Preview hash link",+} as const;+const previewPageId = "preview-links-page";+const viewerToken = "preview-links-e2e-viewer-token";++type PreviewLink = {+ key: string;+ text: string;+ href: string;+ component?: string;+ tag?: string;+};++const previewLinks: PreviewLink[] = [+ { key: "home-link", text: previewLinkText.homeLink, href: "/" },+ { key: "page-link", text: previewLinkText.pageLink, href: "/my-page" },+ {+ key: "rich-text-link",+ text: previewLinkText.richTextLink,+ href: "/my-page",+ component: "RichTextLink",+ },+ {+ key: "page-anchor",+ text: previewLinkText.pageAnchor,+ href: "/my-page",+ component: "ws:element",+ tag: "a",+ },+ {+ key: "page-query-link",+ text: previewLinkText.pageQueryLink,+ href: "/my-page?tab=details",+ },+ { key: "hash-link", text: previewLinkText.hashLink, href: "#section" },+] as const;++const getPreviewUrl = ({+ pageId,+ hash,+}: {+ pageId?: string;+ hash?: string;+}) => {+ const url = new URL(+ getProjectBuilderUrl({+ projectId: fixture.projectId,+ authToken: viewerToken,+ mode: "preview",+ })+ );+ if (pageId !== undefined) {+ url.searchParams.set("pageId", pageId);+ }+ if (hash !== undefined) {+ url.searchParams.set("pageHash", hash);+ }+ return url.href;+};++const expectActiveLink = async ({+ canvas,+ text,+ active,+}: {+ canvas: Awaited<ReturnType<typeof waitForCanvasFrame>>;+ text: string;+ active: boolean;+}) => {+ const link = canvas.getByRole("link", { name: text });+ await link.waitFor({ state: "visible" });+ await expectLinkAttribute(link, "aria-current", active ? "page" : null);+ await expectLinkClass(link, active);+};++const expectLinkAttribute = async (+ locator: Locator,+ name: string,+ expected: string | null+) => {+ const actual = await locator.getAttribute(name);+ if (actual !== expected) {+ throw new Error(`Expected ${name}=${expected}, got ${actual}`);+ }+};++const expectLinkClass = async (locator: Locator, active: boolean) => {+ const className = (await locator.getAttribute("class")) ?? "";+ const classList = className.split(/\s+/).filter(Boolean);+ const hasActiveClass = classList.includes("active");+ if (hasActiveClass !== active) {+ throw new Error(+ `Expected active class=${active}, got class="${className}"`+ );+ }+};++const appendChild = (+ instances: InstanceData[],+ parentId: string,+ childId: string+) => {+ const parent = instances.find((instance) => instance.id === parentId);+ if (parent === undefined) {+ throw new Error(`Expected instance "${parentId}"`);+ }+ parent.children.push({ type: "id", value: childId });+};++const addTextLink = ({+ instances,+ props,+ id,+ component = "Link",+ tag,+ text,+ href,+}: {+ instances: InstanceData[];+ props: PropData[];+ id: string;+ component?: string;+ tag?: string;+ text: string;+ href: string;+}) => {+ instances.push({+ type: "instance",+ id,+ component,+ tag,+ label: text,+ children: [{ type: "text", value: text }],+ });+ props.push({+ id: `${id}-href`,+ instanceId: id,+ name: "href",+ type: "string",+ value: href,+ });+};++const addPreviewLinks = ({+ instances,+ props,+ parentId,+ prefix,+}: {+ instances: InstanceData[];+ props: PropData[];+ parentId: string;+ prefix: string;+}) => {+ for (const link of previewLinks) {+ const id = `${prefix}-${link.key}`;+ addTextLink({+ instances,+ props,+ id,+ text: link.text,+ href: link.href,+ component: link.component,+ tag: link.tag,+ });+ appendChild(instances, parentId, id);+ }+};++const preparePreviewLinksProject = async () => {+ const build = await loadDevBuild({ projectId: fixture.projectId });+ const pages = JSON.parse(build.pages) as PagesData;+ const instances = JSON.parse(build.instances) as InstanceData[];+ const props = JSON.parse(build.props) as PropData[];++ const homePage = pages.pages.find((page) => page.id === pages.homePageId);+ if (homePage === undefined) {+ throw new Error("Expected home page");+ }+ const homeRoot = instances.find(+ (instance) => instance.id === homePage.rootInstanceId+ );+ const homeContentId = homeRoot?.children.find(+ (child) => child.type === "id"+ )?.value;+ if (homeContentId === undefined) {+ throw new Error("Expected home page content instance");+ }++ const pageRootId = "preview-links-page-root";+ const pageContentId = "preview-links-page-content";++ pages.pages.push({+ id: previewPageId,+ name: "Preview Links Page",+ title: JSON.stringify("Preview Links Page"),+ rootInstanceId: pageRootId,+ path: "/my-page",+ meta: { description: JSON.stringify("") },+ });+ pages.folders+ ?.find((folder) => folder.id === pages.rootFolderId)+ ?.children?.push(previewPageId);++ instances.push(+ {+ type: "instance",+ id: pageRootId,+ component: "ws:element",+ tag: "body",+ children: [{ type: "id", value: pageContentId }],+ },+ {+ type: "instance",+ id: pageContentId,+ component: "ws:element",+ tag: "main",+ label: "Preview Links Page Content",+ children: [],+ }+ );++ addPreviewLinks({+ instances,+ props,+ parentId: homeContentId,+ prefix: "preview-home",+ });+ addPreviewLinks({+ instances,+ props,+ parentId: pageContentId,+ prefix: "preview-page",+ });++ await updateBuild(build.id, {+ pages: JSON.stringify(pages),+ instances: JSON.stringify(instances),+ props: JSON.stringify(props),+ });+ await insertAuthorizationToken({+ token: viewerToken,+ projectId: fixture.projectId,+ name: "E2E viewer token",+ relation: "viewers",+ });+};++test.beforeAll(async () => {+ fixture = await createContentModeProject({+ email: "[email protected]",+ title: "Preview Links E2E",+ assetNamePrefix: "preview-links-",+ editorToken: "preview-links-e2e-editor-token",+ builderToken: "preview-links-e2e-builder-token",+ });+ await preparePreviewLinksProject();+});++test("Preview links expose current page state for components and element anchors", async () => {+ const { page, close } = await newIsolatedPage();++ try {+ await openBuilderUrl({ page, url: getPreviewUrl({}) });+ let canvas = await waitForCanvasFrame({ page });+ await expectActiveLink({+ canvas,+ text: previewLinkText.homeLink,+ active: true,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageLink,+ active: false,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.richTextLink,+ active: false,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageAnchor,+ active: false,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageQueryLink,+ active: false,+ });++ await canvas.getByRole("link", { name: previewLinkText.pageLink }).click();+ canvas = await waitForCanvasFrame({ page });+ await expectActiveLink({+ canvas,+ text: previewLinkText.homeLink,+ active: false,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageLink,+ active: true,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.richTextLink,+ active: true,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageAnchor,+ active: true,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageQueryLink,+ active: false,+ });++ await canvas+ .getByRole("link", { name: previewLinkText.pageQueryLink })+ .click();+ canvas = await waitForCanvasFrame({ page });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageLink,+ active: false,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.richTextLink,+ active: false,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageAnchor,+ active: false,+ });+ await expectActiveLink({+ canvas,+ text: previewLinkText.pageQueryLink,+ active: true,+ });++ await openBuilderUrl({+ page,+ url: getPreviewUrl({ pageId: previewPageId, hash: "#section" }),+ });+ canvas = await waitForCanvasFrame({ page });+ await expectActiveLink({+ canvas,+ text: previewLinkText.hashLink,+ active: true,+ });+ } finally {+ await close();+ }+});diff --git a/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.tsx b/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.tsxindex ed6f071611..e73e1bd0f1 100644--- a/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.tsx+++ b/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/react-router-cloudflare/app/__generated__/_index.tsx b/fixtures/react-router-cloudflare/app/__generated__/_index.tsxindex 566526621e..816886d638 100644--- a/fixtures/react-router-cloudflare/app/__generated__/_index.tsx+++ b/fixtures/react-router-cloudflare/app/__generated__/_index.tsx@@ -15,7 +15,7 @@ import {Heading as Heading,Text as Text,Image as Image,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/react-router-docker/app/__generated__/[another-page]._index.tsx b/fixtures/react-router-docker/app/__generated__/[another-page]._index.tsxindex ed6f071611..e73e1bd0f1 100644--- a/fixtures/react-router-docker/app/__generated__/[another-page]._index.tsx+++ b/fixtures/react-router-docker/app/__generated__/[another-page]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/react-router-docker/app/__generated__/_index.tsx b/fixtures/react-router-docker/app/__generated__/_index.tsxindex 566526621e..816886d638 100644--- a/fixtures/react-router-docker/app/__generated__/_index.tsx+++ b/fixtures/react-router-docker/app/__generated__/_index.tsx@@ -15,7 +15,7 @@ import {Heading as Heading,Text as Text,Image as Image,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/react-router-netlify/app/__generated__/[another-page]._index.tsx b/fixtures/react-router-netlify/app/__generated__/[another-page]._index.tsxindex ed6f071611..e73e1bd0f1 100644--- a/fixtures/react-router-netlify/app/__generated__/[another-page]._index.tsx+++ b/fixtures/react-router-netlify/app/__generated__/[another-page]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/react-router-netlify/app/__generated__/_index.tsx b/fixtures/react-router-netlify/app/__generated__/_index.tsxindex 566526621e..816886d638 100644--- a/fixtures/react-router-netlify/app/__generated__/_index.tsx+++ b/fixtures/react-router-netlify/app/__generated__/_index.tsx@@ -15,7 +15,7 @@ import {Heading as Heading,Text as Text,Image as Image,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/react-router-vercel/app/__generated__/[another-page]._index.tsx b/fixtures/react-router-vercel/app/__generated__/[another-page]._index.tsxindex ed6f071611..e73e1bd0f1 100644--- a/fixtures/react-router-vercel/app/__generated__/[another-page]._index.tsx+++ b/fixtures/react-router-vercel/app/__generated__/[another-page]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/react-router-vercel/app/__generated__/_index.tsx b/fixtures/react-router-vercel/app/__generated__/_index.tsxindex 566526621e..816886d638 100644--- a/fixtures/react-router-vercel/app/__generated__/_index.tsx+++ b/fixtures/react-router-vercel/app/__generated__/_index.tsx@@ -15,7 +15,7 @@ import {Heading as Heading,Text as Text,Image as Image,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.tsxindex 4ebcece298..035cbcadbd 100644--- a/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.tsx+++ b/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.tsx@@ -10,7 +10,7 @@ import {import {Body as Body,Heading as Heading,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/ssg-cloudflare-pages/app/__generated__/_index.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/_index.tsxindex 050563f9e0..edd1e99cca 100644--- a/fixtures/ssg-cloudflare-pages/app/__generated__/_index.tsx+++ b/fixtures/ssg-cloudflare-pages/app/__generated__/_index.tsx@@ -11,9 +11,9 @@ import {Body as Body,Heading as Heading,Text as Text,+ Link as Link,Image as Image,-} from "@webstudio-is/sdk-components-react";-import { Link as Link } from "@webstudio-is/sdk-components-react/ssg";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx b/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsxindex 53cca63dce..b2fa65b703 100644--- a/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx+++ b/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx@@ -4,7 +4,7 @@ import {PageSettingsTitle,ReactSdkContext,} from "@webstudio-is/react-sdk/runtime";-import { SsgCurrentUrlContext } from "@webstudio-is/sdk-components-react/ssg";+import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";import {Page,@@ -24,10 +24,10 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {onError: console.error,}}>- <SsgCurrentUrlContext.Provider value={url}>+ <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} />- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}pageMeta={pageMeta}diff --git a/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx b/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsxindex e8952f15d9..0a55084475 100644--- a/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx+++ b/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx@@ -4,7 +4,7 @@ import {PageSettingsTitle,ReactSdkContext,} from "@webstudio-is/react-sdk/runtime";-import { SsgCurrentUrlContext } from "@webstudio-is/sdk-components-react/ssg";+import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";import { Page, breakpoints, siteName } from "../../app/__generated__/_index";@@ -20,10 +20,10 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {onError: console.error,}}>- <SsgCurrentUrlContext.Provider value={url}>+ <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} />- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}pageMeta={pageMeta}diff --git a/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.tsx b/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.tsxindex 4907c249a3..7fa9a1c098 100644--- a/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.tsx+++ b/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.tsx@@ -10,7 +10,7 @@ import {import {Body as Body,Heading as Heading,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "8a7358b1-7de3-459d-b7b1-56dddfb6ce1e";diff --git a/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx b/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsxindex e8952f15d9..0a55084475 100644--- a/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx+++ b/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx@@ -4,7 +4,7 @@ import {PageSettingsTitle,ReactSdkContext,} from "@webstudio-is/react-sdk/runtime";-import { SsgCurrentUrlContext } from "@webstudio-is/sdk-components-react/ssg";+import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";import { Page, breakpoints, siteName } from "../../app/__generated__/_index";@@ -20,10 +20,10 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {onError: console.error,}}>- <SsgCurrentUrlContext.Provider value={url}>+ <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} />- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}pageMeta={pageMeta}diff --git a/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsx b/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsxindex 0b7ef5266b..2a06e73658 100644--- a/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsx+++ b/fixtures/ssg-netlify-by-project-id/pages/redirect/+Page.tsx@@ -4,7 +4,7 @@ import {PageSettingsTitle,ReactSdkContext,} from "@webstudio-is/react-sdk/runtime";-import { SsgCurrentUrlContext } from "@webstudio-is/sdk-components-react/ssg";+import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";import {Page,@@ -24,10 +24,10 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {onError: console.error,}}>- <SsgCurrentUrlContext.Provider value={url}>+ <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} />- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}pageMeta={pageMeta}diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsxindex 380084eada..7fe6f98117 100644--- a/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsx+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsxindex b0fa1ab831..811a19ce7a 100644--- a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx@@ -15,7 +15,7 @@ import {Heading as Heading,Text as Text,Image as Image,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";diff --git a/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.tsxindex 886ce11c7b..76c965230b 100644--- a/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Image as Image } from "@webstudio-is/sdk-components-react";+import { Image as Image } from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[animations]._index.tsx b/fixtures/webstudio-features/app/__generated__/[animations]._index.tsxindex 1c051b000f..e8bf1bf492 100644--- a/fixtures/webstudio-features/app/__generated__/[animations]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[animations]._index.tsx@@ -11,7 +11,7 @@ import { Body as Body } from "@webstudio-is/sdk-components-react-router";import {Box as Box,Heading as Heading,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {AnimateChildren as AnimateChildren,AnimateText as AnimateText,diff --git a/fixtures/webstudio-features/app/__generated__/[class-names]._index.tsx b/fixtures/webstudio-features/app/__generated__/[class-names]._index.tsxindex 6da2f5ebb3..8f78d80e38 100644--- a/fixtures/webstudio-features/app/__generated__/[class-names]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[class-names]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Box as Box } from "@webstudio-is/sdk-components-react";+import { Box as Box } from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[content-block]._index.tsx b/fixtures/webstudio-features/app/__generated__/[content-block]._index.tsxindex 91ecdf15cf..517cf20c97 100644--- a/fixtures/webstudio-features/app/__generated__/[content-block]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[content-block]._index.tsx@@ -12,7 +12,7 @@ import {Box as Box,Heading as Heading,Paragraph as Paragraph,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[duration]._index.tsx b/fixtures/webstudio-features/app/__generated__/[duration]._index.tsxindex c6387894cc..296330ad3e 100644--- a/fixtures/webstudio-features/app/__generated__/[duration]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[duration]._index.tsx@@ -9,7 +9,7 @@ import {} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";import { AnimateChildren as AnimateChildren } from "@webstudio-is/sdk-components-animation";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[expressions]._index.tsx b/fixtures/webstudio-features/app/__generated__/[expressions]._index.tsxindex 652608d643..abc83242ec 100644--- a/fixtures/webstudio-features/app/__generated__/[expressions]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[expressions]._index.tsx@@ -12,7 +12,7 @@ import {Heading as Heading,HtmlEmbed as HtmlEmbed,Box as Box,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[form]._index.tsx b/fixtures/webstudio-features/app/__generated__/[form]._index.tsxindex d85f966db0..e4ab56e099 100644--- a/fixtures/webstudio-features/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[form]._index.tsx@@ -17,7 +17,7 @@ import {Input as Input,Button as Button,Heading as Heading,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[head-tag]._index.tsx b/fixtures/webstudio-features/app/__generated__/[head-tag]._index.tsxindex bbee83f8e5..7e16a1ce03 100644--- a/fixtures/webstudio-features/app/__generated__/[head-tag]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[head-tag]._index.tsx@@ -17,7 +17,7 @@ import {HeadMeta as HeadMeta,Heading as Heading,HeadTitle as HeadTitle,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.tsxindex 6e0f457261..88060d4a60 100644--- a/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.tsx b/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.tsxindex af5656d5fe..80108f70a1 100644--- a/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.tsx@@ -8,7 +8,7 @@ import {useVariableState,} from "@webstudio-is/react-sdk/runtime";import { Body as Body } from "@webstudio-is/sdk-components-react-router";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-features/app/__generated__/[radix]._index.tsxindex 2dfffa6808..492ddd59a4 100644--- a/fixtures/webstudio-features/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[radix]._index.tsx@@ -19,7 +19,7 @@ import {Text as Text,Box as Box,HtmlEmbed as HtmlEmbed,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-features/app/__generated__/[resources]._index.tsxindex 5a39c0ac5c..50b6f08353 100644--- a/fixtures/webstudio-features/app/__generated__/[resources]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[resources]._index.tsx@@ -11,7 +11,7 @@ import { Body as Body } from "@webstudio-is/sdk-components-react-router";import {Box as Box,HtmlEmbed as HtmlEmbed,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.tsx b/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.tsxindex d78c0e4a8c..c13a45819e 100644--- a/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.tsx@@ -10,7 +10,7 @@ import {import {XmlNode as XmlNode,XmlTime as XmlTime,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/[text-duration]._index.tsx b/fixtures/webstudio-features/app/__generated__/[text-duration]._index.tsxindex 15301f321e..060de920d3 100644--- a/fixtures/webstudio-features/app/__generated__/[text-duration]._index.tsx+++ b/fixtures/webstudio-features/app/__generated__/[text-duration]._index.tsx@@ -12,7 +12,7 @@ import {AnimateChildren as AnimateChildren,AnimateText as AnimateText,} from "@webstudio-is/sdk-components-animation";-import { Heading as Heading } from "@webstudio-is/sdk-components-react";+import { Heading as Heading } from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/fixtures/webstudio-features/app/__generated__/_index.tsx b/fixtures/webstudio-features/app/__generated__/_index.tsxindex 3cd3788b11..fe9a11f496 100644--- a/fixtures/webstudio-features/app/__generated__/_index.tsx+++ b/fixtures/webstudio-features/app/__generated__/_index.tsx@@ -18,7 +18,7 @@ import {Paragraph as Paragraph,Image as Image,Text as Text,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";diff --git a/packages/cli/src/framework-react-router.ts b/packages/cli/src/framework-react-router.tsindex f76dccbd1e..cd5dbd23ef 100644--- a/packages/cli/src/framework-react-router.ts+++ b/packages/cli/src/framework-react-router.ts@@ -34,7 +34,7 @@ export const createFramework = async (): Promise<Framework> => {// cleanup route templates after reading to not bloat generated codeawait rm(routeTemplatesDir, { recursive: true, force: true });- const base = "@webstudio-is/sdk-components-react";+ const base = "@webstudio-is/sdk-components-react/components";const reactRouter = "@webstudio-is/sdk-components-react-router";const reactRadix = "@webstudio-is/sdk-components-react-radix";const animation = "@webstudio-is/sdk-components-animation";diff --git a/packages/cli/src/framework-remix.ts b/packages/cli/src/framework-remix.tsindex c1c886d25e..19f6b2e5c0 100644--- a/packages/cli/src/framework-remix.ts+++ b/packages/cli/src/framework-remix.ts@@ -34,7 +34,7 @@ export const createFramework = async (): Promise<Framework> => {// cleanup route templates after reading to not bloat generated codeawait rm(routeTemplatesDir, { recursive: true, force: true });- const base = "@webstudio-is/sdk-components-react";+ const base = "@webstudio-is/sdk-components-react/components";const remix = "@webstudio-is/sdk-components-react-remix";const reactRadix = "@webstudio-is/sdk-components-react-radix";const animation = "@webstudio-is/sdk-components-animation";diff --git a/packages/cli/src/framework-vike-ssg.ts b/packages/cli/src/framework-vike-ssg.tsindex 03de225e7b..b478af7fea 100644--- a/packages/cli/src/framework-vike-ssg.ts+++ b/packages/cli/src/framework-vike-ssg.ts@@ -32,8 +32,7 @@ export const createFramework = async (): Promise<Framework> => {// cleanup route templates after reading to not bloat generated codeawait rm(routeTemplatesDir, { recursive: true, force: true });- const base = "@webstudio-is/sdk-components-react";- const ssg = "@webstudio-is/sdk-components-react/ssg";+ const base = "@webstudio-is/sdk-components-react/components";const reactRadix = "@webstudio-is/sdk-components-react-radix";const animation = "@webstudio-is/sdk-components-animation";const components: Record<string, string> = {};@@ -42,8 +41,6 @@ export const createFramework = async (): Promise<Framework> => {components[name] = `${base}:${name}`;metas[name] = meta;}- components.Link = `${ssg}:Link`;- components.RichTextLink = `${ssg}:RichTextLink`;for (const [name, meta] of Object.entries(radixComponentMetas)) {components[`${reactRadix}:${name}`] = `${reactRadix}:${name}`;metas[`${reactRadix}:${name}`] = meta;@@ -60,7 +57,7 @@ export const createFramework = async (): Promise<Framework> => {textarea: `${base}:Textarea`,input: `${base}:Input`,select: `${base}:Select`,- a: `${ssg}:Link`,+ a: `${base}:Link`,},html: ({ pagePath }: { pagePath: string }) => {// ignore dynamic pages in static exportdiff --git a/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx b/packages/cli/templates/ssg/app/route-templates/html/+Page.tsxindex d358fb83dd..d959cb6a32 100644--- a/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx+++ b/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx@@ -4,7 +4,7 @@ import {PageSettingsTitle,ReactSdkContext,} from "@webstudio-is/react-sdk/runtime";-import { SsgCurrentUrlContext } from "@webstudio-is/sdk-components-react/ssg";+import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";import { assetBaseUrl, imageLoader } from "__CONSTANTS__";import { Page, breakpoints, siteName } from "__CLIENT__";@@ -20,10 +20,10 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {onError: console.error,}}>- <SsgCurrentUrlContext.Provider value={url}>+ <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} />- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider><PageSettingsMetaurl={url}pageMeta={pageMeta}diff --git a/packages/sdk-cli/src/generate-stories.ts b/packages/sdk-cli/src/generate-stories.tsindex 3f23442523..c7af44d3dc 100644--- a/packages/sdk-cli/src/generate-stories.ts+++ b/packages/sdk-cli/src/generate-stories.ts@@ -17,7 +17,7 @@ import { generateWebstudioComponent } from "@webstudio-is/react-sdk";import { renderTemplate, type TemplateMeta } from "@webstudio-is/template";const WS_NAMESPACE = "ws";-const BASE_NAMESPACE = "@webstudio-is/sdk-components-react";+const BASE_NAMESPACE = "@webstudio-is/sdk-components-react/components";const generateComponentImports = ({scope,diff --git a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsxindex 77902e2af4..4b08da4af6 100644--- a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx@@ -2,7 +2,7 @@ import {Box as Box,Text as Text,HtmlEmbed as HtmlEmbed,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Accordion as Accordion,AccordionItem as AccordionItem,diff --git a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsxindex 2c39c5f745..b820dc273d 100644--- a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx@@ -2,7 +2,7 @@ import {Box as Box,HtmlEmbed as HtmlEmbed,Text as Text,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Label as Label,Checkbox as Checkbox,diff --git a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsxindex 08ee95027e..301b1a21b1 100644--- a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx@@ -2,7 +2,7 @@ import {Box as Box,Button as Button,Text as Text,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Collapsible as Collapsible,CollapsibleTrigger as CollapsibleTrigger,diff --git a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsxindex 5cef504c28..451f5478d6 100644--- a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx@@ -3,7 +3,7 @@ import {Button as Button,Text as Text,HtmlEmbed as HtmlEmbed,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Dialog as Dialog,DialogTrigger as DialogTrigger,diff --git a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsxindex 706bd3ad34..7458222170 100644--- a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx@@ -1,4 +1,4 @@-import { Box as Box } from "@webstudio-is/sdk-components-react";+import { Box as Box } from "@webstudio-is/sdk-components-react/components";import { Label as Label } from "../components";const Component = () => {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 2dd0b39453..cc377a1164 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@@ -5,7 +5,7 @@ import {HtmlEmbed as HtmlEmbed,Link as Link,Paragraph as Paragraph,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {NavigationMenu as NavigationMenu,NavigationMenuList as NavigationMenuList,diff --git a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsxindex 6aafa9936a..8cf60c2b13 100644--- a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx@@ -3,7 +3,7 @@ import {Button as Button,Text as Text,HtmlEmbed as HtmlEmbed,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Popover as Popover,PopoverTrigger as PopoverTrigger,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 9849ec5e6c..c8181142d9 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@@ -2,7 +2,7 @@ import {Box as Box,HtmlEmbed as HtmlEmbed,Text as Text,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {RadioGroup as RadioGroup,Label as Label,diff --git a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsxindex 6fd8243efb..4f4462f3da 100644--- a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx@@ -1,7 +1,7 @@import {Box as Box,HtmlEmbed as HtmlEmbed,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Select as Select,SelectTrigger as SelectTrigger,diff --git a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsxindex 77187c383e..d7710cb6d4 100644--- a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx@@ -3,7 +3,7 @@ import {Button as Button,HtmlEmbed as HtmlEmbed,Text as Text,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Dialog as Dialog,DialogTrigger as DialogTrigger,diff --git a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsxindex 8d769eab8d..930088a6b9 100644--- a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx@@ -1,4 +1,4 @@-import { Box as Box } from "@webstudio-is/sdk-components-react";+import { Box as Box } from "@webstudio-is/sdk-components-react/components";import { Switch as Switch, SwitchThumb as SwitchThumb } from "../components";const Component = () => {diff --git a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsxindex 0d56596fbe..072e7511f0 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 { Box as Box } from "@webstudio-is/sdk-components-react";+import { Box as Box } from "@webstudio-is/sdk-components-react/components";import {Tabs as Tabs,TabsList as TabsList,diff --git a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsxindex 37008fad18..404e62b74b 100644--- a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx@@ -2,7 +2,7 @@ import {Box as Box,Button as Button,Text as Text,-} from "@webstudio-is/sdk-components-react";+} from "@webstudio-is/sdk-components-react/components";import {Tooltip as Tooltip,TooltipTrigger as TooltipTrigger,diff --git a/packages/sdk-components-react-remix/src/link.tsx b/packages/sdk-components-react-remix/src/link.tsxindex 5e630ada21..2b1a27cf9a 100644--- a/packages/sdk-components-react-remix/src/link.tsx+++ b/packages/sdk-components-react-remix/src/link.tsx@@ -3,9 +3,9 @@ import {useLocation,useResolvedPath,} from "@remix-run/react";-import { createLocalLink } from "@webstudio-is/sdk-components-react/local-link";+import { createLink } from "@webstudio-is/sdk-components-react";-export const Link = createLocalLink({+export const Link = createLink({Link: RemixLink,useLocation,useResolvedPath,diff --git a/packages/sdk-components-react-router/src/link.test.tsx b/packages/sdk-components-react-router/src/link.test.tsxindex 21b261b5a8..96efad9b98 100644--- a/packages/sdk-components-react-router/src/link.test.tsx+++ b/packages/sdk-components-react-router/src/link.test.tsx@@ -11,7 +11,7 @@ import {} from "react-router";import { afterEach, expect, test, vi } from "vitest";import { ReactSdkContext, useResource } from "@webstudio-is/react-sdk/runtime";-import { HtmlEmbed } from "@webstudio-is/sdk-components-react";+import { HtmlEmbed } from "@webstudio-is/sdk-components-react/components";import { Link } from "./link";(@@ -215,6 +215,8 @@ test("asset base url only excludes matching root-relative asset paths", async ()const links = Array.from(document.querySelectorAll("a"));+ expect(links[0]?.getAttribute("href")).toBe("/assets");+ expect(links[1]?.getAttribute("href")).toBe("/assets2/file.pdf");expect(links[0]?.getAttribute("data-discover")).toBe("true");expect(links[1]?.getAttribute("data-discover")).toBe("true");});@@ -338,6 +340,30 @@ test("empty local link preserves the current search and clears the hash", asyncexpect(router.state.location.hash).toBe("");});+test("omitted href renders plain anchor fallback", async () => {+ const router = createMemoryRouter(+ [+ {+ path: "/path",+ element: (+ <ReactSdkContext.Provider value={sdkContext}>+ <Link>Missing href</Link>+ </ReactSdkContext.Provider>+ ),+ },+ ],+ { initialEntries: ["/path"] }+ );++ await render(<RouterProvider router={router} />);++ const link = document.querySelector("a");++ expect(link?.getAttribute("href")).toBe("#");+ expect(link?.getAttribute("aria-current")).toBeNull();+ expect(link?.hasAttribute("data-discover")).toBe(false);+});+test("router link forwards navigation props and resolves relative href", async () => {const router = createMemoryRouter([@@ -382,6 +408,36 @@ test("router link forwards navigation props and resolves relative href", async (expect(router.state.location.hash).toBe("#section");});+test("router link forwards discovery props", async () => {+ const router = createMemoryRouter(+ [+ {+ path: "/",+ element: (+ <ReactSdkContext.Provider value={sdkContext}>+ <Link href="/next" discover="none">+ Next+ </Link>+ </ReactSdkContext.Provider>+ ),+ },+ {+ path: "/next",+ element: <div>Next route</div>,+ },+ ],+ { initialEntries: ["/"] }+ );++ await render(<RouterProvider router={router} />);++ const link = document.querySelector("a");++ expect(link?.getAttribute("href")).toBe("/next");+ expect(link?.hasAttribute("data-discover")).toBe(false);+ expect(link?.hasAttribute("discover")).toBe(false);+});+test("router link calls onClick and respects preventDefault", async () => {const onClick = vi.fn((event: React.MouseEvent<HTMLAnchorElement>) => {event.preventDefault();@@ -425,6 +481,52 @@ test("router link calls onClick and respects preventDefault", async () => {expect(router.state.location.pathname).toBe("/");});+test("reloadDocument router link still calls onClick", async () => {+ const onClick = vi.fn((event: React.MouseEvent<HTMLAnchorElement>) => {+ event.preventDefault();+ });+ const router = createMemoryRouter(+ [+ {+ path: "/",+ element: (+ <ReactSdkContext.Provider value={sdkContext}>+ <Link href="/next" reloadDocument onClick={onClick}>+ Next+ </Link>+ </ReactSdkContext.Provider>+ ),+ },+ {+ path: "/next",+ element: <div>Next page</div>,+ },+ ],+ { initialEntries: ["/"] }+ );++ await render(<RouterProvider router={router} />);++ const link = document.querySelector("a");++ expect(link?.getAttribute("href")).toBe("/next");+ expect(link?.getAttribute("data-discover")).toBe("true");++ await act(async () => {+ link?.dispatchEvent(+ new MouseEvent("click", {+ bubbles: true,+ cancelable: true,+ button: 0,+ })+ );+ await Promise.resolve();+ });++ expect(onClick).toHaveBeenCalledTimes(1);+ expect(router.state.location.pathname).toBe("/");+});+test("internal link click does not rerender current generated page while destination is pending", async () => {let pageRenderCount = 0;let linkContentRenderCount = 0;diff --git a/packages/sdk-components-react-router/src/link.tsx b/packages/sdk-components-react-router/src/link.tsxindex 66c3541fb5..6a75881884 100644--- a/packages/sdk-components-react-router/src/link.tsx+++ b/packages/sdk-components-react-router/src/link.tsx@@ -1,8 +1,8 @@-import { Link as RemixLink, useLocation, useResolvedPath } from "react-router";-import { createLocalLink } from "@webstudio-is/sdk-components-react/local-link";+import { Link as RouterLink, useLocation, useResolvedPath } from "react-router";+import { createLink } from "@webstudio-is/sdk-components-react";-export const Link = createLocalLink({- Link: RemixLink,+export const Link = createLink({+ Link: RouterLink,useLocation,useResolvedPath,});diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.jsonindex 47ccd9f8f6..78c9161597 100644--- a/packages/sdk-components-react/package.json+++ b/packages/sdk-components-react/package.json@@ -14,6 +14,11 @@],"exports": {".": {+ "webstudio": "./src/index.ts",+ "types": "./lib/types/index.d.ts",+ "import": "./lib/index.js"+ },+ "./components": {"webstudio": "./src/components.ts","types": "./lib/types/components.d.ts","import": "./lib/components.js"@@ -28,16 +33,6 @@"types": "./lib/types/hooks.d.ts","import": "./lib/hooks.js"},- "./local-link": {- "webstudio": "./src/local-link.tsx",- "types": "./lib/types/local-link.d.ts",- "import": "./lib/local-link.js"- },- "./ssg": {- "webstudio": "./src/ssg.tsx",- "types": "./lib/types/ssg.d.ts",- "import": "./lib/ssg.js"- },"./templates": {"webstudio": "./src/templates.ts","types": "./lib/types/templates.d.ts",diff --git a/packages/sdk-components-react/src/create-link.tsx b/packages/sdk-components-react/src/create-link.tsxnew file mode 100644index 0000000000..12563a8943--- /dev/null+++ b/packages/sdk-components-react/src/create-link.tsx@@ -0,0 +1,154 @@+import {+ type ComponentPropsWithoutRef,+ type ComponentType,+ type ForwardRefExoticComponent,+ type LegacyRef,+ type RefAttributes,+ type ReactNode,+ forwardRef,+ useContext,+} from "react";+import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";+import { BaseLink } from "./link";+import { LinkCurrentUrlContext } from "./link-current-url";+import { isInternalHref, type UrlParts } from "@webstudio-is/sdk/link-utils";+import { getCurrentLinkProps, stripRouterOnlyProps } from "./link-utils";++export type LinkProps = Omit<+ ComponentPropsWithoutRef<typeof BaseLink>,+ "target"+> & {+ // override (string & {}) in target to generate keywords+ target?: "_self" | "_blank" | "_parent" | "_top";++ // useful remix props+ prefetch?: "none" | "intent" | "render" | "viewport";+ discover?: "render" | "none";+ reloadDocument?: boolean;+ replace?: boolean;+ preventScrollReset?: boolean;+ relative?: "route" | "path";+ state?: unknown;+ viewTransition?: boolean;+};++type LinkComponent = ForwardRefExoticComponent<+ LinkProps & RefAttributes<HTMLAnchorElement>+>;++type RouterTo = string | Partial<UrlParts>;++type RouterLinkComponentProps = Omit<LinkProps, "href" | "target"> & {+ target?: ComponentPropsWithoutRef<"a">["target"];+ to: RouterTo;+ ref?: LegacyRef<HTMLAnchorElement>;+};++const getRouterHref = (href: string, location: UrlParts) => {+ if (href === "") {+ return `${location.pathname}${location.search}`;+ }++ return href;+};++const getCurrentHref = (location: UrlParts) =>+ `https://webstudio.local${location.pathname}${location.search}${location.hash}`;++const CurrentUrlProvider = ({+ children,+ location,+}: {+ children: ReactNode;+ location: UrlParts;+}) => (+ <LinkCurrentUrlContext.Provider value={getCurrentHref(location)}>+ {children}+ </LinkCurrentUrlContext.Provider>+);++/**+ * Creates a framework-aware Link.+ *+ * Internal route links render the framework Link component so Remix/React+ * Router keep their own navigation, discovery, prefetch, and transition+ * behavior. Hash-only, external, and asset links fall back to BaseLink because+ * they should behave like native anchors while still supporting current-link+ * styling.+ */+export const createLink = ({+ Link,+ useLocation,+ useResolvedPath,+}: {+ Link: ComponentType<RouterLinkComponentProps>;+ useLocation: () => UrlParts;+ useResolvedPath: (href: string) => UrlParts;+}): LinkComponent => {+ const RouterLink = forwardRef<+ HTMLAnchorElement,+ LinkProps & { href: string }+ >((props, ref) => {+ const location = useLocation();+ const href = getRouterHref(props.href, location);+ const { linkProps, currentLinkProps } = getCurrentLinkProps(+ props,+ location,+ useResolvedPath(props.href)+ );++ return (+ <CurrentUrlProvider location={location}>+ <Link {...linkProps} {...currentLinkProps} to={href} ref={ref} />+ </CurrentUrlProvider>+ );+ });++ const HashLink = forwardRef<HTMLAnchorElement, LinkProps & { href: string }>(+ (props, ref) => {+ const location = useLocation();+ return (+ <CurrentUrlProvider location={location}>+ <BaseLink+ {...stripRouterOnlyProps(props)}+ href={props.href}+ ref={ref}+ />+ </CurrentUrlProvider>+ );+ }+ );++ const FrameworkLink = forwardRef<HTMLAnchorElement, LinkProps>(+ (props, ref) => {+ const { assetBaseUrl } = useContext(ReactSdkContext);+ if (props.href === undefined) {+ return <BaseLink {...stripRouterOnlyProps(props)} ref={ref} />;+ }+ // cast to string when invalid value type is provided with binding+ const href = String(props.href);++ if (+ href.startsWith("#") === false &&+ isInternalHref(href, assetBaseUrl)+ ) {+ // Route through the framework only for navigations it should own. Asset+ // paths can also be root-relative, so they must stay plain anchors.+ return <RouterLink {...props} href={href} ref={ref} />;+ }++ if (href.startsWith("#")) {+ // Hash-only links should preserve the current search params. React Router+ // navigation rewrites them, so keep native anchor behavior and only add+ // Webstudio's aria-current state.+ return <HashLink {...props} href={href} ref={ref} />;+ }++ return <BaseLink {...stripRouterOnlyProps(props)} ref={ref} />;+ }+ );++ FrameworkLink.displayName = BaseLink.displayName;++ return FrameworkLink;+};diff --git a/packages/sdk-components-react/src/index.ts b/packages/sdk-components-react/src/index.tsnew file mode 100644index 0000000000..b9d1b94df0--- /dev/null+++ b/packages/sdk-components-react/src/index.ts@@ -0,0 +1,4 @@+import { createLink, type LinkProps } from "./create-link";+import { LinkCurrentUrlContext } from "./link-current-url";++export { createLink, LinkCurrentUrlContext, type LinkProps };diff --git a/packages/sdk-components-react/src/link-current-url.ts b/packages/sdk-components-react/src/link-current-url.tsnew file mode 100644index 0000000000..5ae009f6e6--- /dev/null+++ b/packages/sdk-components-react/src/link-current-url.ts@@ -0,0 +1,5 @@+import { createContext } from "react";++export const LinkCurrentUrlContext = createContext<string | URL | undefined>(+ undefined+);diff --git a/packages/sdk-components-react/src/link-utils.ts b/packages/sdk-components-react/src/link-utils.tsindex 153ad35ee9..108f2d0e0a 100644--- a/packages/sdk-components-react/src/link-utils.ts+++ b/packages/sdk-components-react/src/link-utils.ts@@ -1,61 +1,13 @@import type { ComponentPropsWithoutRef } from "react";--export type UrlParts = {- pathname: string;- search: string;- hash: string;-};+import {+ isLocalLinkActive,+ resolveLocalLinkUrl,+ type UrlParts,+} from "@webstudio-is/sdk/link-utils";type AnchorProps = ComponentPropsWithoutRef<"a">;-export const isLocalHref = (href: string, assetBaseUrl: string) =>- /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i.test(href) === false &&- (href.startsWith("/") && href.startsWith(assetBaseUrl)) === false;--/**- * React Router resolves href="" and hash-only hrefs without preserving the- * concrete browser URL shape Webstudio uses for :local-link-like matching.- * Normalize those cases before comparing so aria-current follows anchor URL- * semantics instead of route-only semantics.- */-export const resolveLocalLinkUrl = (- href: string,- location: UrlParts,- resolvedPath: UrlParts-): UrlParts => {- if (href === "") {- return {- pathname: location.pathname,- search: location.search,- hash: "",- };- }-- if (href.startsWith("#")) {- return {- pathname: location.pathname,- search: location.search,- hash: href === "#" ? "" : href,- };- }-- return resolvedPath;-};--/**- * Webstudio's local link styles target the concrete URL, not just the matched- * route. This intentionally preserves the old NavLink end/exact behavior while- * also requiring query string and fragment equality.- */-export const isLocalLinkActive = (current: UrlParts, target: UrlParts) => {- return (- current.pathname === target.pathname &&- current.search === target.search &&- current.hash === target.hash- );-};--export const getLocalLinkProps = <+export const getCurrentLinkProps = <Props extends {href: string;"aria-current"?: AnchorProps["aria-current"];@@ -74,9 +26,8 @@ export const getLocalLinkProps = <.join(" ");return {- href,linkProps,- localLinkProps: {+ currentLinkProps: {...(isActive ? { "aria-current": ariaCurrent ?? "page" } : {}),...(classNameValue === "" ? {} : { className: classNameValue }),},@@ -86,14 +37,22 @@ export const getLocalLinkProps = <export const stripRouterOnlyProps = <Props extends {prefetch?: unknown;+ discover?: unknown;reloadDocument?: unknown;replace?: unknown;preventScrollReset?: unknown;+ relative?: unknown;+ state?: unknown;+ viewTransition?: unknown;},>({prefetch,+ discover,reloadDocument,replace,preventScrollReset,+ relative,+ state,+ viewTransition,...props}: Props) => props;diff --git a/packages/sdk-components-react/src/ssg.test.tsx b/packages/sdk-components-react/src/link.test.tsxsimilarity index 69%rename from packages/sdk-components-react/src/ssg.test.tsxrename to packages/sdk-components-react/src/link.test.tsxindex a84568769d..ae823483c0 100644--- a/packages/sdk-components-react/src/ssg.test.tsx+++ b/packages/sdk-components-react/src/link.test.tsx@@ -4,7 +4,8 @@import { renderToStaticMarkup } from "react-dom/server";import { expect, test, vi } from "vitest";import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";-import { Link, SsgCurrentUrlContext } from "./ssg";+import { Link } from "./link";+import { LinkCurrentUrlContext } from "./link-current-url";const sdkContext = {assetBaseUrl: "/assets/",@@ -18,7 +19,7 @@ const sdkContext = {const renderLinks = (currentUrl: string) => {const markup = renderToStaticMarkup(<ReactSdkContext.Provider value={sdkContext}>- <SsgCurrentUrlContext.Provider value={currentUrl}>+ <LinkCurrentUrlContext.Provider value={currentUrl}><Link href="/path?tag=bla#section">Exact</Link><Link href="/path">Path only</Link><Link href="/path?tag=bla">Missing hash</Link>@@ -37,7 +38,7 @@ const renderLinks = (currentUrl: string) => {<Link href="/path?tag=bla#section" aria-current="location">Aria override</Link>- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider></ReactSdkContext.Provider>);document.body.innerHTML = markup;@@ -71,12 +72,12 @@ test("local link is current only when pathname, search, and hash match", () => {test("local link preserves exact pathname behavior", () => {const markup = renderToStaticMarkup(<ReactSdkContext.Provider value={sdkContext}>- <SsgCurrentUrlContext.Provider value="https://example.com/path/child">+ <LinkCurrentUrlContext.Provider value="https://example.com/path/child"><Link href="/path">Parent</Link><Link href="/path/child">Child</Link><Link href="/path/">Trailing slash</Link><Link href="/Path/child">Different case</Link>- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider></ReactSdkContext.Provider>);document.body.innerHTML = markup;@@ -93,20 +94,24 @@ test("local link preserves exact pathname behavior", () => {test("external and asset links render as plain anchors", () => {const markup = renderToStaticMarkup(<ReactSdkContext.Provider value={sdkContext}>- <SsgCurrentUrlContext.Provider value="https://example.com/path">+ <LinkCurrentUrlContext.Provider value="https://example.com/path"><Linkhref="https://example.com/path"prefetch="intent"+ discover="none"preventScrollResetreloadDocumentreplace+ relative="path"+ state={{ from: "test" }}target="_blank"+ viewTransitionaria-current="location">External</Link><Link href="/assets/file.pdf">Asset</Link>- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider></ReactSdkContext.Provider>);document.body.innerHTML = markup;@@ -116,9 +121,13 @@ test("external and asset links render as plain anchors", () => {expect(links[0]?.getAttribute("target")).toBe("_blank");expect(links[0]?.getAttribute("aria-current")).toBe("location");expect(links[0]?.hasAttribute("prefetch")).toBe(false);+ expect(links[0]?.hasAttribute("discover")).toBe(false);expect(links[0]?.hasAttribute("preventscrollreset")).toBe(false);expect(links[0]?.hasAttribute("reloaddocument")).toBe(false);expect(links[0]?.hasAttribute("replace")).toBe(false);+ expect(links[0]?.hasAttribute("relative")).toBe(false);+ expect(links[0]?.hasAttribute("state")).toBe(false);+ expect(links[0]?.hasAttribute("viewtransition")).toBe(false);expect(links[1]?.getAttribute("href")).toBe("/assets/file.pdf");expect(links[1]?.getAttribute("aria-current")).toBeNull();@@ -127,11 +136,11 @@ test("external and asset links render as plain anchors", () => {test("invalid absolute href renders as plain anchor", () => {const markup = renderToStaticMarkup(<ReactSdkContext.Provider value={sdkContext}>- <SsgCurrentUrlContext.Provider value="https://example.com/path">+ <LinkCurrentUrlContext.Provider value="https://example.com/path"><Link href="http://" $webstudio$canvasOnly$assetId="asset-id">Invalid external</Link>- </SsgCurrentUrlContext.Provider>+ </LinkCurrentUrlContext.Provider></ReactSdkContext.Provider>);document.body.innerHTML = markup;@@ -141,3 +150,33 @@ test("invalid absolute href renders as plain anchor", () => {expect(link?.getAttribute("aria-current")).toBeNull();expect(link?.hasAttribute("$webstudio$canvasOnly$assetId")).toBe(false);});++test("omitted href preserves plain anchor fallback", () => {+ const markup = renderToStaticMarkup(+ <ReactSdkContext.Provider value={sdkContext}>+ <LinkCurrentUrlContext.Provider value="https://example.com/path">+ <Link>Missing href</Link>+ </LinkCurrentUrlContext.Provider>+ </ReactSdkContext.Provider>+ );+ document.body.innerHTML = markup;+ const link = document.querySelector("a");++ expect(link?.getAttribute("href")).toBe("#");+ expect(link?.getAttribute("aria-current")).toBeNull();+});++test("current url context accepts relative paths", () => {+ const markup = renderToStaticMarkup(+ <ReactSdkContext.Provider value={sdkContext}>+ <LinkCurrentUrlContext.Provider value="/path?tag=bla#section">+ <Link href="/path?tag=bla#section">Exact</Link>+ </LinkCurrentUrlContext.Provider>+ </ReactSdkContext.Provider>+ );+ document.body.innerHTML = markup;+ const link = document.querySelector("a");++ expect(link?.getAttribute("aria-current")).toBe("page");+ expect(link?.getAttribute("class")).toBe("active");+});diff --git a/packages/sdk-components-react/src/link.tsx b/packages/sdk-components-react/src/link.tsxindex 6e328ceecc..025f9eda31 100644--- a/packages/sdk-components-react/src/link.tsx+++ b/packages/sdk-components-react/src/link.tsx@@ -2,7 +2,11 @@* @deprecated This component will be replaced by the Element component in the future.* Use Element with tag="a" instead.*/-import { forwardRef, type ComponentProps } from "react";+import { forwardRef, useContext, type ComponentProps } from "react";+import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";+import { isInternalHref } from "@webstudio-is/sdk/link-utils";+import { getCurrentLinkProps, stripRouterOnlyProps } from "./link-utils";+import { LinkCurrentUrlContext } from "./link-current-url";export const defaultTag = "a";@@ -11,26 +15,86 @@ type Props = Omit<ComponentProps<"a">, "target" | "download"> & {target?: "_self" | "_blank" | "_parent" | "_top";download?: boolean;prefetch?: "none" | "intent" | "render" | "viewport";+ discover?: "render" | "none";preventScrollReset?: boolean;reloadDocument?: boolean;replace?: boolean;+ relative?: "route" | "path";+ state?: unknown;+ viewTransition?: boolean;};-export const Link = forwardRef<+const getWindowCurrentUrl = () => {+ if (typeof window === "undefined") {+ return;+ }+ return window.location.href;+};++const getCurrentUrl = (value: string | URL | undefined) => {+ if (value === undefined) {+ return;+ }+ return new URL(value, "https://webstudio.local");+};++/**+ * Plain Webstudio anchor implementation.+ *+ * Used by base components, SSG, builder preview, and framework-link fallbacks.+ * It owns current-link styling for native anchors, while framework packages+ * keep their own Link components for route navigation and prefetch behavior.+ */+export const BaseLink = forwardRef<HTMLAnchorElement,Props & { $webstudio$canvasOnly$assetId?: string | undefined }>((props, ref) => {+ const currentUrlValue = useContext(LinkCurrentUrlContext);+ const { assetBaseUrl } = useContext(ReactSdkContext);const {children,// @todo: it's a hack made for Image component for the builder and should't be in the runtime at all.$webstudio$canvasOnly$assetId,+ "aria-current": ariaCurrent,+ className,...rest} = props;+ const hasHref = rest.href !== undefined;+ const href = hasHref ? String(rest.href) : "#";+ const currentHref = currentUrlValue ?? getWindowCurrentUrl();+ const currentUrl = getCurrentUrl(currentHref);+ let linkProps = stripRouterOnlyProps(rest);+ let currentLinkProps = {+ ...(ariaCurrent === undefined ? {} : { "aria-current": ariaCurrent }),+ ...(className === undefined ? {} : { className }),+ };++ if (currentUrl && hasHref && isInternalHref(href, assetBaseUrl)) {+ const props = getCurrentLinkProps(+ { ...rest, href, "aria-current": ariaCurrent, className },+ currentUrl,+ new URL(href, currentUrl)+ );+ linkProps = stripRouterOnlyProps(props.linkProps);+ currentLinkProps = props.currentLinkProps;+ }+return (- <a {...rest} href={rest.href ?? "#"} ref={ref}>+ <a+ {...linkProps}+ {...currentLinkProps}+ href={+ href === "" && currentUrl+ ? `${currentUrl.pathname}${currentUrl.search}`+ : href+ }+ ref={ref}+ >{children}</a>);});-Link.displayName = "Link";+BaseLink.displayName = "Link";++export { BaseLink as Link };diff --git a/packages/sdk-components-react/src/local-link.tsx b/packages/sdk-components-react/src/local-link.tsxdeleted file mode 100644index 353a6d9f83..0000000000--- a/packages/sdk-components-react/src/local-link.tsx+++ /dev/null@@ -1,137 +0,0 @@-import {- type ComponentPropsWithoutRef,- type ComponentType,- type ForwardRefExoticComponent,- type LegacyRef,- type RefAttributes,- forwardRef,- useContext,-} from "react";-import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";-import { Link as BaseLink } from "./link";-import {- getLocalLinkProps,- isLocalHref,- stripRouterOnlyProps,- type UrlParts,-} from "./link-utils";--export type LocalLinkProps = Omit<- ComponentPropsWithoutRef<typeof BaseLink>,- "target"-> & {- // override (string & {}) in target to generate keywords- target?: "_self" | "_blank" | "_parent" | "_top";-- // useful remix props- prefetch?: "none" | "intent" | "render" | "viewport";- reloadDocument?: boolean;- replace?: boolean;- preventScrollReset?: boolean;-};--type LocalLinkComponent = ForwardRefExoticComponent<- LocalLinkProps & RefAttributes<HTMLAnchorElement>->;--type RouterTo = string | Partial<UrlParts>;--type RouterLinkComponentProps = Omit<LocalLinkProps, "href" | "target"> & {- target?: ComponentPropsWithoutRef<"a">["target"];- to: RouterTo;- ref?: LegacyRef<HTMLAnchorElement>;-};--const getRouterHref = (href: string, location: UrlParts) => {- if (href === "") {- return `${location.pathname}${location.search}`;- }-- return href;-};--/**- * Remix and React Router expose compatible navigation hooks but from different- * packages. This factory keeps Webstudio's local-link semantics in one place- * while each integration supplies its own router primitives.- */-export const createLocalLink = ({- Link,- useLocation,- useResolvedPath,-}: {- // Remix v2 and React Router v7 expose compatible Link behavior but different- // public prop types. This adapter boundary captures only the props Webstudio- // actually forwards.- Link: ComponentType<RouterLinkComponentProps>;- useLocation: () => UrlParts;- useResolvedPath: (href: string) => UrlParts;-}): LocalLinkComponent => {- const RouterLink = forwardRef<- HTMLAnchorElement,- LocalLinkProps & { href: string }- >((props, ref) => {- const location = useLocation();- const { href, linkProps, localLinkProps } = getLocalLinkProps(- props,- location,- useResolvedPath(props.href)- );-- return (- <Link- {...linkProps}- {...localLinkProps}- to={getRouterHref(href, location)}- ref={ref}- />- );- });-- const HashLink = forwardRef<- HTMLAnchorElement,- LocalLinkProps & { href: string }- >((props, ref) => {- const location = useLocation();- const { linkProps, localLinkProps } = getLocalLinkProps(- props,- location,- location- );- return (- <BaseLink- {...stripRouterOnlyProps(linkProps)}- {...localLinkProps}- href={props.href}- ref={ref}- />- );- });-- const LocalLink = forwardRef<HTMLAnchorElement, LocalLinkProps>(- (props, ref) => {- const { assetBaseUrl } = useContext(ReactSdkContext);- // cast to string when invalid value type is provided with binding- const href = String(props.href ?? "");-- if (href.startsWith("#") === false && isLocalHref(href, assetBaseUrl)) {- // Route through the framework only for navigations it should own. Asset- // paths can also be root-relative, so they must stay plain anchors.- return <RouterLink {...props} href={href} ref={ref} />;- }-- if (href.startsWith("#")) {- // Hash-only links should preserve the current search params. React Router- // navigation rewrites them, so keep native anchor behavior and only add- // Webstudio's aria-current state.- return <HashLink {...props} href={href} ref={ref} />;- }-- return <BaseLink {...stripRouterOnlyProps(props)} ref={ref} />;- }- );-- LocalLink.displayName = BaseLink.displayName;-- return LocalLink;-};diff --git a/packages/sdk-components-react/src/ssg.tsx b/packages/sdk-components-react/src/ssg.tsxdeleted file mode 100644index c3b411d1a0..0000000000--- a/packages/sdk-components-react/src/ssg.tsx+++ /dev/null@@ -1,91 +0,0 @@-import {- createContext,- forwardRef,- type ComponentPropsWithoutRef,- useContext,-} from "react";-import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";-import type { Link as BaseLink } from "./link";--export const SsgCurrentUrlContext = createContext<string | undefined>(- undefined-);--const isLocalHref = (href: string, assetBaseUrl: string) =>- /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i.test(href) === false &&- (href.startsWith("/") && href.startsWith(assetBaseUrl)) === false;--export const Link = forwardRef<- HTMLAnchorElement,- ComponentPropsWithoutRef<typeof BaseLink>->((props, ref) => {- const currentUrlValue = useContext(SsgCurrentUrlContext);- const { assetBaseUrl } = useContext(ReactSdkContext);- const {- children,- // @todo: it's a hack made for Image component for the builder and should't be in the runtime at all.- $webstudio$canvasOnly$assetId,- prefetch,- preventScrollReset,- reloadDocument,- replace,- "aria-current": ariaCurrent,- className,- ...rest- } = props;- const href = String(rest.href ?? "");- const currentHref =- currentUrlValue ??- (typeof window === "undefined" ? undefined : window.location.href);- const currentUrl = currentHref ? new URL(currentHref) : undefined;- let ariaCurrentValue = ariaCurrent;- let classNameValue = className;-- if (currentUrl && isLocalHref(href, assetBaseUrl)) {- const target =- href === ""- ? {- pathname: currentUrl.pathname,- search: currentUrl.search,- hash: "",- }- : href.startsWith("#")- ? {- pathname: currentUrl.pathname,- search: currentUrl.search,- hash: href === "#" ? "" : href,- }- : new URL(href, currentUrl);- const isActive =- currentUrl.pathname === target.pathname &&- currentUrl.search === target.search &&- currentUrl.hash === target.hash;-- ariaCurrentValue = isActive ? (ariaCurrent ?? "page") : undefined;- classNameValue = [className, isActive ? "active" : undefined]- .filter(Boolean)- .join(" ");- }-- return (- <a- {...rest}- {...(ariaCurrentValue === undefined- ? {}- : { "aria-current": ariaCurrentValue })}- {...(classNameValue ? { className: classNameValue } : {})}- href={- href === "" && currentUrl- ? `${currentUrl.pathname}${currentUrl.search}`- : href- }- ref={ref}- >- {children}- </a>- );-});--Link.displayName = "Link";--export { Link as RichTextLink };diff --git a/packages/sdk-components-react/tsconfig.dts.json b/packages/sdk-components-react/tsconfig.dts.jsonindex 37609ac8e3..5571604daa 100644--- a/packages/sdk-components-react/tsconfig.dts.json+++ b/packages/sdk-components-react/tsconfig.dts.json@@ -1,10 +1,11 @@{"extends": "./tsconfig.json","include": [+ "src/index.ts","src/components.ts","src/metas.ts","src/hooks.ts",- "src/local-link.tsx"+ "src/create-link.tsx"],"compilerOptions": {"declarationDir": "lib/types"diff --git a/packages/sdk/package.json b/packages/sdk/package.jsonindex 4c8a7ec76f..3af7413cc1 100644--- a/packages/sdk/package.json+++ b/packages/sdk/package.json@@ -18,6 +18,11 @@"types": "./lib/types/runtime.d.ts","import": "./lib/runtime.js"},+ "./link-utils": {+ "webstudio": "./src/link-utils.ts",+ "types": "./lib/types/link-utils.d.ts",+ "import": "./lib/link-utils.js"+ },"./normalize.css": {"webstudio": "./src/__generated__/normalize.css.ts","types": "./lib/types/__generated__/normalize.css.d.ts",@@ -41,7 +46,7 @@"typecheck": "tsgo --noEmit -p tsconfig.typecheck.json","test": "vitest run","build:normalize.css": "tsx --conditions=webstudio ./scripts/normalize.css.ts && prettier --write src/__generated__/normalize.css.ts",- "build": "rm -rf lib && esbuild src/index.ts src/runtime.ts src/__generated__/normalize.css.ts src/core-templates.tsx --outdir=lib --bundle --format=esm --packages=external",+ "build": "rm -rf lib && esbuild src/index.ts src/runtime.ts src/link-utils.ts src/__generated__/normalize.css.ts src/core-templates.tsx --outdir=lib --bundle --format=esm --packages=external","dts": "tsc --project tsconfig.dts.json"},"dependencies": {diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.tsindex 35d0b1dde2..8da3bc83ff 100644--- a/packages/sdk/src/index.ts+++ b/packages/sdk/src/index.ts@@ -22,6 +22,7 @@ export * from "./expression";export * from "./resources-generator";export * from "./page-meta-generator";export * from "./url-pattern";+export * from "./link-utils";export * from "./css";export * from "./__generated__/tags";diff --git a/packages/sdk-components-react/src/link-utils.test.ts b/packages/sdk/src/link-utils.test.tssimilarity index 77%rename from packages/sdk-components-react/src/link-utils.test.tsrename to packages/sdk/src/link-utils.test.tsindex 48f9820bb1..96e5dd927e 100644--- a/packages/sdk-components-react/src/link-utils.test.ts+++ b/packages/sdk/src/link-utils.test.ts@@ -1,25 +1,30 @@import { expect, test } from "vitest";import {- isLocalHref,+ isInternalHref,isLocalLinkActive,resolveLocalLinkUrl,-} from "./link-utils";+} from "./index";test("href is local unless it is absolute, protocol-relative, or an asset", () => {- expect(isLocalHref("/path", "/assets/")).toBe(true);- expect(isLocalHref("?tag=bla", "/assets/")).toBe(true);- expect(isLocalHref("#section", "/assets/")).toBe(true);- expect(isLocalHref("", "/assets/")).toBe(true);-- expect(isLocalHref("https://example.com/path", "/assets/")).toBe(false);- expect(isLocalHref("//example.com/path", "/assets/")).toBe(false);- expect(isLocalHref("mailto:[email protected]", "/assets/")).toBe(false);- expect(isLocalHref("/assets/file.pdf", "/assets/")).toBe(false);+ expect(isInternalHref("/path", "/assets/")).toBe(true);+ expect(isInternalHref("?tag=bla", "/assets/")).toBe(true);+ expect(isInternalHref("#section", "/assets/")).toBe(true);+ expect(isInternalHref("", "/assets/")).toBe(true);++ expect(isInternalHref("https://example.com/path", "/assets/")).toBe(false);+ expect(isInternalHref("//example.com/path", "/assets/")).toBe(false);+ expect(isInternalHref("mailto:[email protected]", "/assets/")).toBe(false);+ expect(isInternalHref("/assets/file.pdf", "/assets/")).toBe(false);});test("asset base url only excludes matching root-relative asset paths", () => {- expect(isLocalHref("/assets", "/assets/")).toBe(true);- expect(isLocalHref("/assets2/file.pdf", "/assets/")).toBe(true);+ expect(isInternalHref("/assets", "/assets/")).toBe(true);+ expect(isInternalHref("/assets2/file.pdf", "/assets/")).toBe(true);+});++test("empty asset base url does not exclude every root-relative href", () => {+ expect(isInternalHref("/path", "")).toBe(true);+ expect(isInternalHref("/assets/file.pdf", "")).toBe(true);});test("local link matches exact pathname, search, and hash", () => {diff --git a/packages/sdk/src/link-utils.ts b/packages/sdk/src/link-utils.tsnew file mode 100644index 0000000000..ebdc588582--- /dev/null+++ b/packages/sdk/src/link-utils.ts@@ -0,0 +1,54 @@+export type UrlParts = {+ pathname: string;+ search: string;+ hash: string;+};++export const isInternalHref = (href: string, assetBaseUrl: string) =>+ /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i.test(href) === false &&+ (assetBaseUrl !== "" &&+ href.startsWith("/") &&+ href.startsWith(assetBaseUrl)) === false;++/**+ * React Router resolves href="" and hash-only hrefs without preserving the+ * concrete browser URL shape Webstudio uses for :local-link-like matching.+ * Normalize those cases before comparing so current-link state follows anchor+ * URL semantics instead of route-only semantics.+ */+export const resolveLocalLinkUrl = (+ href: string,+ location: UrlParts,+ resolvedPath: UrlParts+): UrlParts => {+ if (href === "") {+ return {+ pathname: location.pathname,+ search: location.search,+ hash: "",+ };+ }++ if (href.startsWith("#")) {+ return {+ pathname: location.pathname,+ search: location.search,+ hash: href === "#" ? "" : href,+ };+ }++ return resolvedPath;+};++/**+ * Webstudio's local link styles target the concrete URL, not just the matched+ * route. This intentionally preserves the old NavLink end/exact behavior while+ * also requiring query string and fragment equality.+ */+export const isLocalLinkActive = (current: UrlParts, target: UrlParts) => {+ return (+ current.pathname === target.pathname &&+ current.search === target.search &&+ current.hash === target.hash+ );+};diff --git a/packages/sdk/tsconfig.dts.json b/packages/sdk/tsconfig.dts.jsonindex 0829a39f42..4de0c60956 100644--- a/packages/sdk/tsconfig.dts.json+++ b/packages/sdk/tsconfig.dts.json@@ -4,6 +4,7 @@"../../@types/**/*.d.ts","src/index.ts","src/runtime.ts",+ "src/link-utils.ts","src/__generated__/normalize.css.ts"],"compilerOptions": {diff --git a/vite.sdk-components.config.ts b/vite.sdk-components.config.tsindex abb35a1a1a..8577244470 100644--- a/vite.sdk-components.config.ts+++ b/vite.sdk-components.config.ts@@ -16,11 +16,10 @@ export default defineConfig({build: {lib: {entry: [+ maybeEntry("src/index.ts"),hasPrivateFolders ? "private-src/components.ts" : "src/components.ts","src/metas.ts","src/hooks.ts",- maybeEntry("src/local-link.tsx"),- maybeEntry("src/ssg.tsx"),"src/templates.ts",].filter((entry) => entry !== undefined),formats: ["es"],