Skip to content

🎥 Make videos programmatically with React

Merge remote-tracking branch 'origin/main' into codex/preserve-timeline-selection

JonnyBurger0f5805a9f612
diff --cc packages/studio/src/components/Timeline/TimelineSequence.tsx
index 76ee2d66b5,b206313f59..acaf13ab4f
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@@ -93,7 -97,9 +97,8 @@@ import
getTimelineColor,
getTimelineSequenceSelectionKey,
isTimelineSelectionModifierEvent,
- shouldSelectTimelineRowOnPointerDown,
TIMELINE_MARQUEE_ITEM_ATTR,
+ useIsPremountingSelected,
useTimelineMarqueeSelectableItem,
useTimelineRowContainsSelection,
useTimelineRowSelection,
diff --cc packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index c546ad5c1d,48d72477ba..570a60cf1f
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@@ -58,7 -60,11 +60,12 @@@ import
saveSequenceProps,
type SaveSequencePropChange,
} from './save-sequence-prop';
+import {useTimelineKeyframeDragState} from './TimelineKeyframeDragState';
+ import {
+ getTimelineTrimLimitReason,
+ getVisibleTimelineTrimLimitReason,
+ type TimelineTrimLimitReason,
+ } from './timeline-trim-limit-reason';
import {
getTimelineSequenceSelectionKey,
shouldSelectTimelineRowOnPointerDown,