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-breakpoints (#2065)
Ivan Starkovc37f99c49032
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsxindex aad0098f96..c0370d0b9c 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx@@ -13,6 +13,7 @@ import {PopoverSeparator,Separator,Box,+ toast,} from "@webstudio-is/design-system";import { MinusIcon, PlusIcon } from "@webstudio-is/icons";import { breakpointsStore } from "~/shared/nano-states";@@ -38,31 +39,45 @@ const useHandleChangeComplete = (onChangeComplete: (breakpoint: Breakpoint) => void) => {const formRef = useRef<HTMLFormElement>(null);- const handleChangeComplete = () => {+ const [formEntries, setFormEntries] =+ useState<Record<string, FormDataEntryValue>>();++ /**+ * Read form data using onChange event so we can access values at useEffect unsubscribe+ */+ const handleChange = () => {const form = formRef.current;if (form === null || form.reportValidity() === false) {return;}- const parsed = BreakpointFormData.safeParse(- Object.fromEntries(new FormData(form))- );- // Should never be not successful because the html validator should catch it- if (parsed.success) {- const newBreakpoint: Breakpoint = {- id: breakpoint.id,- label: parsed.data.label,- [parsed.data.type]: parsed.data.value,- };- onChangeComplete(newBreakpoint);+ setFormEntries(Object.fromEntries(new FormData(form)));+ };++ const handleChangeComplete = () => {+ if (formEntries === undefined) {+ return;+ }++ const parsed = BreakpointFormData.safeParse(formEntries);+ if (parsed.success === false) {+ toast.error(parsed.error.message);+ return;}++ const newBreakpoint: Breakpoint = {+ id: breakpoint.id,+ label: parsed.data.label,+ [parsed.data.type]: parsed.data.value,+ };+ onChangeComplete(newBreakpoint);};const handleChangeCompleteRef = useRef(handleChangeComplete);handleChangeCompleteRef.current = handleChangeComplete;- // Handle change when unmounting+ // Handle change when unmounting (Popup close in our case)useEffect(() => handleChangeCompleteRef.current, []);- return { formRef, handleChangeComplete };+ return { formRef, handleChangeComplete, handleChange };};const BreakpointEditorItem = ({@@ -71,10 +86,9 @@ const BreakpointEditorItem = ({onChangeComplete,onDelete,}: BreakpointEditorItemProps) => {- const { formRef, handleChangeComplete } = useHandleChangeComplete(- breakpoint,- onChangeComplete- );+ const { formRef, handleChangeComplete, handleChange } =+ useHandleChangeComplete(breakpoint, onChangeComplete);+return (<Flex gap="2" css={{ mx: theme.spacing[7] }}><form@@ -89,11 +103,12 @@ const BreakpointEditorItem = ({handleChangeComplete();}}onBlur={handleChangeComplete}+ onChange={handleChange}><Flex direction="column" gap="1"><InputFieldtype="text"- defaultValue={breakpoint.minWidth ?? breakpoint.maxWidth ?? 0}+ defaultValue={breakpoint.label}placeholder="Breakpoint name"name="label"minLength={1}diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsxindex 363251e909..0dd5aa376b 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx@@ -175,9 +175,7 @@ export const BreakpointsPopover = () => {css={{ flexGrow: 1, textAlign: "left" }}as="span">- {breakpoint.minWidth ??- breakpoint.maxWidth ??- "Base"}+ {breakpoint.label}</Box><PopoverMenuItemRightSlotcss={{ color: theme.colors.foregroundSubtle }}