Skip to content

experimental: split keyframe styles into popover #5126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2025
Merged

experimental: split keyframe styles into popover #5126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 132 additions & 124 deletions ...ilder/app/builder/features/settings-panel/props-section/animation/animation-keyframes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ import {
} from "@webstudio-is/css-engine";
import {
Grid,
IconButton,
Label,
Separator,
Tooltip,
ScrollArea,
theme,
SectionTitle,
SectionTitleButton,
SectionTitleLabel,
FloatingPanel,
CssValueListItem,
SmallIconButton,
CssValueListArrowFocus,
} from "@webstudio-is/design-system";
import { MinusIcon, PlusIcon } from "@webstudio-is/icons";
import type { AnimationKeyframe } from "@webstudio-is/sdk";
import { Fragment, useMemo, useRef, useState } from "react";
import { Fragment, useId, useMemo, useRef, useState } from "react";
import {
CssValueInput,
type IntermediateStyleValue,
} from "~/builder/features/style-panel/shared/css-value-input";
import { useIds } from "~/shared/form-utils";
import { calcOffsets, findInsertionIndex, moveItem } from "./keyframe-helpers";
import { CssEditor } from "~/builder/shared/css-editor";
import type { ComputedStyleDecl } from "~/shared/style-object-model";
Expand All @@ -35,6 +35,8 @@ const unitOptions = [
},
];

const roundOffset = (value: number) => Math.round(value * 1000) / 10;

const OffsetInput = ({
id,
value,
Expand All @@ -54,9 +56,7 @@ const OffsetInput = ({
<CssValueInput
id={id}
placeholder={
value === undefined
? `auto (${Math.round(placeholder * 1000) / 10}%)`
: "auto"
value === undefined ? `auto (${roundOffset(placeholder)}%)` : "auto"
}
getOptions={() => []}
unitOptions={unitOptions}
Expand All @@ -66,11 +66,7 @@ const OffsetInput = ({
property={"font-stretch"}
value={
value !== undefined
? {
type: "unit",
value: Math.round(value * 1000) / 10,
unit: "%",
}
? { type: "unit", value: roundOffset(value), unit: "%" }
: undefined
}
onChange={(styleValue) => {
Expand Down Expand Up @@ -121,91 +117,113 @@ const OffsetInput = ({

const Keyframe = ({
value,
index,
offsetPlaceholder,
onChange,
onDelete,
}: {
value: AnimationKeyframe;
index: number;
offsetPlaceholder: number;
onChange: (
value: AnimationKeyframe | undefined,
isEphemeral: boolean
) => void;
onChange: (value: AnimationKeyframe, isEphemeral: boolean) => void;
onDelete: () => void;
}) => {
const ids = useIds(["offset"]);
const declarations: Array<ComputedStyleDecl> = useMemo(
const offsetId = useId();
const declarations = useMemo(
() =>
(Object.keys(value.styles) as Array<CssProperty>).map((property) => {
(Object.keys(value.styles) as CssProperty[]).map((property) => {
const styleValue = value.styles[property];
return {
property,
source: { name: "local" },
cascadedValue: styleValue,
computedValue: styleValue,
usedValue: styleValue,
};
} satisfies ComputedStyleDecl;
}),
[value.styles]
);

return (
<>
<Grid
gap={1}
align={"center"}
css={{
gridTemplateColumns: "1fr 1fr auto",
paddingInline: theme.panel.paddingInline,
}}
>
<Label htmlFor={ids.offset}>Offset</Label>
<OffsetInput
id={ids.offset}
value={value.offset}
placeholder={offsetPlaceholder}
onChange={(offset) => {
onChange({ ...value, offset }, false);
}}
/>
<Tooltip content="Remove keyframe">
<IconButton onClick={() => onChange(undefined, false)}>
<MinusIcon />
</IconButton>
</Tooltip>
</Grid>
<Grid>
<CssEditor
showSearch={false}
showAddStyleInput
propertiesPosition="top"
virtualize={false}
declarations={declarations}
onAddDeclarations={(addedStyleMap) => {
const styles = { ...value.styles };
for (const [property, value] of addedStyleMap) {
styles[property] = value;
}
onChange({ ...value, styles }, false);
}}
onDeleteProperty={(property, options = {}) => {
if (options.isEphemeral === true) {
return;
}
const styles = { ...value.styles };
delete styles[property];
onChange({ ...value, styles }, false);
}}
onSetProperty={(property) => {
return (newValue, options) => {
const styles = { ...value.styles, [property]: newValue };
onChange({ ...value, styles }, options?.isEphemeral ?? false);
};
}}
onDeleteAllDeclarations={() => {
onChange({ ...value, styles: {} }, false);
}}
/>
</Grid>
</>
<FloatingPanel
title="Keyframe"
content={
<Grid css={{ paddingBlock: theme.panel.paddingBlock }}>
<Grid
gap={1}
align="center"
css={{
gridTemplateColumns: `1fr ${theme.spacing[22]}`,
paddingInline: theme.panel.paddingInline,
}}
>
<Label htmlFor={offsetId}>Offset</Label>
<OffsetInput
id={offsetId}
value={value.offset}
placeholder={offsetPlaceholder}
onChange={(offset) => {
onChange({ ...value, offset }, false);
}}
/>
</Grid>

<CssEditor
showSearch={false}
showAddStyleInput
propertiesPosition="top"
virtualize={false}
declarations={declarations}
onAddDeclarations={(addedStyleMap) => {
const styles = { ...value.styles };
for (const [property, value] of addedStyleMap) {
styles[property] = value;
}
onChange({ ...value, styles }, false);
}}
onDeleteProperty={(property, options = {}) => {
if (options.isEphemeral === true) {
return;
}
const styles = { ...value.styles };
delete styles[property];
onChange({ ...value, styles }, false);
}}
onSetProperty={(property) => {
return (newValue, options) => {
const styles = { ...value.styles, [property]: newValue };
onChange({ ...value, styles }, options?.isEphemeral ?? false);
};
}}
onDeleteAllDeclarations={() => {
onChange({ ...value, styles: {} }, false);
}}
/>
</Grid>
}
>
<CssValueListItem
id={offsetPlaceholder.toString()}
index={index}
label={
<Label truncate>
{value.offset
? `${roundOffset(value.offset)}%`
: `auto (${roundOffset(offsetPlaceholder)}%)`}
</Label>
}
buttons={
<Tooltip content="Remove keyframe">
<SmallIconButton
variant="destructive"
tabIndex={-1}
icon={<MinusIcon />}
onClick={onDelete}
/>
</Tooltip>
}
></CssValueListItem>
</FloatingPanel>
);
};

Expand All @@ -232,7 +250,7 @@ export const Keyframes = ({
const offsets = calcOffsets(keyframes);

return (
<Grid gap={1}>
<div>
<SectionTitle
collapsible={false}
suffix={
Expand All @@ -251,52 +269,42 @@ export const Keyframes = ({
>
<SectionTitleLabel>Keyframes</SectionTitleLabel>
</SectionTitle>
<ScrollArea>
<Grid gap={2}>
{keyframes.map((value, index) => (
<Fragment key={keyRefs.current[index]}>
{index > 0 && <Separator />}
<Keyframe
key={keyRefs.current[index]}
value={value}
offsetPlaceholder={offsets[index]}
onChange={(newValue, isEphemeral) => {
if (newValue === undefined && isEphemeral) {
onChange(undefined, true);
return;
}

if (newValue === undefined) {
const newValues = [...keyframes];
newValues.splice(index, 1);
onChange(newValues, isEphemeral);
return;
}
<CssValueListArrowFocus>
{keyframes.map((value, index) => (
<Fragment key={keyRefs.current[index]}>
<Keyframe
value={value}
index={index}
offsetPlaceholder={offsets[index]}
onChange={(newValue, isEphemeral) => {
let newValues = [...keyframes];
newValues[index] = newValue;

let newValues = [...keyframes];
newValues[index] = newValue;

const { offset } = newValue;
if (offset === undefined) {
onChange(newValues, isEphemeral);
return;
}
const { offset } = newValue;
if (offset === undefined) {
onChange(newValues, isEphemeral);
return;
}

const insertionIndex = findInsertionIndex(newValues, index);
newValues = moveItem(newValues, index, insertionIndex);
keyRefs.current = moveItem(
keyRefs.current,
index,
insertionIndex
);
const insertionIndex = findInsertionIndex(newValues, index);
newValues = moveItem(newValues, index, insertionIndex);
keyRefs.current = moveItem(
keyRefs.current,
index,
insertionIndex
);

onChange(newValues, isEphemeral);
}}
/>
</Fragment>
))}
</Grid>
</ScrollArea>
</Grid>
onChange(newValues, isEphemeral);
}}
onDelete={() => {
const newValues = [...keyframes];
newValues.splice(index, 1);
onChange(newValues, false);
}}
/>
</Fragment>
))}
</CssValueListArrowFocus>
</div>
);
};
Loading