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: Add filter section in style panel (#2955)

Jaya Krishna Namburu66204427e906
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx
index fcdb40380b..df8b7d057e 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx
@@ -49,9 +49,11 @@ const useLayer = (layer: TupleValue) => {
}, [layer]);
};
-export const Layer = (props: LayerProps) => {
+export const BoxShadowLayer = <T extends TupleValue>(props: LayerProps<T>) => {
const { index, id, layer, isHighlighted, onDeleteLayer, onLayerHide } = props;
- const { name, shadow, color } = useLayer(layer);
+ const properties = useLayer(layer);
+
+ const { name, shadow, color } = properties;
return (
<FloatingPanel
@@ -88,10 +90,7 @@ export const Layer = (props: LayerProps) => {
tabIndex={-1}
disabled={layer.hidden}
icon={<SubtractIcon />}
- onClick={(event) => {
- onDeleteLayer(index);
- event.preventDefault();
- }}
+ onClick={() => onDeleteLayer(index)}
/>
</>
}
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 563621a29a..b990adbb00 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,7 @@ import {
SectionTitleLabel,
} from "@webstudio-is/design-system";
import { PlusIcon } from "@webstudio-is/icons";
-import type { StyleProperty } from "@webstudio-is/css-engine";
+import type { StyleProperty, TupleValue } from "@webstudio-is/css-engine";
import { CollapsibleSectionBase } from "~/builder/shared/collapsible-section";
import { useState } from "react";
import { getDots } from "../../shared/collapsible-section";
@@ -12,12 +12,13 @@ import { PropertyName } from "../../shared/property-name";
import { getStyleSource } from "../../shared/style-info";
import type { RenderCategoryProps } from "../../style-sections";
import { LayersList } from "../../style-layers-list";
-import { Layer } from "./box-shadow-layer";
+import { BoxShadowLayer } from "./box-shadow-layer";
import { addLayer } from "../../style-layer-utils";
import { parseBoxShadow } from "@webstudio-is/css-data";
const property: StyleProperty = "boxShadow";
const label = "Box Shadows";
+const INITIAL_BOX_SHADOW = "0px 2px 5px 0px rgba(0, 0, 0, 0.2)";
export const BoxShadowsSection = (props: RenderCategoryProps) => {
const { currentStyle, deleteProperty } = props;
@@ -40,8 +41,7 @@ export const BoxShadowsSection = (props: RenderCategoryProps) => {
onClick={() => {
addLayer(
property,
- // Just using some default shadow by default
- parseBoxShadow("0px 2px 5px 0px rgba(0, 0, 0, 0.2)"),
+ parseBoxShadow(INITIAL_BOX_SHADOW),
currentStyle,
props.createBatchUpdate
);
@@ -66,12 +66,12 @@ export const BoxShadowsSection = (props: RenderCategoryProps) => {
}
>
{value?.type === "layers" && value.value.length > 0 && (
- <LayersList
+ <LayersList<TupleValue>
property={property}
layers={value}
{...props}
renderLayer={(layersProps) => (
- <Layer key={layersProps.index} {...layersProps} />
+ <BoxShadowLayer key={layersProps.index} {...layersProps} />
)}
/>
)}
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
new file mode 100644
index 0000000000..b34c6f7dec
--- /dev/null
+++ b/apps/builder/app/builder/features/style-panel/sections/filter/filter-content.tsx
@@ -0,0 +1,126 @@
+import type { InvalidValue, LayersValue } from "@webstudio-is/css-engine";
+import {
+ Flex,
+ theme,
+ Label,
+ Tooltip,
+ Text,
+ TextArea,
+ textVariants,
+} from "@webstudio-is/design-system";
+import { InfoCircleIcon } from "@webstudio-is/icons";
+import { useState } from "react";
+import type { IntermediateStyleValue } from "../../shared/css-value-input";
+import { parseFilter } from "@webstudio-is/css-data";
+import type { DeleteProperty } from "../../shared/use-style-data";
+
+type FilterContentProps = {
+ index: number;
+ filter: string;
+ onEditLayer: (index: number, layers: LayersValue) => void;
+ deleteProperty: DeleteProperty;
+};
+
+export const FilterSectionContent = ({
+ index,
+ filter,
+ onEditLayer,
+ deleteProperty,
+}: FilterContentProps) => {
+ const [intermediateValue, setIntermediateValue] = useState<
+ IntermediateStyleValue | InvalidValue | undefined
+ >();
+
+ const handleChange = (value: string) => {
+ setIntermediateValue({
+ type: "intermediate",
+ value,
+ });
+ };
+
+ const handleComplete = () => {
+ if (intermediateValue === undefined) {
+ return;
+ }
+
+ const layers = parseFilter(intermediateValue.value);
+ if (layers.type === "invalid") {
+ setIntermediateValue({
+ type: "invalid",
+ value: intermediateValue.value,
+ });
+ return;
+ }
+
+ onEditLayer(index, layers);
+ };
+
+ return (
+ <Flex
+ direction="column"
+ css={{
+ px: theme.spacing[9],
+ paddingTop: theme.spacing[5],
+ paddingBottom: theme.spacing[9],
+ gap: theme.spacing[3],
+ minWidth: theme.spacing[30],
+ }}
+ >
+ <Label>
+ <Flex align={"center"} gap={1}>
+ Code
+ <Tooltip
+ content={
+ <Flex gap="2" direction="column">
+ <Text variant="regularBold">Filters</Text>
+ <Text variant="monoBold">filter</Text>
+ <Text>
+ Applies graphical effects like
+ <br />
+ blur or color shift to an element
+ </Text>
+ </Flex>
+ }
+ >
+ <InfoCircleIcon />
+ </Tooltip>
+ </Flex>
+ </Label>
+ {
+ // @todo Replace the TextArea with code-editor.
+ // For more details, please refer to the issue
+ // https://github.com/webstudio-is/webstudio/issues/2977
+ }
+ <TextArea
+ rows={3}
+ name="description"
+ value={intermediateValue?.value ?? filter ?? ""}
+ 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.
+ // In-order to prevent it and update the content.
+ // We prevent the default behaviour
+ event.preventDefault();
+ }
+
+ if (event.key === "Escape") {
+ if (intermediateValue === undefined) {
+ return;
+ }
+
+ deleteProperty("filter", { isEphemeral: true });
+ setIntermediateValue(undefined);
+ event.preventDefault();
+ }
+ }}
+ />
+ </Flex>
+ );
+};
diff --git a/apps/builder/app/builder/features/style-panel/sections/filter/filter-layer.tsx b/apps/builder/app/builder/features/style-panel/sections/filter/filter-layer.tsx
new file mode 100644
index 0000000000..61412a5132
--- /dev/null
+++ b/apps/builder/app/builder/features/style-panel/sections/filter/filter-layer.tsx
@@ -0,0 +1,48 @@
+import { FloatingPanel } from "~/builder/shared/floating-panel";
+import type { LayerProps } from "../../style-layers-list";
+import { FilterSectionContent } from "./filter-content";
+import {
+ CssValueListItem,
+ Label,
+ SmallIconButton,
+} from "@webstudio-is/design-system";
+import { SubtractIcon } from "@webstudio-is/icons";
+import { useMemo } from "react";
+import { FunctionValue, toValue } from "@webstudio-is/css-engine";
+
+export const FilterLayer = <T extends FunctionValue>(props: LayerProps<T>) => {
+ const { index, id, layer, isHighlighted, onDeleteLayer } = props;
+ const filter = useMemo(() => toValue(layer), [layer]);
+
+ return (
+ <FloatingPanel
+ title="Filter"
+ content={
+ <FilterSectionContent
+ index={index}
+ filter={filter}
+ onEditLayer={props.onEditLayer}
+ deleteProperty={props.deleteProperty}
+ />
+ }
+ >
+ <CssValueListItem
+ id={id}
+ draggable={true}
+ active={isHighlighted}
+ index={index}
+ label={<Label truncate>{filter}</Label>}
+ buttons={
+ <>
+ <SmallIconButton
+ variant="destructive"
+ tabIndex={-1}
+ icon={<SubtractIcon />}
+ onClick={() => onDeleteLayer(index)}
+ />
+ </>
+ }
+ />
+ </FloatingPanel>
+ );
+};
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
new file mode 100644
index 0000000000..5756a00788
--- /dev/null
+++ b/apps/builder/app/builder/features/style-panel/sections/filter/filter.tsx
@@ -0,0 +1,83 @@
+import { CollapsibleSectionBase } from "~/builder/shared/collapsible-section";
+import type { RenderCategoryProps } from "../../style-sections";
+import { useState } from "react";
+import {
+ SectionTitle,
+ SectionTitleButton,
+ SectionTitleLabel,
+ Tooltip,
+} from "@webstudio-is/design-system";
+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 { getStyleSource } from "../../shared/style-info";
+import { LayersList } from "../../style-layers-list";
+import { FilterLayer } from "./filter-layer";
+import { addLayer } from "../../style-layer-utils";
+import { parseFilter } from "@webstudio-is/css-data";
+
+const property: StyleProperty = "filter";
+const label = "Filters";
+const INITIAL_FILTER = "blur(0px)";
+
+export const FilterSection = (props: RenderCategoryProps) => {
+ const { currentStyle, deleteProperty } = props;
+ const [isOpen, setIsOpen] = useState(true);
+ const layerStyleSource = getStyleSource(currentStyle[property]);
+ const value = currentStyle[property]?.value;
+
+ return (
+ <CollapsibleSectionBase
+ fullWidth
+ label={label}
+ isOpen={isOpen}
+ onOpenChange={setIsOpen}
+ trigger={
+ <SectionTitle
+ dots={getDots(currentStyle, [property])}
+ suffix={
+ <Tooltip content={"Add a filter"}>
+ <SectionTitleButton
+ prefix={<PlusIcon />}
+ onClick={() => {
+ addLayer(
+ property,
+ parseFilter(INITIAL_FILTER),
+ currentStyle,
+ props.createBatchUpdate
+ );
+ setIsOpen(true);
+ }}
+ />
+ </Tooltip>
+ }
+ >
+ <PropertyName
+ title={label}
+ style={currentStyle}
+ properties={[property]}
+ description="Filter effects allow you to apply graphical effects like blurring, color shifting, and more to elements."
+ label={
+ <SectionTitleLabel color={layerStyleSource}>
+ {label}
+ </SectionTitleLabel>
+ }
+ onReset={() => deleteProperty(property)}
+ />
+ </SectionTitle>
+ }
+ >
+ {value?.type === "layers" && value.value.length > 0 && (
+ <LayersList<FunctionValue>
+ {...props}
+ property={property}
+ layers={value}
+ renderLayer={(layerProps) => (
+ <FilterLayer {...layerProps} key={layerProps.index} />
+ )}
+ />
+ )}
+ </CollapsibleSectionBase>
+ );
+};
diff --git a/apps/builder/app/builder/features/style-panel/sections/index.ts b/apps/builder/app/builder/features/style-panel/sections/index.ts
index 7fcb2a8252..9f75691d40 100644
--- a/apps/builder/app/builder/features/style-panel/sections/index.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/index.ts
@@ -12,3 +12,4 @@ export * from "./outline/outline";
export * from "./effects/effects";
export * from "./box-shadows/box-shadows";
export * from "./transitions/transitions";
+export * from "./filter/filter";
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx
index 296c346433..303a3a3d54 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx
@@ -11,9 +11,8 @@ import type { LayerProps } from "../../style-layers-list";
import { TupleValue, toValue } from "@webstudio-is/css-engine";
import { findTimingFunctionFromValue } from "./transition-utils";
-export const Layer = (props: LayerProps) => {
- const { id, index, layer, isHighlighted, onDeleteLayer, disabled } = props;
- const { transition, label } = useMemo(() => {
+const useLayer = (layer: TupleValue) => {
+ return useMemo(() => {
const label: TupleValue = {
type: "tuple",
value: [],
@@ -32,6 +31,13 @@ export const Layer = (props: LayerProps) => {
return { transition: toValue(layer), label: toValue(label) };
}, [layer]);
+};
+
+export const TransitionLayer = <T extends TupleValue>(props: LayerProps<T>) => {
+ const { id, index, layer, isHighlighted, onDeleteLayer, disabled } = props;
+ const properties = useLayer(layer);
+
+ const { transition, label } = properties;
return (
<FloatingPanel
@@ -59,10 +65,7 @@ export const Layer = (props: LayerProps) => {
tabIndex={-1}
disabled={disabled || layer?.hidden}
icon={<SubtractIcon />}
- onClick={(event) => {
- onDeleteLayer(index);
- event.preventDefault();
- }}
+ onClick={() => onDeleteLayer(index)}
/>
</>
}
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 2af63c3e0b..5de4f31f51 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,4 @@
-import type { StyleProperty } from "@webstudio-is/css-engine";
+import type { StyleProperty, TupleValue } from "@webstudio-is/css-engine";
import { CollapsibleSectionBase } from "~/builder/shared/collapsible-section";
import type { RenderCategoryProps } from "../../style-sections";
import {
@@ -15,12 +15,13 @@ import { PropertyName } from "../../shared/property-name";
import { addLayer } from "../../style-layer-utils";
import { parseTransition } from "@webstudio-is/css-data";
import { LayersList } from "../../style-layers-list";
-import { Layer } from "./transition-layer";
+import { TransitionLayer } from "./transition-layer";
import { $selectedOrLastStyleSourceSelector } from "~/shared/nano-states";
import { useStore } from "@nanostores/react";
const property: StyleProperty = "transition";
const label = "Transitions";
+const INITIAL_TRANSITION = "opacity 200ms ease";
export const TransitionSection = (props: RenderCategoryProps) => {
const { currentStyle, deleteProperty } = props;
@@ -59,8 +60,7 @@ export const TransitionSection = (props: RenderCategoryProps) => {
onClick={() => {
addLayer(
property,
- // Using default transition value
- parseTransition("opacity 200ms ease"),
+ parseTransition(INITIAL_TRANSITION),
currentStyle,
props.createBatchUpdate
);
@@ -86,13 +86,13 @@ export const TransitionSection = (props: RenderCategoryProps) => {
}
>
{value?.type === "layers" && value.value.length > 0 && (
- <LayersList
+ <LayersList<TupleValue>
property={property}
layers={value}
{...props}
renderLayer={(layerProps) => {
return (
- <Layer
+ <TransitionLayer
{...layerProps}
key={layerProps.index}
layer={layerProps.layer}
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 d9e89933e0..d75d562033 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
@@ -108,7 +108,9 @@ describe("boxShadowUtils", () => {
expect(published).toBe(true);
expect(boxShadowValue).toBeDefined();
expect(deletedProperties.has("boxShadow")).toBe(false);
- expect(boxShadowValue.value[0].value).toMatchInlineSnapshot(`
+ expect(boxShadowValue.value[0].type).toBe("tuple");
+ expect((boxShadowValue.value[0] as TupleValue).value)
+ .toMatchInlineSnapshot(`
[
{
"type": "unit",
@@ -323,7 +325,8 @@ describe("boxShadowUtils", () => {
swapLayers(property, 0, 1, styleInfo, createBatchUpdate);
const boxShadow = styleInfo["boxShadow"]?.value as LayersValue;
- expect(boxShadow.value[0].value).toMatchInlineSnapshot(`
+ expect(boxShadow.value[0].type).toBe("tuple");
+ expect((boxShadow.value[0] as TupleValue).value).toMatchInlineSnapshot(`
[
{
"type": "unit",
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 a1d2c49215..0cf1507318 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
@@ -14,9 +14,13 @@ export const deleteLayer = (
createBatchUpdate: RenderCategoryProps["createBatchUpdate"]
) => {
const batch = createBatchUpdate();
- const layer = layers.value[index];
+ const value = layers.value[index];
- if (layer.type !== "tuple" && layer.type !== "unparsed") {
+ if (
+ value.type !== "tuple" &&
+ value.type !== "function" &&
+ value.type !== "unparsed"
+ ) {
return;
}
const newLayers = [...layers.value];
@@ -41,15 +45,15 @@ export const hideLayer = (
createBatchUpdate: RenderCategoryProps["createBatchUpdate"]
) => {
const batch = createBatchUpdate();
- const layer = layers.value[index];
+ const value = layers.value[index];
- if (layer.type !== "tuple" && layer.type !== "unparsed") {
+ if (value.type !== "tuple" && value.type !== "unparsed") {
return;
}
const newLayers = [...layers.value];
newLayers.splice(index, 1, {
- ...layer,
- hidden: layer.hidden !== true,
+ ...value,
+ hidden: value.hidden !== true,
});
batch.setProperty(property)({
type: "layers",
@@ -61,11 +65,11 @@ export const hideLayer = (
export const addLayer = (
property: StyleProperty,
- layerValue: LayersValue | InvalidValue,
+ value: LayersValue | InvalidValue,
style: StyleInfo,
createBatchUpdate: RenderCategoryProps["createBatchUpdate"]
) => {
- if (layerValue.type === "invalid") {
+ if (value.type === "invalid") {
return;
}
@@ -74,11 +78,11 @@ export const addLayer = (
// Initially its none, so we can just set it.
if (layers?.type === "layers") {
// Adding layers we had before
- layerValue.value = [...layerValue.value, ...layers.value];
+ value.value = [...value.value, ...layers.value];
}
const batch = createBatchUpdate();
- batch.setProperty(property)(layerValue);
+ batch.setProperty(property)(value);
batch.publish();
};
@@ -90,9 +94,12 @@ export const updateLayer = (
createBatchUpdate: RenderCategoryProps["createBatchUpdate"]
) => {
const batch = createBatchUpdate();
- const layer = layers.value[index];
-
- if (layer.type !== "tuple" && layer.type !== "unparsed") {
+ const value = layers.value[index];
+ if (
+ value.type !== "tuple" &&
+ value.type !== "function" &&
+ value.type !== "unparsed"
+ ) {
return;
}
const newLayers = [...layers.value];
@@ -131,15 +138,12 @@ export const swapLayers = (
}
const newValue = [...value.value];
-
newValue.splice(oldIndex, 1);
-
newValue.splice(newIndex, 0, value.value[oldIndex]);
batch.setProperty(property)({
...value,
value: newValue,
});
-
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 4beab7131e..004ce9cde4 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,8 +1,4 @@
-import type {
- LayersValue,
- StyleProperty,
- TupleValue,
-} from "@webstudio-is/css-engine";
+import type { LayersValue, StyleProperty } from "@webstudio-is/css-engine";
import {
CssValueListArrowFocus,
Flex,
@@ -22,10 +18,10 @@ import type {
DeleteProperty,
} from "./shared/use-style-data";
-export type LayerProps = {
+export type LayerProps<T> = {
id: string;
index: number;
- layer: TupleValue;
+ layer: T;
isHighlighted: boolean;
disabled?: boolean;
onLayerHide: (index: number) => void;
@@ -35,14 +31,14 @@ export type LayerProps = {
deleteProperty: DeleteProperty;
};
-type LayerListProperties = RenderCategoryProps & {
+type LayerListProperties<T> = RenderCategoryProps & {
disabled?: boolean;
property: StyleProperty;
layers: LayersValue;
- renderLayer: (props: LayerProps) => JSX.Element;
+ renderLayer: (props: LayerProps<T>) => JSX.Element;
};
-export const LayersList = ({
+export const LayersList = <T,>({
property,
layers,
disabled,
@@ -50,7 +46,7 @@ export const LayersList = ({
renderLayer,
createBatchUpdate,
deleteProperty,
-}: LayerListProperties) => {
+}: LayerListProperties<T>) => {
const layersCount = getLayerCount(property, currentStyle);
const sortableItems = useMemo(
@@ -85,7 +81,7 @@ export const LayersList = ({
<CssValueListArrowFocus dragItemId={dragItemId}>
<Flex direction="column" ref={sortableRefCallback}>
{layers.value.map((layer, index) => {
- if (layer.type !== "tuple") {
+ if (layer.type !== "tuple" && layer.type !== "function") {
return null;
}
const id = String(index);
@@ -100,7 +96,7 @@ export const LayersList = ({
createBatchUpdate,
deleteProperty,
onEditLayer,
- });
+ } as LayerProps<T>);
})}
{placementIndicator}
</Flex>
diff --git a/apps/builder/app/builder/features/style-panel/style-sections.tsx b/apps/builder/app/builder/features/style-panel/style-sections.tsx
index 803a59e1dd..0003c2c490 100644
--- a/apps/builder/app/builder/features/style-panel/style-sections.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-sections.tsx
@@ -26,6 +26,7 @@ import {
BoxShadowsSection,
ListItemSection,
TransitionSection,
+ FilterSection,
} from "./sections";
export const categories = [
@@ -43,6 +44,7 @@ export const categories = [
"effects",
"outline",
"transitions",
+ "filter",
] as const;
export type Category = (typeof categories)[number];
@@ -157,4 +159,5 @@ export const sections: Record<
effects: EffectsSection,
boxShadows: BoxShadowsSection,
transitions: TransitionSection,
+ filter: FilterSection,
};
diff --git a/packages/css-data/src/parse-css-value.ts b/packages/css-data/src/parse-css-value.ts
index 5a78b1f09e..654e0ce489 100644
--- a/packages/css-data/src/parse-css-value.ts
+++ b/packages/css-data/src/parse-css-value.ts
@@ -11,7 +11,7 @@ import {
import { keywordValues } from "./__generated__/keyword-values";
import { units } from "./__generated__/units";
-const cssTryParseValue = (input: string) => {
+export const cssTryParseValue = (input: string) => {
try {
const ast = csstree.parse(input, { context: "value" });
return ast;
diff --git a/packages/css-data/src/property-parsers/background.ts b/packages/css-data/src/property-parsers/background.ts
index 5d0e2669ec..d65b69acfc 100644
--- a/packages/css-data/src/property-parsers/background.ts
+++ b/packages/css-data/src/property-parsers/background.ts
@@ -5,7 +5,7 @@ import type {
RgbValue,
UnparsedValue,
} from "@webstudio-is/css-engine";
-import { parseCssValue } from "../parse-css-value";
+import { parseCssValue, cssTryParseValue } from "../parse-css-value";
export const gradientNames = [
"conic-gradient",
@@ -38,15 +38,6 @@ export const parseBackground = (
};
};
-const cssTreeTryParseValue = (input: string) => {
- try {
- const ast = csstree.parse(input, { context: "value" });
- return ast;
- } catch {
- return undefined;
- }
-};
-
export const backgroundToLonghand = (
background: string
): {
@@ -70,7 +61,7 @@ export const backgroundToLonghand = (
: tokenStream;
}
- const cssAst = cssTreeTryParseValue(tokenStream);
+ const cssAst = cssTryParseValue(tokenStream);
if (cssAst === undefined) {
return {
diff --git a/packages/css-data/src/property-parsers/box-shadow.ts b/packages/css-data/src/property-parsers/box-shadow.ts
index 1b7737eb7b..8be394678e 100644
--- a/packages/css-data/src/property-parsers/box-shadow.ts
+++ b/packages/css-data/src/property-parsers/box-shadow.ts
@@ -7,15 +7,7 @@ import type {
TupleValueItem,
Unit,
} from "@webstudio-is/css-engine";
-
-const cssTreeTryParseValue = (input: string) => {
- try {
- const ast = csstree.parse(input, { context: "value" });
- return ast;
- } catch {
- return undefined;
- }
-};
+import { cssTryParseValue } from "../parse-css-value";
export const parseBoxShadow = (
boxShadow: string
@@ -33,7 +25,7 @@ export const parseBoxShadow = (
: tokenStream;
}
- const cssAst = cssTreeTryParseValue(tokenStream);
+ const cssAst = cssTryParseValue(tokenStream);
if (cssAst === undefined) {
return {
diff --git a/packages/css-data/src/property-parsers/filter.ts b/packages/css-data/src/property-parsers/filter.ts
new file mode 100644
index 0000000000..35796e10f2
--- /dev/null
+++ b/packages/css-data/src/property-parsers/filter.ts
@@ -0,0 +1,102 @@
+import * as csstree from "css-tree";
+import type {
+ InvalidValue,
+ LayerValueItem,
+ LayersValue,
+ TupleValueItem,
+ Unit,
+} from "@webstudio-is/css-engine";
+import { cssTryParseValue, isValidDeclaration } from "../parse-css-value";
+
+/*
+ https://github.com/webstudio-is/webstudio/issues/1016
+ https://github.com/csstree/csstree/issues/246
+
+ css-tree can't validate filter values.
+ So, we are relying on the isValidDeclaration function to validate the filter value.
+ Which uses browser CSSStyleValue.parse to validate.
+*/
+
+export const parseFilter = (input: string): LayersValue | InvalidValue => {
+ let tokenStream = input.trim();
+ tokenStream = tokenStream.endsWith(";")
+ ? tokenStream.slice(0, -1)
+ : tokenStream;
+
+ const cleanupKeywords = ["filter:"];
+
+ for (const cleanupKeyword of cleanupKeywords) {
+ tokenStream = tokenStream.startsWith(cleanupKeyword)
+ ? tokenStream.slice(cleanupKeyword.length).trim()
+ : tokenStream;
+ }
+
+ const cssAst = cssTryParseValue(tokenStream);
+ if (cssAst === undefined) {
+ return {
+ type: "invalid",
+ value: input,
+ };
+ }
+
+ const isValidFilterDecleration = isValidDeclaration("filter", input);
+ if (isValidFilterDecleration === false) {
+ return {
+ type: "invalid",
+ value: input,
+ };
+ }
+
+ const layers: LayerValueItem[] = [];
+ csstree.walk(cssAst, (node) => {
+ if (node.type === "Value") {
+ for (const child of node.children) {
+ if (child.type === "Function") {
+ const tuple: TupleValueItem[] = [];
+ for (const arg of child.children) {
+ if (arg.type === "Dimension") {
+ tuple.push({
+ type: "unit",
+ value: Number(arg.value),
+ unit: arg.unit as Unit,
+ });
+ }
+
+ if (arg.type === "Percentage") {
+ tuple.push({
+ type: "unit",
+ value: Number(arg.value),
+ unit: "%",
+ });
+ }
+
+ if (arg.type === "Identifier") {
+ tuple.push({
+ type: "keyword",
+ value: arg.name,
+ });
+ }
+
+ if (arg.type === "Number") {
+ tuple.push({
+ type: "keyword",
+ value: arg.value,
+ });
+ }
+ }
+
+ layers.push({
+ type: "function",
+ name: child.name,
+ args: { type: "tuple", value: tuple },
+ });
+ }
+ }
+ }
+ });
+
+ return {
+ type: "layers",
+ value: [...layers],
+ };
+};
diff --git a/packages/css-data/src/property-parsers/index.ts b/packages/css-data/src/property-parsers/index.ts
index d38f85e9e1..4101778e3d 100644
--- a/packages/css-data/src/property-parsers/index.ts
+++ b/packages/css-data/src/property-parsers/index.ts
@@ -3,3 +3,4 @@ export * from "./box-shadow";
export * from "./transition";
export * from "./transition-property-extractor";
export * from "./box-shadow-property-extractor";
+export * from "./filter";
diff --git a/packages/css-data/src/property-parsers/transition.ts b/packages/css-data/src/property-parsers/transition.ts
index ee919e25d6..ddc38320a9 100644
--- a/packages/css-data/src/property-parsers/transition.ts
+++ b/packages/css-data/src/property-parsers/transition.ts
@@ -8,15 +8,7 @@ import type {
} from "@webstudio-is/css-engine";
import { animatableProperties } from "../";
import { isTimingFunction } from "./transition-property-extractor";
-
-const cssTreeTryParseValue = (input: string) => {
- try {
- const ast = csstree.parse(input, { context: "value" });
- return ast;
- } catch {
- return undefined;
- }
-};
+import { cssTryParseValue } from "../parse-css-value";
type AnimatableProperty = (typeof animatableProperties)[number];
export const isAnimatableProperty = (
@@ -41,7 +33,7 @@ export const parseTransition = (
: tokenStream;
}
- const cssAst = cssTreeTryParseValue(tokenStream);
+ const cssAst = cssTryParseValue(tokenStream);
if (cssAst === undefined) {
return {
diff --git a/packages/css-engine/src/schema.ts b/packages/css-engine/src/schema.ts
index df44adffa3..d4202fe5cc 100644
--- a/packages/css-engine/src/schema.ts
+++ b/packages/css-engine/src/schema.ts
@@ -118,6 +118,7 @@ const LayerValueItem = z.union([
ImageValue,
TupleValue,
InvalidValue,
+ FunctionValue,
]);
export type LayerValueItem = z.infer<typeof LayerValueItem>;