🎥 Make videos programmatically with React
`@remotion/studio`: Fix nested clip splits from Inspector
JonnyBurger65340fda5e94
diff --git a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsxindex bbed99f20c..0c26cb32eb 100644--- a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx@@ -23,6 +23,7 @@ import {getMediaFileName} from '../public-output-name';import {splitVideoFromAudio} from '../split-video-from-audio-api';import {duplicateSequencesFromSource} from '../Timeline/duplicate-selected-timeline-item';import {+ getSequenceSourceSplitFrame,getTimelineSequenceSplitEligibility,splitTimelineSequenceFromSource,} from '../Timeline/split-selected-timeline-item';@@ -92,9 +93,13 @@ const SplitSequenceQuickAction: React.FC<{splitTimelineSequenceFromSource({nodePathInfo: eligibility.nodePathInfo,- splitFrame: timelinePosition,+ splitFrame: getSequenceSourceSplitFrame({+ timelineFrame: timelinePosition,+ keyframeDisplayOffset: track.keyframeDisplayOffset,+ keyframePlaybackRate: track.keyframePlaybackRate,+ }),}).catch(() => undefined);- }, [canSplit, eligibility, timelinePosition]);+ }, [canSplit, eligibility, timelinePosition, track]);const disabledReason = !isStudioInteractivityEnabled()? 'Studio is read-only': sequencePropStatuses === undefineddiff --git a/packages/studio/src/components/Timeline/get-sequence-split-menu-item.tsx b/packages/studio/src/components/Timeline/get-sequence-split-menu-item.tsxindex 04fce4e255..1e98b3c111 100644--- a/packages/studio/src/components/Timeline/get-sequence-split-menu-item.tsx+++ b/packages/studio/src/components/Timeline/get-sequence-split-menu-item.tsx@@ -2,6 +2,7 @@ import type {CanUpdateSequencePropStatus, TSequence} from 'remotion';import type {SequenceNodePathInfo} from '../../helpers/get-timeline-sequence-sort-key';import type {ComboboxValue} from '../NewComposition/ComboBox';import {+ getSequenceSourceSplitFrame,getTimelineSequenceSplitEligibility,splitTimelineSequenceFromSource,} from './split-selected-timeline-item';@@ -81,7 +82,11 @@ export const getSequenceSplitMenuItem = ({// Keep the frame used to enable the menu item, even during playback.splitTimelineSequenceFromSource({nodePathInfo: eligibility.nodePathInfo,- splitFrame: (splitFrame - keyframeDisplayOffset) * keyframePlaybackRate,+ splitFrame: getSequenceSourceSplitFrame({+ timelineFrame: splitFrame,+ keyframeDisplayOffset,+ keyframePlaybackRate,+ }),}).catch(() => undefined);},};diff --git a/packages/studio/src/components/Timeline/split-selected-timeline-item.ts b/packages/studio/src/components/Timeline/split-selected-timeline-item.tsindex 092f7b1b70..0bb6fb9999 100644--- a/packages/studio/src/components/Timeline/split-selected-timeline-item.ts+++ b/packages/studio/src/components/Timeline/split-selected-timeline-item.ts@@ -6,7 +6,10 @@ import type {TSequence,} from 'remotion';import {Internals} from 'remotion';-import type {SequenceNodePathInfo} from '../../helpers/get-timeline-sequence-sort-key';+import type {+ SequenceNodePathInfo,+ TimelineTrackData,+} from '../../helpers/get-timeline-sequence-sort-key';import {showNotification} from '../Notifications/NotificationCenter';import {splitSequences as splitSequencesApi} from '../split-sequences-api';import {findTrackForNodePathInfo} from './find-track-for-node-path-info';@@ -29,6 +32,18 @@ type SplitPropStatuses = Partial<>>;+export const getSequenceSourceSplitFrame = ({+ timelineFrame,+ keyframeDisplayOffset,+ keyframePlaybackRate,+}: {+ readonly timelineFrame: number;+ readonly keyframeDisplayOffset: TimelineTrackData['keyframeDisplayOffset'];+ readonly keyframePlaybackRate: TimelineTrackData['keyframePlaybackRate'];+}): number => {+ return (timelineFrame - keyframeDisplayOffset) * keyframePlaybackRate;+};+const staticNumberish = (status: CanUpdateSequencePropStatus | undefined,): boolean => {@@ -258,8 +273,11 @@ export const splitSelectedTimelineItems = ({eligible.push({nodePathInfo: eligibility.nodePathInfo,splitFrame: track- ? (splitFrame - track.keyframeDisplayOffset) *- track.keyframePlaybackRate+ ? getSequenceSourceSplitFrame({+ timelineFrame: splitFrame,+ keyframeDisplayOffset: track.keyframeDisplayOffset,+ keyframePlaybackRate: track.keyframePlaybackRate,+ }): splitFrame,});} else {