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.

feat: disable reset button for non-expression binding (#2748)

Bogdan Chadkinad233d158d9a
diff --git a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
index bf07725d2a..060f9b987d 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
@@ -65,6 +65,7 @@ export const BooleanControl = ({
return `${label} expects a boolean value`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/check.tsx b/apps/builder/app/builder/features/settings-panel/controls/check.tsx
index c9d52ec230..b40bef3b8c 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/check.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/check.tsx
@@ -97,6 +97,7 @@ export const CheckControl = ({
return `${label} expects an array of strings`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
index e2bbbb0625..49c8c3d71d 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
@@ -72,6 +72,7 @@ export const CodeControl = ({
return `${label} expects a string value`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/file.tsx b/apps/builder/app/builder/features/settings-panel/controls/file.tsx
index a9b7ea7b00..1a955466e8 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/file.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/file.tsx
@@ -98,6 +98,7 @@ export const FileControl = ({
return `${label} expects a string value or file`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/json.tsx b/apps/builder/app/builder/features/settings-panel/controls/json.tsx
index fe355b16c9..56d53be208 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/json.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/json.tsx
@@ -66,6 +66,7 @@ export const JsonControl = ({
<BindingPopover
scope={scope}
aliases={aliases}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/number.tsx b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
index 072280abd5..514b8ae747 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/number.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
@@ -86,6 +86,7 @@ export const NumberControl = ({
return `${label} expects a number value`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/radio.tsx b/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
index 9673a08457..469dcd8902 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
@@ -83,6 +83,7 @@ export const RadioControl = ({
return `${label} expects one of ${options}`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/select.tsx b/apps/builder/app/builder/features/settings-panel/controls/select.tsx
index d6ba35d173..e36a19292f 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/select.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/select.tsx
@@ -80,6 +80,7 @@ export const SelectControl = ({
return `${label} expects one of ${options}`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text.tsx b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
index 7c6874973d..0f747ddd84 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
@@ -63,6 +63,7 @@ export const TextControl = ({
return `${label} expects a string value`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
index 3613aabd95..ab636088e5 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
@@ -503,6 +503,7 @@ export const UrlControl = ({
return `${label} expects a string value, page or file`;
}
}}
+ removable={prop?.type === "expression"}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
index 55ab97672a..f52e593a07 100644
--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
@@ -125,6 +125,7 @@ const HeaderPair = ({
<BindingPopover
scope={editorScope}
aliases={editorAliases}
+ removable={isLiteralExpression(value) === false}
value={value}
onChange={(newValue) => {
valueField.onChange(newValue);
@@ -384,6 +385,7 @@ export const ResourceForm = forwardRef<
<BindingPopover
scope={scope}
aliases={aliases}
+ removable={isLiteralExpression(urlField.value) === false}
value={urlField.value}
onChange={(value) => {
urlField.onChange(value);
@@ -439,6 +441,7 @@ export const ResourceForm = forwardRef<
<BindingPopover
scope={scope}
aliases={aliases}
+ removable={isLiteralExpression(bodyField.value) === false}
value={bodyField.value}
onChange={(value) => {
bodyField.onChange(value);
diff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsx
index 6a6761c076..9a68451861 100644
--- a/apps/builder/app/builder/shared/binding-popover.tsx
+++ b/apps/builder/app/builder/shared/binding-popover.tsx
@@ -285,6 +285,7 @@ export const BindingPopoverProvider = BindingPopoverContext.Provider;
export const BindingPopover = ({
scope,
aliases,
+ removable = true,
validate,
value,
onChange,
@@ -292,6 +293,7 @@ export const BindingPopover = ({
}: {
scope: Record<string, unknown>;
aliases: Map<string, string>;
+ removable?: boolean;
validate?: (value: unknown) => undefined | string;
value: string;
onChange: (newValue: string) => void;
@@ -369,6 +371,7 @@ export const BindingPopover = ({
aria-label="Reset binding"
prefix={<TrashIcon />}
color="ghost"
+ disabled={removable === false}
onClick={(event) => {
event.preventDefault();
// inline variables and close dialog
diff --git a/packages/design-system/src/components/text-area.tsx b/packages/design-system/src/components/text-area.tsx
index 3408c5641b..c631b0a1c3 100644
--- a/packages/design-system/src/components/text-area.tsx
+++ b/packages/design-system/src/components/text-area.tsx
@@ -31,6 +31,9 @@ const gridStyle = css({
borderColor: theme.colors.borderFocus,
outline: `1px solid ${theme.colors.borderFocus}`,
},
+ "&:has(textarea:disabled)": {
+ background: theme.colors.backgroundInputDisabled,
+ },
variants: {
autoGrow: {
true: {
@@ -76,7 +79,6 @@ const commonStyle = css({
},
"&:disabled": {
color: theme.colors.foregroundDisabled,
- background: theme.colors.backgroundInputDisabled,
},
variants: {
variant: {