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: Enable/disable animations per breakpoints (Builder UI only) (#5010)
Ivan Starkov9e77277a89c4
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsxindex 3709fdc14a..71b33c0ab9 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx@@ -181,10 +181,16 @@ const animationSources = Object.keys(export const AnimateSection = ({animationAction,onChange,+ isAnimationEnabled,+ selectedBreakpointId,}: {animationAction: PropAndMeta;onChange: ((value: undefined, isEphemeral: true) => void) &((value: AnimationAction, isEphemeral: boolean) => void);+ isAnimationEnabled: (+ enabled: [breakpointId: string, enabled: boolean][] | undefined+ ) => boolean | undefined;+ selectedBreakpointId: string;}) => {const fieldIds = useIds(["type",@@ -416,7 +422,12 @@ export const AnimateSection = ({</Grid>)}- <AnimationsSelect value={value} onChange={handleChange} />+ <AnimationsSelect+ value={value}+ onChange={handleChange}+ isAnimationEnabled={isAnimationEnabled}+ selectedBreakpointId={selectedBreakpointId}+ /></Grid></Grid>);diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/animations-select.tsx b/apps/builder/app/builder/features/settings-panel/props-section/animation/animations-select.tsxindex ae5727bd59..b168b537f3 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/animations-select.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/animations-select.tsx@@ -20,6 +20,7 @@ import {FloatingPanel,InputField,DialogTitle,+ Tooltip,} from "@webstudio-is/design-system";import {EyeClosedIcon,@@ -45,15 +46,24 @@ const newAnimationsPerType: {view: newViewAnimations,};-type Props = {+type AnimationsSelectProps = {value: AnimationAction;onChange: ((value: unknown, isEphemeral: boolean) => void) &((value: undefined, isEphemeral: true) => void);+ isAnimationEnabled: (+ enabled: [breakpointId: string, enabled: boolean][] | undefined+ ) => boolean | undefined;+ selectedBreakpointId: string;};const floatingPanelOffset = { alignmentAxis: -100 };-export const AnimationsSelect = ({ value, onChange }: Props) => {+export const AnimationsSelect = ({+ value,+ onChange,+ isAnimationEnabled,+ selectedBreakpointId,+}: AnimationsSelectProps) => {const fieldIds = useIds(["addAnimation"] as const);const [newAnimationHint, setNewAnimationHint] = useState<string | undefined>(@@ -145,106 +155,134 @@ export const AnimationsSelect = ({ value, onChange }: Props) => {</DropdownMenu><CssValueListArrowFocus dragItemId={dragItemId}><Grid gap={1} css={{ gridColumn: "span 2" }} ref={sortableRefCallback}>- {value.animations.map((animation, index) => (- <FloatingPanel- key={index}- title={- <DialogTitle css={{ paddingLeft: theme.spacing[6] }}>- <InputField- css={{- width: "100%",- fontWeight: `inherit`,- }}- variant="chromeless"- value={animation.name}- autoFocus={true}- placeholder="Enter animation name"- onChange={(event) => {- const name = event.currentTarget.value;- const newAnimations = [...value.animations];- newAnimations[index] = { ...animation, name };+ {value.animations.map((animation, index) => {+ const isEnabled = isAnimationEnabled(animation.enabled) ?? true;- const newValue = {- ...value,- animations: newAnimations,- };-- handleChange(newValue, false);- }}- />- </DialogTitle>- }- content={- <AnimationPanelContent- type={value.type}- value={animation}- onChange={(animation, isEphemeral) => {- if (animation === undefined) {- // Reset ephemeral state- handleChange(undefined, true);- return;- }-- const newAnimations = [...value.animations];- newAnimations[index] = animation;- const newValue = {- ...value,- animations: newAnimations,- };- handleChange(newValue, isEphemeral);- }}- />- }- offset={floatingPanelOffset}- >- <CssValueListItem+ return (+ <FloatingPanelkey={index}- label={- <Label disabled={false} truncate>- {animation.name ?? "Unnamed"}- </Label>- }- hidden={false}- draggable- active={dragItemId === String(index)}- state={undefined}- index={index}- id={String(index)}- buttons={- <>- <SmallToggleButton- pressed={false}- onPressedChange={() => {- alert("Not implemented");+ title={+ <DialogTitle css={{ paddingLeft: theme.spacing[6] }}>+ <InputField+ css={{+ width: "100%",+ fontWeight: `inherit`,}}- variant="normal"- tabIndex={-1}- icon={- // eslint-disable-next-line no-constant-condition- false ? <EyeClosedIcon /> : <EyeOpenIcon />- }- />-- <SmallIconButton- variant="destructive"- tabIndex={-1}- icon={<MinusIcon />}- onClick={() => {+ variant="chromeless"+ value={animation.name}+ autoFocus={true}+ placeholder="Enter animation name"+ onChange={(event) => {+ const name = event.currentTarget.value;const newAnimations = [...value.animations];- newAnimations.splice(index, 1);+ newAnimations[index] = { ...animation, name };const newValue = {...value,animations: newAnimations,};+handleChange(newValue, false);}}/>- </>+ </DialogTitle>}- />- </FloatingPanel>- ))}+ content={+ <AnimationPanelContent+ type={value.type}+ value={animation}+ onChange={(animation, isEphemeral) => {+ if (animation === undefined) {+ // Reset ephemeral state+ handleChange(undefined, true);+ return;+ }++ const newAnimations = [...value.animations];+ newAnimations[index] = animation;+ const newValue = {+ ...value,+ animations: newAnimations,+ };+ handleChange(newValue, isEphemeral);+ }}+ />+ }+ offset={floatingPanelOffset}+ >+ <CssValueListItem+ key={index}+ label={+ <Label disabled={false} truncate>+ {animation.name ?? "Unnamed"}+ </Label>+ }+ hidden={!isEnabled}+ draggable+ active={dragItemId === String(index)}+ state={undefined}+ index={index}+ id={String(index)}+ buttons={+ <>+ <Tooltip+ content={+ isEnabled+ ? "Disable animation at breakpoint"+ : "Enable animation at breakpoint"+ }+ >+ <SmallToggleButton+ pressed={!isEnabled}+ onPressedChange={() => {+ const enabledMap = new Map(animation.enabled);+ enabledMap.set(selectedBreakpointId, !isEnabled);++ const enabled = [...enabledMap];++ const newAnimations = [...value.animations];+ const newAnimation = {+ ...animation,+ enabled: enabled.every(([_, enabled]) => enabled)+ ? undefined+ : [...enabledMap],+ };++ newAnimations[index] = newAnimation;++ const newValue = {+ ...value,+ animations: newAnimations,+ };+ handleChange(newValue, false);+ }}+ variant="normal"+ tabIndex={-1}+ icon={isEnabled ? <EyeOpenIcon /> : <EyeClosedIcon />}+ />+ </Tooltip>++ <SmallIconButton+ variant="destructive"+ tabIndex={-1}+ icon={<MinusIcon />}+ onClick={() => {+ const newAnimations = [...value.animations];+ newAnimations.splice(index, 1);++ const newValue = {+ ...value,+ animations: newAnimations,+ };+ handleChange(newValue, false);+ }}+ />+ </>+ }+ />+ </FloatingPanel>+ );+ })}{placementIndicator}</Grid></CssValueListArrowFocus>diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/keyframe-helpers.ts b/apps/builder/app/builder/features/settings-panel/props-section/animation/keyframe-helpers.tsindex 4467623326..0c9977e213 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/keyframe-helpers.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/keyframe-helpers.ts@@ -10,6 +10,11 @@ export const calcOffsets = (const offsets = keyframes.map((k) =>k.offset !== undefined ? k.offset * multiplier : undefined);++ if (offsets.length === 1 && offsets[0] === undefined) {+ return [1];+ }+if (offsets[0] === undefined) {offsets[0] = 0;}diff --git a/apps/builder/app/builder/features/settings-panel/props-section/match-media-breakpoints.test.ts b/apps/builder/app/builder/features/settings-panel/props-section/match-media-breakpoints.test.tsnew file mode 100644index 0000000000..fd69d0c44b--- /dev/null+++ b/apps/builder/app/builder/features/settings-panel/props-section/match-media-breakpoints.test.ts@@ -0,0 +1,61 @@+import { describe, it, expect } from "vitest";+import { matchMediaBreakpoints } from "./match-media-breakpoints";+import type { IsEqual } from "type-fest";++describe("matchMediaBreakpoints", () => {+ it("returns undefined when values array is undefined", () => {+ const matchingBreakpointIds = ["mobile", "tablet", "desktop"];+ const matcher = matchMediaBreakpoints(matchingBreakpointIds);++ expect(matcher(undefined)).toBeUndefined();+ });++ it("returns undefined when no matching breakpoints are found", () => {+ const matchingBreakpointIds = ["mobile", "tablet", "desktop"];+ const values: Array<[string, number]> = [+ ["other-breakpoint", 100],+ ["another-breakpoint", 200],+ ];++ const matcher = matchMediaBreakpoints(matchingBreakpointIds);++ expect(matcher(values)).toBeUndefined();+ });++ it("returns the value of the last matching breakpoint", () => {+ const matchingBreakpointIds = ["mobile", "tablet"];+ const values: Array<[string, number]> = [+ ["mobile", 320],+ ["tablet", 768],+ ["desktop", 1024],+ ];++ const matcher = matchMediaBreakpoints(matchingBreakpointIds);++ expect(matcher(values)).toBe(768);+ });++ it("preserves the value type", () => {+ const matchingBreakpointIds = ["mobile", "tablet", "desktop"];++ const stringValues: Array<[string, string]> = [["mobile", "small"]];+ const stringMatcher = matchMediaBreakpoints(matchingBreakpointIds);+ const strResult = stringMatcher(stringValues);+ expect(strResult).toBe("small");+ true satisfies IsEqual<string | undefined, typeof strResult>;++ const booleanValues: Array<[string, boolean]> = [["tablet", true]];+ const booleanMatcher = matchMediaBreakpoints(matchingBreakpointIds);+ const boolResult = booleanMatcher(booleanValues);+ expect(boolResult).toBe(true);+ true satisfies IsEqual<boolean | undefined, typeof boolResult>;++ const objectValues: Array<[string, { width: number }]> = [+ ["desktop", { width: 1024 }],+ ];+ const objectMatcher = matchMediaBreakpoints(matchingBreakpointIds);+ const objResult = objectMatcher(objectValues);+ expect(objResult).toEqual({ width: 1024 });+ true satisfies IsEqual<{ width: number } | undefined, typeof objResult>;+ });+});diff --git a/apps/builder/app/builder/features/settings-panel/props-section/match-media-breakpoints.ts b/apps/builder/app/builder/features/settings-panel/props-section/match-media-breakpoints.tsnew file mode 100644index 0000000000..5a8e5bd0a8--- /dev/null+++ b/apps/builder/app/builder/features/settings-panel/props-section/match-media-breakpoints.ts@@ -0,0 +1,24 @@+/**+ * Given an array of [breakpointId, value] tuples and an ordered list of breakpoint IDs,+ * returns the value associated with the last matching breakpoint found.+ * If none of the breakpoint IDs are present, returns undefined.+ * */+export const matchMediaBreakpoints =+ (matchingBreakpointIds: string[]) =>+ <T extends [breakpointId: string, value: unknown]>(+ values: T[] | undefined+ ): T[1] | undefined => {+ let lastValue: T[1] | undefined = undefined;++ if (values === undefined) {+ return lastValue;+ }++ const valuesMap = new Map<string, T[1]>(values);++ for (const matchingBreakpointId of matchingBreakpointIds) {+ lastValue = valuesMap.get(matchingBreakpointId) ?? lastValue;+ }++ return lastValue;+ };diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex bbf5ac031f..7b7c5133fa 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -19,6 +19,7 @@ import {$isDesignMode,$isContentMode,$memoryProps,+ $selectedBreakpoint,} from "~/shared/nano-states";import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";import { renderControl } from "../controls/combined";@@ -27,6 +28,8 @@ import { serverSyncStore } from "~/shared/sync";import { $selectedInstanceKey } from "~/shared/awareness";import { AnimateSection } from "./animation/animation-section";import { nanoid } from "nanoid";+import { $matchingBreakpoints } from "../../style-panel/shared/model";+import { matchMediaBreakpoints } from "./match-media-breakpoints";type Item = {name: string;@@ -149,6 +152,10 @@ export const PropsSection = (props: PropsSectionProps) => {const [addingProp, setAddingProp] = useState(false);const isDesignMode = useStore($isDesignMode);const isContentMode = useStore($isContentMode);+ const matchingBreakpoints = useStore($matchingBreakpoints);+ const selectedBreakpoint = useStore($selectedBreakpoint);++ const matchMediaValue = matchMediaBreakpoints(matchingBreakpoints);const hasItems =logic.addedProps.length > 0 || addingProp || logic.initialProps.length > 0;@@ -162,10 +169,12 @@ export const PropsSection = (props: PropsSectionProps) => {const showPropertiesSection =isDesignMode || (isContentMode && logic.initialProps.length > 0);- return hasAnimation ? (+ return hasAnimation && selectedBreakpoint?.id !== undefined ? (<><AnimateSectionanimationAction={animationAction}+ isAnimationEnabled={matchMediaValue}+ selectedBreakpointId={selectedBreakpoint?.id}onChange={(value, isEphemeral) => {const memoryProps = new Map($memoryProps.get());const memoryInstanceProp: Props = new Map(diff --git a/packages/sdk-components-animation/private-src b/packages/sdk-components-animation/private-srcindex 0d0d279075..3b74f0aca3 160000--- a/packages/sdk-components-animation/private-src+++ b/packages/sdk-components-animation/private-src@@ -1 +1 @@-Subproject commit 0d0d2790759ac01df3c9104d4e0e34f4a09ddab7+Subproject commit 3b74f0aca33d2ccad4880e0ca92f20a8392e90d1diff --git a/packages/sdk/src/schema/animation-schema.ts b/packages/sdk/src/schema/animation-schema.tsindex 57ee7ca246..0010ad176f 100644--- a/packages/sdk/src/schema/animation-schema.ts+++ b/packages/sdk/src/schema/animation-schema.ts@@ -154,6 +154,9 @@ export const viewRangeOptionsSchema = z.object({const baseAnimation = z.object({name: z.string().optional(),description: z.string().optional(),+ enabled: z+ .array(z.tuple([z.string().describe("breakpointId"), z.boolean()]))+ .optional(),keyframes: z.array(animationKeyframeSchema),});