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
Add automatic https to url (#2078)
Ivan Starkov42dcbbc3bcef
diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsxindex f2cf538137..745991c60b 100644--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx@@ -1,4 +1,4 @@-import { type ReactNode, useState } from "react";+import { type ReactNode, useState, useEffect } from "react";import { useStore } from "@nanostores/react";import { computed } from "nanostores";import {@@ -49,12 +49,48 @@ const Row = ({ children }: { children: ReactNode }) => (</Flex>);+const canParse = (value: string) => {+ try {+ return Boolean(new URL(value));+ } catch {+ return false;+ }+};++/**+ * Add protocol to URL if it appears absolute and valid. Leave it unchanged otherwise.+ **/+const addHttpsIfMissing = (url: string) => {+ if (url.startsWith("//") && canParse(`https:${url}`)) {+ return new URL(`https:${url}`).href;+ }++ if (url.startsWith("/")) {+ return url;+ }++ if (canParse(url)) {+ return new URL(url).href;+ }++ if (canParse(`https://${url}`)) {+ return new URL(`https://${url}`).href;+ }++ return url;+};+const BaseUrl = ({ prop, onChange, id }: BaseControlProps) => {const localValue = useLocalValue(prop?.type === "string" ? prop.value : "",(value) => onChange({ type: "string", value }));+ useEffect(() => {+ return () => localValue.set(addHttpsIfMissing(localValue.value));+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, []);+return (<Row><InputField@@ -62,9 +98,13 @@ const BaseUrl = ({ prop, onChange, id }: BaseControlProps) => {value={localValue.value}placeholder="http://www.url.com"onChange={(event) => localValue.set(event.target.value)}- onBlur={localValue.save}+ onBlur={() => {+ localValue.set(addHttpsIfMissing(localValue.value));+ localValue.save();+ }}onKeyDown={(event) => {if (event.key === "Enter") {+ localValue.set(addHttpsIfMissing(localValue.value));localValue.save();}}}@@ -145,7 +185,7 @@ const BaseEmail = ({ prop, onChange, id }: BaseControlProps) => {type="email"placeholder="[email protected]"onChange={(event) =>- localValue.set((value) => ({ ...value, email: event.target.value }))+ localValue.set({ ...localValue.value, email: event.target.value })}onBlur={localValue.save}onKeyDown={(event) => {@@ -163,10 +203,10 @@ const BaseEmail = ({ prop, onChange, id }: BaseControlProps) => {value={localValue.value.subject}placeholder="You've got mail!"onChange={(event) =>- localValue.set((value) => ({- ...value,+ localValue.set({+ ...localValue.value,subject: event.target.value,- }))+ })}onBlur={localValue.save}onKeyDown={(event) => {diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsxindex ed7b0869ee..e7bbcdeb94 100644--- a/apps/builder/app/builder/features/settings-panel/shared.tsx+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx@@ -83,27 +83,26 @@ export const useLocalValue = <Type,>(savedValue: Type,onSave: (value: Type) => void) => {- const [localValue, setLocalValue] = useState(savedValue);+ const localValueRef = useRef(savedValue);- // Not using an effect to avoid re-rendering- // https://beta.reactjs.org/reference/react/useState#storing-information-from-previous-renders- const [previousSavedValue, setPreviousSavedValue] = useState(savedValue);- if (equal(previousSavedValue, savedValue) === false) {- setLocalValue(savedValue);- setPreviousSavedValue(savedValue);- }+ const [_, setRefresh] = useState(0);const save = () => {- if (equal(localValue, savedValue) === false) {- onSave(localValue);+ if (equal(localValueRef.current, savedValue) === false) {+ // To synchronize with setState immediately followed by save+ onSave(localValueRef.current);}};+ const setLocalValue = (value: Type) => {+ localValueRef.current = value;+ setRefresh((refresh) => refresh + 1);+ };+// onBlur will not trigger if control is unmounted when props panel is closed or similar.// So we're saving at the unmount- const saveRef = useRef(save);- saveRef.current = save;- useEffect(() => () => saveRef.current(), []);+ // eslint-disable-next-line react-hooks/exhaustive-deps+ useEffect(() => save, []);return {/**@@ -112,7 +111,7 @@ export const useLocalValue = <Type,>(* - or the latest value set via `set()`* (whichever changed most recently)*/- value: localValue,+ value: localValueRef.current,/*** Should be called on onChange or similar event*/