🎥 Make videos programmatically with React
Include inspector headers in scrolling view transitions
JonnyBurger75fad20232c6
diff --git a/packages/studio/src/components/InspectorPanel/EasingInspector.tsx b/packages/studio/src/components/InspectorPanel/EasingInspector.tsxindex 3f8248b04e..300fd4846b 100644--- a/packages/studio/src/components/InspectorPanel/EasingInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/EasingInspector.tsx@@ -9,6 +9,7 @@ import {import {useRuntimeValues} from '../../helpers/use-runtime-values';import {Plus} from '../../icons/plus';import {renderFrame} from '../../state/render-frame';+import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {callAddEffectKeyframe,callAddSequenceKeyframe,@@ -36,6 +37,7 @@ import {import {getEasingSelectionFromCurrentKeyframes} from './easing-inspector-selection';import {KeyframeEasingNavigator} from './KeyframeEasingNavigator';import {KeyframeSettings} from './KeyframeSettings';+import {SequenceInspectorSections} from './SequenceInspectorHeader';import {selectedContainer} from './styles';import {useTrackForSelection} from './use-track-for-selection';@@ -346,7 +348,8 @@ export const EasingInspector: React.FC<{}return (- <div style={selectedContainer}>+ <div style={selectedContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>+ <SequenceInspectorSections track={track} /><EasingEditorkey={getTimelineSelectionKey(currentEasingSelection)}state={state}diff --git a/packages/studio/src/components/InspectorPanel/GuideInspector.tsx b/packages/studio/src/components/InspectorPanel/GuideInspector.tsxindex ba5cd7ae4e..aa2ffe50ad 100644--- a/packages/studio/src/components/InspectorPanel/GuideInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/GuideInspector.tsx@@ -4,6 +4,7 @@ import {EditorShowGuidesContext,persistGuidesList,} from '../../state/editor-guides';+import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {InputDragger} from '../NewComposition/InputDragger';import type {TimelineSelection} from '../Timeline/TimelineSelection';import {CollapsibleInspectorSection} from './CollapsibleInspectorSection';@@ -79,7 +80,7 @@ export const GuideInspector: React.FC<{}return (- <div style={selectedContainer}>+ <div style={selectedContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}><CollapsibleInspectorSectioncollapsiblelabel={`${guide.orientation === 'vertical' ? 'Vertical' : 'Horizontal'} guide`}diff --git a/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx b/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsxindex e9da3450fb..9a380a6539 100644--- a/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx@@ -26,6 +26,7 @@ import {type SchemaFieldInfo,} from '../../helpers/timeline-layout';import {useRuntimeValues} from '../../helpers/use-runtime-values';+import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {InputDragger} from '../NewComposition/InputDragger';import {callDeleteEffectKeyframe,@@ -54,6 +55,7 @@ import {} from './common';import {clampInspectorKeyframeDisplayFrame} from './keyframe-inspector-frame';import {KeyframeEasingNavigator} from './KeyframeEasingNavigator';+import {SequenceInspectorSections} from './SequenceInspectorHeader';import {detailsBeforeInlineAction,detailsWithInlineAction,@@ -530,7 +532,8 @@ export const KeyframeInspector: React.FC<{}return (- <div style={selectedContainer}>+ <div style={selectedContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>+ <SequenceInspectorSections track={track} /><InspectorBackActiondisabled={parentSelection === null}onClick={onSelectParent}diff --git a/packages/studio/src/components/InspectorPanel/SelectedInspector.tsx b/packages/studio/src/components/InspectorPanel/SelectedInspector.tsxindex 94c53cf7b0..02ee46ca10 100644--- a/packages/studio/src/components/InspectorPanel/SelectedInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/SelectedInspector.tsx@@ -1,6 +1,5 @@import React, {useLayoutEffect, useRef, useState} from 'react';import {startSlideViewTransition} from '../../helpers/slide-view-transition';-import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {getTimelineSequenceSelectionKey,type TimelineSelection,@@ -10,20 +9,8 @@ import {EasingInspector} from './EasingInspector';import {GuideInspector} from './GuideInspector';import {isSequenceSectionSelection} from './inspector-selection';import {KeyframeInspector} from './KeyframeInspector';-import {SequenceInspectorSections} from './SequenceInspectorHeader';import {SequenceSelectionInspector} from './SequenceSelectionInspector';-import {scrollableContainer} from './styles';-import {useTrackForSelection} from './use-track-for-selection';--const headerStyle: React.CSSProperties = {- flexShrink: 0,-};--const contentStyle: React.CSSProperties = {- display: 'flex',- flex: '1 0 auto',- flexDirection: 'column',-};+import {container} from './styles';const SelectedInspectorContent: React.FC<{readonly selection: TimelineSelection;@@ -60,7 +47,6 @@ export const SelectedInspector: React.FC<{const [displayedSelection, setDisplayedSelection] = useState(selection);const displayedSelectionRef = useRef(selection);const panelRef = useRef<HTMLDivElement>(null);- const track = useTrackForSelection(displayedSelection);useLayoutEffect(() => {const previous = displayedSelectionRef.current;@@ -106,25 +92,11 @@ export const SelectedInspector: React.FC<{}, [selection]);return (- <div style={scrollableContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>- {track === null ? null : (- <div style={headerStyle}>- <SequenceInspectorSections- key={- track.nodePathInfo- ? getTimelineSequenceSelectionKey(track.nodePathInfo)- : track.sequence.id- }- track={track}- />- </div>- )}- <div ref={panelRef} style={contentStyle}>- <SelectedInspectorContent- selection={displayedSelection}- readOnlyStudio={readOnlyStudio}- />- </div>+ <div ref={panelRef} style={container}>+ <SelectedInspectorContent+ selection={displayedSelection}+ readOnlyStudio={readOnlyStudio}+ /></div>);};diff --git a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsxindex c7f9ec4cce..7f54fe1359 100644--- a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx@@ -17,6 +17,7 @@ import {hasSequenceControls,InspectorSequenceSection,} from '../InspectorSequenceSection';+import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {showNotification} from '../Notifications/NotificationCenter';import {getMediaFileName} from '../public-output-name';import {splitVideoFromAudio} from '../split-video-from-audio-api';@@ -43,7 +44,10 @@ import {largeInspectorActionIconStyle,} from './common';import type {SequenceSectionSelection} from './inspector-selection';-import {useSequenceInspectorSourceLocation} from './SequenceInspectorHeader';+import {+ SequenceInspectorSections,+ useSequenceInspectorSourceLocation,+} from './SequenceInspectorHeader';import {SequencePrecomposeAction} from './SequencePrecomposeAction';import {SequenceWrapAction} from './SequenceWrapAction';import {selectedContainer} from './styles';@@ -454,8 +458,10 @@ const SequenceExpandedInspector: React.FC<{return (<divstyle={selectedContainer}+ className={VERTICAL_SCROLLBAR_CLASSNAME}onPointerDown={selectSequenceOnInspectorPointerDown}>+ <SequenceInspectorSections track={track} />{validatedLocation ? (<><InspectorSequenceSectiondiff --git a/packages/studio/src/components/InspectorPanel/styles.ts b/packages/studio/src/components/InspectorPanel/styles.tsindex 652a4b2f44..bc3d594e2f 100644--- a/packages/studio/src/components/InspectorPanel/styles.ts+++ b/packages/studio/src/components/InspectorPanel/styles.ts@@ -119,6 +119,8 @@ export const selectedContainer: React.CSSProperties = {backgroundColor: BACKGROUND,flex: 1,minHeight: 0,+ overflowX: 'hidden',+ overflowY: 'auto',};export const centeredMessage: React.CSSProperties = {