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.

Allow to delete width/height on Image (#1210)

Roman Pominov4d6921d0bd8c
diff --git a/apps/builder/app/builder/features/props-panel/controls/number.tsx b/apps/builder/app/builder/features/props-panel/controls/number.tsx
index 56a51c69ee..d96b4e3a1c 100644
--- a/apps/builder/app/builder/features/props-panel/controls/number.tsx
+++ b/apps/builder/app/builder/features/props-panel/controls/number.tsx
@@ -12,6 +12,7 @@ export const NumberControl = ({
propName,
onChange,
onDelete,
+ onSoftDelete,
}: ControlProps<"number", "number">) => {
const id = useId();
@@ -19,6 +20,9 @@ export const NumberControl = ({
if (typeof value === "number") {
onChange({ type: "number", value });
}
+ if (value === "") {
+ onSoftDelete();
+ }
});
return (
diff --git a/apps/builder/app/builder/features/props-panel/props-panel.tsx b/apps/builder/app/builder/features/props-panel/props-panel.tsx
index 5e7a573e50..e9d622a829 100644
--- a/apps/builder/app/builder/features/props-panel/props-panel.tsx
+++ b/apps/builder/app/builder/features/props-panel/props-panel.tsx
@@ -129,6 +129,7 @@ const Property = ({
component,
onChange,
onDelete,
+ onSoftDelete,
setCssProperty,
}: {
prop: Prop | undefined;
@@ -137,6 +138,7 @@ const Property = ({
component: Instance["component"];
onChange: (value: PropValue) => void;
onDelete?: () => void;
+ onSoftDelete: () => void;
setCssProperty: SetCssProperty;
}) =>
renderControl({
@@ -144,6 +146,7 @@ const Property = ({
prop,
propName,
onDelete,
+ onSoftDelete,
onChange: (propValue, asset) => {
onChange(propValue);
@@ -215,6 +218,7 @@ export const PropsPanel = ({
meta={meta}
component={component}
onChange={(value) => logic.handleChange({ prop, propName }, value)}
+ onSoftDelete={() => prop && logic.handleSoftDelete(prop)}
setCssProperty={setCssProperty}
/>
))}
@@ -247,6 +251,7 @@ export const PropsPanel = ({
logic.handleChange({ prop, propName }, value)
}
onDelete={() => logic.handleDelete({ prop, propName })}
+ onSoftDelete={() => prop && logic.handleSoftDelete(prop)}
setCssProperty={setCssProperty}
/>
))}
diff --git a/apps/builder/app/builder/features/props-panel/shared.tsx b/apps/builder/app/builder/features/props-panel/shared.tsx
index b50d8001fe..698a7cd71e 100644
--- a/apps/builder/app/builder/features/props-panel/shared.tsx
+++ b/apps/builder/app/builder/features/props-panel/shared.tsx
@@ -46,6 +46,10 @@ export type ControlProps<Control, PropType> = {
propName: string;
onChange: (value: PropValue, asset?: Asset) => void;
onDelete?: () => void;
+
+ // Should be called when we want to delete the prop,
+ // but want to keep it in the list until panel is closed
+ onSoftDelete: () => void;
};
export const getLabel = (meta: { label?: string }, fallback: string) =>
diff --git a/apps/builder/app/builder/features/props-panel/use-props-logic.ts b/apps/builder/app/builder/features/props-panel/use-props-logic.ts
index c732278f8d..6c4faff737 100644
--- a/apps/builder/app/builder/features/props-panel/use-props-logic.ts
+++ b/apps/builder/app/builder/features/props-panel/use-props-logic.ts
@@ -101,6 +101,10 @@ type UsePropsLogicOutput = {
handleAdd: (propName: string) => void;
handleChange: (prop: PropOrName, value: PropValue) => void;
handleDelete: (prop: PropOrName) => void;
+ /**
+ * Delete the prop, but keep it in the list of added props
+ */
+ handleSoftDelete: (prop: Prop) => void;
};
const getAndDelete = <Value>(map: Map<string, Value>, key: string) => {
@@ -216,6 +220,10 @@ export const usePropsLogic = ({
setNewNames((prev) => prev.filter((name) => propName !== name));
};
+ const handleSoftDelete = (prop: Prop) => {
+ deleteProp(prop.id);
+ };
+
return {
initialProps,
addedProps: [...oldAdded, ...newAdded],
@@ -225,5 +233,6 @@ export const usePropsLogic = ({
handleAdd,
handleChange,
handleDelete,
+ handleSoftDelete,
};
};