🎥 Make videos programmatically with React
Preserve keyframe identities under sequence playback rates
Jonny Burger391997b5f665
diff --git a/packages/studio/src/components/InspectorPanel/AlignmentControls.tsx b/packages/studio/src/components/InspectorPanel/AlignmentControls.tsxindex e626929458..330971844b 100644--- a/packages/studio/src/components/InspectorPanel/AlignmentControls.tsx+++ b/packages/studio/src/components/InspectorPanel/AlignmentControls.tsx@@ -15,7 +15,10 @@ import {INSPECTOR_PANEL_HORIZONTAL_PADDING} from '../InspectorPanelLayout';import {getSelectedOutlineActiveSchema} from '../selected-outline-drag';import {translateFieldKey} from '../selected-outline-types';import {callAddSequenceKeyframe} from '../Timeline/call-add-keyframe';-import {getKeyframeDisplayOffset} from '../Timeline/get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+} from '../Timeline/get-timeline-keyframes';import {saveSequenceProps} from '../Timeline/save-sequence-prop';import {parseTranslate,@@ -118,14 +121,16 @@ export const AlignmentControls: React.FC<{const firstKeyframedStatus = Object.values(nodePropStatuses ?? {}).find((status) => status.status === 'keyframed',);- const sourceFrame =- (timelinePosition -- getKeyframeDisplayOffset({- propStatus: firstKeyframedStatus,- keyframeDisplayOffset: track.keyframeDisplayOffset,- keyframePlaybackRate: track.keyframePlaybackRate,- })) *- track.keyframePlaybackRate;+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ propStatus: firstKeyframedStatus ?? null,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: firstKeyframedStatus ?? null,+ keyframeDisplayOffset: track.keyframeDisplayOffset,+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),+ keyframePlaybackRate: track.keyframePlaybackRate,+ });const dragOverrides = getDragOverrides(nodePath) ?? {};const activeSchema = getSelectedOutlineActiveSchema({@@ -231,7 +236,16 @@ export const AlignmentControls: React.FC<{fileName: nodePath.absolutePath,nodePath,fieldKey: translateFieldKey,- sourceFrame,+ sourceFrame: getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus,+ keyframeDisplayOffset: track.keyframeDisplayOffset,+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),+ keyframePlaybackRate: track.keyframePlaybackRate,+ propStatus,+ }),value: newValue,schema: track.sequence.controls.schema,setPropStatuses,@@ -269,14 +283,16 @@ export const AlignmentControls: React.FC<{const firstRenderKeyframedStatus = Object.values(renderNodePropStatuses ?? {},).find((status) => status.status === 'keyframed');- const renderSourceFrame =- (timelinePosition -- getKeyframeDisplayOffset({- propStatus: firstRenderKeyframedStatus,- keyframeDisplayOffset: track.keyframeDisplayOffset,- keyframePlaybackRate: track.keyframePlaybackRate,- })) *- track.keyframePlaybackRate;+ const renderSourceFrame = getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ propStatus: firstRenderKeyframedStatus ?? null,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: firstRenderKeyframedStatus ?? null,+ keyframeDisplayOffset: track.keyframeDisplayOffset,+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),+ keyframePlaybackRate: track.keyframePlaybackRate,+ });const renderDragOverrides = getDragOverrides(renderNodePath) ?? {};const renderActiveSchema = getSelectedOutlineActiveSchema({diff --git a/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx b/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsxindex 59cf336ef8..4f8fba7e85 100644--- a/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx@@ -32,7 +32,10 @@ import {callDeleteSequenceKeyframe,} from '../Timeline/call-delete-keyframe';import {callMoveKeyframes} from '../Timeline/call-move-keyframe';-import {getKeyframeDisplayOffset} from '../Timeline/get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+} from '../Timeline/get-timeline-keyframes';import {parseKeyframeFieldFromNodePath} from '../Timeline/parse-keyframe-field-from-node-path';import {TimelineEffectPropValue} from '../Timeline/TimelineEffectPropItem';import {@@ -49,10 +52,7 @@ import {InspectorQuickAction,InspectorMessage,} from './common';-import {- clampInspectorKeyframeDisplayFrame,- getInspectorKeyframeSourceFrame,-} from './keyframe-inspector-frame';+import {clampInspectorKeyframeDisplayFrame} from './keyframe-inspector-frame';import {KeyframeEasingNavigator} from './KeyframeEasingNavigator';import {SequenceInspectorSections} from './SequenceInspectorHeader';import {@@ -221,14 +221,16 @@ export const KeyframeInspector: React.FC<{nodePath,propStatus: sequencePropStatus,schema: track.sequence.controls.schema,- sourceFrame:- (selection.frame -- getKeyframeDisplayOffset({- propStatus: sequencePropStatus,- keyframeDisplayOffset,- keyframePlaybackRate,- })) *+ sourceFrame: getKeyframeSourceFrame({+ displayFrame: selection.frame,+ propStatus: sequencePropStatus,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: sequencePropStatus,+ keyframeDisplayOffset,+ keyframePlaybackRate,+ }),keyframePlaybackRate,+ }),};}@@ -277,14 +279,16 @@ export const KeyframeInspector: React.FC<{nodePath,propStatus: effectPropStatus,schema: effect.schema,- sourceFrame:- (selection.frame -- getKeyframeDisplayOffset({- propStatus: effectPropStatus,- keyframeDisplayOffset,- keyframePlaybackRate,- })) *+ sourceFrame: getKeyframeSourceFrame({+ displayFrame: selection.frame,+ propStatus: effectPropStatus,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: effectPropStatus,+ keyframeDisplayOffset,+ keyframePlaybackRate,+ }),keyframePlaybackRate,+ }),validatedLocation: {source: nodePath.absolutePath,line: 1,@@ -332,10 +336,11 @@ export const KeyframeInspector: React.FC<{return;}- const toFrame = getInspectorKeyframeSourceFrame({+ const toFrame = getKeyframeSourceFrame({displayFrame,keyframeDisplayOffset: details.keyframeDisplayOffset,keyframePlaybackRate: details.keyframePlaybackRate,+ propStatus: details.propStatus,});if (displayFrame === selection.frame || toFrame === details.sourceFrame) {@@ -391,10 +396,11 @@ export const KeyframeInspector: React.FC<{durationInFrames: videoConfig.durationInFrames,frame: value,});- const toFrame = getInspectorKeyframeSourceFrame({+ const toFrame = getKeyframeSourceFrame({displayFrame,keyframeDisplayOffset: details.keyframeDisplayOffset,keyframePlaybackRate: details.keyframePlaybackRate,+ propStatus: details.propStatus,});setDraftFrame(displayFrame);diff --git a/packages/studio/src/components/SelectedOutlineCropControls.tsx b/packages/studio/src/components/SelectedOutlineCropControls.tsxindex e3cff733de..23176eefdb 100644--- a/packages/studio/src/components/SelectedOutlineCropControls.tsx+++ b/packages/studio/src/components/SelectedOutlineCropControls.tsx@@ -30,6 +30,7 @@ import {import {getUvCoordinateForPoint} from './selected-outline-uv';import {callAddKeyframes} from './Timeline/call-add-keyframe';import {commitPendingInspectorFields} from './Timeline/focus-inspector-field';+import {resolveKeyframeSourceFrame} from './Timeline/get-timeline-keyframes';import {saveSequenceProps} from './Timeline/save-sequence-prop';const CROP_HANDLE_THICKNESS = 5;@@ -270,7 +271,10 @@ const CropHandle: React.FC<{field.propStatus.status === 'keyframed'? Internals.makeKeyframedDragOverride({status: field.propStatus,- frame: cropDrag.sourceFrame,+ frame: resolveKeyframeSourceFrame(+ cropDrag.sourceFrame,+ field.propStatus,+ ),value,}): Internals.makeStaticDragOverride(value),diff --git a/packages/studio/src/components/SelectedOutlineOverlay.tsx b/packages/studio/src/components/SelectedOutlineOverlay.tsxindex 9a09010594..c4689b1593 100644--- a/packages/studio/src/components/SelectedOutlineOverlay.tsx+++ b/packages/studio/src/components/SelectedOutlineOverlay.tsx@@ -55,7 +55,10 @@ import {} from './selected-outline-types';import {SelectedOutlineKeyboardControls} from './SelectedOutlineKeyboardControls';import {SelectedOutlineRenderer} from './SelectedOutlineRenderer';-import {getKeyframeDisplayOffset} from './Timeline/get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+} from './Timeline/get-timeline-keyframes';import {useTimelineSelection,type TimelineSelection,@@ -315,13 +318,16 @@ const calculateOutlineTargets = ({(status) => status.status === 'keyframed',);const nodeKeyframeDisplayOffset = getKeyframeDisplayOffset({- propStatus: firstKeyframedStatus,+ propStatus: firstKeyframedStatus ?? null,keyframeDisplayOffset,keyframePlaybackRate,});- const sourceFrame =- (targetTimelinePosition - nodeKeyframeDisplayOffset) *- keyframePlaybackRate;+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame: targetTimelinePosition,+ keyframeDisplayOffset: nodeKeyframeDisplayOffset,+ keyframePlaybackRate,+ propStatus: firstKeyframedStatus ?? null,+ });const dragOverrides = getDragOverrides(nodePath) ?? {};const runtimeValues = controls? (runtimeValuesByStore.get(controls.runtimeValues) ??@@ -391,7 +397,7 @@ const calculateOutlineTargets = ({transformOriginPropStatus?.status === 'keyframed')? String(Internals.getEffectiveVisualModeValue({- propStatus: transformOriginPropStatus,+ propStatus: transformOriginPropStatus ?? null,dragOverrideValue: dragOverrides[transformOriginFieldKey],defaultValue: transformOriginFieldSchema.default,frame: sourceFrame,@@ -474,13 +480,16 @@ const calculateOutlineTargets = ({selectedTransformOriginInfo?.displayFrame === null ||selectedTransformOriginInfo?.displayFrame === undefined? sourceFrame- : (selectedTransformOriginInfo.displayFrame -- getKeyframeDisplayOffset({- propStatus: transformOriginPropStatus,+ : getKeyframeSourceFrame({+ displayFrame: selectedTransformOriginInfo.displayFrame,+ propStatus: transformOriginPropStatus ?? null,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: transformOriginPropStatus ?? null,keyframeDisplayOffset,keyframePlaybackRate,- })) *- keyframePlaybackRate;+ }),+ keyframePlaybackRate,+ });const canTransformOriginStatus =transformOriginPropStatus?.status === 'static' ||(transformOriginPropStatus?.status === 'keyframed' &&@@ -497,12 +506,11 @@ const calculateOutlineTargets = ({fieldSchema?.type === 'translate' &&canTransformOriginStatus &&canTransformOriginTranslateStatus;- const cropSourceFrame =- selectedCropInfo?.displayFrame === null ||- selectedCropInfo?.displayFrame === undefined- ? sourceFrame- : (selectedCropInfo.displayFrame - nodeKeyframeDisplayOffset) *- keyframePlaybackRate;+ const cropSourceFrame = {+ displayFrame: selectedCropInfo?.displayFrame ?? targetTimelinePosition,+ keyframeDisplayOffset: nodeKeyframeDisplayOffset,+ keyframePlaybackRate,+ };const canCropDrag =previewInteractive &&selectedForCrop &&@@ -524,7 +532,7 @@ const calculateOutlineTargets = ({transformOriginPropStatus !== undefined? {defaultValue: transformOriginFieldSchema.default,- propStatus: transformOriginPropStatus,+ propStatus: transformOriginPropStatus ?? null,value: transformOriginValueForRotation,}: null,@@ -600,7 +608,7 @@ const calculateOutlineTargets = ({clientId: connectedClientId,keyframePlaybackRate,keyframeDisplayOffset: getKeyframeDisplayOffset({- propStatus: transformOriginPropStatus,+ propStatus: transformOriginPropStatus ?? null,keyframeDisplayOffset,keyframePlaybackRate,}),@@ -609,7 +617,7 @@ const calculateOutlineTargets = ({originPropStatus: transformOriginPropStatus,originValue: String(Internals.getEffectiveVisualModeValue({- propStatus: transformOriginPropStatus,+ propStatus: transformOriginPropStatus ?? null,dragOverrideValue: dragOverrides[transformOriginFieldKey],defaultValue: transformOriginFieldSchema.default,frame: transformOriginSourceFrame,@@ -648,7 +656,17 @@ const calculateOutlineTargets = ({): '1',schema: controls.schema,- sourceFrame: transformOriginSourceFrame,+ sourceFrame: {+ displayFrame:+ selectedTransformOriginInfo?.displayFrame ??+ targetTimelinePosition,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: transformOriginPropStatus,+ keyframeDisplayOffset,+ keyframePlaybackRate,+ }),+ keyframePlaybackRate,+ },translateDefault: fieldSchema.default,translatePropStatus: propStatus,translateValue: String(diff --git a/packages/studio/src/components/SelectedOutlineTransformOriginHandle.tsx b/packages/studio/src/components/SelectedOutlineTransformOriginHandle.tsxindex 2a1f9e7136..9461207aaf 100644--- a/packages/studio/src/components/SelectedOutlineTransformOriginHandle.tsx+++ b/packages/studio/src/components/SelectedOutlineTransformOriginHandle.tsx@@ -30,6 +30,7 @@ import {getUvHandlePosition,} from './selected-outline-uv';import {callAddKeyframes} from './Timeline/call-add-keyframe';+import {resolveKeyframeSourceFrame} from './Timeline/get-timeline-keyframes';import {saveSequenceProps} from './Timeline/save-sequence-prop';import {parseCssRotation} from './Timeline/timeline-rotation-utils';import {@@ -215,7 +216,10 @@ export const SelectedOutlineTransformOriginHandle: React.FC<{transformOriginDrag.originPropStatus.status === 'keyframed'? Internals.makeKeyframedDragOverride({status: transformOriginDrag.originPropStatus,- frame: transformOriginDrag.sourceFrame,+ frame: resolveKeyframeSourceFrame(+ transformOriginDrag.sourceFrame,+ transformOriginDrag.originPropStatus,+ ),value: origin,}): Internals.makeStaticDragOverride(origin),@@ -227,7 +231,10 @@ export const SelectedOutlineTransformOriginHandle: React.FC<{? transformOriginDrag.originPropStatus.status === 'keyframed'? Internals.makeKeyframedDragOverride({status: transformOriginDrag.translatePropStatus,- frame: transformOriginDrag.sourceFrame,+ frame: resolveKeyframeSourceFrame(+ transformOriginDrag.sourceFrame,+ transformOriginDrag.translatePropStatus,+ ),value: translate,}): {diff --git a/packages/studio/src/components/SelectedOutlineUvControls.tsx b/packages/studio/src/components/SelectedOutlineUvControls.tsxindex f439c41528..e33f010bc9 100644--- a/packages/studio/src/components/SelectedOutlineUvControls.tsx+++ b/packages/studio/src/components/SelectedOutlineUvControls.tsx@@ -43,6 +43,10 @@ import {type UvCoordinate,} from './selected-outline-uv';import {callAddEffectKeyframe} from './Timeline/call-add-keyframe';+import {+ resolveKeyframeSourceFrame,+ type KeyframeSourceFrame,+} from './Timeline/get-timeline-keyframes';import {saveEffectProp} from './Timeline/save-effect-prop';import type {TimelineSelection,@@ -193,7 +197,7 @@ const saveNumericEffectField = ({readonly setPropStatuses: React.ContextType<typeof Internals.VisualModeSettersContext>['setPropStatuses'];- readonly sourceFrame: number;+ readonly sourceFrame: KeyframeSourceFrame;}): void => {const defaultValue = fieldDefaultToString(field.fieldDefault);if (@@ -213,7 +217,7 @@ const saveNumericEffectField = ({nodePath,effectIndex,fieldKey: field.fieldKey,- sourceFrame,+ sourceFrame: resolveKeyframeSourceFrame(sourceFrame, field.propStatus),value: lastValue,schema,setPropStatuses,@@ -355,7 +359,10 @@ const SelectedUvEllipseStartHandle: React.FC<{field.propStatus.status === 'keyframed'? Internals.makeKeyframedDragOverride({status: field.propStatus,- frame: control.handle.sourceFrame,+ frame: resolveKeyframeSourceFrame(+ control.handle.sourceFrame,+ field.propStatus,+ ),value: nextValue,}): Internals.makeStaticDragOverride(nextValue),@@ -501,7 +508,10 @@ const SelectedUvEllipseResizeHandle: React.FC<{field.propStatus.status === 'keyframed'? Internals.makeKeyframedDragOverride({status: field.propStatus,- frame: control.handle.sourceFrame,+ frame: resolveKeyframeSourceFrame(+ control.handle.sourceFrame,+ field.propStatus,+ ),value: nextValue,}): Internals.makeStaticDragOverride(nextValue),@@ -693,7 +703,10 @@ const SelectedUvEllipseRotationHandle: React.FC<{field.propStatus.status === 'keyframed'? Internals.makeKeyframedDragOverride({status: field.propStatus,- frame: control.handle.sourceFrame,+ frame: resolveKeyframeSourceFrame(+ control.handle.sourceFrame,+ field.propStatus,+ ),value: nextValue,}): Internals.makeStaticDragOverride(nextValue),@@ -914,7 +927,10 @@ const SelectedUvHandleCircle: React.FC<{handle.propStatus.status === 'keyframed'? Internals.makeKeyframedDragOverride({status: handle.propStatus,- frame: handle.sourceFrame,+ frame: resolveKeyframeSourceFrame(+ handle.sourceFrame,+ handle.propStatus,+ ),value: nextValue,}): Internals.makeStaticDragOverride(nextValue),@@ -979,7 +995,10 @@ const SelectedUvHandleCircle: React.FC<{nodePath: handle.nodePath,effectIndex: handle.effectIndex,fieldKey: handle.fieldKey,- sourceFrame: handle.sourceFrame,+ sourceFrame: resolveKeyframeSourceFrame(+ handle.sourceFrame,+ handle.propStatus,+ ),value: lastValue,schema: handle.schema,setPropStatuses,@@ -1074,9 +1093,11 @@ const useSelectedOutlineUvTarget = (nodePath: layoutTarget.nodePathInfo.sequenceSubscriptionKey,selectedEffects: selectedEffectsBySequenceKey.get(layoutTarget.key),sequence: layoutTarget.sequence,- sourceFrame:- (timelinePosition - layoutTarget.keyframeDisplayOffset) *- layoutTarget.keyframePlaybackRate,+ sourceFrame: {+ displayFrame: timelinePosition,+ keyframeDisplayOffset: layoutTarget.keyframeDisplayOffset,+ keyframePlaybackRate: layoutTarget.keyframePlaybackRate,+ },}),};}, [diff --git a/packages/studio/src/components/Timeline/TimelineEffectPropItem.tsx b/packages/studio/src/components/Timeline/TimelineEffectPropItem.tsxindex 5113767abb..d2a3278004 100644--- a/packages/studio/src/components/Timeline/TimelineEffectPropItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineEffectPropItem.tsx@@ -26,7 +26,10 @@ import type {ComboboxValue} from '../NewComposition/ComboBox';import {useEditorOpening} from '../use-default-editor-info';import {callAddEffectKeyframe} from './call-add-keyframe';import {getCopyContextForAgentsMenuItem} from './get-copy-context-for-agents-menu-item';-import {getKeyframeDisplayOffset} from './get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+} from './get-timeline-keyframes';import {saveEffectProp} from './save-effect-prop';import {enqueueSavePropChange} from './save-prop-queue';import {TimelineExpandArrowSpacer} from './TimelineExpandArrowButton';@@ -393,6 +396,7 @@ const TimelineEffectPropValueAtCurrentFrame: React.FC<{readonly validatedLocation: CodePosition;readonly keyframeDisplayOffset: number;readonly keyframePlaybackRate: number;+ readonly propStatus: CanUpdateSequencePropStatus | null;readonly runtimeValueStore: RuntimeValueStore | null;}> = ({field,@@ -400,6 +404,7 @@ const TimelineEffectPropValueAtCurrentFrame: React.FC<{validatedLocation,keyframeDisplayOffset,keyframePlaybackRate,+ propStatus,runtimeValueStore,}) => {const timelinePosition = Internals.Timeline.useTimelinePosition();@@ -409,9 +414,12 @@ const TimelineEffectPropValueAtCurrentFrame: React.FC<{field={field}nodePath={nodePath}validatedLocation={validatedLocation}- sourceFrame={- (timelinePosition - keyframeDisplayOffset) * keyframePlaybackRate- }+ sourceFrame={getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ keyframeDisplayOffset,+ keyframePlaybackRate,+ propStatus,+ })}runtimeValueStore={runtimeValueStore}/>);@@ -644,6 +652,7 @@ export const TimelineEffectPropItem: React.FC<{validatedLocation={validatedLocation}keyframeDisplayOffset={resolvedKeyframeDisplayOffset}keyframePlaybackRate={keyframePlaybackRate}+ propStatus={propStatus}runtimeValueStore={runtimeValueStore}/></TimelineFieldRowContent>diff --git a/packages/studio/src/components/Timeline/TimelineKeyframeControls.tsx b/packages/studio/src/components/Timeline/TimelineKeyframeControls.tsxindex bd92aa2bd7..91543ce990 100644--- a/packages/studio/src/components/Timeline/TimelineKeyframeControls.tsx+++ b/packages/studio/src/components/Timeline/TimelineKeyframeControls.tsx@@ -41,6 +41,7 @@ import {} from './get-keyframe-navigation';import {getKeyframeDisplayOffset,+ getKeyframeSourceFrame,getTimelineKeyframes,} from './get-timeline-keyframes';import {normalizeFontWeightForKeyframe} from './normalize-font-weight-for-keyframe';@@ -284,14 +285,16 @@ const resolveKeyframeControlTarget = ({keyframeDisplayOffset: track.keyframeDisplayOffset,keyframePlaybackRate: track.keyframePlaybackRate,}),- sourceFrame:- (timelinePosition -- getKeyframeDisplayOffset({- propStatus: sequenceSelectedPropStatus,- keyframeDisplayOffset: track.keyframeDisplayOffset,- keyframePlaybackRate: track.keyframePlaybackRate,- })) *- track.keyframePlaybackRate,+ sourceFrame: getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ propStatus: sequenceSelectedPropStatus,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: sequenceSelectedPropStatus,+ keyframeDisplayOffset: track.keyframeDisplayOffset,+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),defaultValue: fieldNode.field.fieldSchema.default,dragOverrideValue: (getDragOverrides(nodePath) ?? {})[fieldNode.field.key@@ -326,14 +329,16 @@ const resolveKeyframeControlTarget = ({keyframeDisplayOffset: track.keyframeDisplayOffset,keyframePlaybackRate: track.keyframePlaybackRate,}),- sourceFrame:- (timelinePosition -- getKeyframeDisplayOffset({- propStatus: effectSelectedPropStatus,- keyframeDisplayOffset: track.keyframeDisplayOffset,- keyframePlaybackRate: track.keyframePlaybackRate,- })) *- track.keyframePlaybackRate,+ sourceFrame: getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ propStatus: effectSelectedPropStatus,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: effectSelectedPropStatus,+ keyframeDisplayOffset: track.keyframeDisplayOffset,+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),defaultValue: fieldNode.field.fieldSchema.default,dragOverrideValue: getEffectDragOverrides(nodePath,@@ -566,8 +571,12 @@ export const TimelineKeyframeControls: React.FC<{keyframeDisplayOffset,keyframePlaybackRate,});- const jsxFrame =- (timelinePosition - resolvedKeyframeDisplayOffset) * keyframePlaybackRate;+ const jsxFrame = getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ keyframeDisplayOffset: resolvedKeyframeDisplayOffset,+ keyframePlaybackRate,+ propStatus,+ });const keyframes = useMemo(() =>getTimelineKeyframes(diff --git a/packages/studio/src/components/Timeline/TimelineSequencePropItem.tsx b/packages/studio/src/components/Timeline/TimelineSequencePropItem.tsxindex f055d69bc4..9c2ceec0ec 100644--- a/packages/studio/src/components/Timeline/TimelineSequencePropItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequencePropItem.tsx@@ -28,7 +28,10 @@ import {useEditorOpening} from '../use-default-editor-info';import {callAddSequenceKeyframe} from './call-add-keyframe';import {getCopyContextForAgentsMenuItem} from './get-copy-context-for-agents-menu-item';import {getSequencePropResetChanges} from './get-sequence-prop-reset-changes';-import {getKeyframeDisplayOffset} from './get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+} from './get-timeline-keyframes';import {saveSequenceProps} from './save-sequence-prop';import {isTimelineFieldStacked} from './timeline-field-row-layout';import {TimelineExpandArrowSpacer} from './TimelineExpandArrowButton';@@ -310,10 +313,12 @@ const TimelineSequenceKeyframedValueAtCurrentFrame: React.FC<return (<TimelineSequenceKeyframedValueAtSourceFrame{...props}- sourceFrame={- (timelinePosition - resolvedKeyframeDisplayOffset) *- keyframePlaybackRate- }+ sourceFrame={getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ keyframeDisplayOffset: resolvedKeyframeDisplayOffset,+ keyframePlaybackRate,+ propStatus: props.propStatus,+ })}/>);};diff --git a/packages/studio/src/components/Timeline/delete-selected-keyframe.ts b/packages/studio/src/components/Timeline/delete-selected-keyframe.tsindex 7bf601bdcb..5c4a636e5e 100644--- a/packages/studio/src/components/Timeline/delete-selected-keyframe.ts+++ b/packages/studio/src/components/Timeline/delete-selected-keyframe.ts@@ -12,7 +12,10 @@ import {type DeleteSequenceKeyframeChange,} from './call-delete-keyframe';import {findTrackForNodePathInfo} from './find-track-for-node-path-info';-import {getKeyframeDisplayOffset} from './get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+} from './get-timeline-keyframes';import {parseKeyframeFieldFromNodePath} from './parse-keyframe-field-from-node-path';import type {SetPropStatuses} from './save-sequence-prop';@@ -93,9 +96,12 @@ const getSelectedKeyframeDeletion = ({keyframeDisplayOffset: track?.keyframeDisplayOffset ?? 0,keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,});- const effectSourceFrame =- (frame - effectKeyframeDisplayOffset) *- (track?.keyframePlaybackRate ?? 1);+ const effectSourceFrame = getKeyframeSourceFrame({+ displayFrame: frame,+ keyframeDisplayOffset: effectKeyframeDisplayOffset,+ keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,+ propStatus: effectPropStatus,+ });const effectPlayheadSourceFrame =(timelinePosition - effectKeyframeDisplayOffset) *(track?.keyframePlaybackRate ?? 1);@@ -121,17 +127,21 @@ const getSelectedKeyframeDeletion = ({nodePath,)?.[field.fieldKey];const keyframeDisplayOffset = getKeyframeDisplayOffset({- propStatus: sequencePropStatus,+ propStatus: sequencePropStatus ?? null,keyframeDisplayOffset: track?.keyframeDisplayOffset ?? 0,keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,});- const sourceFrame =- (frame - keyframeDisplayOffset) * (track?.keyframePlaybackRate ?? 1);+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame: frame,+ keyframeDisplayOffset,+ keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,+ propStatus: sequencePropStatus ?? null,+ });const playheadSourceFrame =(timelinePosition - keyframeDisplayOffset) *(track?.keyframePlaybackRate ?? 1);const sequenceValueWhenLastKeyframeDeleted = getValueWhenLastKeyframeDeleted({- propStatus: sequencePropStatus,+ propStatus: sequencePropStatus ?? null,playheadSourceFrame,});diff --git a/packages/studio/src/components/Timeline/get-timeline-keyframes.ts b/packages/studio/src/components/Timeline/get-timeline-keyframes.tsindex 9f82968df0..4a2625531a 100644--- a/packages/studio/src/components/Timeline/get-timeline-keyframes.ts+++ b/packages/studio/src/components/Timeline/get-timeline-keyframes.ts@@ -1,5 +1,69 @@import type {CanUpdateSequencePropStatus} from 'remotion';+// Keep display-clock inputs until the edited property is known, so resolving its+// original source keyframe accounts for rounding introduced by the full offset.+export type KeyframeSourceFrame =+ | number+ | {+ readonly displayFrame: number;+ readonly keyframeDisplayOffset: number;+ readonly keyframePlaybackRate: number;+ };++export const getKeyframeSourceFrame = ({+ displayFrame,+ keyframeDisplayOffset,+ keyframePlaybackRate,+ propStatus,+}: {+ displayFrame: number;+ keyframeDisplayOffset: number;+ keyframePlaybackRate: number;+ propStatus: CanUpdateSequencePropStatus | null;+}): number => {+ const sourceFrame =+ (displayFrame - keyframeDisplayOffset) * keyframePlaybackRate;+ if (propStatus?.status !== 'keyframed') {+ return sourceFrame;+ }++ // Converting a displayed keyframe back to source frames may introduce rounding+ // error. Resolve its original frame so edits keep the existing keyframe identity,+ // including when source keyframes themselves have fractional frames.+ const tolerance =+ Number.EPSILON *+ Math.max(1, Math.abs(displayFrame), Math.abs(keyframeDisplayOffset)) *+ keyframePlaybackRate *+ 8;+ let closestFrame = sourceFrame;+ let closestDistance = Infinity;+ for (const keyframe of propStatus.keyframes) {+ const distance = Math.abs(keyframe.frame - sourceFrame);+ if (distance <= tolerance && distance < closestDistance) {+ closestFrame = keyframe.frame;+ closestDistance = distance;+ }+ }++ return closestFrame;+};++export const resolveKeyframeSourceFrame = (+ sourceFrame: KeyframeSourceFrame,+ propStatus: CanUpdateSequencePropStatus | null,+): number => {+ return getKeyframeSourceFrame({+ ...(typeof sourceFrame === 'number'+ ? {+ displayFrame: sourceFrame,+ keyframeDisplayOffset: 0,+ keyframePlaybackRate: 1,+ }+ : sourceFrame),+ propStatus,+ });+};+export const getTimelineKeyframes = (propStatus: CanUpdateSequencePropStatus | null | undefined,keyframeDisplayOffset = 0,diff --git a/packages/studio/src/components/Timeline/keyframe-clipboard.ts b/packages/studio/src/components/Timeline/keyframe-clipboard.tsindex eeed3d6a5a..bd8928d1aa 100644--- a/packages/studio/src/components/Timeline/keyframe-clipboard.ts+++ b/packages/studio/src/components/Timeline/keyframe-clipboard.ts@@ -16,7 +16,10 @@ import {type TSequence,} from 'remotion';import {findTrackForNodePathInfo} from './find-track-for-node-path-info';-import {getKeyframeDisplayOffset} from './get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+} from './get-timeline-keyframes';import {parseKeyframeFieldFromNodePath} from './parse-keyframe-field-from-node-path';import type {TimelineSelection} from './TimelineSelection';@@ -257,9 +260,12 @@ export const getKeyframeClipboardDataFromSelections = ({const keyframes: {readonly frame: number; readonly value: unknown}[] = [];for (const {selection} of resolvedFields) {- const sourceFrame =- (selection.frame - firstResolved.keyframeDisplayOffset) *- firstResolved.keyframePlaybackRate;+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame: selection.frame,+ keyframeDisplayOffset: firstResolved.keyframeDisplayOffset,+ keyframePlaybackRate: firstResolved.keyframePlaybackRate,+ propStatus: keyframedPropStatus,+ });const keyframe = keyframedPropStatus.keyframes.find((item) => item.frame === sourceFrame,);@@ -452,11 +458,12 @@ export const getPasteKeyframeTarget = ({}const keyframes = payload.keyframes.map((keyframe) => ({- sourceFrame:- (timelinePosition -- resolved.keyframeDisplayOffset +- keyframe.frameOffset) *- resolved.keyframePlaybackRate,+ sourceFrame: getKeyframeSourceFrame({+ displayFrame: timelinePosition + keyframe.frameOffset,+ keyframeDisplayOffset: resolved.keyframeDisplayOffset,+ keyframePlaybackRate: resolved.keyframePlaybackRate,+ propStatus: resolved.propStatus,+ }),value: keyframe.value,}));const firstFrame = keyframes[0]?.sourceFrame;diff --git a/packages/studio/src/components/Timeline/use-timeline-keyframe-drag.ts b/packages/studio/src/components/Timeline/use-timeline-keyframe-drag.tsindex 2295001224..7202c1c805 100644--- a/packages/studio/src/components/Timeline/use-timeline-keyframe-drag.ts+++ b/packages/studio/src/components/Timeline/use-timeline-keyframe-drag.ts@@ -24,7 +24,11 @@ import {TIMELINE_PADDING} from '../../helpers/timeline-layout';import {callMoveKeyframes} from './call-move-keyframe';import {findTrackForNodePathInfo} from './find-track-for-node-path-info';import {getBoundedKeyframeDragDelta} from './get-bounded-keyframe-drag-delta';-import {getKeyframeDisplayOffset} from './get-timeline-keyframes';+import {+ getKeyframeDisplayOffset,+ getKeyframeSourceFrame,+ resolveKeyframeSourceFrame,+} from './get-timeline-keyframes';import {parseKeyframeFieldFromNodePath} from './parse-keyframe-field-from-node-path';import {getTimelineKeyframeDragKey,@@ -257,14 +261,16 @@ const getTimelineKeyframeDragTarget = ({return null;}- const effectSourceFrame =- (displayFrame -- getKeyframeDisplayOffset({- propStatus: effectPropStatus,- keyframeDisplayOffset: track?.keyframeDisplayOffset ?? 0,- keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,- })) *- (track?.keyframePlaybackRate ?? 1);+ const effectSourceFrame = getKeyframeSourceFrame({+ displayFrame,+ propStatus: effectPropStatus,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: effectPropStatus,+ keyframeDisplayOffset: track?.keyframeDisplayOffset ?? 0,+ keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,+ }),+ keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,+ });if (!effectPropStatus.keyframes.some(@@ -294,14 +300,16 @@ const getTimelineKeyframeDragTarget = ({return null;}- const sourceFrame =- (displayFrame -- getKeyframeDisplayOffset({- propStatus: sequencePropStatus,- keyframeDisplayOffset: track?.keyframeDisplayOffset ?? 0,- keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,- })) *- (track?.keyframePlaybackRate ?? 1);+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame,+ propStatus: sequencePropStatus,+ keyframeDisplayOffset: getKeyframeDisplayOffset({+ propStatus: sequencePropStatus,+ keyframeDisplayOffset: track?.keyframeDisplayOffset ?? 0,+ keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,+ }),+ keyframePlaybackRate: track?.keyframePlaybackRate ?? 1,+ });if (!sequencePropStatus.keyframes.some(@@ -346,17 +354,24 @@ const groupTargets = (targets: readonly TimelineKeyframeDragTarget[]) => {return [...groups.values()];};+const getMoveForTarget = (+ target: TimelineKeyframeDragTarget,+ delta: number,+) => ({+ fromFrame: target.sourceFrame,+ toFrame: resolveKeyframeSourceFrame(+ target.sourceFrame + delta * target.keyframePlaybackRate,+ target.propStatus,+ ),+});+const getMovesForGroup = ({group,delta,}: {readonly group: readonly TimelineKeyframeDragTarget[];readonly delta: number;-}) =>- group.map((target) => ({- fromFrame: target.sourceFrame,- toFrame: target.sourceFrame + delta * target.keyframePlaybackRate,- }));+}) => group.map((target) => getMoveForTarget(target, delta));const canMoveTimelineKeyframeDragTargets = ({targets,@@ -717,9 +732,7 @@ export const useTimelineKeyframeDrag = ({fileName: target.fileName,nodePath: target.nodePath,fieldKey: target.fieldKey,- fromFrame: target.sourceFrame,- toFrame:- target.sourceFrame + lastDelta * target.keyframePlaybackRate,+ ...getMoveForTarget(target, lastDelta),schema: target.schema,})),effectKeyframes: targets@@ -735,9 +748,7 @@ export const useTimelineKeyframeDrag = ({nodePath: target.nodePath,effectIndex: target.effectIndex,fieldKey: target.fieldKey,- fromFrame: target.sourceFrame,- toFrame:- target.sourceFrame + lastDelta * target.keyframePlaybackRate,+ ...getMoveForTarget(target, lastDelta),schema: target.schema,})),setPropStatuses,@@ -997,9 +1008,7 @@ export const useTimelineEasingKeyframeDrag = ({fileName: target.fileName,nodePath: target.nodePath,fieldKey: target.fieldKey,- fromFrame: target.sourceFrame,- toFrame:- target.sourceFrame + lastDelta * target.keyframePlaybackRate,+ ...getMoveForTarget(target, lastDelta),schema: target.schema,})),effectKeyframes: targets@@ -1015,9 +1024,7 @@ export const useTimelineEasingKeyframeDrag = ({nodePath: target.nodePath,effectIndex: target.effectIndex,fieldKey: target.fieldKey,- fromFrame: target.sourceFrame,- toFrame:- target.sourceFrame + lastDelta * target.keyframePlaybackRate,+ ...getMoveForTarget(target, lastDelta),schema: target.schema,})),setPropStatuses,diff --git a/packages/studio/src/components/selected-outline-drag.ts b/packages/studio/src/components/selected-outline-drag.tsindex 3a3da68cb6..a8d8d4e9f2 100644--- a/packages/studio/src/components/selected-outline-drag.ts+++ b/packages/studio/src/components/selected-outline-drag.ts@@ -40,6 +40,10 @@ import {} from './selected-outline-types';import {getUvHandlePosition, type UvCoordinate} from './selected-outline-uv';import type {AddSequenceKeyframeChange} from './Timeline/call-add-keyframe';+import {+ getKeyframeSourceFrame,+ resolveKeyframeSourceFrame,+} from './Timeline/get-timeline-keyframes';import type {SaveSequencePropChange} from './Timeline/save-sequence-prop';import {getTimelineDisplayDecimalPlaces,@@ -102,9 +106,12 @@ export const getSelectedOutlineDragStates = ({const dragOverrideValue = (getDragOverrides(target.nodePath) ?? {})[translateFieldKey];- const sourceFrame =- (timelinePosition - target.keyframeDisplayOffset) *- target.keyframePlaybackRate;+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ keyframeDisplayOffset: target.keyframeDisplayOffset,+ keyframePlaybackRate: target.keyframePlaybackRate,+ propStatus: target.propStatus,+ });const effectiveValue = Internals.getEffectiveVisualModeValue({propStatus: target.propStatus,dragOverrideValue,@@ -390,7 +397,10 @@ export const getSelectedOutlineCropDragChanges = ({fileName: target.nodePath.absolutePath,nodePath: target.nodePath,fieldKey,- sourceFrame: target.sourceFrame,+ sourceFrame: resolveKeyframeSourceFrame(+ target.sourceFrame,+ field.propStatus,+ ),value,schema: target.schema,clientId: target.clientId,@@ -588,9 +598,12 @@ export const getSelectedOutlineScaleDragStates = ({const dragOverrideValue = (getDragOverrides(target.nodePath) ?? {})[scaleFieldKey];- const sourceFrame =- (timelinePosition - target.keyframeDisplayOffset) *- target.keyframePlaybackRate;+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ keyframeDisplayOffset: target.keyframeDisplayOffset,+ keyframePlaybackRate: target.keyframePlaybackRate,+ propStatus: target.propStatus,+ });const effectiveValue = Internals.getEffectiveVisualModeValue({propStatus: target.propStatus,dragOverrideValue,@@ -737,9 +750,12 @@ export const getSelectedOutlineRotationDragStates = ({const dragOverrideValue = (getDragOverrides(target.nodePath) ?? {})[rotateFieldKey];- const sourceFrame =- (timelinePosition - target.keyframeDisplayOffset) *- target.keyframePlaybackRate;+ const sourceFrame = getKeyframeSourceFrame({+ displayFrame: timelinePosition,+ keyframeDisplayOffset: target.keyframeDisplayOffset,+ keyframePlaybackRate: target.keyframePlaybackRate,+ propStatus: target.propStatus,+ });const effectiveValue = Internals.getEffectiveVisualModeValue({propStatus: target.propStatus,dragOverrideValue,@@ -1045,7 +1061,10 @@ export const getSelectedOutlineTransformOriginDragChanges = ({fileName: target.nodePath.absolutePath,nodePath: target.nodePath,fieldKey: transformOriginFieldKey,- sourceFrame: target.sourceFrame,+ sourceFrame: resolveKeyframeSourceFrame(+ target.sourceFrame,+ target.originPropStatus,+ ),value: origin,schema: target.schema,});@@ -1088,7 +1107,10 @@ export const getSelectedOutlineTransformOriginDragChanges = ({fileName: target.nodePath.absolutePath,nodePath: target.nodePath,fieldKey: translateFieldKey,- sourceFrame: target.sourceFrame,+ sourceFrame: resolveKeyframeSourceFrame(+ target.sourceFrame,+ target.translatePropStatus,+ ),value: translate,schema: target.schema,});diff --git a/packages/studio/src/components/selected-outline-types.ts b/packages/studio/src/components/selected-outline-types.tsindex f43f9999ac..3f7b188c69 100644--- a/packages/studio/src/components/selected-outline-types.ts+++ b/packages/studio/src/components/selected-outline-types.ts@@ -9,6 +9,7 @@ import type {} from 'remotion';import type {SequenceNodePathInfo} from '../helpers/get-timeline-sequence-sort-key';import type {ComboboxValue} from './NewComposition/ComboBox';+import type {KeyframeSourceFrame} from './Timeline/get-timeline-keyframes';import type {TimelineSelection} from './Timeline/TimelineSelection';export type SelectedOutlineContextMenuOpenResult =@@ -120,7 +121,7 @@ export type SelectedOutlineCropDragTarget = {>;readonly nodePath: SequencePropsSubscriptionKey;readonly schema: InteractivitySchema;- readonly sourceFrame: number;+ readonly sourceFrame: KeyframeSourceFrame;readonly transformOrigin: {readonly defaultValue: string | undefined;readonly propStatus: CanUpdateSequencePropStatus;@@ -153,7 +154,7 @@ export type SelectedOutlineTransformOriginDragTarget = {readonly rotateValue: string;readonly scaleValue: number | string;readonly schema: InteractivitySchema;- readonly sourceFrame: number;+ readonly sourceFrame: KeyframeSourceFrame;readonly translateDefault: string | undefined;readonly translatePropStatus:| CanUpdateSequencePropStatusStaticdiff --git a/packages/studio/src/components/selected-outline-uv.ts b/packages/studio/src/components/selected-outline-uv.tsindex 64a6dabc4b..e45e60c803 100644--- a/packages/studio/src/components/selected-outline-uv.ts+++ b/packages/studio/src/components/selected-outline-uv.ts@@ -16,6 +16,10 @@ import {type OutlinePoint,type SelectedOutline,} from './selected-outline-geometry';+import {+ resolveKeyframeSourceFrame,+ type KeyframeSourceFrame,+} from './Timeline/get-timeline-keyframes';import {getTimelineDisplayDecimalPlaces,roundToDecimalPlaces,@@ -69,7 +73,7 @@ export type SelectedOutlineUvHandle = {readonly isSelected: boolean;readonly nodePath: SequencePropsSubscriptionKey;readonly schema: InteractivitySchema;- readonly sourceFrame: number;+ readonly sourceFrame: KeyframeSourceFrame;readonly value: UvCoordinate;};@@ -832,7 +836,7 @@ export const getSelectedUvHandles = ({readonly nodePath: SequencePropsSubscriptionKey;readonly selectedEffects: Map<number, SelectedEffectFields> | undefined;readonly sequence: TSequence;- readonly sourceFrame: number;+ readonly sourceFrame: KeyframeSourceFrame;}): SelectedOutlineUvHandle[] => {if (clientId === null || selectedEffects === undefined) {return [];@@ -875,7 +879,7 @@ export const getSelectedUvHandles = ({propStatus,dragOverrideValue: dragOverrides[key],defaultValue: undefined,- frame: sourceFrame,+ frame: resolveKeyframeSourceFrame(sourceFrame, propStatus),shouldResortToDefaultValueIfUndefined: false,});});@@ -897,7 +901,7 @@ export const getSelectedUvHandles = ({propStatus,dragOverrideValue: dragOverrides[fieldKey],defaultValue: fieldSchema.default,- frame: sourceFrame,+ frame: resolveKeyframeSourceFrame(sourceFrame, propStatus),shouldResortToDefaultValueIfUndefined: true,});}