🎥 Make videos programmatically with React
Treat percentage translate as computed in Studio
Jonny Burger970dd6bf374d
diff --git a/packages/studio-server/src/preview-server/routes/can-update-sequence-props.ts b/packages/studio-server/src/preview-server/routes/can-update-sequence-props.tsindex 3cc14496fb..3292aeba3e 100644--- a/packages/studio-server/src/preview-server/routes/can-update-sequence-props.ts+++ b/packages/studio-server/src/preview-server/routes/can-update-sequence-props.ts@@ -1894,7 +1894,7 @@ const computeSequenceOnlyPropsRecord = ({const dotIndex = key.indexOf('.');if (dotIndex !== -1) {- filteredProps[key] = getNestedPropStatus({+ const status = getNestedPropStatus({jsxElement,ast,parentKey: key.slice(0, dotIndex),@@ -1903,6 +1903,19 @@ const computeSequenceOnlyPropsRecord = ({allowSpecialValues: assetKeys.includes(key),lastSpreadIndex,});+ filteredProps[key] =+ key === 'style.translate' &&+ ((status.status === 'static' &&+ typeof status.codeValue === 'string' &&+ status.codeValue.includes('%')) ||+ (status.status === 'keyframed' &&+ status.keyframes.some(+ (keyframe) =>+ typeof keyframe.value === 'string' &&+ keyframe.value.includes('%'),+ )))+ ? computedStatus()+ : status;} else if (key in allProps) {filteredProps[key] = allProps[key];} else if (lastSpreadIndex !== -1) {diff --git a/packages/studio-server/src/test/compute-sequence-props-status.test.ts b/packages/studio-server/src/test/compute-sequence-props-status.test.tsindex cba3c89986..87897b0221 100644--- a/packages/studio-server/src/test/compute-sequence-props-status.test.ts+++ b/packages/studio-server/src/test/compute-sequence-props-status.test.ts@@ -1188,6 +1188,45 @@ export const Example: React.FC = () => {});});+test('percentage translate values are computed while other style props remain editable', () => {+ const input = `import React from 'react';+import {Sequence, interpolate, useCurrentFrame} from 'remotion';++export const Example: React.FC = () => {+ const frame = useCurrentFrame();+ return (+ <>+ <Sequence style={{translate: interpolate(frame, [0, 100], ['0% 0px', '-20% 0px']), opacity: 0.5}} />+ <Sequence style={{translate: '20% 0px'}} />+ <Sequence style={{translate: interpolate(frame, [0, 100], ['0px 0px', '20px 0px'])}} />+ </>+ );+};+`;+ const getProps = (line: number) => {+ const result = computeSequencePropsStatusFromContent({+ videoConfigValues: null,+ fileContents: input,+ nodePath: getNodePathFromContent(input, line),+ componentIdentity: null,+ keys: ['style.translate', 'style.opacity'],+ effects: [],+ });+ if (!result.canUpdate) throw new Error('Expected canUpdate to be true');+ return result.props;+ };++ expect(getProps(8)['style.translate']).toEqual({status: 'computed'});+ expect(getProps(8)['style.opacity']).toMatchObject({+ status: 'static',+ codeValue: 0.5,+ });+ expect(getProps(9)['style.translate']).toEqual({status: 'computed'});+ expect(getProps(10)['style.translate']).toMatchObject({+ status: 'keyframed',+ });+});+test('computeSequencePropsStatus preserves the useCurrentFrame coordinate space across userland timing components', () => {const input = `import React from 'react';import {AbsoluteFill, interpolate, useCurrentFrame} from 'remotion';