🎥 Make videos programmatically with React
Merge remote-tracking branch 'origin/main' into codex/computed-value-fix-modal
Jonny Burgerde8ca8809065
diff --cc packages/studio/src/components/Timeline/TimelineEffectPropItem.tsxindex b9d3a87a04,f99cd99d43..1f3eb0b739--- a/packages/studio/src/components/Timeline/TimelineEffectPropItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineEffectPropItem.tsx@@@ -76,11 -77,9 +76,10 @@@ const isResettableStatus = (const TimelineComputedEffectPropValue: React.FC<{readonly field: EffectSchemaFieldInfo;- readonly nodePath: SequencePropsSubscriptionKey;readonly propStatus: CanUpdateSequencePropStatusFalse;readonly runtimeValueStore: RuntimeValueStore | null;-}> = ({field, propStatus, runtimeValueStore}) => {+ readonly validatedLocation: CodePosition;- }> = ({field, nodePath, propStatus, runtimeValueStore, validatedLocation}) => {++}> = ({field, propStatus, runtimeValueStore, validatedLocation}) => {const runtimeValue = useRuntimeStoreValue(runtimeValueStore, field.key);return (@@@ -88,8 -87,7 +87,7 @@@propStatus={propStatus}field={field}runtimeValue={runtimeValue}- scaleLockNodePath={nodePath}- fixHref={TIMELINE_COMPUTED_EFFECT_FIX_LINK}+ validatedLocation={validatedLocation}/>);};@@@ -292,8 -290,6 +290,7 @@@ export const TimelineEffectPropValue: RpropStatus={{status: 'computed'}}field={field}runtimeValueStore={runtimeValueStore}- nodePath={nodePath}+ validatedLocation={validatedLocation}/>);}@@@ -354,8 -350,6 +351,7 @@@propStatus={propStatus}field={field}runtimeValueStore={runtimeValueStore}- nodePath={nodePath}+ validatedLocation={validatedLocation}/>);}diff --cc packages/studio/src/components/Timeline/TimelineSchemaField.tsxindex 087f2ed590,1819a3d50a..3a91b0c9fd--- a/packages/studio/src/components/Timeline/TimelineSchemaField.tsx+++ b/packages/studio/src/components/Timeline/TimelineSchemaField.tsx@@@ -11,8 -10,7 +11,9 @@@ import typeTimelineFieldOnDragValueChange,TimelineFieldOnSave,} from '../../helpers/timeline-layout';+import {SetSelectedModalContext} from '../../state/modals';+import {updateAvailable} from '../RenderQueue/actions';+ import {formatTimelineFieldValueForDisplay} from './timeline-field-display-utils';import {TimelineArrayField} from './TimelineArrayField';import {isTimelinePrimitiveFieldInfo,@@@ -121,57 -115,16 +122,39 @@@ export const TimelineNonEditableStatusreadonly propStatus: CanUpdateSequencePropStatusFalse;readonly field: SchemaFieldInfo;readonly runtimeValue: unknown;- readonly scaleLockNodePath: SequencePropsSubscriptionKey | null;- readonly fixHref: string;-}> = ({propStatus, field, runtimeValue, fixHref}) => {+ readonly validatedLocation: CodePosition;- }> = ({- propStatus,- field,- runtimeValue,- scaleLockNodePath,- validatedLocation,- }) => {++}> = ({propStatus, field, runtimeValue, validatedLocation}) => {+ const {setSelectedModal} = useContext(SetSelectedModalContext);+ const onFix = useCallback(() => {+ const controller = new AbortController();+ updateAvailable(controller.signal)+ .then((info) => {+ setSelectedModal({+ type: 'fix-computed-value',+ prop: field.key,+ context: `${validatedLocation.source}:${validatedLocation.line}:${validatedLocation.column}`,+ remotionInteractivitySkillAvailable:+ info.remotionInteractivitySkillAvailable,+ });+ })+ .catch(() => {+ setSelectedModal({+ type: 'fix-computed-value',+ prop: field.key,+ context: `${validatedLocation.source}:${validatedLocation.line}:${validatedLocation.column}`,+ remotionInteractivitySkillAvailable: false,+ });+ });+ }, [field.key, setSelectedModal, validatedLocation]);+if (propStatus.status === 'computed') {return (<UnsupportedStatus- label={- <TimelineFieldValue- field={field}- onSave={() => Promise.resolve()}- onDragValueChange={() => undefined}- onDragEnd={() => undefined}- propStatus={{- status: 'static',- codeValue: runtimeValue,- keyframeDisplayOffsetAdjustment: null,- }}- effectiveValue={runtimeValue}- scaleLockNodePath={scaleLockNodePath}- />- }+ label={formatTimelineFieldValueForDisplay({+ fieldSchema: field.fieldSchema,+ value: runtimeValue,+ })}- fixHref={fixHref}+ onFix={onFix}formattedValue/>);diff --cc packages/studio/src/components/Timeline/TimelineSequencePropItem.tsxindex 41d50a542c,260d4d5a0c..3d0e3814ad--- a/packages/studio/src/components/Timeline/TimelineSequencePropItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequencePropItem.tsx@@@ -605,8 -605,7 +605,7 @@@ export const TimelineSequencePropItem:propStatus={propStatus}field={field}runtimeValue={runtimeValue}- scaleLockNodePath={nodePath}- fixHref="https://www.remotion.dev/docs/studio/interactivity-best-practices#keep-editable-values-visible"+ validatedLocation={validatedLocation}/>);