Skip to content

🎥 Make videos programmatically with React

Restore scrolling for the full sequence inspector

JonnyBurgerf350aefb02a9
diff --git a/packages/studio/src/components/InspectorPanel/EasingInspector.tsx b/packages/studio/src/components/InspectorPanel/EasingInspector.tsx
index 5c21925783..3f8248b04e 100644
--- a/packages/studio/src/components/InspectorPanel/EasingInspector.tsx
+++ b/packages/studio/src/components/InspectorPanel/EasingInspector.tsx
@@ -9,7 +9,6 @@ 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,
@@ -347,7 +346,7 @@ export const EasingInspector: React.FC<{
}
return (
- <div style={selectedContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>
+ <div style={selectedContainer}>
<EasingEditor
key={getTimelineSelectionKey(currentEasingSelection)}
state={state}
diff --git a/packages/studio/src/components/InspectorPanel/GuideInspector.tsx b/packages/studio/src/components/InspectorPanel/GuideInspector.tsx
index aa2ffe50ad..ba5cd7ae4e 100644
--- a/packages/studio/src/components/InspectorPanel/GuideInspector.tsx
+++ b/packages/studio/src/components/InspectorPanel/GuideInspector.tsx
@@ -4,7 +4,6 @@ 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';
@@ -80,7 +79,7 @@ export const GuideInspector: React.FC<{
}
return (
- <div style={selectedContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>
+ <div style={selectedContainer}>
<CollapsibleInspectorSection
collapsible
label={`${guide.orientation === 'vertical' ? 'Vertical' : 'Horizontal'} guide`}
diff --git a/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx b/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx
index 12df182d8d..e9da3450fb 100644
--- a/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx
+++ b/packages/studio/src/components/InspectorPanel/KeyframeInspector.tsx
@@ -26,7 +26,6 @@ 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,
@@ -531,7 +530,7 @@ export const KeyframeInspector: React.FC<{
}
return (
- <div style={selectedContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>
+ <div style={selectedContainer}>
<InspectorBackAction
disabled={parentSelection === null}
onClick={onSelectParent}
diff --git a/packages/studio/src/components/InspectorPanel/SelectedInspector.tsx b/packages/studio/src/components/InspectorPanel/SelectedInspector.tsx
index 2e82bd89ea..94c53cf7b0 100644
--- a/packages/studio/src/components/InspectorPanel/SelectedInspector.tsx
+++ b/packages/studio/src/components/InspectorPanel/SelectedInspector.tsx
@@ -1,5 +1,6 @@
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,
@@ -11,7 +12,7 @@ import {isSequenceSectionSelection} from './inspector-selection';
import {KeyframeInspector} from './KeyframeInspector';
import {SequenceInspectorSections} from './SequenceInspectorHeader';
import {SequenceSelectionInspector} from './SequenceSelectionInspector';
-import {container} from './styles';
+import {scrollableContainer} from './styles';
import {useTrackForSelection} from './use-track-for-selection';
const headerStyle: React.CSSProperties = {
@@ -20,10 +21,8 @@ const headerStyle: React.CSSProperties = {
const contentStyle: React.CSSProperties = {
display: 'flex',
- flex: 1,
+ flex: '1 0 auto',
flexDirection: 'column',
- minHeight: 0,
- overflow: 'hidden',
};
const SelectedInspectorContent: React.FC<{
@@ -107,7 +106,7 @@ export const SelectedInspector: React.FC<{
}, [selection]);
return (
- <div style={container}>
+ <div style={scrollableContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>
{track === null ? null : (
<div style={headerStyle}>
<SequenceInspectorSections
diff --git a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx
index 41eacd112b..c7f9ec4cce 100644
--- a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx
+++ b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx
@@ -17,7 +17,6 @@ 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';
@@ -455,7 +454,6 @@ const SequenceExpandedInspector: React.FC<{
return (
<div
style={selectedContainer}
- className={VERTICAL_SCROLLBAR_CLASSNAME}
onPointerDown={selectSequenceOnInspectorPointerDown}
>
{validatedLocation ? (
diff --git a/packages/studio/src/components/InspectorPanel/styles.ts b/packages/studio/src/components/InspectorPanel/styles.ts
index bc3d594e2f..652a4b2f44 100644
--- a/packages/studio/src/components/InspectorPanel/styles.ts
+++ b/packages/studio/src/components/InspectorPanel/styles.ts
@@ -119,8 +119,6 @@ export const selectedContainer: React.CSSProperties = {
backgroundColor: BACKGROUND,
flex: 1,
minHeight: 0,
- overflowX: 'hidden',
- overflowY: 'auto',
};
export const centeredMessage: React.CSSProperties = {