Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: fix various text editor bugs (#2420)

Bogdan Chadkin00826c636a9f
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx
index a08884e256..6d049a4d59 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx
@@ -1,4 +1,5 @@
import { useRef, useEffect } from "react";
+import { computed } from "nanostores";
import { useStore } from "@nanostores/react";
import { computePosition, flip, offset, shift } from "@floating-ui/dom";
import { theme, Flex, IconButton, Tooltip } from "@webstudio-is/design-system";
@@ -11,7 +12,10 @@ import {
LinkIcon,
PaintBrushIcon,
} from "@webstudio-is/icons";
-import { selectedInstanceSelectorStore } from "~/shared/nano-states";
+import {
+ selectedInstanceIntanceToTagStore,
+ selectedInstanceSelectorStore,
+} from "~/shared/nano-states";
import { type TextToolbarState, textToolbarStore } from "~/shared/nano-states";
import type { Publish } from "~/shared/pubsub";
import { scaleStore } from "~/builder/shared/nano-states";
@@ -49,6 +53,25 @@ const getRectForRelativeRect = (
};
};
+const $isWithinLink = computed(
+ [selectedInstanceSelectorStore, selectedInstanceIntanceToTagStore],
+ (selectedInstanceSelector, selectedInstanceIntanceToTag) => {
+ if (
+ selectedInstanceSelector === undefined ||
+ selectedInstanceIntanceToTag === undefined
+ ) {
+ return false;
+ }
+ for (const instanceId of selectedInstanceSelector) {
+ const tag = selectedInstanceIntanceToTag.get(instanceId);
+ if (tag === "a") {
+ return true;
+ }
+ }
+ return false;
+ }
+);
+
type ToolbarProps = {
state: TextToolbarState;
onToggle: (value: Format) => void;
@@ -56,6 +79,8 @@ type ToolbarProps = {
};
const Toolbar = ({ state, onToggle, scale }: ToolbarProps) => {
+ const isWithinLink = useStore($isWithinLink);
+
const rootRef = useRef<HTMLDivElement | null>(null);
useEffect(() => {
@@ -162,15 +187,17 @@ const Toolbar = ({ state, onToggle, scale }: ToolbarProps) => {
</IconButton>
</Tooltip>
- <Tooltip content="Inline link">
- <IconButton
- aria-label="Inline link"
- variant={state.isLink ? "local" : "default"}
- onClick={() => onToggle("link")}
- >
- <LinkIcon />
- </IconButton>
- </Tooltip>
+ {isWithinLink === false && (
+ <Tooltip content="Inline link">
+ <IconButton
+ aria-label="Inline link"
+ variant={state.isLink ? "local" : "default"}
+ onClick={() => onToggle("link")}
+ >
+ <LinkIcon />
+ </IconButton>
+ </Tooltip>
+ )}
<Tooltip content="Wrap with span">
<IconButton
diff --git a/apps/builder/app/canvas/features/text-editor/interop.ts b/apps/builder/app/canvas/features/text-editor/interop.ts
index 39cd4cc841..ec9afd2426 100644
--- a/apps/builder/app/canvas/features/text-editor/interop.ts
+++ b/apps/builder/app/canvas/features/text-editor/interop.ts
@@ -190,3 +190,11 @@ export const $convertToLexical = (
$writeLexical(p, rootInstance.children, instances, refs);
}
};
+
+export const $convertTextToLexical = (text: string) => {
+ const root = $getRoot();
+ const p = $createParagraphNode();
+ root.append(p);
+ const textNode = $createTextNode(text);
+ p.append(textNode);
+};
diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx
index bff569fc45..9531287432 100644
--- a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx
+++ b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx
@@ -1,3 +1,4 @@
+import { useRef } from "react";
import { useStore } from "@nanostores/react";
import { ContentEditable } from "@lexical/react/LexicalContentEditable";
import type { ComponentStory, ComponentMeta } from "@storybook/react";
@@ -56,6 +57,7 @@ const instances: Instances = new Map([
export const Basic: ComponentStory<typeof TextEditor> = ({ onChange }) => {
const state = useStore(textToolbarStore);
+ const ref = useRef<null | HTMLDivElement>(null);
const setFormat = (type: Format) => {
publish({ type: "formatTextToolbar", payload: type });
@@ -125,6 +127,7 @@ export const Basic: ComponentStory<typeof TextEditor> = ({ onChange }) => {
}}
>
<TextEditor
+ rootRef={ref}
rootInstanceSelector={["1"]}
instances={instances}
contentEditable={<ContentEditable />}
diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.tsx
index 0be18c054a..592c309c06 100644
--- a/apps/builder/app/canvas/features/text-editor/text-editor.tsx
+++ b/apps/builder/app/canvas/features/text-editor/text-editor.tsx
@@ -23,7 +23,12 @@ import type { Instance, Instances } from "@webstudio-is/sdk";
import { idAttribute } from "@webstudio-is/react-sdk";
import type { InstanceSelector } from "~/shared/tree-utils";
import { ToolbarConnectorPlugin } from "./toolbar-connector";
-import { type Refs, $convertToLexical, $convertToUpdates } from "./interop";
+import {
+ type Refs,
+ $convertToLexical,
+ $convertToUpdates,
+ $convertTextToLexical,
+} from "./interop";
import { colord } from "colord";
const BindInstanceToNodePlugin = ({ refs }: { refs: Refs }) => {
@@ -172,6 +177,7 @@ const onError = (error: Error) => {
};
type TextEditorProps = {
+ rootRef: { current: null | HTMLDivElement };
rootInstanceSelector: InstanceSelector;
instances: Instances;
contentEditable: JSX.Element;
@@ -180,6 +186,7 @@ type TextEditorProps = {
};
export const TextEditor = ({
+ rootRef,
rootInstanceSelector,
instances,
contentEditable,
@@ -220,10 +227,19 @@ export const TextEditor = ({
},
},
editorState: () => {
+ const textContent = (rootRef.current?.textContent ?? "").trim();
+ const [rootInstanceId] = rootInstanceSelector;
+ if (textContent.length !== 0) {
+ const rootInstance = instances.get(rootInstanceId);
+ if (rootInstance && rootInstance.children.length === 0) {
+ $convertTextToLexical(textContent);
+ return;
+ }
+ }
// text editor is unmounted when change properties in side panel
// so assume new nodes don't need to preserve instance id
// and store only initial references
- $convertToLexical(instances, rootInstanceSelector[0], refs);
+ $convertToLexical(instances, rootInstanceId, refs);
},
nodes: [LinkNode],
onError,
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
index 3608918874..c73c3c980c 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -77,9 +77,8 @@ const ContentEditable = ({
// <a> stops working with inline-flex when only 1 character left
// so add span inside and use it as editor element in lexical
const span = document.createElement("span");
- span.contentEditable = "true";
- const child = rootElement.firstChild;
- if (child !== null) {
+ for (const child of rootElement.childNodes) {
+ rootElement.removeChild(child);
span.appendChild(child);
}
rootElement.appendChild(span);
@@ -260,6 +259,7 @@ export const WebstudioComponentCanvas = forwardRef<
HTMLElement,
WebstudioComponentProps
>(({ instance, instanceSelector, children, components, ...restProps }, ref) => {
+ const rootRef = useRef<null | HTMLDivElement>(null);
const instanceId = instance.id;
const instanceStyles = useInstanceStyles(instanceId);
useCssRules({ instanceId: instance.id, instanceStyles });
@@ -323,7 +323,7 @@ export const WebstudioComponentCanvas = forwardRef<
const instanceElement = (
<>
- <Component {...props} ref={ref}>
+ <Component {...props} ref={mergeRefs(ref, rootRef)}>
{renderWebstudioComponentChildren(children)}
</Component>
</>
@@ -341,12 +341,13 @@ export const WebstudioComponentCanvas = forwardRef<
return (
<Suspense fallback={instanceElement}>
<TextEditor
+ rootRef={rootRef}
rootInstanceSelector={instanceSelector}
instances={instances}
contentEditable={
<ContentEditable
renderComponentWithRef={(elementRef) => (
- <Component {...props} ref={mergeRefs(ref, elementRef)}>
+ <Component {...props} ref={mergeRefs(ref, elementRef, rootRef)}>
{initialContentEditableContent.current}
</Component>
)}
diff --git a/packages/sdk-components-react/src/text.tsx b/packages/sdk-components-react/src/text.tsx
index a2fdfdb9b5..81834a29fb 100644
--- a/packages/sdk-components-react/src/text.tsx
+++ b/packages/sdk-components-react/src/text.tsx
@@ -12,7 +12,7 @@ export const Text = forwardRef<ElementRef<typeof defaultTag>, Props>(
({ tag: Tag = defaultTag, children, ...props }, ref) => {
return (
<Tag {...props} ref={ref}>
- {children}
+ {children ?? "The text you can edit"}
</Tag>
);
}