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: Add UI controls for managing `transform-origin` property from style-panel (#3930)
Jaya Krishna Namburu152405b55859
diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.test.ts b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.test.tsindex 9b34b3bcb8..f02878abf4 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.test.ts+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.test.ts@@ -5,6 +5,7 @@ import {extractTransformOriginValues,} from "./transform-extractors";import { parseCssValue } from "@webstudio-is/css-data";+import type { TupleValue } from "@webstudio-is/css-engine";describe("extractRotatePropertiesFromTransform", () => {test("parses transform and returns undefined if no rotate values exists", () => {@@ -110,50 +111,58 @@ describe("extractSkewPropertiesFromTransform", () => {describe("extractTransformOriginValues", () => {test("parses transform-origin and returns the individual properties from the value", () => {expect(- extractTransformOriginValues(parseCssValue("transformOrigin", "center"))+ extractTransformOriginValues(+ parseCssValue("transformOrigin", "center") as TupleValue+ )).toEqual({x: { type: "keyword", value: "center" },y: { type: "keyword", value: "center" },- z: { type: "unit", unit: "px", value: 0 },+ z: undefined,});expect(- extractTransformOriginValues(parseCssValue("transformOrigin", "top"))+ extractTransformOriginValues(+ parseCssValue("transformOrigin", "top") as TupleValue+ )).toEqual({x: { type: "keyword", value: "center" },y: { type: "keyword", value: "top" },- z: { type: "unit", unit: "px", value: 0 },+ z: undefined,});expect(- extractTransformOriginValues(parseCssValue("transformOrigin", "right"))+ extractTransformOriginValues(+ parseCssValue("transformOrigin", "right") as TupleValue+ )).toEqual({x: { type: "keyword", value: "right" },y: { type: "keyword", value: "center" },- z: { type: "unit", unit: "px", value: 0 },+ z: undefined,});expect(- extractTransformOriginValues(parseCssValue("transformOrigin", "45px"))+ extractTransformOriginValues(+ parseCssValue("transformOrigin", "45px") as TupleValue+ )).toEqual({x: { type: "unit", unit: "px", value: 45 },y: { type: "keyword", value: "center" },- z: { type: "unit", unit: "px", value: 0 },+ z: undefined,});expect(extractTransformOriginValues(- parseCssValue("transformOrigin", "20px 40px")+ parseCssValue("transformOrigin", "20px 40px") as TupleValue)).toEqual({x: { type: "unit", unit: "px", value: 20 },y: { type: "unit", unit: "px", value: 40 },- z: { type: "unit", unit: "px", value: 0 },+ z: undefined,});expect(extractTransformOriginValues(- parseCssValue("transformOrigin", "10px 20px 30px")+ parseCssValue("transformOrigin", "10px 20px 30px") as TupleValue)).toEqual({x: { type: "unit", unit: "px", value: 10 },@@ -163,12 +172,42 @@ describe("extractTransformOriginValues", () => {expect(extractTransformOriginValues(- parseCssValue("transformOrigin", "left top 30px")+ parseCssValue("transformOrigin", "left top 30px") as TupleValue)).toEqual({x: { type: "keyword", value: "left" },y: { type: "keyword", value: "top" },- z: { type: "unit", unit: "px", value: 30 },+ z: { type: "unit", value: 30, unit: "px" },+ });++ expect(+ extractTransformOriginValues(+ parseCssValue("transformOrigin", "bottom right 60px") as TupleValue+ )+ ).toEqual({+ x: { type: "keyword", value: "right" },+ y: { type: "keyword", value: "bottom" },+ z: { type: "unit", value: 60, unit: "px" },+ });++ expect(+ extractTransformOriginValues(+ parseCssValue("transformOrigin", "left 50% 60px") as TupleValue+ )+ ).toEqual({+ x: { type: "keyword", value: "left" },+ y: { type: "unit", value: 50, unit: "%" },+ z: { type: "unit", value: 60, unit: "px" },+ });++ expect(+ extractTransformOriginValues(+ parseCssValue("transformOrigin", "50% bottom 60px") as TupleValue+ )+ ).toEqual({+ x: { type: "unit", value: 50, unit: "%" },+ y: { type: "keyword", value: "bottom" },+ z: { type: "unit", value: 60, unit: "px" },});});});diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.ts b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.tsindex 1b77862813..8a1f50061e 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.ts+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-extractors.ts@@ -2,6 +2,7 @@ import type {FunctionValue,KeywordValue,StyleValue,+ TupleValue,UnitValue,} from "@webstudio-is/css-engine";@@ -58,14 +59,16 @@ const isValidTransformOriginValue = (return value.type === "unit" || value.type === "keyword";};-export const extractTransformOriginValues = (value: StyleValue) => {- if (value.type !== "tuple") {- return;- }-+export const extractTransformOriginValues = (+ value: TupleValue+): {+ x: KeywordValue | UnitValue;+ y: KeywordValue | UnitValue;+ z?: UnitValue;+} => {let x: KeywordValue | UnitValue = { type: "keyword", value: "center" };let y: KeywordValue | UnitValue = { type: "keyword", value: "center" };- let z: UnitValue = { type: "unit", unit: "px", value: 0 };+ let z: UnitValue | undefined;// https://www.w3.org/TR/css-transforms-1/#transform-origin-property// https://github.com/mdn/content/issues/35411@@ -84,24 +87,54 @@ export const extractTransformOriginValues = (value: StyleValue) => {}}- if (- value.value.length === 2 &&- isValidTransformOriginValue(value.value[0]) &&- isValidTransformOriginValue(value.value[1])- ) {- x = value.value[0];- y = value.value[1];+ // If keywords are used for x and y axises, their values can be swapped+ // and they are still valid. So, we are making sure that x is left or right+ // and y is top or bottom by checking their values.++ if (value.value.length === 2) {+ const [first, second] = value.value;+ if (+ isValidTransformOriginValue(first) === true &&+ isValidTransformOriginValue(second) === true+ ) {+ x = first;+ y = second;++ if (first.type === "keyword" && ["left", "right"].includes(first.value)) {+ x = first;+ y = second;+ } else if (+ first.type === "keyword" &&+ ["top", "bottom"].includes(first.value)+ ) {+ y = first;+ x = second;+ }+ }}- if (- value.value.length === 3 &&- isValidTransformOriginValue(value.value[0]) &&- isValidTransformOriginValue(value.value[1]) &&- value.value[2].type === "unit"- ) {- x = value.value[0];- y = value.value[1];- z = value.value[2];+ if (value.value.length === 3) {+ const [first, second, third] = value.value;+ if (+ isValidTransformOriginValue(first) === true &&+ isValidTransformOriginValue(second) === true &&+ third.type === "unit"+ ) {+ x = first;+ y = second;+ z = third;++ if (first.type === "keyword" && ["left", "right"].includes(first.value)) {+ x = first;+ y = second;+ } else if (+ first.type === "keyword" &&+ ["top", "bottom"].includes(first.value)+ ) {+ y = first;+ x = second;+ }+ }}return {diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-origin.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-origin.tsxnew file mode 100644index 0000000000..9c2c9fdb8b--- /dev/null+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-origin.tsx@@ -0,0 +1,217 @@+import type { SectionProps } from "../shared/section";+import {+ Label,+ Flex,+ Grid,+ theme,+ PositionGrid,+} from "@webstudio-is/design-system";+import {+ KeywordValue,+ StyleValue,+ TupleValue,+ UnitValue,+ type StyleProperty,+} from "@webstudio-is/css-engine";+import { PropertyName } from "../../shared/property-name";+import { styleConfigByName } from "../../shared/configs";+import { useMemo } from "react";+import { extractTransformOriginValues } from "./transform-extractors";+import { CssValueInputContainer } from "../../shared/css-value-input";+import type { StyleUpdateOptions } from "../../shared/use-style-data";++const property: StyleProperty = "transformOrigin";++// Fake properties to use in the CssValueInputContainer+// x, y axis takes length | percentage | keyword+// z axis takes length+const fakePropertyX: StyleProperty = "backgroundPositionX";+const fakePropertyY: StyleProperty = "backgroundPositionY";+const fakePropertyZ: StyleProperty = "outlineOffset";++const keyworkToValue: Record<string, number> = {+ left: 0,+ right: 100,+ center: 50,+ top: 0,+ bottom: 100,+};++const calculateBackgroundPosition = (value: StyleValue | undefined) => {+ if (value === undefined) {+ return 50;+ }++ if (value.type === "unit") {+ return value.value;+ }++ if (value.type === "keyword") {+ return keyworkToValue[value.value];+ }++ return 0;+};++export const TransformOrigin = (props: SectionProps) => {+ const { currentStyle, deleteProperty, setProperty } = props;+ const value = currentStyle[property]?.local;+ const { label } = styleConfigByName(property);+ const origin = useMemo(() => {+ if (value?.type !== "tuple") {+ return;+ }++ return extractTransformOriginValues(value);+ }, [value]);++ const xInfo = useMemo(() => calculateBackgroundPosition(origin?.x), [origin]);+ const yInfo = useMemo(() => calculateBackgroundPosition(origin?.y), [origin]);+ const xOriginKeywords: Array<KeywordValue> = ["left", "center", "right"].map(+ (value) => ({+ type: "keyword",+ value,+ })+ );+ const yOriginKeywords: Array<KeywordValue> = ["top", "center", "bottom"].map(+ (value) => ({+ type: "keyword",+ value,+ })+ );++ if (value?.type !== "tuple" || origin === undefined) {+ return;+ }++ const handleValueChange = (+ index: number,+ value: StyleValue,+ options?: StyleUpdateOptions+ ) => {+ if (value.type === "invalid") {+ return;+ }++ let newValue: UnitValue | KeywordValue | undefined;++ if (+ value.type === "layers" &&+ (value.value[0].type === "unit" || value.value[0].type === "keyword")+ ) {+ newValue = value.value[0];+ }++ if (value.type === "unit" || value.type === "keyword") {+ newValue = value;+ }++ if (newValue === undefined) {+ return;+ }++ const newTupleValue: TupleValue = {+ type: "tuple",+ value: [origin.x, origin.y],+ };++ if (origin.z !== undefined) {+ newTupleValue.value.push(origin.z);+ }++ newTupleValue.value.splice(index, 1, newValue);+ setProperty(property)(newTupleValue, options);+ };++ const handlePositionGridChange = (position: { x: number; y: number }) => {+ const value: TupleValue = {+ type: "tuple",+ value: [+ {+ type: "unit",+ value: position.x,+ unit: "%",+ },+ {+ type: "unit",+ value: position.y,+ unit: "%",+ },+ ],+ };++ if (origin.z !== undefined) {+ value.value.push(origin.z);+ }++ setProperty(property)(value, { isEphemeral: false });+ };++ return (+ <Flex+ direction="column"+ gap="2"+ css={{+ px: theme.spacing[9],+ }}+ >+ <PropertyName+ label={label}+ properties={[property]}+ style={currentStyle}+ onReset={() => deleteProperty(property)}+ />+ <Flex gap="6">+ <Grid css={{ gridTemplateColumns: "1fr 1fr" }} align="center" gapX="2">+ <PositionGrid+ selectedPosition={{ x: xInfo, y: yInfo }}+ onSelect={handlePositionGridChange}+ />+ <Flex gap="2" direction="column">+ <Flex gap="2" align="center">+ <Label>X</Label>+ <CssValueInputContainer+ value={origin.x}+ keywords={xOriginKeywords}+ styleSource="local"+ property={fakePropertyX}+ deleteProperty={() => {}}+ setValue={(value, options) =>+ handleValueChange(0, value, options)+ }+ />+ </Flex>+ <Flex gap="2" align="center">+ <Label>Y</Label>+ <CssValueInputContainer+ value={origin.y}+ keywords={yOriginKeywords}+ styleSource="local"+ property={fakePropertyY}+ deleteProperty={() => {}}+ setValue={(value, options) =>+ handleValueChange(1, value, options)+ }+ />+ </Flex>+ {origin.z !== undefined && (+ <Flex gap="2" align="center">+ <Label>Z</Label>+ <CssValueInputContainer+ value={origin.z}+ keywords={[]}+ styleSource="local"+ property={fakePropertyZ}+ deleteProperty={() => {}}+ setValue={(value, options) =>+ handleValueChange(2, value, options)+ }+ />+ </Flex>+ )}+ </Flex>+ </Grid>+ </Flex>+ </Flex>+ );+};diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.test.ts b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.test.tsindex 3b733782ac..dac527913e 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.test.ts+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.test.ts@@ -7,7 +7,6 @@ import {updateRotateOrSkewPropertyValue,updateTransformTuplePropertyValue,} from "./transform-utils";-import { extractRotatePropertiesFromTransform } from "./transform-extractors";import type { StyleInfo } from "../../shared/style-info";import {FunctionValue,@@ -17,6 +16,7 @@ import {type StyleValue,} from "@webstudio-is/css-engine";import { parseCssValue } from "@webstudio-is/css-data";+import { extractRotatePropertiesFromTransform } from "./transform-extractors";const initializeStyleInfo = () => {const currentStyle: StyleInfo = {};diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.ts b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.tsindex 01e44068e1..6fe94bd126 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.ts+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.ts@@ -101,6 +101,11 @@ export const addDefaultsForTransormSection = (props: {return setProperty("scale")(scale);}+ case "transformOrigin": {+ const transformOrigin = parseCssValue("transformOrigin", "50% 50%");+ return setProperty("transformOrigin")(transformOrigin);+ }+case "backfaceVisibility": {return setProperty("backfaceVisibility")({type: "keyword",@@ -161,6 +166,9 @@ export const isTransformPanelPropertyUsed = (params: {case "backfaceVisibility":return currentStyle["backfaceVisibility"]?.local?.type === "keyword";+ case "transformOrigin":+ return currentStyle["transformOrigin"]?.local?.type === "tuple";+case "perspective":return currentStyle["perspective"]?.local !== undefined;diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsxindex 17798d4912..4e1eb070b2 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx@@ -45,6 +45,7 @@ import { getStyleSource } from "../../shared/style-info";import { PropertyName } from "../../shared/property-name";import { getDots } from "../../shared/collapsible-section";import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import { TransformOrigin } from "./transform-origin";export const transformPanels = ["translate",@@ -56,6 +57,7 @@ export const transformPanels = [export const transformPanelDropdown = [...transformPanels,"backfaceVisibility",+ "transformOrigin","perspective",] as const;@@ -66,6 +68,7 @@ export const properties = ["translate","scale","transform",+ "transformOrigin","backfaceVisibility","perspective",] satisfies Array<StyleProperty>;@@ -98,6 +101,7 @@ export const Section = (props: SectionProps) => {batch.deleteProperty("translate");batch.deleteProperty("scale");batch.deleteProperty("transform");+ batch.deleteProperty("transformOrigin");batch.deleteProperty("backfaceVisibility");batch.deleteProperty("perspective");batch.publish();@@ -188,6 +192,7 @@ export const Section = (props: SectionProps) => {) : undefined}<BackfaceVisibility {...props} />+ <TransformOrigin {...props} /><TransformPerspective {...props} /></CollapsibleSectionRoot>);diff --git a/packages/design-system/src/components/position-grid.tsx b/packages/design-system/src/components/position-grid.tsxindex 66f800199b..86765465b5 100644--- a/packages/design-system/src/components/position-grid.tsx+++ b/packages/design-system/src/components/position-grid.tsx@@ -138,6 +138,7 @@ export const PositionGrid = ({focusedPosition,});const numericSelectedPosition = toNumericPosition(selectedPosition);+return (<GridtabIndex={0}