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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
experimental: support transition-behavior property (#3650)
Bogdan Chadkin2af8d57b8ec8
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.test.ts b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.test.tsindex 93dbef64f7..8cfe68c43e 100644--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.test.ts+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.test.ts@@ -35,7 +35,7 @@ const createBatchUpdate: CreateBatchUpdate = () => ({deleteProperty: (propertyName: string) => {deletedProperties.add(propertyName);},- publish: (options?: unknown) => {+ publish: (_options?: unknown) => {published = true;},});@@ -74,6 +74,13 @@ describe("transition-utils", () => {{ type: "unit", value: 0, unit: "ms" },],},+ transitionBehavior: {+ type: "layers",+ value: [+ { type: "keyword", value: "normal" },+ { type: "keyword", value: "allow-discrete" },+ ],+ },};const layers = convertIndividualTransitionToLayers(properties);diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.ts b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.tsindex 5cdfc3081e..973e88678b 100644--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.ts+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-utils.ts@@ -39,6 +39,10 @@ export const defaultTransitionTimingFunction: KeywordValue = {type: "keyword",value: "ease",};+export const defaultTransitionBehavior: KeywordValue = {+ type: "keyword",+ value: "normal",+};export const defaultFunctions = {linear: "linear",@@ -119,6 +123,7 @@ export const getTransitionProperties = (transitionTimingFunction: { type: "layers", value: [] },transitionDelay: { type: "layers", value: [] },transitionDuration: { type: "layers", value: [] },+ transitionBehavior: { type: "layers", value: [] },};for (const property of transitionLongHandProperties) {const value = currentyStyle[property];@@ -148,6 +153,7 @@ export const convertIndividualTransitionToLayers = (transitionDuration,transitionDelay,transitionTimingFunction,+ transitionBehavior,} = properties;// https://developer.mozilla.org/en-US/docs/Web/CSS/transition-timing-function@@ -169,12 +175,16 @@ export const convertIndividualTransitionToLayers = (const delay =getValueOrRepeatLast(transitionDelay.value, index) ??defaultTransitionDelay;+ const behavior =+ getValueOrRepeatLast(transitionBehavior.value, index) ??+ defaultTransitionBehavior;if (isValidTransitionValue(property) &&isValidTransitionValue(duration) &&isValidTransitionValue(timingFunction) &&- isValidTransitionValue(delay)+ isValidTransitionValue(delay) &&+ isValidTransitionValue(behavior)) {const layer: TupleValue = {type: "tuple",@@ -204,45 +214,30 @@ export const addDefaultTransitionLayer = (props: {}) => {const { createBatchUpdate, currentStyle } = props;const properties = getTransitionProperties(currentStyle);- const { timing, property, delay, duration } = extractTransitionProperties({- type: "tuple",+ const batch = createBatchUpdate();+ batch.setProperty("transitionProperty")({+ type: "layers",+ value: [...properties.transitionProperty.value, defaultTransitionProperty],+ });+ batch.setProperty("transitionTimingFunction")({+ type: "layers",value: [- defaultTransitionProperty,- defaultTransitionDuration,+ ...properties.transitionTimingFunction.value,defaultTransitionTimingFunction,- defaultTransitionDelay,],});- const batch = createBatchUpdate();-- if (property) {- batch.setProperty("transitionProperty")({- type: "layers",- value: [...properties.transitionProperty.value, property],- });- }-- if (timing) {- batch.setProperty("transitionTimingFunction")({- type: "layers",- value: [...properties.transitionTimingFunction.value, timing],- });- }-- if (duration) {- batch.setProperty("transitionDuration")({- type: "layers",- value: [...properties.transitionDuration.value, duration],- });- }-- if (delay) {- batch.setProperty("transitionDelay")({- type: "layers",- value: [...properties.transitionDelay.value, delay],- });- }-+ batch.setProperty("transitionDuration")({+ type: "layers",+ value: [...properties.transitionDuration.value, defaultTransitionDuration],+ });+ batch.setProperty("transitionDelay")({+ type: "layers",+ value: [...properties.transitionDelay.value, defaultTransitionDelay],+ });+ batch.setProperty("transitionBehavior")({+ type: "layers",+ value: [...properties.transitionBehavior.value, defaultTransitionBehavior],+ });batch.publish();};@@ -271,6 +266,7 @@ export const deleteTransitionLayer = (props: {batch.publish(options);};+// @todo support editing transition-behaviorexport const editTransitionLayer = (props: {index: number;layers: LayersValue;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.tsxindex 345dded6dc..c4c912aeda 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@@ -31,8 +31,9 @@ import type { StyleProperty } from "@webstudio-is/css-engine";const label = "Transitions";const initialTransition = "opacity 200ms ease 0s";-export const properties =- transitionLongHandProperties as unknown as Array<StyleProperty>;+export const properties = (+ transitionLongHandProperties as unknown as Array<StyleProperty>+).filter((property) => property !== "transitionBehavior");export const Section = (props: SectionProps) => {const { currentStyle, createBatchUpdate } = props;diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.tsindex c17c5e94f8..e84ae5b8ed 100644--- a/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts@@ -3358,8 +3358,13 @@ export const styles = {{property: "transitionBehavior",value: {- type: "invalid",- value: "normal",+ type: "layers",+ value: [+ {+ type: "keyword",+ value: "normal",+ },+ ],},},{@@ -8858,8 +8863,17 @@ export const styles = {{property: "transitionBehavior",value: {- type: "invalid",- value: "normal,normal",+ type: "layers",+ value: [+ {+ type: "keyword",+ value: "normal",+ },+ {+ type: "keyword",+ value: "normal",+ },+ ],},},{@@ -11240,8 +11254,13 @@ export const styles = {{property: "transitionBehavior",value: {- type: "invalid",- value: "normal",+ type: "layers",+ value: [+ {+ type: "keyword",+ value: "normal",+ },+ ],},},{diff --git a/packages/css-data/bin/mdn-data.ts b/packages/css-data/bin/mdn-data.tsindex 80415bdb2e..e6d89828b6 100755--- a/packages/css-data/bin/mdn-data.ts+++ b/packages/css-data/bin/mdn-data.ts@@ -246,6 +246,7 @@ const experimentalProperties = ["background-position-y","-webkit-tap-highlight-color","-webkit-overflow-scrolling",+ "transition-behavior",];const unsupportedProperties = [diff --git a/packages/css-data/src/__generated__/keyword-values.ts b/packages/css-data/src/__generated__/keyword-values.tsindex 22d9ca8583..8377b4979e 100644--- a/packages/css-data/src/__generated__/keyword-values.ts+++ b/packages/css-data/src/__generated__/keyword-values.ts@@ -5066,6 +5066,13 @@ export const keywordValues = {"unset",],transformStyle: ["flat", "preserve-3d", "initial", "inherit", "unset"],+ transitionBehavior: [+ "normal",+ "allow-discrete",+ "initial",+ "inherit",+ "unset",+ ],transitionDelay: ["initial", "inherit", "unset"],transitionDuration: ["initial", "inherit", "unset"],transitionProperty: ["none", "all", "initial", "inherit", "unset"],diff --git a/packages/css-data/src/__generated__/properties.ts b/packages/css-data/src/__generated__/properties.tsindex 39efb394a6..25c9d31b81 100644--- a/packages/css-data/src/__generated__/properties.ts+++ b/packages/css-data/src/__generated__/properties.ts@@ -2934,6 +2934,15 @@ export const properties = {},types: [],},+ transitionBehavior: {+ unitGroups: [],+ inherited: false,+ initial: {+ type: "keyword",+ value: "normal",+ },+ types: [],+ },transitionDelay: {unitGroups: ["time"],inherited: false,diff --git a/packages/css-data/src/parse-css-value.test.ts b/packages/css-data/src/parse-css-value.test.tsindex 1d41d0a3bf..7848c2048b 100644--- a/packages/css-data/src/parse-css-value.test.ts+++ b/packages/css-data/src/parse-css-value.test.ts@@ -227,3 +227,23 @@ test("parse background-attachment property as layers", () => {],});});++test("parse transition-behavior property as layers", () => {+ expect(parseCssValue("transitionBehavior", `normal`)).toEqual({+ type: "layers",+ value: [{ type: "keyword", value: "normal" }],+ });+ expect(parseCssValue("transitionBehavior", `normal, allow-discrete`)).toEqual(+ {+ type: "layers",+ value: [+ { type: "keyword", value: "normal" },+ { type: "keyword", value: "allow-discrete" },+ ],+ }+ );+ expect(parseCssValue("transitionBehavior", `normal, invalid`)).toEqual({+ type: "invalid",+ value: "normal, invalid",+ });+});diff --git a/packages/css-data/src/parse-css-value.ts b/packages/css-data/src/parse-css-value.tsindex 787b026002..538274e52a 100644--- a/packages/css-data/src/parse-css-value.ts+++ b/packages/css-data/src/parse-css-value.ts@@ -67,6 +67,10 @@ export const isValidDeclaration = ();}+ if (cssPropertyName === "transition-behavior") {+ return true;+ }+// @todo remove after csstree fixes// - https://github.com/csstree/csstree/issues/246// - https://github.com/csstree/csstree/issues/164@@ -100,6 +104,7 @@ const repeatedProps = new Set<StyleProperty>(["backgroundRepeat","backgroundSize","backgroundImage",+ "transitionBehavior",]);export const parseCssValue = (@@ -138,27 +143,44 @@ export const parseCssValue = (return parseShadow(property, input);}- if (isTransitionLongHandProperty(property)) {+ if (+ isTransitionLongHandProperty(property) &&+ property !== "transitionBehavior"+ ) {return parseTransitionLonghandProperty(property, input);}// prevent infinite splitting into layers for itemsif (repeatedProps.has(property) && topLevel) {const nodes = "children" in ast ? ast.children?.toArray() ?? [] : [ast];- return {+ let invalid = false;+ const layersValue: StyleValue = {type: "layers",- value: splitRepeated(nodes).map(- (nodes) =>- parseCssValue(- property,- csstree.generate({- type: "Value",- children: new csstree.List<CssNode>().fromArray(nodes),- }),- false- ) as LayerValueItem- ),+ value: splitRepeated(nodes).map((nodes) => {+ const value = csstree.generate({+ type: "Value",+ children: new csstree.List<CssNode>().fromArray(nodes),+ });+ const parsed = parseCssValue(property, value, false) as LayerValueItem;+ if (parsed.type === "invalid") {+ invalid = true;+ }+ return parsed;+ }),};+ // at least one layer is invalid then whole value is invalid+ if (invalid) {+ return invalidValue;+ }+ return layersValue;+ }++ // csstree does not support transition-behavior+ // so check keywords manually+ if (property === "transitionBehavior") {+ return keywordValues[property].includes(input as never)+ ? { type: "keyword", value: input }+ : invalidValue;}if (ast.type === "Value" && ast.children.first === ast.children.last) {diff --git a/packages/css-data/src/property-parsers/transition.ts b/packages/css-data/src/property-parsers/transition.tsindex ac3c09bcc7..2f2012392c 100644--- a/packages/css-data/src/property-parsers/transition.ts+++ b/packages/css-data/src/property-parsers/transition.ts@@ -7,6 +7,7 @@ import type {Unit,UnitValue,FunctionValue,+ StyleProperty,} from "@webstudio-is/css-engine";import { animatableProperties } from "../";import { isTimingFunction } from "./transition-property-extractor";@@ -20,7 +21,8 @@ export const transitionLongHandProperties = ["transitionTimingFunction","transitionDelay","transitionDuration",-] as const;+ "transitionBehavior",+] as const satisfies StyleProperty[];export const commonTransitionProperties = ["all",diff --git a/packages/css-engine/src/__generated__/types.ts b/packages/css-engine/src/__generated__/types.tsindex 9a32400c96..5c2672df5b 100644--- a/packages/css-engine/src/__generated__/types.ts+++ b/packages/css-engine/src/__generated__/types.ts@@ -312,6 +312,7 @@ export type Property =| "transformBox"| "transformOrigin"| "transformStyle"+ | "transitionBehavior"| "transitionDelay"| "transitionDuration"| "transitionProperty"