🎥 Make videos programmatically with React
Fix Studio update depth errors during continuous trimming
Jonny Burger50ec776c03a9
diff --git a/packages/core/src/use-sequence-registration.ts b/packages/core/src/use-sequence-registration.tsindex f2dac240ec..5ed03ea5ce 100644--- a/packages/core/src/use-sequence-registration.ts+++ b/packages/core/src/use-sequence-registration.ts@@ -1,10 +1,13 @@-import {useContext, useEffect, useRef} from 'react';+import {useContext, useEffect, useLayoutEffect, useRef} from 'react';import type {TSequence} from './CompositionManager.js';import {DisableSequenceRegistrationContext,SequenceManagerActionsContext,} from './SequenceManager.js';+const useIsomorphicLayoutEffect =+ typeof window === 'undefined' ? useEffect : useLayoutEffect;+export const useSequenceRegistration = ({getSequence,id,@@ -40,11 +43,14 @@ export const useSequenceRegistration = ({};}, [id, registerSequence, registrationEnabled, unregisterSequence]);- useEffect(() => {+ // Commit metadata with the synchronous preview update, so continuous input+ // cannot leave lower-priority registration updates pending between commits.+ useIsomorphicLayoutEffect(() => {if (registrationDisabled ||getSequence === null ||updateSequence === null ||+ lastRegisteredGetterRef.current === null ||lastRegisteredGetterRef.current === getSequence) {return;diff --git a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx b/packages/studio/src/components/Timeline/TimelineVirtualization.tsxindex 7967332610..c928dd9b2f 100644--- a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx+++ b/packages/studio/src/components/Timeline/TimelineVirtualization.tsx@@ -221,10 +221,31 @@ export const TimelineVirtualizationProvider: React.FC<{paddingStart,rangeExtractor,});+ const measuredLayoutRef = useRef<{+ readonly heights: readonly number[];+ readonly keys: readonly (string | number)[];+ } | null>(null);useLayoutEffect(() => {+ const previous = measuredLayoutRef.current;+ const keys = trackHeights.map((_, index) => getItemKey(index));+ // Trimming changes timeline metadata without changing row geometry. Only+ // invalidate measurements when heights or the cached row identities change.+ if (+ previous !== null &&+ previous.heights.length === trackHeights.length &&+ trackHeights.every(+ (height, index) =>+ previous.heights[index] === height &&+ previous.keys[index] === keys[index],+ )+ ) {+ return;+ }++ measuredLayoutRef.current = {heights: trackHeights, keys};virtualizer.measure();- }, [trackHeights, virtualizer]);+ }, [getItemKey, trackHeights, virtualizer]);useEffect(() => {if (revealRequest === null) {