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: Allow reset optional items (#4759)

Ivan Starkov7f114f4b6942
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
index 88a0ba5247..36f2f19beb 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
@@ -68,7 +68,11 @@ const renderProperty = (
prop,
computedValue: propValues.get(propName) ?? meta.defaultValue,
propName,
- deletable: deletable ?? false,
+ deletable:
+ deletable ??
+ ((meta.defaultValue === undefined || meta.defaultValue !== prop?.value) &&
+ meta.required === false &&
+ prop !== undefined),
onDelete: () => {
if (prop) {
logic.handleDelete(prop);
diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsx
index 917dac0002..83ded69397 100644
--- a/packages/design-system/src/components/select.tsx
+++ b/packages/design-system/src/components/select.tsx
@@ -7,6 +7,8 @@ import {
useMemo,
forwardRef,
useState,
+ useEffect,
+ useRef,
} from "react";
import { styled, theme } from "../stitches.config";
import {
@@ -221,9 +223,23 @@ const SelectBase = <Option,>(
const descriptions = options.map((option) => getDescription?.(option));
+ // Allow reset select fix https://github.com/radix-ui/primitives/issues/2706
+ const [selectResetKeyFix, setSelectResetKeyFix] = useState(0);
+ const prevValue = useRef(value);
+
+ useEffect(() => {
+ if (prevValue.current !== undefined && value === undefined) {
+ setSelectResetKeyFix((prev) => prev + 1);
+ }
+
+ prevValue.current = value;
+ }, [value]);
+
return (
<Primitive.Root
+ key={selectResetKeyFix}
name={name}
+ // null because of https://github.com/radix-ui/primitives/issues/2706
value={value === undefined ? undefined : getValue(value)}
defaultValue={
defaultValue === undefined ? undefined : getValue(defaultValue)