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: support bound and overwritten binding button variants (#2769)

Bogdan Chadkina21b5eb9845e
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 060f9b987d..e351c6bea5 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
@@ -11,6 +11,7 @@ import {
RemovePropButton,
$selectedInstanceScope,
updateExpressionValue,
+ useBindingState,
} from "../shared";
export const BooleanControl = ({
@@ -19,7 +20,6 @@ export const BooleanControl = ({
propName,
computedValue,
deletable,
- readOnly,
onChange,
onDelete,
}: ControlProps<"boolean">) => {
@@ -28,6 +28,9 @@ export const BooleanControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<Grid
@@ -41,13 +44,17 @@ export const BooleanControl = ({
align="center"
gap="2"
>
- <Label htmlFor={id} description={meta.description} readOnly={readOnly}>
+ <Label
+ htmlFor={id}
+ description={meta.description}
+ readOnly={overwritable === false}
+ >
{label}
</Label>
<BindingControl>
<Switch
id={id}
- disabled={readOnly}
+ disabled={overwritable === false}
checked={Boolean(computedValue ?? false)}
onCheckedChange={(value) => {
if (prop?.type === "expression") {
@@ -65,7 +72,7 @@ export const BooleanControl = ({
return `${label} expects a boolean value`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
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 b40bef3b8c..d6fc5573af 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/check.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/check.tsx
@@ -12,6 +12,7 @@ import {
Label,
$selectedInstanceScope,
updateExpressionValue,
+ useBindingState,
} from "../shared";
const add = (array: string[], item: string) => {
@@ -34,7 +35,6 @@ export const CheckControl = ({
propName,
computedValue,
deletable,
- readOnly,
onChange,
onDelete,
}: ControlProps<"check" | "inline-check" | "multi-select">) => {
@@ -50,6 +50,9 @@ export const CheckControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<VerticalLayout
@@ -57,7 +60,7 @@ export const CheckControl = ({
<Label
htmlFor={`${id}:${options[0]}`}
description={meta.description}
- readOnly={readOnly}
+ readOnly={overwritable === false}
>
{label}
</Label>
@@ -69,7 +72,7 @@ export const CheckControl = ({
{options.map((option) => (
<CheckboxAndLabel key={option}>
<Checkbox
- disabled={readOnly}
+ disabled={overwritable === false}
checked={value.includes(option)}
onCheckedChange={(checked) => {
const newValue = checked
@@ -97,7 +100,7 @@ export const CheckControl = ({
return `${label} expects an array of strings`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
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 49c8c3d71d..32f27ef652 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
@@ -12,6 +12,7 @@ import {
Label,
updateExpressionValue,
$selectedInstanceScope,
+ useBindingState,
} from "../shared";
export const CodeControl = ({
@@ -20,7 +21,6 @@ export const CodeControl = ({
propName,
computedValue,
deletable,
- readOnly,
onChange,
onDelete,
}: ControlProps<"code">) => {
@@ -46,11 +46,17 @@ export const CodeControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<VerticalLayout
label={
- <Label description={metaOverride.description} readOnly={readOnly}>
+ <Label
+ description={metaOverride.description}
+ readOnly={overwritable === false}
+ >
{label}
</Label>
}
@@ -59,7 +65,7 @@ export const CodeControl = ({
>
<BindingControl>
<HtmlEditor
- readOnly={readOnly}
+ readOnly={overwritable === false}
value={localValue.value}
onChange={localValue.set}
onBlur={localValue.save}
@@ -72,7 +78,7 @@ export const CodeControl = ({
return `${label} expects a string value`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
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 1a955466e8..1b41c07ee7 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/file.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/file.tsx
@@ -13,6 +13,7 @@ import {
Label,
updateExpressionValue,
$selectedInstanceScope,
+ useBindingState,
} from "../shared";
import { SelectAsset } from "./select-asset";
@@ -46,7 +47,6 @@ export const FileControl = ({
prop,
propName,
computedValue,
- readOnly,
deletable,
onChange,
onDelete,
@@ -76,6 +76,9 @@ export const FileControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<VerticalLayout
@@ -89,7 +92,11 @@ export const FileControl = ({
>
<Flex css={{ gap: theme.spacing[3] }} direction="column" justify="center">
<BindingControl>
- <UrlInput id={id} readOnly={readOnly} localValue={localStringValue} />
+ <UrlInput
+ id={id}
+ readOnly={overwritable === false}
+ localValue={localStringValue}
+ />
<BindingPopover
scope={scope}
aliases={aliases}
@@ -98,7 +105,7 @@ export const FileControl = ({
return `${label} expects a string value or file`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
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 56d53be208..52aa2b35ec 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/json.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/json.tsx
@@ -7,6 +7,7 @@ import {
Label,
updateExpressionValue,
$selectedInstanceScope,
+ useBindingState,
} from "../shared";
import {
ExpressionEditor,
@@ -23,7 +24,6 @@ export const JsonControl = ({
propName,
computedValue,
deletable,
- readOnly,
onChange,
onDelete,
}: ControlProps<"json">) => {
@@ -45,11 +45,14 @@ export const JsonControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression = prop?.type === "expression" ? prop.value : valueString;
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<VerticalLayout
label={
- <Label description={meta.description} readOnly={readOnly}>
+ <Label description={meta.description} readOnly={overwritable === false}>
{label}
</Label>
}
@@ -58,7 +61,7 @@ export const JsonControl = ({
>
<BindingControl>
<ExpressionEditor
- readOnly={readOnly}
+ readOnly={overwritable === false}
value={localValue.value}
onChange={localValue.set}
onBlur={localValue.save}
@@ -66,7 +69,7 @@ export const JsonControl = ({
<BindingPopover
scope={scope}
aliases={aliases}
- removable={prop?.type === "expression"}
+ variant={variant}
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 514b8ae747..38076d8233 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/number.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
@@ -13,6 +13,7 @@ import {
Label,
updateExpressionValue,
$selectedInstanceScope,
+ useBindingState,
} from "../shared";
export const NumberControl = ({
@@ -22,7 +23,6 @@ export const NumberControl = ({
computedValue,
onChange,
deletable,
- readOnly,
onDelete,
}: ControlProps<"number">) => {
const id = useId();
@@ -49,11 +49,18 @@ export const NumberControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<ResponsiveLayout
label={
- <Label htmlFor={id} description={meta.description} readOnly={readOnly}>
+ <Label
+ htmlFor={id}
+ description={meta.description}
+ readOnly={overwritable === false}
+ >
{label}
</Label>
}
@@ -63,7 +70,7 @@ export const NumberControl = ({
<BindingControl>
<InputField
id={id}
- disabled={readOnly}
+ disabled={overwritable === false}
type="number"
value={localValue.value}
color={isInvalid ? "error" : undefined}
@@ -86,7 +93,7 @@ export const NumberControl = ({
return `${label} expects a number value`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
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 469dcd8902..6de785359a 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
@@ -13,6 +13,7 @@ import {
Label,
$selectedInstanceScope,
updateExpressionValue,
+ useBindingState,
} from "../shared";
export const RadioControl = ({
@@ -21,7 +22,6 @@ export const RadioControl = ({
propName,
computedValue,
deletable,
- readOnly,
onChange,
onDelete,
}: ControlProps<"radio" | "inline-radio">) => {
@@ -37,11 +37,18 @@ export const RadioControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<VerticalLayout
label={
- <Label htmlFor={id} description={meta.description} readOnly={readOnly}>
+ <Label
+ htmlFor={id}
+ description={meta.description}
+ readOnly={overwritable === false}
+ >
{label}
</Label>
}
@@ -50,7 +57,7 @@ export const RadioControl = ({
>
<BindingControl>
<RadioGroup
- disabled={readOnly}
+ disabled={overwritable === false}
name="value"
value={value}
onValueChange={(value) => {
@@ -83,7 +90,7 @@ export const RadioControl = ({
return `${label} expects one of ${options}`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
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 e36a19292f..7819588ecc 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/select.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/select.tsx
@@ -13,6 +13,7 @@ import {
Label,
$selectedInstanceScope,
updateExpressionValue,
+ useBindingState,
} from "../shared";
export const SelectControl = ({
@@ -21,7 +22,6 @@ export const SelectControl = ({
propName,
computedValue,
deletable,
- readOnly,
onChange,
onDelete,
}: ControlProps<"select">) => {
@@ -38,11 +38,18 @@ export const SelectControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<VerticalLayout
label={
- <Label htmlFor={id} description={meta.description} readOnly={readOnly}>
+ <Label
+ htmlFor={id}
+ description={meta.description}
+ readOnly={overwritable === false}
+ >
{label}
</Label>
}
@@ -53,7 +60,7 @@ export const SelectControl = ({
<Select
fullWidth
id={id}
- disabled={readOnly}
+ disabled={overwritable === false}
value={value}
options={options}
getLabel={humanizeString}
@@ -80,7 +87,7 @@ export const SelectControl = ({
return `${label} expects one of ${options}`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
index e202b6198e..ba16b134a2 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
@@ -2,8 +2,8 @@ import { useId, useMemo } from "react";
import { useStore } from "@nanostores/react";
import { computed } from "nanostores";
import { TextArea } from "@webstudio-is/design-system";
-import type { DataSources, Instance } from "@webstudio-is/sdk";
-import { $dataSources, $instances } from "~/shared/nano-states";
+import type { Instance } from "@webstudio-is/sdk";
+import { $instances } from "~/shared/nano-states";
import { serverSyncStore } from "~/shared/sync";
import {
BindingControl,
@@ -17,8 +17,8 @@ import {
$selectedInstanceScope,
Label,
updateExpressionValue,
+ useBindingState,
} from "../shared";
-import { decodeDataSourceVariable } from "@webstudio-is/react-sdk";
const useInstance = (instanceId: Instance["id"]) => {
const $store = useMemo(() => {
@@ -41,14 +41,6 @@ const updateChildren = (
});
};
-const isVariableIdentifier = (expression: string, dataSources: DataSources) => {
- const potentialVariableId = decodeDataSourceVariable(expression);
- return (
- potentialVariableId !== undefined &&
- dataSources.get(potentialVariableId)?.type === "variable"
- );
-};
-
export const TextContent = ({
instanceId,
meta,
@@ -77,16 +69,18 @@ export const TextContent = ({
expression = child.value;
}
- const dataSources = useStore($dataSources);
- // allow editiing single variable expression
- const readOnly =
- child.type === "expression" &&
- isVariableIdentifier(child.value, dataSources) === false;
+ const { overwritable, variant } = useBindingState(
+ child.type === "expression" ? child.value : undefined
+ );
return (
<VerticalLayout
label={
- <Label htmlFor={id} description={meta.description} readOnly={readOnly}>
+ <Label
+ htmlFor={id}
+ description={meta.description}
+ readOnly={overwritable === false}
+ >
{label}
</Label>
}
@@ -96,7 +90,7 @@ export const TextContent = ({
<BindingControl>
<TextArea
id={id}
- disabled={readOnly}
+ disabled={overwritable === false}
autoGrow
value={localValue.value}
rows={1}
@@ -113,7 +107,7 @@ export const TextContent = ({
return `${label} expects a string value`;
}
}}
- removable={child.type === "expression"}
+ variant={variant}
value={expression}
onChange={(newExpression) => {
updateChildren(instanceId, "expression", 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 0f747ddd84..d7c764db58 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
@@ -13,6 +13,7 @@ import {
Label,
updateExpressionValue,
$selectedInstanceScope,
+ useBindingState,
} from "../shared";
export const TextControl = ({
@@ -21,7 +22,6 @@ export const TextControl = ({
propName,
deletable,
computedValue,
- readOnly,
onChange,
onDelete,
}: ControlProps<"text">) => {
@@ -40,12 +40,15 @@ export const TextControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
const input = (
<BindingControl>
<TextArea
id={id}
- disabled={readOnly}
+ disabled={overwritable === false}
autoGrow
value={localValue.value}
rows={meta.rows ?? 1}
@@ -63,7 +66,7 @@ export const TextControl = ({
return `${label} expects a string value`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
@@ -76,7 +79,11 @@ export const TextControl = ({
);
const labelElement = (
- <Label htmlFor={id} description={meta.description} readOnly={readOnly}>
+ <Label
+ htmlFor={id}
+ description={meta.description}
+ readOnly={overwritable === false}
+ >
{label}
</Label>
);
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 ab636088e5..c6c41a4e69 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
@@ -33,6 +33,7 @@ import {
Label,
updateExpressionValue,
$selectedInstanceScope,
+ useBindingState,
} from "../shared";
import { SelectAsset } from "./select-asset";
@@ -428,7 +429,6 @@ export const UrlControl = ({
prop,
propName,
computedValue,
- readOnly,
deletable,
onChange,
onDelete,
@@ -447,6 +447,9 @@ export const UrlControl = ({
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
+ const { overwritable, variant } = useBindingState(
+ prop?.type === "expression" ? prop.value : undefined
+ );
return (
<VerticalLayout
@@ -469,7 +472,7 @@ export const UrlControl = ({
>
<ToggleGroup
type="single"
- disabled={readOnly}
+ disabled={overwritable === false}
value={mode}
onValueChange={(value) => {
// too tricky to prove to TS that value is a Mode
@@ -489,7 +492,7 @@ export const UrlControl = ({
<BaseControl
id={id}
instanceId={instanceId}
- readOnly={readOnly}
+ readOnly={overwritable === false}
prop={prop}
value={value}
onChange={onChange}
@@ -503,7 +506,7 @@ export const UrlControl = ({
return `${label} expects a string value, page or file`;
}
}}
- removable={prop?.type === "expression"}
+ variant={variant}
value={expression}
onChange={(newExpression) =>
onChange({ type: "expression", value: newExpression })
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 7dce70cac5..1521a56862 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
@@ -96,7 +96,7 @@ const renderProperty = (
component,
instanceId,
}: PropsSectionProps,
- { prop, propName, meta, readOnly }: PropAndMeta,
+ { prop, propName, meta }: PropAndMeta,
deletable?: boolean
) =>
renderControl({
@@ -106,7 +106,6 @@ const renderProperty = (
prop,
computedValue: propValues.get(propName) ?? meta.defaultValue,
propName,
- readOnly,
deletable: deletable ?? false,
onDelete: () => {
if (prop) {
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
index a26831f651..a17e103fbd 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
@@ -3,14 +3,12 @@ import type { Instance, Prop } from "@webstudio-is/sdk";
import {
type PropMeta,
showAttribute,
- decodeDataSourceVariable,
textContentAttribute,
collectionComponent,
} from "@webstudio-is/react-sdk";
import type { PropValue } from "../shared";
import { useStore } from "@nanostores/react";
import {
- $dataSources,
$registeredComponentMetas,
$registeredComponentPropsMetas,
} from "~/shared/nano-states";
@@ -20,7 +18,6 @@ export type PropAndMeta = {
prop?: Prop;
propName: string;
meta: PropMeta;
- readOnly: boolean;
};
export type NameAndLabel = { name: string; label?: string };
@@ -153,7 +150,6 @@ export const usePropsLogic = ({
instance.component
);
const meta = useStore($registeredComponentPropsMetas).get(instance.component);
- const dataSources = useStore($dataSources);
if (meta === undefined) {
throw new Error(`Could not get meta for component "${instance.component}"`);
@@ -169,20 +165,6 @@ export const usePropsLogic = ({
const initialPropsNames = new Set(meta.initialProps ?? []);
- /**
- * make sure expression can be edited if consists only of single variable
- */
- const isReadOnly = (prop?: Prop) => {
- if (prop?.type !== "expression") {
- return false;
- }
- const potentialVariableId = decodeDataSourceVariable(prop.value);
- return (
- potentialVariableId === undefined ||
- dataSources.get(potentialVariableId)?.type !== "variable"
- );
- };
-
const systemProps: PropAndMeta[] = systemPropsMeta.map(({ name, meta }) => {
let saved = getAndDelete<Prop>(unprocessedSaved, name);
if (saved === undefined && meta.defaultValue !== undefined) {
@@ -194,7 +176,6 @@ export const usePropsLogic = ({
prop: saved,
propName: name,
meta,
- readOnly: isReadOnly(saved),
};
});
const canHaveTextContent =
@@ -219,7 +200,6 @@ export const usePropsLogic = ({
type: "string",
defaultValue: "",
},
- readOnly: false,
});
}
@@ -255,7 +235,6 @@ export const usePropsLogic = ({
prop,
propName: name,
meta: known,
- readOnly: isReadOnly(prop),
});
}
@@ -280,7 +259,6 @@ export const usePropsLogic = ({
prop,
propName: prop.name,
meta: known,
- readOnly: isReadOnly(prop),
});
}
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 f52e593a07..b8bd2bb0a0 100644
--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
@@ -125,7 +125,7 @@ const HeaderPair = ({
<BindingPopover
scope={editorScope}
aliases={editorAliases}
- removable={isLiteralExpression(value) === false}
+ variant={isLiteralExpression(value) ? "default" : "bound"}
value={value}
onChange={(newValue) => {
valueField.onChange(newValue);
@@ -385,7 +385,7 @@ export const ResourceForm = forwardRef<
<BindingPopover
scope={scope}
aliases={aliases}
- removable={isLiteralExpression(urlField.value) === false}
+ variant={isLiteralExpression(urlField.value) ? "default" : "bound"}
value={urlField.value}
onChange={(value) => {
urlField.onChange(value);
@@ -441,7 +441,9 @@ export const ResourceForm = forwardRef<
<BindingPopover
scope={scope}
aliases={aliases}
- removable={isLiteralExpression(bodyField.value) === false}
+ variant={
+ isLiteralExpression(bodyField.value) ? "default" : "bound"
+ }
value={bodyField.value}
onChange={(value) => {
bodyField.onChange(value);
diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsx
index 766105471f..a9d4bee361 100644
--- a/apps/builder/app/builder/features/settings-panel/shared.tsx
+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx
@@ -1,10 +1,12 @@
-import { computed } from "nanostores";
+import { atom, computed, type ReadableAtom } from "nanostores";
+import { useStore } from "@nanostores/react";
import {
type ComponentPropsWithoutRef,
type ReactNode,
useRef,
useState,
useEffect,
+ useMemo,
} from "react";
import equal from "fast-deep-equal";
import {
@@ -34,6 +36,7 @@ import {
$selectedInstanceSelector,
$variableValuesByInstanceSelector,
} from "~/shared/nano-states";
+import type { BindingVariant } from "~/builder/shared/binding-popover";
export type PropValue =
| { type: "number"; value: number }
@@ -61,7 +64,6 @@ export type ControlProps<Control> = {
propName: string;
computedValue: unknown;
deletable: boolean;
- readOnly: boolean;
onChange: (value: PropValue, asset?: Asset) => void;
onDelete: () => void;
};
@@ -333,3 +335,40 @@ export const updateExpressionValue = (expression: string, value: unknown) => {
$dataSourceVariables.set(dataSourceVariables);
}
};
+
+export const useBindingState = (expression: undefined | string) => {
+ const $bindingState = useMemo((): ReadableAtom<{
+ overwritable: boolean;
+ variant: BindingVariant;
+ }> => {
+ if (expression === undefined) {
+ // value is not bound to expression and can be updated
+ return atom({ overwritable: true, variant: "default" });
+ }
+ // try to extract variable id from expression
+ const potentialVariableId = decodeDataSourceVariable(expression);
+ if (potentialVariableId === undefined) {
+ // expression is complex and cannot be updated
+ return atom({ overwritable: false, variant: "bound" });
+ }
+ return computed(
+ [$dataSources, $dataSourceVariables],
+ (dataSources, dataSourceVariables) => {
+ const dataSource = dataSources.get(potentialVariableId);
+ // resources and parameters cannot be updated
+ if (dataSource?.type !== "variable") {
+ return { overwritable: false, variant: "bound" };
+ }
+ const variableId = potentialVariableId;
+ return {
+ overwritable: true,
+ variant:
+ dataSourceVariables.get(variableId) === undefined
+ ? "bound"
+ : "overwritten",
+ };
+ }
+ );
+ }, [expression]);
+ return useStore($bindingState);
+};
diff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsx
index 9a68451861..29fc557587 100644
--- a/apps/builder/app/builder/shared/binding-popover.tsx
+++ b/apps/builder/app/builder/shared/binding-popover.tsx
@@ -10,12 +10,13 @@ import {
type ReactNode,
} from "react";
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
-import { DotIcon, PlusIcon, TrashIcon } from "@webstudio-is/icons";
+import { DotIcon, PlusIcon, ResetIcon, TrashIcon } from "@webstudio-is/icons";
import {
Box,
Button,
CssValueListArrowFocus,
CssValueListItem,
+ Flex,
FloatingPanelPopover,
FloatingPanelPopoverClose,
FloatingPanelPopoverContent,
@@ -25,12 +26,17 @@ import {
Label,
ScrollArea,
SmallIconButton,
+ Text,
Tooltip,
theme,
} from "@webstudio-is/design-system";
-import { validateExpression } from "@webstudio-is/react-sdk";
+import {
+ decodeDataSourceVariable,
+ validateExpression,
+} from "@webstudio-is/react-sdk";
import { ExpressionEditor, formatValuePreview } from "./expression-editor";
import { useSideOffset } from "./floating-panel";
+import { $dataSourceVariables } from "~/shared/nano-states";
export const evaluateExpressionWithinScope = (
expression: string,
@@ -207,18 +213,47 @@ export const BindingControl = ({ children }: { children: ReactNode }) => {
);
};
+export type BindingVariant = "default" | "bound" | "overwritten";
+
const BindingButton = forwardRef<
HTMLButtonElement,
- ButtonHTMLAttributes<HTMLButtonElement> & { error?: string }
->(({ error, ...props }, ref) => {
+ ButtonHTMLAttributes<HTMLButtonElement> & {
+ variant: BindingVariant;
+ error?: string;
+ value: string;
+ }
+>(({ variant, error, value, ...props }, ref) => {
const expanded = props["aria-expanded"];
+ const overwrittenMessage =
+ variant === "overwritten" ? (
+ <Flex direction="column" gap="2" css={{ maxWidth: theme.spacing[28] }}>
+ <Text>Bound variable is overwritten with temporary value</Text>
+ <Button
+ color="dark"
+ prefix={<ResetIcon />}
+ css={{ flexGrow: 1 }}
+ onClick={() => {
+ const potentialVariableId = decodeDataSourceVariable(value);
+ const dataSourceVariables = new Map($dataSourceVariables.get());
+ if (potentialVariableId !== undefined) {
+ dataSourceVariables.delete(potentialVariableId);
+ $dataSourceVariables.set(dataSourceVariables);
+ }
+ }}
+ >
+ Reset value
+ </Button>
+ </Flex>
+ ) : undefined;
+ const tooltipContent = error ?? overwrittenMessage;
return (
// prevent giving content to tooltip when popover is open
// to avoid button remounting and popover flickering
// when switch between valid and error value
- <Tooltip content={expanded ? undefined : error} delayDuration={0}>
+ <Tooltip content={expanded ? undefined : tooltipContent} delayDuration={0}>
<SmallIconButton
ref={ref}
+ data-variant={variant}
css={{
// hide by default
opacity: `var(${bindingOpacityProperty}, 0)`,
@@ -233,6 +268,9 @@ const BindingButton = forwardRef<
transitionTimingFunction: "cubic-bezier(0.37, 0, 0.63, 1)",
"--dot-display": "block",
"--plus-display": "none",
+ "&[data-variant=bound], &[data-variant=overwritten]": {
+ opacity: 1,
+ },
"&:hover, &:focus-visible, &[aria-expanded=true]": {
// always show when interacted with
opacity: 1,
@@ -248,15 +286,21 @@ const BindingButton = forwardRef<
width: 12,
height: 12,
borderRadius: "50%",
- backgroundColor: "#834DF4",
+ backgroundColor: theme.colors.backgroundStyleSourceToken,
display: "flex",
justifyContent: "center",
alignItems: "center",
+ "&[data-variant=bound]": {
+ backgroundColor: theme.colors.backgroundStyleSourceLocal,
+ },
+ "&[data-variant=overwritten]": {
+ backgroundColor: theme.colors.borderOverwrittenMain,
+ },
"&[data-variant=error]": {
backgroundColor: theme.colors.backgroundDestructiveMain,
},
}}
- data-variant={error ? "error" : "default"}
+ data-variant={error ? "error" : variant}
>
<DotIcon
size={14}
@@ -285,7 +329,7 @@ export const BindingPopoverProvider = BindingPopoverContext.Provider;
export const BindingPopover = ({
scope,
aliases,
- removable = true,
+ variant,
validate,
value,
onChange,
@@ -293,7 +337,7 @@ export const BindingPopover = ({
}: {
scope: Record<string, unknown>;
aliases: Map<string, string>;
- removable?: boolean;
+ variant: BindingVariant;
validate?: (value: unknown) => undefined | string;
value: string;
onChange: (newValue: string) => void;
@@ -328,7 +372,7 @@ export const BindingPopover = ({
}}
>
<FloatingPanelPopoverTrigger asChild ref={triggerRef}>
- <BindingButton error={valueError} />
+ <BindingButton variant={variant} error={valueError} value={value} />
</FloatingPanelPopoverTrigger>
<FloatingPanelPopoverContent
sideOffset={sideOffset}
@@ -371,7 +415,7 @@ export const BindingPopover = ({
aria-label="Reset binding"
prefix={<TrashIcon />}
color="ghost"
- disabled={removable === false}
+ disabled={variant === "default"}
onClick={(event) => {
event.preventDefault();
// inline variables and close dialog