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: Fix mailto subject without email (#5770)
Oleg Isonena9b9e5b7f9e8
diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.test.ts b/apps/builder/app/builder/features/settings-panel/controls/url.test.tsnew file mode 100644index 0000000000..6dd4ccb4ee--- /dev/null+++ b/apps/builder/app/builder/features/settings-panel/controls/url.test.ts@@ -0,0 +1,18 @@+import { describe, expect, test } from "vitest";+import { __testing__ } from "./url";++describe("email url control value", () => {+ test("preserves subject without email", () => {+ expect(__testing__.emailToProp({ email: "", subject: "Hello" })).toEqual(+ "mailto:?subject=Hello"+ );+ expect(__testing__.propToEmail("mailto:?subject=Hello")).toEqual({+ email: "",+ subject: "Hello",+ });+ });++ test("clears value when email and subject are empty", () => {+ expect(__testing__.emailToProp({ email: "", subject: "" })).toEqual("");+ });+});diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsxindex dea9464cdf..2c66f13101 100644--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx@@ -173,7 +173,12 @@ const BasePhone = ({);};-const propToEmail = (value: string) => {+type EmailValue = {+ email: string;+ subject: string;+};++const propToEmail = (value: string): EmailValue => {let url;try {url = new URL(value);@@ -191,6 +196,23 @@ const propToEmail = (value: string) => {};};+const emailToProp = ({ email, subject }: EmailValue) => {+ if (email === "" && subject === "") {+ return "";+ }++ const url = new URL(`mailto:${email}`);+ if (subject !== "") {+ url.searchParams.set("subject", subject);+ }+ return url.toString();+};++export const __testing__ = {+ emailToProp,+ propToEmail,+};+const BaseEmail = ({readOnly,prop,@@ -199,19 +221,7 @@ const BaseEmail = ({id,}: BaseControlProps) => {const localValue = useLocalValue(propToEmail(value), ({ email, subject }) => {- if (email === "") {- if (prop?.type === "expression") {- updateExpressionValue(prop.value, "");- } else {- onChange({ type: "string", value: "" });- }- return;- }- const url = new URL(`mailto:${email}`);- if (subject !== "") {- url.searchParams.set("subject", subject);- }- const value = url.toString();+ const value = emailToProp({ email, subject });if (prop?.type === "expression") {updateExpressionValue(prop.value, value);} else {