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: Text Content does not propagate changes from Settings Panel if Previous Edit was on Canvas (#3040)

Ivan Starkov348b5709b570
diff --git a/apps/builder/app/builder/features/ai/ai-command-bar.tsx b/apps/builder/app/builder/features/ai/ai-command-bar.tsx
index 4c40e42d7f..0acf7495fb 100644
--- a/apps/builder/app/builder/features/ai/ai-command-bar.tsx
+++ b/apps/builder/app/builder/features/ai/ai-command-bar.tsx
@@ -43,7 +43,7 @@ import { useLongPressToggle } from "./hooks/long-press-toggle";
import { AiCommandBarButton } from "./ai-button";
import { fetchTranscription } from "./ai-fetch-transcription";
import { fetchResult } from "./ai-fetch-result";
-import { useEffectEvent } from "./hooks/effect-event";
+import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import { AiApiException, RateLimitException } from "./api-exceptions";
import { useClientSettings } from "~/builder/shared/client-settings";
import { flushSync } from "react-dom";
diff --git a/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts b/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts
index dd771d7757..395485300c 100644
--- a/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts
+++ b/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts
@@ -1,5 +1,5 @@
import { type SyntheticEvent, type KeyboardEvent, useRef } from "react";
-import { useEffectEvent } from "./effect-event";
+import { useEffectEvent } from "~/shared/hook-utils/effect-event";
type UseClickAndHoldProps = {
onStart: () => void;
diff --git a/apps/builder/app/builder/features/ai/hooks/media-recorder.ts b/apps/builder/app/builder/features/ai/hooks/media-recorder.ts
index 2403541d56..e213feaad7 100644
--- a/apps/builder/app/builder/features/ai/hooks/media-recorder.ts
+++ b/apps/builder/app/builder/features/ai/hooks/media-recorder.ts
@@ -1,5 +1,5 @@
import { useRef, useState } from "react";
-import { useEffectEvent } from "./effect-event";
+import { useEffectEvent } from "~/shared/hook-utils/effect-event";
// https://github.com/openai/whisper/discussions/870
const DEFAULT_OPTIONS: MediaRecorderOptions = {
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
index 2041817c65..eb02bdc4c9 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
@@ -38,7 +38,7 @@ import { Header, HeaderSuffixSpacer } from "../../shared/panel";
import { $pages } from "~/shared/nano-states";
import { nanoid } from "nanoid";
import { serverSyncStore } from "~/shared/sync";
-import { useEffectEvent } from "~/builder/features/ai/hooks/effect-event";
+import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import {
isSlugUsed,
registerFolderChildMutable,
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
index 8055ef7cbd..29d7121dbf 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
@@ -81,7 +81,7 @@ import { ImageControl } from "~/builder/features/project-settings";
import { ImageInfo } from "./image-info";
import { SocialPreview } from "./social-preview";
// @todo should be moved to shared because features should not depend on features
-import { useEffectEvent } from "~/builder/features/ai/hooks/effect-event";
+import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import { CustomMetadata } from "./custom-metadata";
import {
compilePathnamePattern,
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 e4ccab40b6..a2802f1061 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
@@ -120,6 +120,7 @@ export const Basic: StoryFn<typeof TextEditor> = ({ onChange }) => {
rootInstanceSelector={["1"]}
instances={instances}
contentEditable={<ContentEditable />}
+ onBlur={() => {}}
onChange={onChange}
onSelectInstance={(instanceId) =>
console.info("select instance", instanceId)
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 c05c319680..bd28fbc76d 100644
--- a/apps/builder/app/canvas/features/text-editor/text-editor.tsx
+++ b/apps/builder/app/canvas/features/text-editor/text-editor.tsx
@@ -30,6 +30,7 @@ import {
$convertTextToLexical,
} from "./interop";
import { colord } from "colord";
+import { useEffectEvent } from "~/shared/hook-utils/effect-event";
const BindInstanceToNodePlugin = ({ refs }: { refs: Refs }) => {
const [editor] = useLexicalComposerContext();
@@ -63,6 +64,27 @@ const AutofocusPlugin = () => {
return null;
};
+const InterceptBlurPlugin = (props: { onBlur: () => void }) => {
+ const [editor] = useLexicalComposerContext();
+ const onBlur = useEffectEvent(props.onBlur);
+
+ useEffect(() => {
+ const rootElement = editor.getRootElement();
+
+ if (rootElement === null) {
+ return;
+ }
+
+ rootElement.addEventListener("blur", onBlur);
+
+ return () => {
+ rootElement.removeEventListener("blur", onBlur);
+ };
+ }, [editor, onBlur]);
+
+ return null;
+};
+
/**
* In case of text color is near transparent, make caret visible with color animation between #666 and #999
*/
@@ -182,6 +204,7 @@ type TextEditorProps = {
instances: Instances;
contentEditable: JSX.Element;
onChange: (instancesList: Instance[]) => void;
+ onBlur: () => void;
onSelectInstance: (instanceId: Instance["id"]) => void;
};
@@ -191,6 +214,7 @@ export const TextEditor = ({
instances,
contentEditable,
onChange,
+ onBlur,
onSelectInstance,
}: TextEditorProps) => {
// class names must be started with letter so we add a prefix
@@ -248,6 +272,7 @@ export const TextEditor = ({
return (
<LexicalComposer initialConfig={initialConfig}>
<AutofocusPlugin />
+ <InterceptBlurPlugin onBlur={onBlur} />
<RemoveParagaphsPlugin />
<CaretColorPlugin />
<ToolbarConnectorPlugin
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 5d6df2a4dd..e686b271dc 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -367,6 +367,9 @@ export const WebstudioComponentCanvas = forwardRef<
rootRef={rootRef}
rootInstanceSelector={instanceSelector}
instances={instances}
+ onBlur={() => {
+ $textEditingInstanceSelector.set(undefined);
+ }}
contentEditable={
<ContentEditable
renderComponentWithRef={(elementRef) => (
diff --git a/apps/builder/app/builder/features/ai/hooks/effect-event.ts b/apps/builder/app/shared/hook-utils/effect-event.ts
similarity index 100%
rename from apps/builder/app/builder/features/ai/hooks/effect-event.ts
rename to apps/builder/app/shared/hook-utils/effect-event.ts