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
Partially fix tooltip trigger editing (#2041)
Ivan Starkov1b4b2db376f5
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex e00d10a258..9b09942a0b 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -1,5 +1,12 @@-import { type MouseEvent, type FormEvent, useEffect, forwardRef } from "react";-import { Suspense, lazy, useCallback, useRef } from "react";+import {+ type MouseEvent,+ type FormEvent,+ useEffect,+ forwardRef,+ type ForwardedRef,+ useRef,+} from "react";+import { Suspense, lazy } from "react";import { useStore } from "@nanostores/react";import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";import store from "immerhin";@@ -45,32 +52,35 @@ const ContentEditable = ({...props}: {Component: AnyComponent;- elementRef: { current: null | HTMLElement };+ elementRef: ForwardedRef<HTMLElement>;[idAttribute]: Instance["id"];[componentAttribute]: Instance["component"];}) => {const [editor] = useLexicalComposerContext();- const ref = useCallback(- (rootElement: null | HTMLElement) => {- // button with contentEditable does not let to press space- // so add span inside and use it as editor element in lexical- if (rootElement?.tagName === "BUTTON") {- const span = document.createElement("span");- span.contentEditable = "true";- rootElement.appendChild(span);- rootElement = span;- }- if (rootElement) {- rootElement.contentEditable = "true";- }- editor.setRootElement(rootElement);- elementRef.current = rootElement ?? null;- },- [editor, elementRef]- );+ const ref = useRef<HTMLElement>(null);++ useEffect(() => {+ let rootElement = ref.current;- return <Component ref={ref} {...props} />;+ if (rootElement == null) {+ return;+ }++ if (rootElement?.tagName === "BUTTON") {+ const span = document.createElement("span");+ span.contentEditable = "true";+ rootElement.appendChild(span);+ rootElement = span;+ }+ if (rootElement) {+ rootElement.contentEditable = "true";+ }++ editor.setRootElement(rootElement);+ }, [editor]);++ return <Component ref={mergeRefs(ref, elementRef)} {...props} />;};// this utility is temporary solution to compute instance selectors@@ -153,7 +163,6 @@ export const WebstudioComponentDev = forwardRef<WebstudioComponentDevProps & ImplicitEvents>(({ instance, instanceSelector, children, components, ...restProps }, ref) => {const instanceId = instance.id;- const instanceElementRef = useRef<HTMLElement>(null);const instanceStyles = useInstanceStyles(instanceId);useCssRules({ instanceId: instance.id, instanceStyles });const instances = useStore(instancesStore);@@ -249,14 +258,14 @@ export const WebstudioComponentDev = forwardRef<}}+ // Do not pass Radix handlers in edit mode+ const componentProps = isPreviewMode+ ? { ...restProps, ...props, ...composedHandlers }+ : props;+const instanceElement = (<>- <Component- {...restProps}- {...props}- {...composedHandlers}- ref={mergeRefs(instanceElementRef, ref)}- >+ <Component {...componentProps} ref={ref}>{renderWebstudioComponentChildren(children)}</Component></>@@ -276,8 +285,8 @@ export const WebstudioComponentDev = forwardRef<instances={instances}contentEditable={<ContentEditable- {...props}- elementRef={instanceElementRef}+ {...componentProps}+ elementRef={ref}Component={Component}/>}diff --git a/apps/builder/app/canvas/instance-selected.ts b/apps/builder/app/canvas/instance-selected.tsindex 106cdda1db..061dedbd4f 100644--- a/apps/builder/app/canvas/instance-selected.ts+++ b/apps/builder/app/canvas/instance-selected.ts@@ -201,14 +201,21 @@ export const subscribeSelectedInstance = (// detect movement of the element within same parent// React prevent remount when key stays the same+ // `attributes: true` fixes issues with popups after trigger text editing+ // that cause radix to incorrectly set content in a wrong position at first renderconst mutationObserver = new MutationObserver(update);const updateObservers = () => {for (const element of elements) {resizeObserver.observe(element);+const parent = element?.parentElement;if (parent) {- mutationObserver.observe(parent, { childList: true });+ mutationObserver.observe(parent, {+ childList: true,+ attributes: true,+ attributeFilter: ["style", "class"],+ });}}};diff --git a/packages/sdk-components-react-radix/src/__generated__/popover.props.ts b/packages/sdk-components-react-radix/src/__generated__/popover.props.tsindex 6edce62522..4b1468a2ef 100644--- a/packages/sdk-components-react-radix/src/__generated__/popover.props.ts+++ b/packages/sdk-components-react-radix/src/__generated__/popover.props.ts@@ -418,7 +418,12 @@ export const propsPopoverContent: Record<string, PropMeta> = {dir: { required: false, control: "text", type: "string" },draggable: { required: false, control: "boolean", type: "boolean" },hidden: { required: false, control: "boolean", type: "boolean" },- hideWhenDetached: { required: false, control: "boolean", type: "boolean" },+ hideWhenDetached: {+ required: false,+ control: "boolean",+ type: "boolean",+ defaultValue: true,+ },id: { required: false, control: "text", type: "string" },inputMode: {description:diff --git a/packages/sdk-components-react-radix/src/__generated__/tooltip.props.ts b/packages/sdk-components-react-radix/src/__generated__/tooltip.props.tsindex 9681090549..2a1e55957e 100644--- a/packages/sdk-components-react-radix/src/__generated__/tooltip.props.ts+++ b/packages/sdk-components-react-radix/src/__generated__/tooltip.props.ts@@ -429,7 +429,12 @@ export const propsTooltipContent: Record<string, PropMeta> = {dir: { required: false, control: "text", type: "string" },draggable: { required: false, control: "boolean", type: "boolean" },hidden: { required: false, control: "boolean", type: "boolean" },- hideWhenDetached: { required: false, control: "boolean", type: "boolean" },+ hideWhenDetached: {+ required: false,+ control: "boolean",+ type: "boolean",+ defaultValue: true,+ },id: { required: false, control: "text", type: "string" },inputMode: {description:diff --git a/packages/sdk-components-react-radix/src/popover.tsx b/packages/sdk-components-react-radix/src/popover.tsxindex 0fe82a430c..6526fd25dc 100644--- a/packages/sdk-components-react-radix/src/popover.tsx+++ b/packages/sdk-components-react-radix/src/popover.tsx@@ -52,13 +52,19 @@ export const PopoverTrigger = forwardRef<export const PopoverContent = forwardRef<ElementRef<typeof PopoverPrimitive.Content>,ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>->(({ sideOffset = 4, align = "center", ...props }, ref) => (- <PopoverPrimitive.Portal>- <PopoverPrimitive.Content- ref={ref}- align="center"- sideOffset={sideOffset}- {...props}- />- </PopoverPrimitive.Portal>-));+>(+ (+ { sideOffset = 4, align = "center", hideWhenDetached = true, ...props },+ ref+ ) => (+ <PopoverPrimitive.Portal>+ <PopoverPrimitive.Content+ ref={ref}+ align="center"+ sideOffset={sideOffset}+ hideWhenDetached={hideWhenDetached}+ {...props}+ />+ </PopoverPrimitive.Portal>+ )+);diff --git a/packages/sdk-components-react-radix/src/tooltip.tsx b/packages/sdk-components-react-radix/src/tooltip.tsxindex 3921a9890b..6f301b8e03 100644--- a/packages/sdk-components-react-radix/src/tooltip.tsx+++ b/packages/sdk-components-react-radix/src/tooltip.tsx@@ -56,8 +56,14 @@ export const TooltipTrigger = forwardRef<export const TooltipContent = forwardRef<ElementRef<typeof TooltipPrimitive.Content>,ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>->(({ sideOffset = 4, ...props }, ref) => (+>(({ sideOffset = 4, hideWhenDetached = true, ...props }, ref) => (<TooltipPrimitive.Portal>- <TooltipPrimitive.Content ref={ref} sideOffset={sideOffset} {...props} />+ <TooltipPrimitive.Content+ ref={ref}+ // Do not show content if trigger is detached+ hideWhenDetached={hideWhenDetached}+ sideOffset={sideOffset}+ {...props}+ /></TooltipPrimitive.Portal>));