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.

refactor: allow show/hide options for filters and backdrop-filters (#3502)

Jaya Krishna Namburu7b860d16de88
diff --git a/apps/builder/app/builder/features/style-panel/style-layer-utils.ts b/apps/builder/app/builder/features/style-panel/style-layer-utils.ts
index dab2e2d801..3b9244ad31 100644
--- a/apps/builder/app/builder/features/style-panel/style-layer-utils.ts
+++ b/apps/builder/app/builder/features/style-panel/style-layer-utils.ts
@@ -11,10 +11,10 @@ import type {
StyleUpdateOptions,
} from "./shared/use-style-data";
-export const deleteLayer = <T extends TupleValue | LayersValue>(
+export const deleteLayer = <Layers extends TupleValue | LayersValue>(
property: StyleProperty,
index: number,
- layers: T,
+ layers: Layers,
createBatchUpdate: SectionProps["createBatchUpdate"]
) => {
const batch = createBatchUpdate();
@@ -41,34 +41,40 @@ export const deleteLayer = <T extends TupleValue | LayersValue>(
batch.publish();
};
-export const hideLayer = (
+export const hideLayer = <Layers extends LayersValue | TupleValue>(
property: StyleProperty,
index: number,
- layers: LayersValue,
+ layers: Layers,
createBatchUpdate: SectionProps["createBatchUpdate"]
) => {
- const batch = createBatchUpdate();
- const value = layers.value[index];
-
- if (value.type !== "tuple" && value.type !== "unparsed") {
+ if (layers.type !== "layers" && layers.type !== "tuple") {
return;
}
- const newLayers = [...layers.value];
- newLayers.splice(index, 1, {
- ...value,
- hidden: value.hidden !== true,
- });
- batch.setProperty(property)({
- type: "layers",
- value: newLayers,
+
+ const newLayersValue = layers.value.map((layer, layerIndex) => {
+ if (layerIndex !== index) {
+ return layer;
+ }
+
+ if (layer.type === "function" || layer.type === "tuple") {
+ return {
+ ...layer,
+ hidden: layer.hidden ? false : true,
+ } as Layers["value"][number];
+ }
});
+ const newLayers: Layers = JSON.parse(JSON.stringify(layers));
+ newLayers.value = newLayersValue as Layers["value"];
+
+ const batch = createBatchUpdate();
+ batch.setProperty(property)(newLayers);
batch.publish();
};
-export const addLayer = <T extends LayersValue | TupleValue>(
+export const addLayer = <Layers extends LayersValue | TupleValue>(
property: StyleProperty,
- value: T | InvalidValue,
+ value: Layers | InvalidValue,
style: StyleInfo,
createBatchUpdate: SectionProps["createBatchUpdate"]
) => {
@@ -81,7 +87,7 @@ export const addLayer = <T extends LayersValue | TupleValue>(
const existingValues = style[property]?.value;
if (existingValues?.type === "layers") {
- value.value = [...value.value, ...existingValues.value] as T["value"];
+ value.value = [...value.value, ...existingValues.value] as Layers["value"];
}
// Transitions come's with a default property of tuple. Which needs to be overwritten
@@ -94,7 +100,7 @@ export const addLayer = <T extends LayersValue | TupleValue>(
value.value = [
...value.value,
...(existingValues?.value || []),
- ] as T["value"];
+ ] as Layers["value"];
}
const batch = createBatchUpdate();
@@ -102,10 +108,10 @@ export const addLayer = <T extends LayersValue | TupleValue>(
batch.publish();
};
-export const updateLayer = <T extends LayersValue | TupleValue>(
+export const updateLayer = <Layers extends LayersValue | TupleValue>(
property: StyleProperty,
- newValue: T,
- oldValue: T,
+ newValue: Layers,
+ oldValue: Layers,
index: number,
createBatchUpdate: SectionProps["createBatchUpdate"],
options: StyleUpdateOptions
diff --git a/apps/builder/app/builder/features/style-panel/style-layers-list.tsx b/apps/builder/app/builder/features/style-panel/style-layers-list.tsx
index cb4ae28494..3e5e377eb7 100644
--- a/apps/builder/app/builder/features/style-panel/style-layers-list.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-layers-list.tsx
@@ -58,7 +58,8 @@ type LayerListProps = SectionProps & {
const extractPropertiesFromLayer = (layer: TupleValue | FunctionValue) => {
if (layer.type === "function") {
- return { name: toValue(layer), value: toValue(layer), color: undefined };
+ const value = `${layer.name}(${toValue(layer.args)})`;
+ return { name: value, value, color: undefined };
}
const name = [];
@@ -121,9 +122,6 @@ export const LayersList = ({
};
const handleHideLayer = (index: number) => {
- if (value.type === "tuple") {
- return;
- }
return hideLayer(property, index, value, createBatchUpdate);
};
@@ -146,9 +144,17 @@ export const LayersList = ({
<CssValueListArrowFocus dragItemId={dragItemId}>
<Flex direction="column" ref={sortableRefCallback}>
{value.value.map((layer, index) => {
- if (layer.type !== "tuple" && layer.type !== "function") {
+ // Because we are using a tuple or function to represent the layers,
+ // We use tuple for text-shadow and box-shadow properties
+ // and function for filter and backdrop-filter property
+
+ const isLayerATupleOrFunction =
+ layer.type === "tuple" || layer.type === "function";
+
+ if (isLayerATupleOrFunction === false) {
return;
}
+
const id = String(index);
const properties = extractPropertiesFromLayer(layer);
@@ -172,7 +178,10 @@ export const LayersList = ({
active={dragItemId === id}
index={index}
label={<Label truncate>{properties.name}</Label>}
- hidden={layer.type === "tuple" && layer?.hidden}
+ hidden={
+ (layer.type === "tuple" || layer.type === "function") &&
+ layer?.hidden
+ }
thumbnail={
property === "textShadow" || property === "boxShadow" ? (
<ColorThumb color={properties.color} />
@@ -180,7 +189,7 @@ export const LayersList = ({
}
buttons={
<>
- {layer.type === "tuple" ? (
+ {layer.type === "tuple" || layer.type === "function" ? (
<SmallToggleButton
variant="normal"
pressed={layer?.hidden}
@@ -199,7 +208,10 @@ export const LayersList = ({
<SmallIconButton
variant="destructive"
tabIndex={-1}
- disabled={layer.type === "tuple" && layer.hidden}
+ disabled={
+ (layer.type === "tuple" || layer.type === "function") &&
+ layer.hidden
+ }
icon={<SubtractIcon />}
onClick={() => handleDeleteLayer(index)}
/>
diff --git a/packages/css-engine/src/core/to-value.ts b/packages/css-engine/src/core/to-value.ts
index 5da38e1ad2..f29eb2b01b 100644
--- a/packages/css-engine/src/core/to-value.ts
+++ b/packages/css-engine/src/core/to-value.ts
@@ -84,7 +84,7 @@ export const toValue = (
}
if (value.type === "unparsed") {
- if (value.hidden) {
+ if (value.hidden === true) {
// We assume that property is background-image and use this to hide background layers
// In the future we might want to have a more generic way to hide values
// i.e. have knowledge about property-name, as none is property specific
@@ -113,6 +113,11 @@ export const toValue = (
}
if (value.type === "function") {
+ // Right now, we are using function-value only for filter and backdrop-filter functions
+ if (value.hidden === true) {
+ return "";
+ }
+
return `${value.name}(${toValue(value.args, transformValue)})`;
}
diff --git a/packages/css-engine/src/schema.ts b/packages/css-engine/src/schema.ts
index 57fb769adb..c257848fe8 100644
--- a/packages/css-engine/src/schema.ts
+++ b/packages/css-engine/src/schema.ts
@@ -60,10 +60,12 @@ export const FunctionValue: z.ZodType<{
type: "function";
name: string;
args: StyleValue;
+ hidden?: boolean;
}> = z.object({
type: z.literal("function"),
name: z.string(),
args: z.lazy(() => StyleValue),
+ hidden: z.boolean().optional(),
});
export const ImageValue = z.object({