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: close navigation overlays for anchor links (#6244)
Oleg Isonene25b7871c3bb
diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.jsonindex aaafe9d6cb..7101c7df32 100644--- a/packages/sdk-components-react-radix/package.json+++ b/packages/sdk-components-react-radix/package.json@@ -39,6 +39,7 @@"build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts !./src/*.template.tsx !./src/*.test.{ts,tsx}' -e asChild -e modal -e defaultOpen -e defaultChecked && oxfmt \"**/*.props.ts\"","build:stories": "tsx --conditions=webstudio src/generate-stories.ts && oxfmt \"src/__generated__/*.stories.tsx\"","dts": "tsc --project tsconfig.dts.json",+ "test": "vitest run","typecheck": "tsc --noEmit"},"peerDependencies": {@@ -65,6 +66,7 @@"await-interaction-response": "^0.0.2"},"devDependencies": {+ "@testing-library/react": "^16.2.0","@types/react": "^18.2.70","@types/react-dom": "^18.2.25","@webstudio-is/css-data": "workspace:*",@@ -74,6 +76,7 @@"@webstudio-is/template": "workspace:*","@webstudio-is/tsconfig": "workspace:*","react": "18.3.0-canary-14898b6a9-20240318",- "react-dom": "18.3.0-canary-14898b6a9-20240318"+ "react-dom": "18.3.0-canary-14898b6a9-20240318",+ "vitest": "^3.1.2"}}diff --git a/packages/sdk-components-react-radix/src/dialog.tsx b/packages/sdk-components-react-radix/src/dialog.tsxindex 2efe26b5fc..3c08627128 100644--- a/packages/sdk-components-react-radix/src/dialog.tsx+++ b/packages/sdk-components-react-radix/src/dialog.tsx@@ -16,43 +16,17 @@ import {getClosestInstance,type Hook,} from "@webstudio-is/react-sdk/runtime";--/**- * Naive heuristic to determine if a click event will cause navigate- */-const willNavigate = (event: MouseEvent) => {- const { target } = event;-- if (target instanceof HTMLAnchorElement === false) {- return false;- }-- if (target.hasAttribute("href") === false) {- return false;- }-- if (target.href === "#") {- return false;- }-- if (target.hasAttribute("target") && target.target === "_blank") {- return false;- }-- if (event.ctrlKey || event.metaKey) {- return false;- }-- return true;-};+import {+ getLinkActivation,+ NavigationOverlayContext,+ useNavigationOverlay,+} from "./navigation-overlay";// wrap in forwardRef because Root is functional component without refexport const Dialog = forwardRef<HTMLDivElement,Omit<ComponentProps<typeof DialogPrimitive.Root>, "defaultOpen">>((props, _ref) => {- const { renderer } = useContext(ReactSdkContext);-const currentOpen = props.open ?? false;const [open, setOpen] = useState(currentOpen);// synchronize external value with local one when changed@@ -62,45 +36,18 @@ export const Dialog = forwardRef<await interactionResponse();setOpen(open);}, []);-- /**- * Close the dialog when a navigable link within it is clicked.- */- useEffect(() => {- if (renderer !== undefined) {- return;- }-- if (open === false) {- return;- }-- const handleClick = (event: MouseEvent) => {- const { target } = event;-- if (willNavigate(event) === false) {- return;- }-- if (target instanceof HTMLAnchorElement === false) {- return false;- }-- if (target.closest('[role="dialog"]')) {- onOpenChangeHandler?.(false);- }- };-- window.addEventListener("click", handleClick);- return () => window.removeEventListener("click", handleClick);- }, [open, onOpenChangeHandler, renderer]);+ const close = useCallback(() => {+ void onOpenChangeHandler(false);+ }, [onOpenChangeHandler]);return (- <DialogPrimitive.Root- {...props}- onOpenChange={onOpenChangeHandler}- open={open}- />+ <NavigationOverlayContext.Provider value={close}>+ <DialogPrimitive.Root+ {...props}+ onOpenChange={onOpenChangeHandler}+ open={open}+ />+ </NavigationOverlayContext.Provider>);});@@ -137,45 +84,27 @@ export const DialogOverlay = forwardRef<export const DialogContent = forwardRef<HTMLDivElement,ComponentProps<typeof DialogPrimitive.Content>->((props, ref) => {+>(({ onClickCapture, onCloseAutoFocus, ...props }, ref) => {+ // Hash navigation keeps the page alive, so restoring focus to the trigger+ // would pull focus away from the newly selected section.const preventAutoFocusOnClose = useRef(false);const { renderer } = useContext(ReactSdkContext);-- /**- * Prevent focusing on the trigger after a navigable link in a dialog is clicked and closes the dialog.- */- useEffect(() => {- if (renderer !== undefined) {- return;- }-- preventAutoFocusOnClose.current = false;-- const handleClick = (event: MouseEvent) => {- const { target } = event;-- if (willNavigate(event) === false) {- return;- }-- if (target instanceof HTMLAnchorElement === false) {- return false;- }-- if (target.closest('[role="dialog"]')) {- preventAutoFocusOnClose.current = true;- }- };-- window.addEventListener("click", handleClick);- return () => window.removeEventListener("click", handleClick);- }, [renderer]);+ const close = useNavigationOverlay();return (<DialogPrimitive.Contentref={ref}{...props}+ onClickCapture={(event) => {+ onClickCapture?.(event);+ // Preview mirrors the published site; Canvas stays open for editing.+ if (renderer !== "canvas" && getLinkActivation(event)) {+ preventAutoFocusOnClose.current = true;+ close?.();+ }+ }}onCloseAutoFocus={(event) => {+ onCloseAutoFocus?.(event);if (preventAutoFocusOnClose.current) {event.preventDefault();}diff --git a/packages/sdk-components-react-radix/src/navigation-menu.tsx b/packages/sdk-components-react-radix/src/navigation-menu.tsxindex b1f3177514..76b4aaad69 100644--- a/packages/sdk-components-react-radix/src/navigation-menu.tsx+++ b/packages/sdk-components-react-radix/src/navigation-menu.tsx@@ -2,7 +2,10 @@ import {Children,forwardRef,type ComponentPropsWithoutRef,+ useCallback,useContext,+ useRef,+ useState,} from "react";import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu";import { getIndexWithinAncestorFromProps } from "@webstudio-is/sdk/runtime";@@ -11,6 +14,11 @@ import {ReactSdkContext,type Hook,} from "@webstudio-is/react-sdk/runtime";+import {+ getLinkActivation,+ NavigationOverlayContext,+ useNavigationOverlay,+} from "./navigation-overlay";export const NavigationMenu = forwardRef<HTMLLIElement,@@ -18,7 +26,7 @@ export const NavigationMenu = forwardRef<ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Root>,"orientation" | "aria-orientation">->(({ value: propsValue, ...props }, ref) => {+>(({ value: propsValue, defaultValue, onValueChange, ...props }, ref) => {/*** If the value is an empty string, "NavigationMenuViewport" isn't in the tree.* This is Radix's way to differentiate animations. However, in the builder, we can't style non-existing elements.@@ -26,18 +34,67 @@ export const NavigationMenu = forwardRef<* This ensures "NavigationMenuViewport" always appears in the HTML tree.**/const { renderer } = useContext(ReactSdkContext);- let value = propsValue;+ const [uncontrolledValue, setUncontrolledValue] = useState(+ () => defaultValue ?? ""+ );+ const handleValueChange = useCallback(+ (value: string) => {+ if (propsValue === undefined) {+ setUncontrolledValue(value);+ }+ onValueChange?.(value);+ },+ [onValueChange, propsValue]+ );+ const close = useCallback(() => handleValueChange(""), [handleValueChange]);++ let value = propsValue ?? uncontrolledValue;if (renderer === "canvas") {value = value === "" ? "-1" : value;}- return <NavigationMenuPrimitive.Root ref={ref} value={value} {...props} />;+ return (+ <NavigationOverlayContext.Provider value={close}>+ <NavigationMenuPrimitive.Root+ {...props}+ ref={ref}+ value={value}+ onValueChange={handleValueChange}+ />+ </NavigationOverlayContext.Provider>+ );});export const NavigationMenuList = NavigationMenuPrimitive.List;export const NavigationMenuViewport = NavigationMenuPrimitive.Viewport;-export const NavigationMenuContent = NavigationMenuPrimitive.Content;+export const NavigationMenuContent = forwardRef<+ HTMLDivElement,+ ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Content>+>(({ onClickCapture, ...props }, ref) => {+ const close = useNavigationOverlay();+ const { renderer } = useContext(ReactSdkContext);++ return (+ <NavigationMenuPrimitive.Content+ ref={ref}+ {...props}+ onClickCapture={(event) => {+ onClickCapture?.(event);+ const anchor = getLinkActivation(event);+ // Preview mirrors the published site; Canvas stays open for editing.+ // Radix NavigationMenuLink dismisses itself; plain anchors do not.+ if (+ renderer !== "canvas" &&+ anchor !== undefined &&+ anchor.hasAttribute("data-ws-navigation-menu-link") === false+ ) {+ close?.();+ }+ }}+ />+ );+});export const NavigationMenuItem = forwardRef<HTMLLIElement,@@ -52,11 +109,31 @@ export const NavigationMenuItem = forwardRef<export const NavigationMenuLink = forwardRef<HTMLAnchorElement,ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Link>->(({ children, ...props }, ref) => {+>(({ children, onClickCapture, onSelect, ...props }, ref) => {const firstChild = Children.toArray(children)[0];+ // Radix only preserves the menu for Meta-clicks. Remember the browser-like+ // activation decision so its custom select event can also preserve the menu+ // for other modifiers, downloads, and links targeting another context.+ const shouldDismissRef = useRef(false);return (- <NavigationMenuPrimitive.Link asChild={true} ref={ref} {...props}>+ <NavigationMenuPrimitive.Link+ asChild={true}+ ref={ref}+ {...props}+ data-ws-navigation-menu-link=""+ onClickCapture={(event) => {+ onClickCapture?.(event);+ shouldDismissRef.current = getLinkActivation(event) !== undefined;+ }}+ onSelect={(event) => {+ onSelect?.(event);+ if (shouldDismissRef.current === false) {+ // This cancels Radix's custom dismissal event, not native navigation.+ event.preventDefault();+ }+ }}+ >{firstChild ?? <a>Add link component</a>}</NavigationMenuPrimitive.Link>);diff --git a/packages/sdk-components-react-radix/src/navigation-overlay.test.tsx b/packages/sdk-components-react-radix/src/navigation-overlay.test.tsxnew file mode 100644index 0000000000..70d1eca836--- /dev/null+++ b/packages/sdk-components-react-radix/src/navigation-overlay.test.tsx@@ -0,0 +1,341 @@+/**+ * @vitest-environment jsdom+ */+import { forwardRef } from "react";+import {+ cleanup,+ fireEvent,+ render,+ screen,+ waitFor,+} from "@testing-library/react";+import { afterEach, expect, test, vi } from "vitest";+import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogTitle,+ DialogTrigger,+} from "./dialog";+import {+ NavigationMenu,+ NavigationMenuContent,+ NavigationMenuItem,+ NavigationMenuLink,+ NavigationMenuList,+ NavigationMenuTrigger,+} from "./navigation-menu";+import { Popover, PopoverContent, PopoverTrigger } from "./popover";+import { getLinkActivation } from "./navigation-overlay";++afterEach(() => {+ cleanup();+ window.history.replaceState(null, "", "/");+});++const Link = forwardRef<+ HTMLAnchorElement,+ { download?: boolean; href?: string; target?: string }+>(({ download, href = "#destination", target, ...props }, ref) => (+ <a {...props} download={download} href={href} ref={ref} target={target}>+ <span>Destination</span>+ </a>+));++test("closes a popover and preserves hash navigation", async () => {+ render(+ <Popover open>+ <PopoverTrigger>+ <button>Open</button>+ </PopoverTrigger>+ <PopoverContent>+ <Link />+ </PopoverContent>+ </Popover>+ );++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.queryByText("Destination")).toBeNull();+ await waitFor(() => expect(window.location.hash).toBe("#destination"));+});++test("closes a navigation menu when a plain link is activated", () => {+ const onValueChange = vi.fn();+ render(+ <NavigationMenu defaultValue="menu" onValueChange={onValueChange}>+ <NavigationMenuList>+ <NavigationMenuItem value="menu">+ <NavigationMenuTrigger>+ <button>Menu</button>+ </NavigationMenuTrigger>+ <NavigationMenuContent>+ <Link />+ </NavigationMenuContent>+ </NavigationMenuItem>+ </NavigationMenuList>+ </NavigationMenu>+ );++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.queryByText("Destination")).toBeNull();+ expect(onValueChange).toHaveBeenCalledExactlyOnceWith("");+});++test("preserves controlled Navigation Menu state", () => {+ const onValueChange = vi.fn();+ const menu = (+ <NavigationMenu value="menu" onValueChange={onValueChange}>+ <NavigationMenuList>+ <NavigationMenuItem value="menu">+ <NavigationMenuTrigger>+ <button>Menu</button>+ </NavigationMenuTrigger>+ <NavigationMenuContent>+ <Link />+ </NavigationMenuContent>+ </NavigationMenuItem>+ </NavigationMenuList>+ </NavigationMenu>+ );+ render(menu);++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.getByText("Destination")).toBeDefined();+ expect(onValueChange).toHaveBeenCalledExactlyOnceWith("");+});++test("preserves Navigation Menu Link dismissal behavior", () => {+ const onValueChange = vi.fn();+ render(+ <NavigationMenu defaultValue="menu" onValueChange={onValueChange}>+ <NavigationMenuList>+ <NavigationMenuItem value="menu">+ <NavigationMenuTrigger>+ <button>Menu</button>+ </NavigationMenuTrigger>+ <NavigationMenuContent>+ <NavigationMenuLink>+ <Link />+ </NavigationMenuLink>+ </NavigationMenuContent>+ </NavigationMenuItem>+ </NavigationMenuList>+ </NavigationMenu>+ );++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.queryByText("Destination")).toBeNull();+ expect(onValueChange).toHaveBeenCalledExactlyOnceWith("");+});++test.each([+ ["a modified click", { ctrlKey: true }, {}],+ ["a link opening another context", {}, { target: "_blank" }],+] as const)(+ "keeps a navigation menu open for %s",+ (_name, eventInit, linkProps) => {+ const onValueChange = vi.fn();+ render(+ <NavigationMenu defaultValue="menu" onValueChange={onValueChange}>+ <NavigationMenuList>+ <NavigationMenuItem value="menu">+ <NavigationMenuTrigger>+ <button>Menu</button>+ </NavigationMenuTrigger>+ <NavigationMenuContent>+ <NavigationMenuLink>+ <Link {...linkProps} />+ </NavigationMenuLink>+ </NavigationMenuContent>+ </NavigationMenuItem>+ </NavigationMenuList>+ </NavigationMenu>+ );++ fireEvent.click(screen.getByText("Destination"), eventInit);++ expect(screen.getByText("Destination")).toBeDefined();+ expect(onValueChange).not.toHaveBeenCalled();+ }+);++test("closes a dialog when a nested link element is activated", async () => {+ render(+ <Dialog open>+ <DialogTrigger>+ <button>Open navigation</button>+ </DialogTrigger>+ <DialogContent>+ <DialogTitle>Navigation</DialogTitle>+ <DialogDescription>Choose a destination</DialogDescription>+ <Link />+ </DialogContent>+ </Dialog>+ );++ fireEvent.click(screen.getByText("Destination"));++ await waitFor(() => expect(screen.queryByRole("dialog")).toBeNull());+ expect(document.activeElement).not.toBe(+ screen.getByRole("button", { name: "Open navigation" })+ );+});++test.each(["_parent", "_top"])(+ "closes an overlay for target=%s in the top-level context",+ (target) => {+ render(+ <Popover open>+ <PopoverTrigger>+ <button>Open</button>+ </PopoverTrigger>+ <PopoverContent>+ <Link target={target} />+ </PopoverContent>+ </Popover>+ );++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.queryByText("Destination")).toBeNull();+ }+);++test.each(["_parent", "_top"])(+ "keeps an overlay open for target=%s in a child context",+ (target) => {+ const iframe = document.createElement("iframe");+ document.body.append(iframe);+ const iframeDocument = iframe.contentDocument;+ if (iframeDocument === null) {+ throw new Error("Expected iframe document");+ }+ const anchor = iframeDocument.createElement("a");+ const child = iframeDocument.createElement("span");+ anchor.setAttribute("href", "#destination");+ anchor.setAttribute("target", target);+ anchor.append(child);++ expect(+ getLinkActivation({+ target: child,+ button: 0,+ altKey: false,+ ctrlKey: false,+ metaKey: false,+ shiftKey: false,+ })+ ).toBeUndefined();++ iframe.remove();+ }+);++test.each([+ ["a modified click", { ctrlKey: true }, {}],+ ["a non-primary click", { button: 1 }, {}],+ ["a download", {}, { download: true }],+ ["a link opening another context", {}, { target: "_blank" }],+ ["an empty fragment", {}, { href: "#" }],+] as const)("keeps a popover open for %s", (_name, eventInit, linkProps) => {+ render(+ <Popover open>+ <PopoverTrigger>+ <button>Open</button>+ </PopoverTrigger>+ <PopoverContent>+ <Link {...linkProps} />+ </PopoverContent>+ </Popover>+ );++ fireEvent.click(screen.getByText("Destination"), eventInit);++ expect(screen.getByText("Destination")).toBeDefined();+});++test("keeps a popover open when the document target opens another context", () => {+ const base = document.createElement("base");+ base.target = "_blank";+ document.head.append(base);++ try {+ render(+ <Popover open>+ <PopoverTrigger>+ <button>Open</button>+ </PopoverTrigger>+ <PopoverContent>+ <Link />+ </PopoverContent>+ </Popover>+ );++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.getByText("Destination")).toBeDefined();+ } finally {+ base.remove();+ }+});++test("keeps navigation overlays interactive on the builder canvas", () => {+ render(+ <ReactSdkContext.Provider+ value={{+ assetBaseUrl: "/",+ imageLoader: ({ src }) => src,+ resources: {},+ breakpoints: [],+ onError: () => {},+ renderer: "canvas",+ }}+ >+ <Popover open>+ <PopoverTrigger>+ <button>Open</button>+ </PopoverTrigger>+ <PopoverContent>+ <Link />+ </PopoverContent>+ </Popover>+ </ReactSdkContext.Provider>+ );++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.getByText("Destination")).toBeDefined();+});++test("closes navigation overlays in builder preview", () => {+ render(+ <ReactSdkContext.Provider+ value={{+ assetBaseUrl: "/",+ imageLoader: ({ src }) => src,+ resources: {},+ breakpoints: [],+ onError: () => {},+ renderer: "preview",+ }}+ >+ <Popover open>+ <PopoverTrigger>+ <button>Open</button>+ </PopoverTrigger>+ <PopoverContent>+ <Link />+ </PopoverContent>+ </Popover>+ </ReactSdkContext.Provider>+ );++ fireEvent.click(screen.getByText("Destination"));++ expect(screen.queryByText("Destination")).toBeNull();+});diff --git a/packages/sdk-components-react-radix/src/navigation-overlay.ts b/packages/sdk-components-react-radix/src/navigation-overlay.tsnew file mode 100644index 0000000000..59d7029dbc--- /dev/null+++ b/packages/sdk-components-react-radix/src/navigation-overlay.ts@@ -0,0 +1,71 @@+import {+ createContext,+ type MouseEvent as ReactMouseEvent,+ useContext,+} from "react";++type LinkActivationEvent = Pick<+ ReactMouseEvent,+ "target" | "button" | "altKey" | "ctrlKey" | "metaKey" | "shiftKey"+>;++export const getLinkActivation = (event: LinkActivationEvent) => {+ if (+ event.button !== 0 ||+ event.altKey ||+ event.ctrlKey ||+ event.metaKey ||+ event.shiftKey ||+ event.target instanceof Element === false+ ) {+ return;+ }++ const anchor = event.target.closest<HTMLAnchorElement>("a[href]");+ if (+ anchor === null ||+ anchor.namespaceURI !== "http://www.w3.org/1999/xhtml"+ ) {+ return;+ }++ if (anchor.hasAttribute("download")) {+ return;+ }++ // An anchor without target inherits the first document-level <base target>.+ // HTMLAnchorElement.target only exposes the anchor's own attribute.+ const target =+ anchor.getAttribute("target") ??+ anchor.ownerDocument+ .querySelector<HTMLBaseElement>("base[target]")+ ?.getAttribute("target") ??+ null;+ const targetKeyword = target?.toLowerCase();+ const currentWindow = anchor.ownerDocument.defaultView;+ // _parent and _top reuse the current context only at the top level. A named+ // target does so only when it names the current window.+ const targetsCurrentContext =+ target === null ||+ target === "" ||+ targetKeyword === "_self" ||+ (targetKeyword === "_parent" && currentWindow?.parent === currentWindow) ||+ (targetKeyword === "_top" && currentWindow?.top === currentWindow) ||+ (targetKeyword?.startsWith("_") === false &&+ target === currentWindow?.name);+ if (targetsCurrentContext === false) {+ return;+ }++ if (anchor.getAttribute("href") === "#") {+ return;+ }++ return anchor;+};++export const NavigationOverlayContext = createContext<(() => void) | undefined>(+ undefined+);++export const useNavigationOverlay = () => useContext(NavigationOverlayContext);diff --git a/packages/sdk-components-react-radix/src/popover.tsx b/packages/sdk-components-react-radix/src/popover.tsxindex 2df6fc0855..42e1f33213 100644--- a/packages/sdk-components-react-radix/src/popover.tsx+++ b/packages/sdk-components-react-radix/src/popover.tsx@@ -5,9 +5,20 @@ import {Children,useState,useEffect,+ useCallback,+ useContext,} from "react";import * as PopoverPrimitive from "@radix-ui/react-popover";-import { getClosestInstance, type Hook } from "@webstudio-is/react-sdk/runtime";+import {+ getClosestInstance,+ ReactSdkContext,+ type Hook,+} from "@webstudio-is/react-sdk/runtime";+import {+ getLinkActivation,+ NavigationOverlayContext,+ useNavigationOverlay,+} from "./navigation-overlay";// wrap in forwardRef because Root is functional component without refexport const Popover = forwardRef<@@ -18,8 +29,11 @@ export const Popover = forwardRef<const [open, setOpen] = useState(currentOpen);// synchronize external value with local one when changeduseEffect(() => setOpen(currentOpen), [currentOpen]);+ const close = useCallback(() => setOpen(false), []);return (- <PopoverPrimitive.Root {...props} open={open} onOpenChange={setOpen} />+ <NavigationOverlayContext.Provider value={close}>+ <PopoverPrimitive.Root {...props} open={open} onOpenChange={setOpen} />+ </NavigationOverlayContext.Provider>);});@@ -47,19 +61,37 @@ export const PopoverContent = forwardRef<ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>>((- { sideOffset = 4, align = "center", hideWhenDetached = true, ...props },+ {+ sideOffset = 4,+ align = "center",+ hideWhenDetached = true,+ onClickCapture,+ ...props+ },ref- ) => (- <PopoverPrimitive.Portal>- <PopoverPrimitive.Content- ref={ref}- align="center"- sideOffset={sideOffset}- hideWhenDetached={hideWhenDetached}- {...props}- />- </PopoverPrimitive.Portal>- )+ ) => {+ const close = useNavigationOverlay();+ const { renderer } = useContext(ReactSdkContext);++ return (+ <PopoverPrimitive.Portal>+ <PopoverPrimitive.Content+ ref={ref}+ align="center"+ sideOffset={sideOffset}+ hideWhenDetached={hideWhenDetached}+ {...props}+ onClickCapture={(event) => {+ onClickCapture?.(event);+ // Preview mirrors the published site; Canvas stays open for editing.+ if (renderer !== "canvas" && getLinkActivation(event)) {+ close?.();+ }+ }}+ />+ </PopoverPrimitive.Portal>+ );+ });export const PopoverClose = PopoverPrimitive.Close;diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 001272a562..ed509ef062 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -2866,6 +2866,9 @@ importers:specifier: ^0.0.2version: 0.0.2devDependencies:+ '@testing-library/react':+ specifier: ^16.2.0+ version: 16.2.0(@testing-library/[email protected])(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])'@types/react':specifier: ^18.2.70version: 18.2.79@@ -2896,6 +2899,9 @@ importers:react-dom:specifier: 18.3.0-canary-14898b6a9-20240318version: 18.3.0-canary-14898b6a9-20240318([email protected])+ vitest:+ specifier: ^3.1.2+ version: 3.1.2(@types/[email protected])(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected]))([email protected])([email protected])packages/sdk-components-react-remix:dependencies: