mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-11-17 23:47:33 +00:00
fix(studio): scope timeline ease focus lifecycle
This commit is contained in:
@@ -399,8 +399,8 @@ export function StudioRightPanel({
|
||||
onUpdateArcSegment={handleUpdateArcSegment}
|
||||
onUnroll={handleUnroll}
|
||||
onUpdateKeyframeEase={handleUpdateKeyframeEase}
|
||||
onSetAllKeyframeEases={handleSetAllKeyframeEases}
|
||||
onUpdateSegmentEase={handleUpdateSegmentEase}
|
||||
onSetAllKeyframeEases={handleSetAllKeyframeEases}
|
||||
recordingState={recordingState}
|
||||
recordingDuration={recordingDuration}
|
||||
onToggleRecording={onToggleRecording}
|
||||
|
||||
@@ -5,11 +5,15 @@ import { createRoot } from "react-dom/client";
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import type { GsapAnimation } from "@hyperframes/core/gsap-parser";
|
||||
import { DesignPanelInputProvider } from "../../contexts/DesignPanelInputContext";
|
||||
import { usePlayerStore } from "../../player";
|
||||
import { usePlayerStore } from "../../player/store/playerStore";
|
||||
import { GsapAnimationSection } from "./GsapAnimationSection";
|
||||
|
||||
(globalThis as unknown as { IS_REACT_ACT_ENVIRONMENT: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
|
||||
|
||||
const animationCardMock = vi.hoisted(() => ({
|
||||
consumers: [] as Array<{ tweenPercentage: number | null; consume: () => void }>,
|
||||
}));
|
||||
|
||||
vi.mock("./AnimationCard", () => ({
|
||||
AnimationCard: ({
|
||||
animation,
|
||||
@@ -19,20 +23,27 @@ vi.mock("./AnimationCard", () => ({
|
||||
animation: GsapAnimation;
|
||||
focusedSegment: { tweenPercentage: number } | null;
|
||||
onFocusSegmentConsumed: () => void;
|
||||
}) => (
|
||||
<button
|
||||
type="button"
|
||||
data-testid={`animation-${animation.id}`}
|
||||
data-focused={focusedSegment ? String(focusedSegment.tweenPercentage) : ""}
|
||||
onClick={onFocusSegmentConsumed}
|
||||
/>
|
||||
),
|
||||
}) => {
|
||||
animationCardMock.consumers.push({
|
||||
tweenPercentage: focusedSegment?.tweenPercentage ?? null,
|
||||
consume: onFocusSegmentConsumed,
|
||||
});
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
data-testid={`animation-${animation.id}`}
|
||||
data-focused={focusedSegment ? String(focusedSegment.tweenPercentage) : ""}
|
||||
onClick={onFocusSegmentConsumed}
|
||||
/>
|
||||
);
|
||||
},
|
||||
}));
|
||||
|
||||
vi.mock("./GsapAddAnimationControl", () => ({ GsapAddAnimationControl: () => null }));
|
||||
|
||||
afterEach(() => {
|
||||
document.body.innerHTML = "";
|
||||
animationCardMock.consumers = [];
|
||||
usePlayerStore.getState().reset();
|
||||
});
|
||||
|
||||
@@ -76,6 +87,8 @@ function renderSection(elementId: string) {
|
||||
|
||||
describe("GsapAnimationSection", () => {
|
||||
it("consumes a shared animation id only for the focused element", () => {
|
||||
usePlayerStore.getState().beginTimelineSession("project-a");
|
||||
usePlayerStore.getState().setSelectedElementId("index.html#second");
|
||||
usePlayerStore.getState().setFocusedEaseSegment({
|
||||
elementId: "index.html#second",
|
||||
animationId: sharedAnimation.id,
|
||||
@@ -97,4 +110,65 @@ describe("GsapAnimationSection", () => {
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBeNull();
|
||||
act(() => view.root.unmount());
|
||||
});
|
||||
|
||||
it("does not let an older consumer clear a newer request", () => {
|
||||
const store = usePlayerStore.getState();
|
||||
store.beginTimelineSession("project-a");
|
||||
store.setSelectedElementId("index.html#first");
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#first",
|
||||
animationId: sharedAnimation.id,
|
||||
tweenPercentage: 25,
|
||||
});
|
||||
const view = renderSection("index.html#first");
|
||||
const staleConsumer = animationCardMock.consumers.at(-1)?.consume;
|
||||
if (!staleConsumer) throw new Error("expected first focus consumer");
|
||||
|
||||
act(() => {
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#first",
|
||||
animationId: sharedAnimation.id,
|
||||
tweenPercentage: 75,
|
||||
});
|
||||
});
|
||||
const current = usePlayerStore.getState().focusedEaseSegment;
|
||||
if (!current) throw new Error("expected replacement request");
|
||||
|
||||
act(() => staleConsumer());
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBe(current);
|
||||
|
||||
const currentConsumer = animationCardMock.consumers.at(-1)?.consume;
|
||||
if (!currentConsumer) throw new Error("expected replacement focus consumer");
|
||||
act(() => currentConsumer());
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBeNull();
|
||||
act(() => view.root.unmount());
|
||||
});
|
||||
|
||||
it("rejects a request from an earlier project session", () => {
|
||||
const store = usePlayerStore.getState();
|
||||
store.beginTimelineSession("project-a");
|
||||
store.setSelectedElementId("index.html#first");
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#first",
|
||||
animationId: sharedAnimation.id,
|
||||
tweenPercentage: 50,
|
||||
});
|
||||
const staleRequest = usePlayerStore.getState().focusedEaseSegment;
|
||||
if (!staleRequest) throw new Error("expected request");
|
||||
|
||||
const view = renderSection("index.html#first");
|
||||
|
||||
act(() => {
|
||||
store.beginTimelineSession("project-b");
|
||||
store.setSelectedElementId("index.html#first");
|
||||
usePlayerStore.setState({ focusedEaseSegment: staleRequest });
|
||||
});
|
||||
|
||||
const card = view.host.querySelector<HTMLButtonElement>(
|
||||
"[data-testid='animation-shared-animation']",
|
||||
);
|
||||
expect(card?.dataset.focused).toBe("");
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBe(staleRequest);
|
||||
act(() => view.root.unmount());
|
||||
});
|
||||
});
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
} from "./gsapAnimationCallbacks";
|
||||
import { useTrackDesignInput } from "../../contexts/DesignPanelInputContext";
|
||||
import { usePlayerStore } from "../../player";
|
||||
import { isFocusedEaseRequestCurrent } from "../../player/store/keyframeSlice";
|
||||
import { GsapAddAnimationControl } from "./GsapAddAnimationControl";
|
||||
|
||||
interface GsapAnimationSectionProps extends GsapAnimationEditCallbacks {
|
||||
@@ -20,8 +21,8 @@ interface GsapAnimationSectionProps extends GsapAnimationEditCallbacks {
|
||||
}
|
||||
|
||||
export const GsapAnimationSection = memo(function GsapAnimationSection({
|
||||
animations,
|
||||
elementId,
|
||||
animations,
|
||||
multipleTimelines,
|
||||
unsupportedTimelinePattern,
|
||||
onAddAnimation,
|
||||
@@ -31,7 +32,24 @@ export const GsapAnimationSection = memo(function GsapAnimationSection({
|
||||
const [addMenuOpen, setAddMenuOpen] = useState(false);
|
||||
const trackedCallbacks = withTrackedGsapAnimationCallbacks(callbacks, track);
|
||||
const focusedEaseSegment = usePlayerStore((s) => s.focusedEaseSegment);
|
||||
const setFocusedEaseSegment = usePlayerStore((s) => s.setFocusedEaseSegment);
|
||||
const clearFocusedEaseSegment = usePlayerStore((s) => s.clearFocusedEaseSegment);
|
||||
const timelineProjectId = usePlayerStore((s) => s.timelineProjectId);
|
||||
const timelineSessionEpoch = usePlayerStore((s) => s.timelineSessionEpoch);
|
||||
const selectedElementId = usePlayerStore((s) => s.selectedElementId);
|
||||
const focusedRequestIsCurrent =
|
||||
focusedEaseSegment !== null &&
|
||||
isFocusedEaseRequestCurrent(focusedEaseSegment, {
|
||||
timelineProjectId,
|
||||
timelineSessionEpoch,
|
||||
selectedElementId,
|
||||
});
|
||||
const focusedAnimationExists =
|
||||
focusedEaseSegment !== null &&
|
||||
animations.some((animation) => animation.id === focusedEaseSegment.animationId);
|
||||
const focusedHere =
|
||||
focusedRequestIsCurrent && focusedEaseSegment.elementId === elementId && focusedAnimationExists
|
||||
? focusedEaseSegment
|
||||
: null;
|
||||
|
||||
return (
|
||||
<Section title="Animation" icon={<Film size={15} />}>
|
||||
@@ -56,16 +74,10 @@ export const GsapAnimationSection = memo(function GsapAnimationSection({
|
||||
key={anim.id}
|
||||
animation={anim}
|
||||
defaultExpanded={index === 0}
|
||||
focusedSegment={
|
||||
focusedEaseSegment?.elementId === elementId &&
|
||||
focusedEaseSegment.animationId === anim.id
|
||||
? focusedEaseSegment
|
||||
: null
|
||||
}
|
||||
focusedSegment={focusedHere?.animationId === anim.id ? focusedHere : null}
|
||||
onFocusSegmentConsumed={() => {
|
||||
const focused = usePlayerStore.getState().focusedEaseSegment;
|
||||
if (focused?.elementId === elementId && focused.animationId === anim.id) {
|
||||
setFocusedEaseSegment(null);
|
||||
if (focusedHere?.animationId === anim.id) {
|
||||
clearFocusedEaseSegment(focusedHere.nonce);
|
||||
}
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -568,8 +568,8 @@ export const PropertyPanel = memo(function PropertyPanel(props: PropertyPanelPro
|
||||
onUpdateArcSegment={onUpdateArcSegment}
|
||||
onUnroll={onUnroll}
|
||||
onUpdateKeyframeEase={onUpdateKeyframeEase}
|
||||
onSetAllKeyframeEases={onSetAllKeyframeEases}
|
||||
onUpdateSegmentEase={onUpdateSegmentEase}
|
||||
onSetAllKeyframeEases={onSetAllKeyframeEases}
|
||||
/>
|
||||
)}
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { type ReactNode, useEffect, useRef, useState } from "react";
|
||||
import { resolveEditingSections } from "@hyperframes/core/editing";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { DesignPanelInputProvider } from "../../contexts/DesignPanelInputContext";
|
||||
import { slugifyDesignInput } from "../../utils/designInputTracking";
|
||||
import type { DomEditSelection } from "./domEditing";
|
||||
@@ -20,34 +19,16 @@ import { formatTextFieldPreview } from "./propertyPanelSections";
|
||||
import { STUDIO_GSAP_PANEL_ENABLED } from "./manualEditingAvailability";
|
||||
import { useColorGradingController } from "./useColorGradingController";
|
||||
import { usePlayerStore } from "../../player";
|
||||
import { isFocusedEaseRequestCurrent } from "../../player/store/keyframeSlice";
|
||||
import {
|
||||
FlatColorGradingAccessory,
|
||||
FlatColorGradingSection,
|
||||
} from "./propertyPanelFlatColorGradingSection";
|
||||
|
||||
type EditingSections = ReturnType<typeof resolveEditingSections>;
|
||||
|
||||
type FlatGroupDescriptor = {
|
||||
id: string;
|
||||
title: string;
|
||||
summary?: string;
|
||||
accessory?: ReactNode;
|
||||
content: ReactNode;
|
||||
};
|
||||
|
||||
// Type-only fallback for the Motion effect-card callbacks. Used solely to
|
||||
// satisfy FlatMotionSection's required-callback shape when the effect list is
|
||||
// gated off (showEffects === false, so none of these are ever invoked). Keeps
|
||||
// the gated-off path free of `!` non-null assertions — the real, narrowed
|
||||
// handlers flow through only when the double-gate below passes.
|
||||
const EMPTY_GSAP_EFFECT_HANDLERS = {
|
||||
onAddAnimation: () => {},
|
||||
onUpdateProperty: () => {},
|
||||
onUpdateMeta: () => {},
|
||||
onDeleteAnimation: () => {},
|
||||
onAddProperty: () => {},
|
||||
onRemoveProperty: () => {},
|
||||
};
|
||||
import {
|
||||
EMPTY_GSAP_EFFECT_HANDLERS,
|
||||
type EditingSections,
|
||||
type FlatGroupDescriptor,
|
||||
} from "./propertyPanelFlatDescriptors";
|
||||
|
||||
/**
|
||||
* The flat "Ledger" inspector shell (design_handoff_studio_inspector).
|
||||
@@ -184,8 +165,8 @@ export function PropertyPanelFlat({
|
||||
| "onUpdateArcSegment"
|
||||
| "onUnroll"
|
||||
| "onUpdateKeyframeEase"
|
||||
| "onSetAllKeyframeEases"
|
||||
| "onUpdateSegmentEase"
|
||||
| "onSetAllKeyframeEases"
|
||||
| "recordingState"
|
||||
| "recordingDuration"
|
||||
| "onToggleRecording"
|
||||
@@ -263,6 +244,8 @@ export function PropertyPanelFlat({
|
||||
// force the Motion group open so its AnimationCard (which only mounts while
|
||||
// the group is expanded) can consume the focus and reveal the ease editor.
|
||||
const focusedEaseSegment = usePlayerStore((s) => s.focusedEaseSegment);
|
||||
const timelineProjectId = usePlayerStore((s) => s.timelineProjectId);
|
||||
const timelineSessionEpoch = usePlayerStore((s) => s.timelineSessionEpoch);
|
||||
// Identity of the element THIS panel actually renders (not the store's
|
||||
// selectedElementId, which flips synchronously on selection while the panel
|
||||
// still renders the previous element during async DOM-selection resolution):
|
||||
@@ -270,11 +253,27 @@ export function PropertyPanelFlat({
|
||||
// successor when both share a class-selector animation id.
|
||||
const renderedElementId = `${element.sourceFile}#${element.id}`;
|
||||
useEffect(() => {
|
||||
if (!focusedEaseSegment || focusedEaseSegment.elementId !== renderedElementId) return;
|
||||
if (gsapAnimations.some((a) => a.id === focusedEaseSegment.animationId)) {
|
||||
setOpenGroupId("motion");
|
||||
}
|
||||
}, [focusedEaseSegment, gsapAnimations, renderedElementId]);
|
||||
if (!focusedEaseSegment) return;
|
||||
if (
|
||||
!isFocusedEaseRequestCurrent(focusedEaseSegment, {
|
||||
timelineProjectId,
|
||||
timelineSessionEpoch,
|
||||
selectedElementId,
|
||||
})
|
||||
)
|
||||
return;
|
||||
if (focusedEaseSegment.elementId !== renderedElementId) return;
|
||||
if (!gsapAnimations.some((animation) => animation.id === focusedEaseSegment.animationId))
|
||||
return;
|
||||
setOpenGroupId("motion");
|
||||
}, [
|
||||
focusedEaseSegment,
|
||||
gsapAnimations,
|
||||
renderedElementId,
|
||||
selectedElementId,
|
||||
timelineProjectId,
|
||||
timelineSessionEpoch,
|
||||
]);
|
||||
|
||||
const [justToggledIds, setJustToggledIds] = useState<string[]>([]);
|
||||
const justToggledTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
|
||||
@@ -27,8 +27,8 @@ describe("withTrackedGsapAnimationCallbacks", () => {
|
||||
const onUpdateSegmentEase = vi.fn();
|
||||
callbacks.onLivePreview = onLivePreview;
|
||||
callbacks.onLivePreviewEnd = onLivePreviewEnd;
|
||||
|
||||
callbacks.onUpdateSegmentEase = onUpdateSegmentEase;
|
||||
|
||||
const tracked = withTrackedGsapAnimationCallbacks(callbacks, vi.fn());
|
||||
|
||||
expect(tracked.onUpdateFromProperty).toBeUndefined();
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
import type { ReactNode } from "react";
|
||||
import type { resolveEditingSections } from "@hyperframes/core/editing";
|
||||
|
||||
export type EditingSections = ReturnType<typeof resolveEditingSections>;
|
||||
|
||||
export type FlatGroupDescriptor = {
|
||||
id: string;
|
||||
title: string;
|
||||
summary?: string;
|
||||
accessory?: ReactNode;
|
||||
content: ReactNode;
|
||||
};
|
||||
|
||||
// FlatMotionSection never calls these while effect cards are hidden; they only
|
||||
// provide its required callback shape on the gated-off path.
|
||||
export const EMPTY_GSAP_EFFECT_HANDLERS = {
|
||||
onAddAnimation: () => {},
|
||||
onUpdateProperty: () => {},
|
||||
onUpdateMeta: () => {},
|
||||
onDeleteAnimation: () => {},
|
||||
onAddProperty: () => {},
|
||||
onRemoveProperty: () => {},
|
||||
};
|
||||
@@ -11,8 +11,8 @@ import { usePlayerStore } from "../../player";
|
||||
|
||||
afterEach(() => {
|
||||
document.body.innerHTML = "";
|
||||
usePlayerStore.getState().reset();
|
||||
});
|
||||
usePlayerStore.getState().reset();
|
||||
|
||||
function baseElement(overrides: Partial<DomEditSelection> = {}): DomEditSelection {
|
||||
return {
|
||||
@@ -271,13 +271,14 @@ describe("FlatMotionSection", () => {
|
||||
expect(buttons().some((b) => b.textContent === "+ Add effect")).toBe(true);
|
||||
act(() => root.unmount());
|
||||
});
|
||||
});
|
||||
|
||||
it("forwards focused bulk segment easing through the flat animation card", () => {
|
||||
const onUpdateKeyframeEase = vi.fn();
|
||||
const onUpdateSegmentEase = vi.fn();
|
||||
usePlayerStore.setState({
|
||||
focusedEaseSegment: {
|
||||
it("forwards focused bulk segment easing through the flat animation card", () => {
|
||||
const onUpdateKeyframeEase = vi.fn();
|
||||
const onUpdateSegmentEase = vi.fn();
|
||||
const store = usePlayerStore.getState();
|
||||
store.beginTimelineSession("project-a");
|
||||
store.setSelectedElementId("index.html#hero");
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#hero",
|
||||
animationId: "a1",
|
||||
tweenPercentage: 50,
|
||||
@@ -285,55 +286,55 @@ it("forwards focused bulk segment easing through the flat animation card", () =>
|
||||
{ animationId: "a1", tweenPercentage: 50 },
|
||||
{ animationId: "a2", tweenPercentage: 75 },
|
||||
],
|
||||
},
|
||||
});
|
||||
const { host, root } = renderInto(
|
||||
<FlatMotionSection
|
||||
element={baseElement()}
|
||||
animations={[
|
||||
{
|
||||
id: "a1",
|
||||
method: "to",
|
||||
position: 0,
|
||||
duration: 1,
|
||||
properties: { x: 100 },
|
||||
keyframes: {
|
||||
format: "percentage",
|
||||
keyframes: [
|
||||
{ percentage: 0, properties: { x: 0 } },
|
||||
{ percentage: 50, properties: { x: 100 } },
|
||||
],
|
||||
},
|
||||
} as never,
|
||||
]}
|
||||
showTiming={false}
|
||||
showEffects
|
||||
onSetAttribute={vi.fn()}
|
||||
onAddAnimation={vi.fn()}
|
||||
onUpdateProperty={vi.fn()}
|
||||
onUpdateMeta={vi.fn()}
|
||||
onDeleteAnimation={vi.fn()}
|
||||
onAddProperty={vi.fn()}
|
||||
onRemoveProperty={vi.fn()}
|
||||
onUpdateKeyframeEase={onUpdateKeyframeEase}
|
||||
onUpdateSegmentEase={onUpdateSegmentEase}
|
||||
/>,
|
||||
);
|
||||
|
||||
const dropdown = host.querySelector<HTMLButtonElement>("[data-ease-type-dropdown]");
|
||||
expect(dropdown).not.toBeNull();
|
||||
act(() => dropdown?.click());
|
||||
const preset = host.querySelector<HTMLButtonElement>('[data-ease-preset-id="quad-out"]');
|
||||
expect(preset).not.toBeNull();
|
||||
act(() => preset?.click());
|
||||
|
||||
expect(onUpdateSegmentEase).toHaveBeenCalledExactlyOnceWith(
|
||||
[
|
||||
{ animationId: "a1", tweenPercentage: 50 },
|
||||
{ animationId: "a2", tweenPercentage: 75 },
|
||||
],
|
||||
"power2.out",
|
||||
);
|
||||
expect(onUpdateKeyframeEase).not.toHaveBeenCalled();
|
||||
act(() => root.unmount());
|
||||
});
|
||||
const { host, root } = renderInto(
|
||||
<FlatMotionSection
|
||||
element={baseElement()}
|
||||
animations={[
|
||||
{
|
||||
id: "a1",
|
||||
method: "to",
|
||||
position: 0,
|
||||
duration: 1,
|
||||
properties: { x: 100 },
|
||||
keyframes: {
|
||||
format: "percentage",
|
||||
keyframes: [
|
||||
{ percentage: 0, properties: { x: 0 } },
|
||||
{ percentage: 50, properties: { x: 100 } },
|
||||
],
|
||||
},
|
||||
} as never,
|
||||
]}
|
||||
showTiming={false}
|
||||
showEffects
|
||||
onSetAttribute={vi.fn()}
|
||||
onAddAnimation={vi.fn()}
|
||||
onUpdateProperty={vi.fn()}
|
||||
onUpdateMeta={vi.fn()}
|
||||
onDeleteAnimation={vi.fn()}
|
||||
onAddProperty={vi.fn()}
|
||||
onRemoveProperty={vi.fn()}
|
||||
onUpdateKeyframeEase={onUpdateKeyframeEase}
|
||||
onUpdateSegmentEase={onUpdateSegmentEase}
|
||||
/>,
|
||||
);
|
||||
|
||||
const dropdown = host.querySelector<HTMLButtonElement>("[data-ease-type-dropdown]");
|
||||
expect(dropdown).not.toBeNull();
|
||||
act(() => dropdown?.click());
|
||||
const preset = host.querySelector<HTMLButtonElement>('[data-ease-preset-id="quad-out"]');
|
||||
expect(preset).not.toBeNull();
|
||||
act(() => preset?.click());
|
||||
|
||||
expect(onUpdateSegmentEase).toHaveBeenCalledExactlyOnceWith(
|
||||
[
|
||||
{ animationId: "a1", tweenPercentage: 50 },
|
||||
{ animationId: "a2", tweenPercentage: 75 },
|
||||
],
|
||||
"power2.out",
|
||||
);
|
||||
expect(onUpdateKeyframeEase).not.toHaveBeenCalled();
|
||||
act(() => root.unmount());
|
||||
});
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
} from "./gsapAnimationCallbacks";
|
||||
import { deriveElementTiming } from "./propertyPanelFlatTimingDerivation";
|
||||
import { usePlayerStore } from "../../player";
|
||||
import { isFocusedEaseRequestCurrent } from "../../player/store/keyframeSlice";
|
||||
import { GsapAddAnimationControl } from "./GsapAddAnimationControl";
|
||||
|
||||
export function FlatTimingRow({
|
||||
@@ -138,14 +139,24 @@ export function FlatMotionSection({
|
||||
const [addMenuOpen, setAddMenuOpen] = useState(false);
|
||||
const trackedCallbacks = withTrackedGsapAnimationCallbacks(callbacks, track);
|
||||
const focusedEaseSegment = usePlayerStore((s) => s.focusedEaseSegment);
|
||||
const setFocusedEaseSegment = usePlayerStore((s) => s.setFocusedEaseSegment);
|
||||
const clearFocusedEaseSegment = usePlayerStore((s) => s.clearFocusedEaseSegment);
|
||||
const timelineProjectId = usePlayerStore((s) => s.timelineProjectId);
|
||||
const timelineSessionEpoch = usePlayerStore((s) => s.timelineSessionEpoch);
|
||||
const selectedElementId = usePlayerStore((s) => s.selectedElementId);
|
||||
// Only consume a focus request aimed at the element THIS panel renders (not
|
||||
// the store's selectedElementId, which flips synchronously during async
|
||||
// selection resolution), so a shared class-selector animation id can't open
|
||||
// the wrong element's editor.
|
||||
const renderedElementId = `${element.sourceFile}#${element.id}`;
|
||||
const focusedHere =
|
||||
focusedEaseSegment && focusedEaseSegment.elementId === renderedElementId
|
||||
focusedEaseSegment &&
|
||||
focusedEaseSegment.elementId === renderedElementId &&
|
||||
isFocusedEaseRequestCurrent(focusedEaseSegment, {
|
||||
timelineProjectId,
|
||||
timelineSessionEpoch,
|
||||
selectedElementId,
|
||||
}) &&
|
||||
animations.some((animation) => animation.id === focusedEaseSegment.animationId)
|
||||
? focusedEaseSegment
|
||||
: null;
|
||||
|
||||
@@ -182,7 +193,11 @@ export function FlatMotionSection({
|
||||
defaultExpanded={index === 0}
|
||||
flat
|
||||
focusedSegment={focusedHere?.animationId === anim.id ? focusedHere : null}
|
||||
onFocusSegmentConsumed={() => setFocusedEaseSegment(null)}
|
||||
onFocusSegmentConsumed={() => {
|
||||
if (focusedHere?.animationId === anim.id) {
|
||||
clearFocusedEaseSegment(focusedHere.nonce);
|
||||
}
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
<GsapAddAnimationControl
|
||||
|
||||
@@ -110,8 +110,8 @@ export interface PropertyPanelProps {
|
||||
) => void;
|
||||
onRemoveKeyframe?: (animationId: string, percentage: number) => void;
|
||||
onUpdateKeyframeEase?: (animationId: string, percentage: number, ease: string) => void;
|
||||
onSetAllKeyframeEases?: (animationId: string, ease: string) => void;
|
||||
onUpdateSegmentEase?: NonNullable<GsapAnimationEditCallbacks["onUpdateSegmentEase"]>;
|
||||
onSetAllKeyframeEases?: (animationId: string, ease: string) => void;
|
||||
onConvertToKeyframes?: (animationId: string, duration?: number) => void;
|
||||
onCommitAnimatedProperty?: (
|
||||
selection: DomEditSelection,
|
||||
|
||||
@@ -200,8 +200,8 @@ export function DomEditProvider({
|
||||
commitMutation,
|
||||
applyMarqueeSelection,
|
||||
handleUpdateKeyframeEase,
|
||||
handleSetAllKeyframeEases,
|
||||
handleUpdateSegmentEase,
|
||||
handleSetAllKeyframeEases,
|
||||
},
|
||||
children,
|
||||
}: {
|
||||
|
||||
@@ -57,9 +57,9 @@ const recordResolverParity = vi.fn<(...args: unknown[]) => Promise<void>>(async
|
||||
const capturedOnReorderShadow: { fn: ((targets: string[]) => void) | undefined } = {
|
||||
fn: undefined,
|
||||
};
|
||||
|
||||
const domEditSelectionRef: { current: DomEditSelection | null } = { current: null };
|
||||
const gsapCommitMutation = Object.assign(vi.fn(), { batch: vi.fn() });
|
||||
|
||||
vi.mock("../utils/sdkResolverShadow", () => ({
|
||||
runResolverShadow: vi.fn(),
|
||||
recordResolverParity: (...args: unknown[]) => recordResolverParity(...args),
|
||||
|
||||
@@ -584,11 +584,11 @@ export function useDomEditSession({
|
||||
handleGsapRemoveAllKeyframes,
|
||||
handleResetSelectedElementKeyframes,
|
||||
handleUpdateKeyframeEase,
|
||||
handleUpdateSegmentEase,
|
||||
handleSetAllKeyframeEases,
|
||||
commitAnimatedProperty,
|
||||
commitAnimatedProperties,
|
||||
handleSetArcPath,
|
||||
handleUpdateSegmentEase,
|
||||
handleUpdateArcSegment,
|
||||
handleUnroll,
|
||||
invalidateGsapCache: bumpGsapCache,
|
||||
|
||||
@@ -301,7 +301,6 @@ describe("Timeline provider boundary", () => {
|
||||
act(() => root.unmount());
|
||||
});
|
||||
|
||||
// fallow-ignore-next-line code-duplication
|
||||
it("renders the gutter without legacy icons or hue dots", () => {
|
||||
const { host, root } = renderBasicTimeline();
|
||||
|
||||
@@ -398,8 +397,8 @@ describe("Timeline provider boundary", () => {
|
||||
);
|
||||
});
|
||||
|
||||
const viewport = host.querySelector('[aria-label="Timeline"]')?.firstElementChild;
|
||||
expect(viewport).toBeInstanceOf(HTMLElement);
|
||||
const viewport = host.querySelector<HTMLElement>("[data-timeline-scroll-viewport]");
|
||||
expect(viewport).not.toBeNull();
|
||||
act(() => {
|
||||
viewport?.dispatchEvent(
|
||||
new MouseEvent("pointerdown", {
|
||||
|
||||
@@ -91,7 +91,7 @@ describe("useTimelineKeyframeHandlers", () => {
|
||||
const root = mountReactHarness(<Harness />);
|
||||
act(() => onSelectSegment?.(ELEMENT.id, COLLIDING_TARGET));
|
||||
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toEqual({
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toMatchObject({
|
||||
animationId: "position-tween",
|
||||
collidingAnimationTargets: [
|
||||
{ animationId: "position-tween", tweenPercentage: 100 },
|
||||
@@ -130,7 +130,7 @@ describe("useTimelineKeyframeHandlers", () => {
|
||||
// Selecting a segment must NOT move the playhead.
|
||||
act(() => onSelectSegment?.(ELEMENT.id, FLAT_TWEEN_TARGET));
|
||||
expect(onSeek).not.toHaveBeenCalled();
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toEqual({
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toMatchObject({
|
||||
animationId: "position-tween",
|
||||
tweenPercentage: 100,
|
||||
elementId: ELEMENT.id,
|
||||
|
||||
@@ -22,6 +22,34 @@ export interface KeyframeCacheEntry {
|
||||
easeEach?: string;
|
||||
}
|
||||
|
||||
export interface FocusedEaseSegment {
|
||||
animationId: string;
|
||||
collidingAnimationTargets?: AnimationKeyframeTarget[];
|
||||
tweenPercentage: number;
|
||||
elementId: string;
|
||||
projectId: string | null;
|
||||
sessionEpoch: number;
|
||||
nonce: number;
|
||||
}
|
||||
|
||||
type FocusedEaseSegmentTarget = Omit<FocusedEaseSegment, "projectId" | "sessionEpoch" | "nonce">;
|
||||
|
||||
interface TimelineSessionIdentity {
|
||||
timelineProjectId: string | null;
|
||||
timelineSessionEpoch: number;
|
||||
}
|
||||
|
||||
export function isFocusedEaseRequestCurrent(
|
||||
request: FocusedEaseSegment,
|
||||
state: TimelineSessionIdentity & { selectedElementId: string | null },
|
||||
): boolean {
|
||||
return (
|
||||
request.projectId === state.timelineProjectId &&
|
||||
request.sessionEpoch === state.timelineSessionEpoch &&
|
||||
request.elementId === state.selectedElementId
|
||||
);
|
||||
}
|
||||
|
||||
export interface KeyframeSlice {
|
||||
/** Selected collapsed (`element:pct`) or expanded (`element:group:animation:clipPct`) diamonds. */
|
||||
selectedKeyframes: Set<string>;
|
||||
@@ -35,22 +63,11 @@ export interface KeyframeSlice {
|
||||
/** Union-expand clips (keyframed clips are expanded by default on load). */
|
||||
expandClips: (ids: readonly string[]) => void;
|
||||
|
||||
/** elementId scopes the request to one element so a shared (class-selector)
|
||||
* animation id can't open the ease editor on the wrong element. */
|
||||
focusedEaseSegment: {
|
||||
animationId: string;
|
||||
collidingAnimationTargets?: AnimationKeyframeTarget[];
|
||||
tweenPercentage: number;
|
||||
elementId: string;
|
||||
} | null;
|
||||
setFocusedEaseSegment: (
|
||||
target: {
|
||||
animationId: string;
|
||||
collidingAnimationTargets?: AnimationKeyframeTarget[];
|
||||
tweenPercentage: number;
|
||||
elementId: string;
|
||||
} | null,
|
||||
) => void;
|
||||
/** Project/session/element-scoped request. Its nonce makes stale consumers harmless. */
|
||||
focusedEaseSegment: FocusedEaseSegment | null;
|
||||
focusedEaseRequestNonce: number;
|
||||
setFocusedEaseSegment: (target: FocusedEaseSegmentTarget) => void;
|
||||
clearFocusedEaseSegment: (nonce: number) => void;
|
||||
|
||||
/** Keyframe data per element id, populated from parsed GSAP animations. */
|
||||
keyframeCache: Map<string, KeyframeCacheEntry>;
|
||||
@@ -60,7 +77,10 @@ export interface KeyframeSlice {
|
||||
setKeyframeCache: (elementId: string, data: KeyframeCacheEntry | undefined) => void;
|
||||
}
|
||||
|
||||
export function createKeyframeSlice(set: StoreApi<KeyframeSlice>["setState"]): KeyframeSlice {
|
||||
export function createKeyframeSlice(
|
||||
set: StoreApi<KeyframeSlice>["setState"],
|
||||
getTimelineSessionIdentity: () => TimelineSessionIdentity,
|
||||
): KeyframeSlice {
|
||||
return {
|
||||
selectedKeyframes: new Set(),
|
||||
toggleSelectedKeyframe: (key) =>
|
||||
@@ -97,7 +117,25 @@ export function createKeyframeSlice(set: StoreApi<KeyframeSlice>["setState"]): K
|
||||
}),
|
||||
|
||||
focusedEaseSegment: null,
|
||||
setFocusedEaseSegment: (target) => set({ focusedEaseSegment: target }),
|
||||
focusedEaseRequestNonce: 0,
|
||||
setFocusedEaseSegment: (target) =>
|
||||
set((state) => {
|
||||
const nonce = state.focusedEaseRequestNonce + 1;
|
||||
const { timelineProjectId, timelineSessionEpoch } = getTimelineSessionIdentity();
|
||||
return {
|
||||
focusedEaseRequestNonce: nonce,
|
||||
focusedEaseSegment: {
|
||||
...target,
|
||||
projectId: timelineProjectId,
|
||||
sessionEpoch: timelineSessionEpoch,
|
||||
nonce,
|
||||
},
|
||||
};
|
||||
}),
|
||||
clearFocusedEaseSegment: (nonce) =>
|
||||
set((state) =>
|
||||
state.focusedEaseSegment?.nonce === nonce ? { focusedEaseSegment: null } : state,
|
||||
),
|
||||
|
||||
keyframeCache: new Map(),
|
||||
setKeyframeCache: (elementId, data) =>
|
||||
|
||||
@@ -53,6 +53,82 @@ describe("usePlayerStore", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("focused ease requests", () => {
|
||||
it("stamps the current project session and only lets its nonce clear it", () => {
|
||||
const store = usePlayerStore.getState();
|
||||
store.beginTimelineSession("project-a");
|
||||
store.setSelectedElementId("index.html#hero");
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#hero",
|
||||
animationId: "animation-a",
|
||||
tweenPercentage: 50,
|
||||
});
|
||||
const first = usePlayerStore.getState().focusedEaseSegment;
|
||||
if (!first) throw new Error("expected focused ease request");
|
||||
expect(first.projectId).toBe("project-a");
|
||||
expect(first.sessionEpoch).toBeGreaterThan(0);
|
||||
expect(first.nonce).toBeGreaterThan(0);
|
||||
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#hero",
|
||||
animationId: "animation-a",
|
||||
tweenPercentage: 75,
|
||||
});
|
||||
const second = usePlayerStore.getState().focusedEaseSegment;
|
||||
if (!second) throw new Error("expected replacement request");
|
||||
expect(second.nonce).toBe(first.nonce + 1);
|
||||
|
||||
store.clearFocusedEaseSegment(first.nonce);
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBe(second);
|
||||
store.clearFocusedEaseSegment(second.nonce);
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBeNull();
|
||||
});
|
||||
|
||||
it("clears a pending request when the project session changes", () => {
|
||||
const store = usePlayerStore.getState();
|
||||
store.beginTimelineSession("project-a");
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#hero",
|
||||
animationId: "animation-a",
|
||||
tweenPercentage: 50,
|
||||
});
|
||||
|
||||
store.beginTimelineSession("project-b");
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBeNull();
|
||||
});
|
||||
|
||||
it("does not revive an old request after selecting away and back", () => {
|
||||
const store = usePlayerStore.getState();
|
||||
store.setSelectedElementId("index.html#a");
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#a",
|
||||
animationId: "animation-a",
|
||||
tweenPercentage: 50,
|
||||
});
|
||||
|
||||
store.setSelectedElementId("index.html#b");
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBeNull();
|
||||
store.setSelectedElementId("index.html#a");
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBeNull();
|
||||
});
|
||||
|
||||
it("invalidates on a genuine selection-anchor change but not a same-anchor echo", () => {
|
||||
const store = usePlayerStore.getState();
|
||||
store.setSelection(new Set(["index.html#a", "index.html#b"]), "index.html#a");
|
||||
store.setFocusedEaseSegment({
|
||||
elementId: "index.html#a",
|
||||
animationId: "animation-a",
|
||||
tweenPercentage: 50,
|
||||
});
|
||||
const request = usePlayerStore.getState().focusedEaseSegment;
|
||||
|
||||
store.setSelectionAnchor("index.html#a");
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBe(request);
|
||||
store.setSelectionAnchor("index.html#b");
|
||||
expect(usePlayerStore.getState().focusedEaseSegment).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe("setIsPlaying", () => {
|
||||
it("sets isPlaying to true", () => {
|
||||
usePlayerStore.getState().setIsPlaying(true);
|
||||
|
||||
@@ -305,6 +305,7 @@ function createTimelineResetState() {
|
||||
selectedKeyframes: new Set<string>(),
|
||||
expandedClipIds: new Set<string>(),
|
||||
selectedElementIds: new Set<string>(),
|
||||
focusedEaseSegment: null,
|
||||
clipRevealRequest: null,
|
||||
keyframeCache: new Map(),
|
||||
gsapAnimations: new Map(),
|
||||
@@ -343,7 +344,7 @@ export const usePlayerStore = create<PlayerState>((set, get) => ({
|
||||
activeTool: "select",
|
||||
setActiveTool: (tool) => set({ activeTool: tool }),
|
||||
|
||||
...createKeyframeSlice(set),
|
||||
...createKeyframeSlice(set, get),
|
||||
|
||||
activeKeyframePct: null,
|
||||
setActiveKeyframePct: (pct) => set({ activeKeyframePct: pct }),
|
||||
@@ -533,6 +534,7 @@ export const usePlayerStore = create<PlayerState>((set, get) => ({
|
||||
selectedElementIds,
|
||||
activeKeyframePct: null,
|
||||
motionPathArmed: false,
|
||||
focusedEaseSegment: null,
|
||||
}
|
||||
: { selectedElementId: id, selectedElementIds };
|
||||
}),
|
||||
@@ -542,9 +544,16 @@ export const usePlayerStore = create<PlayerState>((set, get) => ({
|
||||
setSelectionAnchor: (id) =>
|
||||
set((s) => {
|
||||
if (id != null && s.selectedElementIds.size > 1 && s.selectedElementIds.has(id)) {
|
||||
return { selectedElementId: id };
|
||||
return {
|
||||
selectedElementId: id,
|
||||
focusedEaseSegment: id === s.selectedElementId ? s.focusedEaseSegment : null,
|
||||
};
|
||||
}
|
||||
return { selectedElementId: id, selectedElementIds: id ? new Set([id]) : new Set<string>() };
|
||||
return {
|
||||
selectedElementId: id,
|
||||
selectedElementIds: id ? new Set([id]) : new Set<string>(),
|
||||
focusedEaseSegment: id === s.selectedElementId ? s.focusedEaseSegment : null,
|
||||
};
|
||||
}),
|
||||
updateElement: (elementId, updates) =>
|
||||
set((state) => ({
|
||||
@@ -567,11 +576,6 @@ export const usePlayerStore = create<PlayerState>((set, get) => ({
|
||||
reset: () => set(createTimelineResetState()),
|
||||
}));
|
||||
|
||||
// Bug-bash aid: expose the store so a reproduction can dump live state from the
|
||||
// console, e.g. `__playerStore.getState().selectedElementId`. Harmless read
|
||||
// handle; no behavioural effect.
|
||||
// Only in dev. `import.meta.env` may be undefined in non-Vite bundlers (Next.js
|
||||
// Turbopack), so guard the access like the telemetry client does.
|
||||
function isDevBuild(): boolean {
|
||||
try {
|
||||
return import.meta.env.DEV === true;
|
||||
|
||||
Reference in New Issue
Block a user