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: prevent image delete when close image dialog (#2482)

Bogdan Chadkin46548ebfd4d1
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 a22824d01c..aeacdbeae7 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/file.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/file.tsx
@@ -13,17 +13,14 @@ type FileControlProps = ControlProps<"file", "asset" | "string">;
const UrlInput = ({
id,
- disabled,
localValue,
}: {
id: string;
- disabled: boolean;
- localValue: ReturnType<typeof useLocalValue<string>>;
+ localValue: ReturnType<typeof useLocalValue<undefined | string>>;
}) => (
<InputField
- disabled={disabled}
id={id}
- value={localValue.value}
+ value={localValue.value ?? ""}
placeholder="http://www.url.com"
onChange={(event) => localValue.set(event.target.value)}
onBlur={localValue.save}
@@ -53,9 +50,13 @@ export const FileControl = ({
const id = useId();
const localStringValue = useLocalValue(
- prop?.type === "string" ? prop.value : "",
+ // use undefined for asset type to not delete
+ // when url is reset by asset selector
+ prop?.type === "string" ? prop.value : undefined,
(value) => {
- if (value === "") {
+ if (value === undefined) {
+ return;
+ } else if (value === "") {
onSoftDelete();
} else {
onChange({ type: "string", value });
@@ -73,11 +74,7 @@ export const FileControl = ({
onDelete={onDelete}
>
<Row>
- <UrlInput
- id={id}
- disabled={prop?.type === "asset"}
- localValue={localStringValue}
- />
+ <UrlInput id={id} localValue={localStringValue} />
</Row>
<Row>
<SelectAsset
@@ -85,7 +82,6 @@ export const FileControl = ({
accept={meta.accept}
onChange={onChange}
onSoftDelete={onSoftDelete}
- disabled={localStringValue.value !== ""}
/>
</Row>
</VerticalLayout>
diff --git a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
index 2f5ff8b56b..5869c78866 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
@@ -27,7 +27,6 @@ type AssetControlProps = ControlProps<unknown, "asset">;
type Props = {
accept?: string;
- disabled?: boolean;
prop: AssetControlProps["prop"];
onChange: AssetControlProps["onChange"];
onSoftDelete: AssetControlProps["onSoftDelete"];
@@ -38,7 +37,6 @@ export const SelectAsset = ({
onChange,
onSoftDelete,
accept,
- disabled = false,
}: Props) => {
const assetStore = useMemo(
() =>
@@ -67,11 +65,11 @@ export const SelectAsset = ({
/>
}
>
- <Button color="neutral" css={{ flex: 1 }} disabled={disabled}>
+ <Button color="neutral" css={{ flex: 1 }}>
{asset?.name ?? "Choose source"}
</Button>
</FloatingPanel>
- {prop && disabled === false ? (
+ {prop ? (
<SmallIconButton
icon={<TrashIcon />}
onClick={onSoftDelete}