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: Move css filter properties to be used as tuples instead of layers in the data-layer (#3247)

Jaya Krishna Namburue0941ac34928
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadows.tsx b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadows.tsx
index 283bdd7c9f..12c44ffba9 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadows.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadows.tsx
@@ -4,7 +4,11 @@ import {
SectionTitleLabel,
} from "@webstudio-is/design-system";
import { PlusIcon } from "@webstudio-is/icons";
-import type { StyleProperty, TupleValue } from "@webstudio-is/css-engine";
+import type {
+ LayersValue,
+ StyleProperty,
+ TupleValue,
+} from "@webstudio-is/css-engine";
import { CollapsibleSectionRoot } from "~/builder/shared/collapsible-section";
import { useState } from "react";
import { getDots } from "../../shared/collapsible-section";
@@ -68,7 +72,7 @@ export const Section = (props: SectionProps) => {
}
>
{value?.type === "layers" && value.value.length > 0 && (
- <LayersList<TupleValue>
+ <LayersList<TupleValue, LayersValue>
property={property}
layers={value}
{...props}
diff --git a/apps/builder/app/builder/features/style-panel/sections/filter/filter-content.tsx b/apps/builder/app/builder/features/style-panel/sections/filter/filter-content.tsx
index b34c6f7dec..90c61a455c 100644
--- a/apps/builder/app/builder/features/style-panel/sections/filter/filter-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/filter/filter-content.tsx
@@ -1,4 +1,8 @@
-import type { InvalidValue, LayersValue } from "@webstudio-is/css-engine";
+import type {
+ InvalidValue,
+ LayersValue,
+ TupleValue,
+} from "@webstudio-is/css-engine";
import {
Flex,
theme,
@@ -17,7 +21,7 @@ import type { DeleteProperty } from "../../shared/use-style-data";
type FilterContentProps = {
index: number;
filter: string;
- onEditLayer: (index: number, layers: LayersValue) => void;
+ onEditLayer: (index: number, layers: LayersValue | TupleValue) => void;
deleteProperty: DeleteProperty;
};
@@ -98,10 +102,7 @@ export const FilterSectionContent = ({
css={{ minHeight: theme.spacing[14], ...textVariants.mono }}
state={intermediateValue?.type === "invalid" ? "invalid" : undefined}
onChange={handleChange}
- onBlur={handleComplete}
onKeyDown={(event) => {
- event.stopPropagation();
-
if (event.key === "Enter") {
handleComplete();
// On pressing Enter, the textarea is creating a new line.
diff --git a/apps/builder/app/builder/features/style-panel/sections/filter/filter.tsx b/apps/builder/app/builder/features/style-panel/sections/filter/filter.tsx
index 04cfe2f1ed..9db09ede1c 100644
--- a/apps/builder/app/builder/features/style-panel/sections/filter/filter.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/filter/filter.tsx
@@ -10,7 +10,11 @@ import {
import { getDots } from "../../shared/collapsible-section";
import { PropertyName } from "../../shared/property-name";
import { PlusIcon } from "@webstudio-is/icons";
-import { FunctionValue, type StyleProperty } from "@webstudio-is/css-engine";
+import {
+ FunctionValue,
+ TupleValue,
+ type StyleProperty,
+} from "@webstudio-is/css-engine";
import { getStyleSource } from "../../shared/style-info";
import { LayersList } from "../../style-layers-list";
import { FilterLayer } from "./filter-layer";
@@ -70,8 +74,8 @@ export const Section = (props: SectionProps) => {
</SectionTitle>
}
>
- {value?.type === "layers" && value.value.length > 0 && (
- <LayersList<FunctionValue>
+ {value?.type === "tuple" && value.value.length > 0 && (
+ <LayersList<FunctionValue, TupleValue>
{...props}
property={property}
layers={value}
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsx
index fdd68f1936..d9829b732d 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsx
@@ -1,4 +1,8 @@
-import type { StyleProperty, TupleValue } from "@webstudio-is/css-engine";
+import type {
+ LayersValue,
+ StyleProperty,
+ TupleValue,
+} from "@webstudio-is/css-engine";
import { CollapsibleSectionRoot } from "~/builder/shared/collapsible-section";
import type { SectionProps } from "../shared/section";
import {
@@ -88,7 +92,7 @@ export const Section = (props: SectionProps) => {
}
>
{value?.type === "layers" && value.value.length > 0 && (
- <LayersList<TupleValue>
+ <LayersList<TupleValue, LayersValue>
property={property}
layers={value}
{...props}
diff --git a/apps/builder/app/builder/features/style-panel/style-layer-utils.test.ts b/apps/builder/app/builder/features/style-panel/style-layer-utils.test.ts
index d75d562033..4707884ff5 100644
--- a/apps/builder/app/builder/features/style-panel/style-layer-utils.test.ts
+++ b/apps/builder/app/builder/features/style-panel/style-layer-utils.test.ts
@@ -1,9 +1,9 @@
import { afterEach, describe, expect, test } from "@jest/globals";
-import type {
- LayersValue,
- StyleProperty,
- StyleValue,
- TupleValue,
+import {
+ type LayersValue,
+ type StyleProperty,
+ type StyleValue,
+ type TupleValue,
} from "@webstudio-is/css-engine";
import type { CreateBatchUpdate } from "./shared/use-style-data";
import {
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 2c3ee85500..611b4a7399 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
@@ -2,37 +2,47 @@ import type {
InvalidValue,
LayersValue,
StyleProperty,
+ TupleValue,
} from "@webstudio-is/css-engine";
import type { SectionProps } from "./sections";
import type { StyleInfo } from "./shared/style-info";
import type { CreateBatchUpdate } from "./shared/use-style-data";
-export const deleteLayer = (
+const isLayersOrTuppleValue = (
+ value: TupleValue | LayersValue
+): value is LayersValue | TupleValue => {
+ return value.type === "layers" || value.type === "tuple";
+};
+
+export const deleteLayer = <T extends TupleValue | LayersValue>(
property: StyleProperty,
index: number,
- layers: LayersValue,
+ layers: T,
createBatchUpdate: SectionProps["createBatchUpdate"]
) => {
const batch = createBatchUpdate();
- const value = layers.value[index];
+ const newLayers = [...layers.value];
+ newLayers.splice(index, 1);
- if (
- value.type !== "tuple" &&
- value.type !== "function" &&
- value.type !== "unparsed"
- ) {
+ const propertyValue: LayersValue | TupleValue =
+ layers.type === "tuple"
+ ? {
+ type: "tuple",
+ value: newLayers as TupleValue["value"],
+ }
+ : {
+ type: "layers",
+ value: newLayers as LayersValue["value"],
+ };
+
+ if (isLayersOrTuppleValue(propertyValue) === false) {
return;
}
- const newLayers = [...layers.value];
- newLayers.splice(index, 1);
if (newLayers.length === 0) {
batch.deleteProperty(property);
} else {
- batch.setProperty(property)({
- type: "layers",
- value: newLayers,
- });
+ batch.setProperty(property)(propertyValue);
}
batch.publish();
@@ -63,22 +73,23 @@ export const hideLayer = (
batch.publish();
};
-export const addLayer = (
+export const addLayer = <T extends LayersValue | TupleValue>(
property: StyleProperty,
- value: LayersValue | InvalidValue,
+ value: T | InvalidValue,
style: StyleInfo,
createBatchUpdate: SectionProps["createBatchUpdate"]
) => {
- if (value.type === "invalid") {
+ if (
+ value.type === "invalid" ||
+ (value.type !== "layers" && value.type !== "tuple")
+ ) {
return;
}
- const layers = style[property]?.value;
-
- // Initially its none, so we can just set it.
- if (layers?.type === "layers") {
+ const existingValues = getValue(property, style);
+ if (existingValues?.type === "layers" || existingValues?.type === "tuple") {
// Adding layers we had before
- value.value = [...value.value, ...layers.value];
+ value.value = [...value.value, ...existingValues.value] as T["value"];
}
const batch = createBatchUpdate();
@@ -86,41 +97,45 @@ export const addLayer = (
batch.publish();
};
-export const updateLayer = (
+export const updateLayer = <T extends LayersValue | TupleValue>(
property: StyleProperty,
- newValue: LayersValue,
- layers: LayersValue,
+ newValue: T,
+ oldValue: T,
index: number,
createBatchUpdate: SectionProps["createBatchUpdate"]
) => {
const batch = createBatchUpdate();
- const value = layers.value[index];
- if (
- value.type !== "tuple" &&
- value.type !== "function" &&
- value.type !== "unparsed"
- ) {
- return;
- }
- const newLayers = [...layers.value];
+ const newLayers = [...oldValue.value];
newLayers.splice(index, 1, ...newValue.value);
- batch.setProperty(property)({
- type: "layers",
- value: newLayers,
- });
+ const newPropertyValue: TupleValue | LayersValue =
+ oldValue.type === "tuple"
+ ? {
+ type: "tuple",
+ value: newLayers as TupleValue["value"],
+ }
+ : {
+ type: "layers",
+ value: newLayers as LayersValue["value"],
+ };
+
+ batch.setProperty(property)(newPropertyValue);
batch.publish();
};
export const getLayerCount = (property: StyleProperty, style: StyleInfo) => {
const value = style[property]?.value;
- const layers = value?.type === "layers" ? value : undefined;
- return layers?.value.length ?? 0;
+ const existingValue =
+ value?.type === "layers" || value?.type === "tuple" ? value : undefined;
+ return existingValue?.value.length ?? 0;
};
export const getValue = (property: StyleProperty, style: StyleInfo) => {
const value = style[property]?.value;
- return value?.type === "layers" && value.value.length > 0 ? value : undefined;
+ return value?.type === "layers" ||
+ (value?.type === "tuple" && value.value.length > 0)
+ ? value
+ : undefined;
};
export const swapLayers = (
@@ -141,9 +156,16 @@ export const swapLayers = (
newValue.splice(oldIndex, 1);
newValue.splice(newIndex, 0, value.value[oldIndex]);
- batch.setProperty(property)({
- ...value,
- value: newValue,
- });
+ batch.setProperty(property)(
+ value.type === "tuple"
+ ? {
+ type: "tuple",
+ value: newValue as TupleValue["value"],
+ }
+ : {
+ type: "layers",
+ value: newValue as LayersValue["value"],
+ }
+ );
batch.publish();
};
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 09f5c4431b..3c0fa5dfcf 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
@@ -1,4 +1,8 @@
-import type { LayersValue, StyleProperty } from "@webstudio-is/css-engine";
+import type {
+ LayersValue,
+ StyleProperty,
+ TupleValue,
+} from "@webstudio-is/css-engine";
import {
CssValueListArrowFocus,
Flex,
@@ -18,27 +22,30 @@ import type {
DeleteProperty,
} from "./shared/use-style-data";
-export type LayerProps<T> = {
+export type LayerProps<LayerType> = {
id: string;
index: number;
- layer: T;
+ layer: LayerType;
isHighlighted: boolean;
disabled?: boolean;
onLayerHide: (index: number) => void;
onDeleteLayer: (index: number) => void;
- onEditLayer: (index: number, layers: LayersValue) => void;
+ onEditLayer: (index: number, layers: LayersValue | TupleValue) => void;
createBatchUpdate: CreateBatchUpdate;
deleteProperty: DeleteProperty;
};
-type LayerListProperties<T> = SectionProps & {
+type LayerListProperties<LayerType, PropertyValueType> = SectionProps & {
disabled?: boolean;
property: StyleProperty;
- layers: LayersValue;
- renderLayer: (props: LayerProps<T>) => JSX.Element;
+ layers: PropertyValueType;
+ renderLayer: (props: LayerProps<LayerType>) => JSX.Element;
};
-export const LayersList = <T,>({
+export const LayersList = <
+ LayerType,
+ PropertyValueType extends TupleValue | LayersValue,
+>({
property,
layers,
disabled,
@@ -46,7 +53,7 @@ export const LayersList = <T,>({
renderLayer,
createBatchUpdate,
deleteProperty,
-}: LayerListProperties<T>) => {
+}: LayerListProperties<LayerType, PropertyValueType>) => {
const layersCount = getLayerCount(property, currentStyle);
const sortableItems = useMemo(
@@ -70,11 +77,20 @@ export const LayersList = <T,>({
};
const handleHideLayer = (index: number) => {
+ if (layers.type === "tuple") {
+ return;
+ }
return hideLayer(property, index, layers, createBatchUpdate);
};
- const onEditLayer = (index: number, newLayers: LayersValue) => {
- return updateLayer(property, newLayers, layers, index, createBatchUpdate);
+ const onEditLayer = (index: number, newLayers: PropertyValueType) => {
+ return updateLayer<PropertyValueType>(
+ property,
+ newLayers,
+ layers,
+ index,
+ createBatchUpdate
+ );
};
return (
@@ -96,7 +112,7 @@ export const LayersList = <T,>({
createBatchUpdate,
deleteProperty,
onEditLayer,
- } as LayerProps<T>);
+ } as LayerProps<LayerType>);
})}
{placementIndicator}
</Flex>
diff --git a/packages/css-data/src/property-parsers/box-shadow.ts b/packages/css-data/src/property-parsers/box-shadow.ts
index 8be394678e..f5d9ab87b4 100644
--- a/packages/css-data/src/property-parsers/box-shadow.ts
+++ b/packages/css-data/src/property-parsers/box-shadow.ts
@@ -26,7 +26,6 @@ export const parseBoxShadow = (
}
const cssAst = cssTryParseValue(tokenStream);
-
if (cssAst === undefined) {
return {
type: "invalid",
diff --git a/packages/css-data/src/property-parsers/filter.ts b/packages/css-data/src/property-parsers/filter.ts
index 35796e10f2..62d424da3e 100644
--- a/packages/css-data/src/property-parsers/filter.ts
+++ b/packages/css-data/src/property-parsers/filter.ts
@@ -1,8 +1,7 @@
import * as csstree from "css-tree";
import type {
InvalidValue,
- LayerValueItem,
- LayersValue,
+ TupleValue,
TupleValueItem,
Unit,
} from "@webstudio-is/css-engine";
@@ -17,7 +16,7 @@ import { cssTryParseValue, isValidDeclaration } from "../parse-css-value";
Which uses browser CSSStyleValue.parse to validate.
*/
-export const parseFilter = (input: string): LayersValue | InvalidValue => {
+export const parseFilter = (input: string): TupleValue | InvalidValue => {
let tokenStream = input.trim();
tokenStream = tokenStream.endsWith(";")
? tokenStream.slice(0, -1)
@@ -47,7 +46,7 @@ export const parseFilter = (input: string): LayersValue | InvalidValue => {
};
}
- const layers: LayerValueItem[] = [];
+ const layers: TupleValueItem[] = [];
csstree.walk(cssAst, (node) => {
if (node.type === "Value") {
for (const child of node.children) {
@@ -96,7 +95,7 @@ export const parseFilter = (input: string): LayersValue | InvalidValue => {
});
return {
- type: "layers",
+ type: "tuple",
value: [...layers],
};
};