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: add advanced transform options (#4243)

Bogdan Chadkinc69f6874b2ae
diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsx
index dd70ea4fa3..e531e3a4bf 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsx
@@ -1,6 +1,5 @@
import { propertyDescriptions, propertySyntaxes } from "@webstudio-is/css-data";
-import type { SectionProps } from "../shared/section";
-import { Flex, Grid, theme, PositionGrid } from "@webstudio-is/design-system";
+import { Flex, Grid, PositionGrid } from "@webstudio-is/design-system";
import {
KeywordValue,
StyleValue,
@@ -12,9 +11,12 @@ import { styleConfigByName } from "../../shared/configs";
import { useMemo } from "react";
import { extractTransformOrPerspectiveOriginValues } from "./transform-extractors";
import { CssValueInputContainer } from "../../shared/css-value-input";
-import type { StyleUpdateOptions } from "../../shared/use-style-data";
-import { calculatePositionFromOrigin } from "./transform-utils";
+import {
+ setProperty,
+ type StyleUpdateOptions,
+} from "../../shared/use-style-data";
import { PropertyInlineLabel, PropertyLabel } from "../../property-label";
+import { useComputedStyleDecl } from "../../shared/model";
// Fake properties to use in the CssValueInputContainer
// x, y axis takes length | percentage | keyword
@@ -23,18 +25,50 @@ const fakePropertyX: StyleProperty = "backgroundPositionX";
const fakePropertyY: StyleProperty = "backgroundPositionY";
const fakePropertyZ: StyleProperty = "outlineOffset";
-export const TransformAndPerspectiveOrigin = (
- props: SectionProps & { property: StyleProperty }
-) => {
- const { currentStyle, setProperty, property } = props;
- const value = currentStyle[property]?.local;
+const keywordToValue: Record<string, number> = {
+ left: 0,
+ right: 100,
+ center: 50,
+ top: 0,
+ bottom: 100,
+};
+
+export const calculatePositionFromOrigin = (value: StyleValue | undefined) => {
+ if (value === undefined) {
+ return 50;
+ }
+
+ if (value.type === "unit") {
+ return value.value;
+ }
+
+ if (value.type === "keyword") {
+ return keywordToValue[value.value];
+ }
+
+ return 0;
+};
+
+export const TransformAndPerspectiveOrigin = ({
+ property,
+}: {
+ property: StyleProperty;
+}) => {
+ const styleDecl = useComputedStyleDecl(property);
+ const value = styleDecl.cascadedValue;
const { label } = styleConfigByName(property);
- const origin = useMemo(() => {
- if (value?.type !== "tuple" && value?.type !== "keyword") {
- return;
+ const origin = useMemo((): {
+ x: KeywordValue | UnitValue;
+ y: KeywordValue | UnitValue;
+ z?: UnitValue;
+ } => {
+ if (value.type === "tuple" || value.type === "keyword") {
+ return extractTransformOrPerspectiveOriginValues(value);
}
-
- return extractTransformOrPerspectiveOriginValues(value);
+ return {
+ x: { type: "unit", value: 50, unit: "%" },
+ y: { type: "unit", value: 50, unit: "%" },
+ };
}, [value]);
const xInfo = useMemo(() => calculatePositionFromOrigin(origin?.x), [origin]);
@@ -52,10 +86,6 @@ export const TransformAndPerspectiveOrigin = (
})
);
- if (origin === undefined) {
- return;
- }
-
const handleValueChange = (
index: number,
value: StyleValue,
@@ -120,13 +150,7 @@ export const TransformAndPerspectiveOrigin = (
};
return (
- <Flex
- direction="column"
- gap="2"
- css={{
- px: theme.spacing[9],
- }}
- >
+ <Grid gap="2">
<PropertyLabel
label={label}
description={
@@ -220,6 +244,6 @@ export const TransformAndPerspectiveOrigin = (
</Flex>
</Grid>
</Flex>
- </Flex>
+ </Grid>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-backface-visibility.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-backface-visibility.tsx
deleted file mode 100644
index 510547bc27..0000000000
--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-backface-visibility.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { propertyDescriptions } from "@webstudio-is/css-data";
-import { Grid, theme } from "@webstudio-is/design-system";
-import { TextControl } from "../../controls";
-import { PropertyLabel } from "../../property-label";
-
-export const BackfaceVisibility = () => {
- return (
- <Grid
- css={{
- px: theme.spacing[9],
- gridTemplateColumns: `2fr 1fr`,
- }}
- >
- <PropertyLabel
- label="Backface Visibility"
- description={propertyDescriptions.backfaceVisibility}
- properties={["backfaceVisibility"]}
- />
- <TextControl property="backfaceVisibility" />
- </Grid>
- );
-};
diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-perspective.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-perspective.tsx
deleted file mode 100644
index 4f145aa533..0000000000
--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-perspective.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { propertyDescriptions } from "@webstudio-is/css-data";
-import { Grid, theme } from "@webstudio-is/design-system";
-import { TextControl } from "../../controls";
-import { PropertyLabel } from "../../property-label";
-
-export const TransformPerspective = () => {
- return (
- <Grid
- css={{
- px: theme.spacing[9],
- gridTemplateColumns: `2fr 1fr`,
- }}
- >
- <PropertyLabel
- label="Perspective"
- description={propertyDescriptions.perspective}
- properties={["perspective"]}
- />
- <TextControl property="perspective" />
- </Grid>
- );
-};
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.ts
deleted file mode 100644
index 45f0ac0f98..0000000000
--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-utils.test.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-import { describe, test, expect } from "@jest/globals";
-import {
- addDefaultsForTransormSection,
- handleDeleteTransformProperty,
- handleHideTransformProperty,
- isTransformPanelPropertyUsed,
-} from "./transform-utils";
-import type { StyleInfo } from "../../shared/style-info";
-import {
- toValue,
- TupleValue,
- type StyleProperty,
- type StyleValue,
-} from "@webstudio-is/css-engine";
-import { parseCssValue } from "@webstudio-is/css-data";
-import { extractRotatePropertiesFromTransform } from "./transform-extractors";
-
-const initializeStyleInfo = () => {
- const currentStyle: StyleInfo = {};
- const setProperty = (property: StyleProperty) => (value: StyleValue) => {
- currentStyle[property] = { value };
- };
- const deleteProperty = (property: StyleProperty) => {
- delete currentStyle[property];
- };
-
- return { currentStyle, setProperty, deleteProperty };
-};
-
-describe("Transform utils CRUD operations", () => {
- test("adds a default translate property", () => {
- const { currentStyle, setProperty } = initializeStyleInfo();
-
- addDefaultsForTransormSection({
- panel: "translate",
- currentStyle,
- setProperty,
- });
- const translate = currentStyle["translate"]?.value;
- expect(translate).toEqual({
- type: "tuple",
- value: [
- {
- type: "unit",
- unit: "px",
- value: 0,
- },
- {
- type: "unit",
- unit: "px",
- value: 0,
- },
- {
- type: "unit",
- unit: "px",
- value: 0,
- },
- ],
- });
- });
-
- test("adds a default scale property", () => {
- const { currentStyle, setProperty } = initializeStyleInfo();
-
- addDefaultsForTransormSection({
- panel: "scale",
- currentStyle,
- setProperty,
- });
-
- const scale = currentStyle["scale"]?.value;
- expect(scale).toEqual({
- type: "tuple",
- value: [
- {
- type: "unit",
- unit: "%",
- value: 100,
- },
- {
- type: "unit",
- unit: "%",
- value: 100,
- },
- {
- type: "unit",
- unit: "%",
- value: 100,
- },
- ],
- });
- });
-
- test("adds a default rotate and scale property", () => {
- const { currentStyle, setProperty } = initializeStyleInfo();
-
- addDefaultsForTransormSection({
- panel: "rotate",
- currentStyle,
- setProperty,
- });
-
- expect(toValue(currentStyle["transform"]?.value)).toBe(
- "rotateX(0deg) rotateY(0deg) rotateZ(0deg)"
- );
-
- addDefaultsForTransormSection({
- panel: "skew",
- currentStyle,
- setProperty,
- });
- expect(toValue(currentStyle["transform"]?.value)).toBe(
- "skewX(0deg) skewY(0deg) rotateX(0deg) rotateY(0deg) rotateZ(0deg)"
- );
- });
-
- test("checks if any of the transform property exist", () => {
- const { currentStyle, setProperty } = initializeStyleInfo();
-
- expect(
- isTransformPanelPropertyUsed({
- currentStyle,
- panel: "translate",
- })
- ).toBe(false);
-
- addDefaultsForTransormSection({
- panel: "rotate",
- currentStyle,
- setProperty,
- });
-
- expect(
- isTransformPanelPropertyUsed({ currentStyle, panel: "rotate" })
- ).toBe(true);
- });
-
- test("deletes rotate property values from the transform", () => {
- const { currentStyle, setProperty, deleteProperty } = initializeStyleInfo();
- setProperty("transform")(
- parseCssValue(
- "transform",
- "rotateX(50deg) rotateY(50deg) rotateZ(50deg) scale(1, 1) translate(10px, 10px)"
- )
- );
-
- handleDeleteTransformProperty({
- panel: "rotate",
- currentStyle,
- setProperty,
- deleteProperty,
- });
-
- expect(toValue(currentStyle["transform"]?.value)).toBe(
- "scale(1, 1) translate(10px, 10px)"
- );
- });
-
- test("delete skew property values from the transform", () => {
- const { currentStyle, setProperty, deleteProperty } = initializeStyleInfo();
- setProperty("transform")(
- parseCssValue(
- "transform",
- "rotateX(50deg) rotateY(50deg) rotateZ(50deg) skew(10deg) skewX(10deg) skewY(10deg)"
- )
- );
- handleDeleteTransformProperty({
- panel: "skew",
- currentStyle,
- setProperty,
- deleteProperty,
- });
- expect(toValue(currentStyle["transform"]?.value)).toBe(
- "rotateX(50deg) rotateY(50deg) rotateZ(50deg) skew(10deg)"
- );
- });
-
- test("hide translate and rotate properties", () => {
- const { currentStyle, setProperty } = initializeStyleInfo();
- addDefaultsForTransormSection({
- panel: "translate",
- currentStyle,
- setProperty,
- });
- addDefaultsForTransormSection({
- panel: "rotate",
- currentStyle,
- setProperty,
- });
-
- handleHideTransformProperty({
- panel: "translate",
- currentStyle,
- setProperty,
- });
- expect(currentStyle["translate"]?.value?.hidden).toBe(true);
-
- handleHideTransformProperty({
- panel: "rotate",
- currentStyle,
- setProperty,
- });
- const rotate = extractRotatePropertiesFromTransform(
- currentStyle["transform"]?.value as TupleValue
- );
-
- expect(rotate.rotateX?.hidden).toBe(true);
- expect(rotate.rotateY?.hidden).toBe(true);
- expect(rotate.rotateZ?.hidden).toBe(true);
- });
-});
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.ts
index fa39ce0453..8162bdcec5 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
@@ -6,12 +6,10 @@ import {
type TupleValue,
} from "@webstudio-is/css-engine";
import {
+ deleteProperty,
setProperty,
- type DeleteProperty,
- type SetProperty,
type StyleUpdateOptions,
} from "../../shared/use-style-data";
-import type { StyleInfo } from "../../shared/style-info";
import {
extractRotatePropertiesFromTransform,
extractSkewPropertiesFromTransform,
@@ -25,14 +23,6 @@ export const transformPanels = [
"skew",
] as const;
-export const transformPanelDropdown = [
- ...transformPanels,
- "backfaceVisibility",
- "transformOrigin",
- "perspective",
- "perspectiveOrigin",
-] as const;
-
export type TransformPanel = (typeof transformPanels)[number];
const defaultTranslate = "0px 0px 0px";
@@ -42,8 +32,8 @@ const defaultSkew = "skewX(0deg) skewY(0deg)";
export const getHumanizedTextFromTransformLayer = (
panel: TransformPanel,
- value: TupleValue
-): { label: string; value: TupleValue } | undefined => {
+ value: StyleValue
+): { label: string; value: StyleValue } | undefined => {
switch (panel) {
case "translate":
return {
@@ -99,11 +89,10 @@ export const getHumanizedTextFromTransformLayer = (
};
export const addDefaultsForTransormSection = (props: {
- panel: (typeof transformPanelDropdown)[number];
- currentStyle: StyleInfo;
- setProperty: SetProperty;
+ panel: (typeof transformPanels)[number];
+ styles: ComputedStyleDecl[];
}) => {
- const { setProperty, panel, currentStyle } = props;
+ const { panel, styles } = props;
switch (panel) {
case "translate": {
@@ -116,50 +105,28 @@ export const addDefaultsForTransormSection = (props: {
return setProperty("scale")(scale);
}
- case "transformOrigin": {
- const transformOrigin = parseCssValue("transformOrigin", "50% 50%");
- return setProperty("transformOrigin")(transformOrigin);
- }
-
- case "perspectiveOrigin": {
- const perspectiveOrigin = parseCssValue("perspectiveOrigin", "50% 50%");
- return setProperty("perspectiveOrigin")(perspectiveOrigin);
- }
-
- case "backfaceVisibility": {
- return setProperty("backfaceVisibility")({
- type: "keyword",
- value: "visible",
- });
- }
-
- case "perspective": {
- return setProperty("perspective")({
- type: "keyword",
- value: "none",
- });
- }
-
case "skew":
case "rotate": {
- const value = currentStyle["transform"]?.value;
const parsedValue = parseCssValue(
"transform",
panel === "rotate" ? defaultRotate : defaultSkew
);
+ const transform = styles.find(
+ (styleDecl) => styleDecl.property === "transform"
+ )?.cascadedValue;
// rotate and skew are maintained using tuple
// If the existing value is anything other than tuple.
// We need to update the property to use tuples
- if (value?.type !== "tuple") {
+ if (transform === undefined || transform.type !== "tuple") {
return setProperty("transform")(parsedValue);
}
- if (parsedValue.type === "tuple" && value.type === "tuple") {
- const filteredValues = removeRotateOrSkewValues(panel, value);
+ if (parsedValue.type === "tuple" && transform.type === "tuple") {
+ const filteredValues = removeRotateOrSkewValues(panel, transform);
return setProperty("transform")({
- ...value,
+ ...transform,
value: [...parsedValue.value, ...filteredValues],
});
}
@@ -167,50 +134,41 @@ export const addDefaultsForTransormSection = (props: {
}
};
-export const isTransformPanelPropertyUsed = (params: {
- currentStyle: StyleInfo;
- panel: (typeof transformPanelDropdown)[number];
+export const isTransformPanelPropertyUsed = ({
+ panel,
+ styles,
+}: {
+ panel: (typeof transformPanels)[number];
+ styles: ComputedStyleDecl[];
}): boolean => {
- const { currentStyle, panel } = params;
switch (panel) {
- case "scale":
case "translate":
- return currentStyle[panel]?.value.type === "tuple";
-
- /*
- backface-visibility is a keyword property. And it's default value is visible.
- It's not inherited. So, we need to check with the local value to enable/disable in the dropdown.
- If we check with the computed value, it will always return true.
- https://developer.mozilla.org/en-US/docs/Web/CSS/backface-visibility#formal_definition
- */
- case "backfaceVisibility":
- return currentStyle["backfaceVisibility"]?.local?.type === "keyword";
-
- case "transformOrigin":
- return currentStyle["transformOrigin"]?.local !== undefined;
-
- case "perspective":
- return currentStyle["perspective"]?.local !== undefined;
-
- case "perspectiveOrigin":
- return currentStyle["perspectiveOrigin"]?.local !== undefined;
-
+ case "scale": {
+ const styleDecl = styles.find(
+ (styleDecl) => styleDecl.property === panel
+ );
+ return styleDecl?.cascadedValue.type === "tuple";
+ }
case "rotate": {
- const rotate = currentStyle["transform"]?.value;
+ const styleDecl = styles.find(
+ (styleDecl) => styleDecl.property === "transform"
+ );
return (
- rotate?.type === "tuple" &&
- extractRotatePropertiesFromTransform(rotate).rotateX !== undefined
+ styleDecl?.cascadedValue.type === "tuple" &&
+ extractRotatePropertiesFromTransform(styleDecl.cascadedValue)
+ .rotateX !== undefined
);
}
-
case "skew": {
- const skew = currentStyle["transform"]?.value;
+ const styleDecl = styles.find(
+ (styleDecl) => styleDecl.property === "transform"
+ );
return (
- skew?.type === "tuple" &&
- extractSkewPropertiesFromTransform(skew).skewX !== undefined
+ styleDecl?.cascadedValue.type === "tuple" &&
+ extractSkewPropertiesFromTransform(styleDecl.cascadedValue).skewX !==
+ undefined
);
}
-
default:
return false;
}
@@ -227,13 +185,13 @@ export const removeRotateOrSkewValues = (
);
};
-export const handleDeleteTransformProperty = (params: {
- currentStyle: StyleInfo;
- setProperty: SetProperty;
- deleteProperty: DeleteProperty;
+export const handleDeleteTransformProperty = ({
+ panel,
+ value,
+}: {
panel: TransformPanel;
+ value: StyleValue;
}) => {
- const { deleteProperty, panel, currentStyle, setProperty } = params;
switch (panel) {
case "scale":
case "translate":
@@ -241,8 +199,7 @@ export const handleDeleteTransformProperty = (params: {
break;
case "rotate": {
- const value = currentStyle["transform"]?.value;
- if (value?.type !== "tuple") {
+ if (value.type !== "tuple") {
return;
}
const filteredValues = removeRotateOrSkewValues("rotate", value);
@@ -258,8 +215,7 @@ export const handleDeleteTransformProperty = (params: {
}
case "skew": {
- const value = currentStyle["transform"]?.value;
- if (value?.type !== "tuple") {
+ if (value.type !== "tuple") {
return;
}
const filteredValues = removeRotateOrSkewValues("skew", value);
@@ -275,17 +231,17 @@ export const handleDeleteTransformProperty = (params: {
}
};
-export const handleHideTransformProperty = (params: {
- setProperty: SetProperty;
- currentStyle: StyleInfo;
+export const handleHideTransformProperty = ({
+ panel,
+ value,
+}: {
panel: TransformPanel;
+ value: StyleValue;
}) => {
- const { panel, setProperty, currentStyle } = params;
switch (panel) {
case "scale":
case "translate": {
- const value = currentStyle[panel]?.value;
- if (value?.type !== "tuple") {
+ if (value.type !== "tuple") {
return;
}
setProperty(panel)({
@@ -296,8 +252,7 @@ export const handleHideTransformProperty = (params: {
}
case "rotate": {
- const value = currentStyle["transform"]?.value;
- if (value?.type !== "tuple") {
+ if (value.type !== "tuple") {
return;
}
const newValue: TupleValue = {
@@ -333,8 +288,7 @@ export const handleHideTransformProperty = (params: {
}
case "skew": {
- const value = currentStyle["transform"]?.value;
- if (value?.type !== "tuple") {
+ if (value.type !== "tuple") {
return;
}
const newValue: TupleValue = {
@@ -364,30 +318,6 @@ export const handleHideTransformProperty = (params: {
}
};
-const keywordToValue: Record<string, number> = {
- left: 0,
- right: 100,
- center: 50,
- top: 0,
- bottom: 100,
-};
-
-export const calculatePositionFromOrigin = (value: StyleValue | undefined) => {
- if (value === undefined) {
- return 50;
- }
-
- if (value.type === "unit") {
- return value.value;
- }
-
- if (value.type === "keyword") {
- return keywordToValue[value.value];
- }
-
- return 0;
-};
-
const transformFunctions = ["rotateX", "rotateY", "rotateZ", "skewX", "skewY"];
export const updateTransformFunction = (
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.tsx
index d37ae169a9..950cb3ae3e 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
@@ -1,7 +1,11 @@
-import { CollapsibleSectionRoot } from "~/builder/shared/collapsible-section";
-import type { SectionProps } from "../shared/section";
+import {
+ forwardRef,
+ useState,
+ type ElementRef,
+ type ComponentProps,
+} from "react";
import type { StyleProperty } from "@webstudio-is/css-engine";
-import { useMemo, useState } from "react";
+import { propertyDescriptions } from "@webstudio-is/css-data";
import {
CssValueListArrowFocus,
CssValueListItem,
@@ -11,19 +15,24 @@ import {
DropdownMenuPortal,
DropdownMenuTrigger,
Flex,
+ Grid,
+ IconButton,
Label,
SectionTitle,
SectionTitleButton,
SmallIconButton,
SmallToggleButton,
theme,
+ Tooltip,
} from "@webstudio-is/design-system";
import {
EyeconClosedIcon,
PlusIcon,
SubtractIcon,
EyeconOpenIcon,
+ EllipsesIcon,
} from "@webstudio-is/icons";
+import { CollapsibleSectionRoot } from "~/builder/shared/collapsible-section";
import {
addDefaultsForTransormSection,
isTransformPanelPropertyUsed,
@@ -31,7 +40,6 @@ import {
handleHideTransformProperty,
getHumanizedTextFromTransformLayer,
transformPanels,
- transformPanelDropdown,
type TransformPanel,
} from "./transform-utils";
import { FloatingPanel } from "~/builder/shared/floating-panel";
@@ -39,49 +47,113 @@ import { TranslatePanelContent } from "./transform-translate";
import { ScalePanelContent } from "./transform-scale";
import { RotatePanelContent } from "./transform-rotate";
import { SkewPanelContent } from "./transform-skew";
-import { BackfaceVisibility } from "./transform-backface-visibility";
-import { TransformPerspective } from "./transform-perspective";
import { humanizeString } from "~/shared/string-utils";
import { getDots } from "../../shared/style-section";
import { TransformAndPerspectiveOrigin } from "./transform-and-perspective-origin";
-import { PropertySectionLabel } from "../../property-label";
-import { propertyDescriptions } from "@webstudio-is/css-data";
-import { useComputedStyles } from "../../shared/model";
+import {
+ getPriorityStyleValueSource,
+ PropertyLabel,
+ PropertySectionLabel,
+} from "../../property-label";
+import { useComputedStyleDecl, useComputedStyles } from "../../shared/model";
+import { createBatchUpdate } from "../../shared/use-style-data";
+import { TextControl } from "../../controls";
const label = "Transforms";
-export const properties = [
- "translate",
- "scale",
- "transform",
+const advancedProperties = [
"transformOrigin",
"backfaceVisibility",
"perspective",
"perspectiveOrigin",
] satisfies [StyleProperty, ...StyleProperty[]];
-export const Section = (props: SectionProps) => {
- const [isOpen, setIsOpen] = useState(true);
+export const properties = [
+ "translate",
+ "scale",
+ "transform",
+ ...advancedProperties,
+] satisfies [StyleProperty, ...StyleProperty[]];
+
+const TransformAdvancedButton = forwardRef<
+ ElementRef<"button">,
+ ComponentProps<"button">
+>((props, ref) => {
+ const styles = useComputedStyles(advancedProperties);
+ const styleValueSourceColor = getPriorityStyleValueSource(styles);
+ return (
+ <Tooltip content="Advanced transform options">
+ <IconButton
+ {...props}
+ ref={ref}
+ variant={styleValueSourceColor}
+ onClick={(event) => {
+ if (event.altKey) {
+ const batch = createBatchUpdate();
+ for (const property of advancedProperties) {
+ batch.deleteProperty(property);
+ }
+ batch.publish();
+ return;
+ }
+ props.onClick?.(event);
+ }}
+ >
+ <EllipsesIcon />
+ </IconButton>
+ </Tooltip>
+ );
+});
+
+const TransformAdvancedPopover = () => {
+ return (
+ <FloatingPanel
+ title="Advanced Transform"
+ content={
+ <Grid
+ css={{
+ p: theme.spacing[9],
+ gap: theme.spacing[6],
+ width: theme.spacing[30],
+ }}
+ >
+ <Grid css={{ gridTemplateColumns: `2fr 1fr` }}>
+ <PropertyLabel
+ label="Backface Visibility"
+ description={propertyDescriptions.backfaceVisibility}
+ properties={["backfaceVisibility"]}
+ />
+ <TextControl property="backfaceVisibility" />
+ </Grid>
+ <TransformAndPerspectiveOrigin property="transformOrigin" />
+ <Grid css={{ gridTemplateColumns: `2fr 1fr` }}>
+ <PropertyLabel
+ label="Perspective"
+ description={propertyDescriptions.perspective}
+ properties={["perspective"]}
+ />
+ <TextControl property="perspective" />
+ </Grid>
+ <TransformAndPerspectiveOrigin property="perspectiveOrigin" />
+ </Grid>
+ }
+ >
+ <TransformAdvancedButton />
+ </FloatingPanel>
+ );
+};
- const { currentStyle } = props;
+export const Section = () => {
+ const [isOpen, setIsOpen] = useState(true);
+ const styles = useComputedStyles(properties);
const isAnyTransformPropertyAdded = transformPanels.some((panel) =>
isTransformPanelPropertyUsed({
- currentStyle: props.currentStyle,
panel,
+ styles,
})
);
- const isBackfaceVisibilityUsed = isTransformPanelPropertyUsed({
- currentStyle,
- panel: "backfaceVisibility",
- });
- const isPerspectiveOriginUsed = isTransformPanelPropertyUsed({
- currentStyle,
- panel: "perspective",
- });
-
- const styles = useComputedStyles(properties);
return (
<CollapsibleSectionRoot
fullWidth
@@ -92,41 +164,41 @@ export const Section = (props: SectionProps) => {
<SectionTitle
dots={getDots(styles)}
suffix={
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <SectionTitleButton prefix={<PlusIcon />}></SectionTitleButton>
- </DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuContent
- collisionPadding={16}
- css={{ width: theme.spacing[24] }}
- >
- {transformPanelDropdown.map((panel) => {
- return (
+ <Flex gap={1}>
+ <TransformAdvancedPopover />
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <SectionTitleButton
+ prefix={<PlusIcon />}
+ ></SectionTitleButton>
+ </DropdownMenuTrigger>
+ <DropdownMenuPortal>
+ <DropdownMenuContent
+ collisionPadding={16}
+ css={{ width: theme.spacing[24] }}
+ >
+ {transformPanels.map((panel) => (
<DropdownMenuItem
- disabled={
- isTransformPanelPropertyUsed({
- currentStyle: props.currentStyle,
- panel,
- }) === true
- }
+ disabled={isTransformPanelPropertyUsed({
+ panel,
+ styles,
+ })}
key={panel}
onSelect={() => {
addDefaultsForTransormSection({
- currentStyle: props.currentStyle,
- setProperty: props.setProperty,
panel,
+ styles,
});
setIsOpen(true);
}}
>
{humanizeString(panel)}
</DropdownMenuItem>
- );
- })}
- </DropdownMenuContent>
- </DropdownMenuPortal>
- </DropdownMenu>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenuPortal>
+ </DropdownMenu>
+ </Flex>
}
>
<PropertySectionLabel
@@ -137,48 +209,42 @@ export const Section = (props: SectionProps) => {
</SectionTitle>
}
>
- {isAnyTransformPropertyAdded === true ? (
+ {isAnyTransformPropertyAdded && (
<CssValueListArrowFocus>
<Flex direction="column">
- {transformPanels.map((panel, index) => (
- <TransformSection
- {...props}
- key={panel}
- index={index}
- panel={panel}
- />
- ))}
+ {transformPanels.map(
+ (panel, index) =>
+ isTransformPanelPropertyUsed({
+ panel,
+ styles,
+ }) && (
+ <TransformSection key={panel} index={index} panel={panel} />
+ )
+ )}
</Flex>
</CssValueListArrowFocus>
- ) : undefined}
-
- {isBackfaceVisibilityUsed && <BackfaceVisibility />}
- <TransformAndPerspectiveOrigin property="transformOrigin" {...props} />
- {isPerspectiveOriginUsed && <TransformPerspective />}
- <TransformAndPerspectiveOrigin property="perspectiveOrigin" {...props} />
+ )}
</CollapsibleSectionRoot>
);
};
-const TransformSection = (
- props: SectionProps & { index: number; panel: TransformPanel }
-) => {
- const { currentStyle, setProperty, deleteProperty, panel, index } = props;
- const properties = useMemo(() => {
- const property =
- panel === "rotate" || panel === "skew" ? "transform" : panel;
- const value = currentStyle[property]?.value;
-
- if (value === undefined || value.type !== "tuple") {
- return;
- }
-
- return getHumanizedTextFromTransformLayer(panel, value);
- }, [currentStyle, panel]);
-
- if (properties === undefined) {
+const TransformSection = ({
+ panel,
+ index,
+}: {
+ index: number;
+ panel: TransformPanel;
+}) => {
+ const property = panel === "rotate" || panel === "skew" ? "transform" : panel;
+ const styleDecl = useComputedStyleDecl(property);
+ const values = getHumanizedTextFromTransformLayer(
+ panel,
+ styleDecl.cascadedValue
+ );
+ if (values === undefined) {
return;
}
+ const { value, label } = values;
return (
<FloatingPanel
@@ -195,28 +261,21 @@ const TransformSection = (
<CssValueListItem
id={panel}
index={index}
- hidden={properties.value.hidden}
- label={<Label truncate>{properties.label}</Label>}
+ hidden={value.hidden}
+ label={<Label truncate>{label}</Label>}
buttons={
<>
<SmallToggleButton
variant="normal"
- pressed={properties.value.hidden}
+ pressed={value.hidden}
tabIndex={-1}
onPressedChange={() =>
handleHideTransformProperty({
- currentStyle,
- setProperty,
panel,
+ value: styleDecl.cascadedValue,
})
}
- icon={
- properties.value.hidden ? (
- <EyeconClosedIcon />
- ) : (
- <EyeconOpenIcon />
- )
- }
+ icon={value.hidden ? <EyeconClosedIcon /> : <EyeconOpenIcon />}
/>
<SmallIconButton
variant="destructive"
@@ -224,10 +283,8 @@ const TransformSection = (
icon={<SubtractIcon />}
onClick={() =>
handleDeleteTransformProperty({
- currentStyle,
- setProperty,
- deleteProperty,
panel,
+ value: styleDecl.cascadedValue,
})
}
/>