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: Don't auto replace embed code if the value required changes after sanitization (#2933)
Oleg Isonen35efee6c4f32
diff --git a/apps/builder/app/builder/features/settings-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsxindex 32f27ef652..7b6e48cb03 100644--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx@@ -14,6 +14,67 @@ import {$selectedInstanceScope,useBindingState,} from "../shared";+import { useState } from "react";+import {+ Button,+ Flex,+ SmallIconButton,+ Text,+ Tooltip,+ rawTheme,+ theme,+} from "@webstudio-is/design-system";+import { InfoCircleIcon } from "@webstudio-is/icons";++const ErrorInfo = ({+ error,+ onAutoFix,+}: {+ error?: Error;+ onAutoFix: () => void;+}) => {+ if (error === undefined) {+ return;+ }+ const errorContent = (+ <Flex direction="column" gap="2" css={{ width: theme.spacing[28] }}>+ <Text>+ Entered HTML has a validation error. Do you want us to fix it?+ </Text>+ <Button+ color="neutral-destructive"+ onClick={() => {+ onAutoFix();+ }}+ >+ Fix automatically+ </Button>+ </Flex>+ );++ return (+ <Tooltip content={errorContent} delayDuration={0}>+ <SmallIconButton+ icon={<InfoCircleIcon color={rawTheme.colors.foregroundDestructive} />}+ />+ </Tooltip>+ );+};++type Error = { message: string; value: string; expected: string };++const validateHtml = (value: string): Error | undefined => {+ // This is basically what browser does when innerHTML is set+ // but isolated within temporary element+ // so the result is correct markup+ const div = document.createElement("div");+ div.innerHTML = value;+ const expected = div.innerHTML;+ // We don't need to show error for unnecessary whitespace.+ if (value.replace(/\s/g, "") !== expected.replace(/\s/g, "")) {+ return { message: "Invalid HTML detected", value, expected };+ }+};export const CodeControl = ({meta,@@ -24,21 +85,23 @@ export const CodeControl = ({onChange,onDelete,}: ControlProps<"code">) => {+ const [error, setError] = useState<Error>();const metaOverride = {...meta,control: "text" as const,};const localValue = useLocalValue(String(computedValue ?? ""), (value) => {- // sanitize html before saving- // this is basically what browser does when innerHTML is set- // but isolated within temporary element- // so the result is correct markup- const div = document.createElement("div");- div.innerHTML = value;+ const error = validateHtml(value);+ setError(error);++ if (error) {+ return;+ }+if (prop?.type === "expression") {- updateExpressionValue(prop.value, div.innerHTML);+ updateExpressionValue(prop.value, value);} else {- onChange({ type: "string", value: div.innerHTML });+ onChange({ type: "string", value });}});const label = getLabel(metaOverride, propName);@@ -53,12 +116,23 @@ export const CodeControl = ({return (<VerticalLayoutlabel={- <Label- description={metaOverride.description}- readOnly={overwritable === false}- >- {label}- </Label>+ <Flex gap="1" align="center">+ <Label+ description={metaOverride.description}+ readOnly={overwritable === false}+ >+ {label}+ </Label>+ <ErrorInfo+ error={error}+ onAutoFix={() => {+ if (error) {+ setError(undefined);+ localValue.set(error.expected);+ }+ }}+ />+ </Flex>}deletable={deletable}onDelete={onDelete}@@ -66,8 +140,12 @@ export const CodeControl = ({<BindingControl><HtmlEditorreadOnly={overwritable === false}+ invalid={error !== undefined}value={localValue.value}- onChange={localValue.set}+ onChange={(value) => {+ setError(undefined);+ localValue.set(value);+ }}onBlur={localValue.save}/><BindingPopoverdiff --git a/apps/builder/app/builder/shared/code-editor.tsx b/apps/builder/app/builder/shared/code-editor.tsxindex a28e09849d..923498f84b 100644--- a/apps/builder/app/builder/shared/code-editor.tsx+++ b/apps/builder/app/builder/shared/code-editor.tsx@@ -25,6 +25,10 @@ const rootStyle = css({borderColor: theme.colors.borderFocus,outline: `1px solid ${theme.colors.borderFocus}`,},+ '&[data-invalid="true"]': {+ borderColor: theme.colors.borderDestructiveMain,+ outlineColor: theme.colors.borderDestructiveMain,+ },"& .cm-focused": {outline: "none",},@@ -45,6 +49,7 @@ export const CodeEditor = ({className,readOnly = false,autoFocus = false,+ invalid = false,value,onChange,onBlur,@@ -53,9 +58,10 @@ export const CodeEditor = ({className?: string;readOnly?: boolean;autoFocus?: boolean;+ invalid?: boolean;value: string;onChange: (newValue: string) => void;- onBlur?: () => void;+ onBlur?: (event: FocusEvent) => void;}) => {const editorRef = useRef<null | HTMLDivElement>(null);const viewRef = useRef<undefined | EditorView>();@@ -111,8 +117,8 @@ export const CodeEditor = ({}}),EditorView.domEventHandlers({- blur: () => {- onBlurRef.current?.();+ blur(event) {+ onBlurRef.current?.(event);},}),]),@@ -141,5 +147,7 @@ export const CodeEditor = ({if (className) {rootClassName += ` ${className}`;}- return <div className={rootClassName} ref={editorRef}></div>;+ return (+ <div className={rootClassName} data-invalid={invalid} ref={editorRef}></div>+ );};diff --git a/apps/builder/app/builder/shared/html-editor.tsx b/apps/builder/app/builder/shared/html-editor.tsxindex abebc8719a..82f9788e74 100644--- a/apps/builder/app/builder/shared/html-editor.tsx+++ b/apps/builder/app/builder/shared/html-editor.tsx@@ -1,4 +1,4 @@-import { useMemo } from "react";+import { forwardRef, useMemo } from "react";import {keymap,drawSelection,@@ -75,17 +75,16 @@ const wrapperStyle = css({},});-export const HtmlEditor = ({- readOnly = false,- value,- onChange,- onBlur,-}: {- readOnly?: boolean;- value: string;- onChange: (newValue: string) => void;- onBlur?: () => void;-}) => {+export const HtmlEditor = forwardRef<+ HTMLDivElement,+ {+ readOnly?: boolean;+ invalid?: boolean;+ value: string;+ onChange: (newValue: string) => void;+ onBlur?: (event: FocusEvent) => void;+ }+>(({ readOnly = false, invalid = false, value, onChange, onBlur }, ref) => {const extensions = useMemo(() => [highlightActiveLine(),@@ -116,14 +115,17 @@ export const HtmlEditor = ({);return (- <div className={wrapperStyle.toString()}>+ <div className={wrapperStyle.toString()} ref={ref}><CodeEditorextensions={extensions}readOnly={readOnly}+ invalid={invalid}value={value}onChange={onChange}onBlur={onBlur}/></div>);-};+});++HtmlEditor.displayName = "HtmlEditor";