🎥 Make videos programmatically with React
@remotion/studio: Make inspector sections collapsible
Jonny Burger22a24a20ef3b
diff --git a/packages/docs/docs/visual-editing.mdx b/packages/docs/docs/visual-editing.mdxindex ef982ed417..1dbbb312fc 100644--- a/packages/docs/docs/visual-editing.mdx+++ b/packages/docs/docs/visual-editing.mdx@@ -15,7 +15,13 @@ Basic controls are [inferred from the values in `defaultProps`](/docs/default-pr## Opening the default props editorTo open the default props editor, press the <svg style={{width: 20, verticalAlign:"middle", marginLeft: 4, marginRight: 4}} viewBox="0 0 100 100" fill="transparent"><rect x="3" y="3" width="94" height="94" rx="7" stroke="var(--ifm-font-color-base)" strokeWidth="6"/><path d="M59 91.5V8.5C59 4.63401 62.134 1.5 66 1.5H92C95.866 1.5 99 4.63401 99 8.5V91.5C99 95.366 95.866 98.5 92 98.5H66C62.134 98.5 59 95.366 59 91.5Z" fill="var(--ifm-font-color-base)" stroke="var(--ifm-font-color-base)"/></svg>-icon in the top right corner of the Remotion Studio to open the right sidebar. Alternatively, press <kbd>Cmd/Ctrl</kbd> + <kbd>J</kbd> to toggle the sidebar. Select the <code>Props</code> tab.+icon in the top right corner of the Remotion Studio to open the right sidebar. Alternatively, press <kbd>Cmd/Ctrl</kbd> + <kbd>J</kbd> to toggle the sidebar. The composition's default props are in the Default Props section.++## Inspector sections<AvailableFrom v="4.0.526" />++Click a section title, such as Metadata, Default Props, or Actions, to collapse or expand its contents. You can also focus the title with <kbd>Tab</kbd> and press <kbd>Enter</kbd> or <kbd>Space</kbd>. Collapsing Default Props preserves the editor mode and unfinished JSON.++Empty sections, such as Effects without any effects, are not collapsible. Header actions remain separate from the title: adding an effect or importing captions opens the corresponding section.## Editing default propsdiff --git a/packages/example/e2e/captions-inspector.test.mts b/packages/example/e2e/captions-inspector.test.mtsindex 3d8ec84070..6856c3320d 100644--- a/packages/example/e2e/captions-inspector.test.mts+++ b/packages/example/e2e/captions-inspector.test.mts@@ -149,6 +149,12 @@ test.describe('captions inspector', () => {sourceBeforeFailedImport,);+ await page+ .getByRole('button', {name: 'Collapse Captions', exact: true})+ .click();+ await expect(defaultCaption).toBeHidden();+ await expect(importCaptionsButton).toBeVisible();+await importCaptionsInput.setInputFiles({name: 'captions.json',mimeType: 'application/json',@@ -220,6 +226,10 @@ test.describe('captions inspector', () => {await expect(importCaptionsButton).toBeVisible({timeout: 1_000});}).toPass({timeout: 30_000});+ await expect(page.getByText('No captions', {exact: true})).toBeVisible();+ await expect(+ page.getByRole('button', {name: /^(Collapse|Expand) Captions$/}),+ ).toHaveCount(0);await page.getByLabel('Import captions file').setInputFiles({name: 'captions.json',mimeType: 'application/json',diff --git a/packages/example/e2e/inspector-control-layout.test.mts b/packages/example/e2e/inspector-control-layout.test.mtsindex e43f273c08..9c9f2f2a46 100644--- a/packages/example/e2e/inspector-control-layout.test.mts+++ b/packages/example/e2e/inspector-control-layout.test.mts@@ -65,6 +65,7 @@ test.describe('Inspector control layout', () => {});test('keeps inspector controls aligned', async ({page}) => {+ test.setTimeout(90_000);await page.goto(`${STUDIO_URL}/inspector-control-layout-e2e`);await expect(page).toHaveURL(/inspector-control-layout-e2e/, {timeout: 15_000,@@ -107,6 +108,15 @@ test.describe('Inspector control layout', () => {expect(Math.abs(sourceActionBox.x - duplicateActionBox.x),).toBeLessThanOrEqual(1);+ await page+ .getByRole('button', {name: 'Collapse Actions', exact: true})+ .click();+ await expect(duplicateAction).toBeHidden();+ await expect(sourceAction).toBeVisible();+ await page+ .getByRole('button', {name: 'Expand Actions', exact: true})+ .press('Enter');+ await expect(duplicateAction).toBeVisible();await expectInspectorControlsToUseAvailableWidth(origin,@@ -172,5 +182,23 @@ test.describe('Inspector control layout', () => {expect(computedFontFamilyBox.y + computedFontFamilyBox.height,).toBeLessThanOrEqual(fontSizeBox.y);++ await page.goto(`${STUDIO_URL}/assets/framer.webm`);+ await page+ .getByRole('button', {name: 'Collapse File', exact: true})+ .click();+ await expect(page.getByText('Size', {exact: true})).toBeHidden();+ await page+ .getByRole('button', {name: 'Expand File', exact: true})+ .press('Enter');+ await expect(page.getByText('Size', {exact: true})).toBeVisible();+ await page+ .getByRole('button', {name: 'Collapse Video', exact: true})+ .click();+ await expect(page.getByText('Frame rate', {exact: true})).toBeHidden();+ await page+ .getByRole('button', {name: 'Expand Video', exact: true})+ .press('Space');+ await expect(page.getByText('Frame rate', {exact: true})).toBeVisible();});});diff --git a/packages/example/e2e/json-editor.test.mts b/packages/example/e2e/json-editor.test.mtsindex 25c2bc9b3e..c8d4b2197e 100644--- a/packages/example/e2e/json-editor.test.mts+++ b/packages/example/e2e/json-editor.test.mts@@ -21,6 +21,42 @@ test.describe('visual mode', () => {test.setTimeout(90_000);await navigateToSchemaTest(page);+ const collapseMetadata = page.getByRole('button', {+ name: 'Collapse Metadata',+ exact: true,+ });+ await page.mouse.move(0, 0);+ await expect(collapseMetadata).toHaveCSS('cursor', 'default');+ await expect(collapseMetadata).toHaveCSS('color', 'rgb(166, 167, 169)');+ await collapseMetadata.hover();+ await expect(collapseMetadata).toHaveCSS('cursor', 'default');+ await expect(collapseMetadata).toHaveCSS('color', 'rgb(255, 255, 255)');+ await collapseMetadata.click();+ const expandMetadata = page.getByRole('button', {+ name: 'Expand Metadata',+ exact: true,+ });+ await expect(expandMetadata).toBeFocused();+ await expect(expandMetadata).toHaveCSS('box-shadow', 'none');+ await expect(page.getByText('Frame rate', {exact: true})).toBeHidden();+ await page.reload();+ await expect(expandMetadata).toBeVisible();+ await expandMetadata.click();+ await expect(page.getByText('Frame rate', {exact: true})).toBeVisible();++ await page+ .getByRole('button', {name: 'Collapse Actions', exact: true})+ .click();+ await expect(+ page.getByRole('button', {name: 'Add Solid', exact: true}),+ ).toBeHidden();+ await page+ .getByRole('button', {name: 'Expand Actions', exact: true})+ .press('Enter');+ await expect(+ page.getByRole('button', {name: 'Add Solid', exact: true}),+ ).toBeVisible();+const jsonTab = page.getByRole('button', {name: 'JSON', exact: true});await expect(jsonTab).toBeVisible({timeout: 10_000});await jsonTab.click();@@ -59,6 +95,24 @@ test.describe('visual mode', () => {await expect(errorDiv).not.toBeEmpty({timeout: 5_000});await textarea.blur();+ await page+ .getByRole('button', {name: 'Collapse Default Props', exact: true})+ .click();+ await expect(textarea).toBeHidden();+ await expect(jsonTab).toBeHidden();+ const expandDefaultProps = page.getByRole('button', {+ name: 'Expand Default Props',+ exact: true,+ });+ await page.keyboard.press('Tab');+ await page.keyboard.press('Shift+Tab');+ await expect(expandDefaultProps).toBeFocused();+ await expect(expandDefaultProps).not.toHaveCSS('box-shadow', 'none');+ await expandDefaultProps.press('Space');+ await expect(textarea).toBeVisible();+ await expect(textarea).toHaveValue('{invalid json');+ await expect(errorDiv).not.toBeEmpty();+await expect.poll(() => fs.readFileSync(rootFile, 'utf-8') === contentAfterValidEdit,diff --git a/packages/example/e2e/multi-sequence-inspector.test.mts b/packages/example/e2e/multi-sequence-inspector.test.mtsindex 8357e298ce..5ac5435d3e 100644--- a/packages/example/e2e/multi-sequence-inspector.test.mts+++ b/packages/example/e2e/multi-sequence-inspector.test.mts@@ -36,6 +36,15 @@ test('edits shared controls and preserves relative translations in a single undo});const sourceBefore = fs.readFileSync(visualMode3DFile, 'utf-8');const x = page.getByRole('button', {name: 'Offset X', exact: true});+ await page+ .getByRole('button', {name: 'Collapse Transform', exact: true})+ .click();+ await expect(x).toBeHidden();+ await page+ .getByRole('button', {name: 'Expand Transform', exact: true})+ .press('Space');+ await expect(x).toHaveText('Mixed');+ await expect(x).toBeVisible();await x.click();const input = page.getByRole('textbox', {name: 'Offset X', exact: true});await input.fill('99');diff --git a/packages/example/e2e/studio.test.mts b/packages/example/e2e/studio.test.mtsindex bfa245e3bd..dd1a5a25cd 100644--- a/packages/example/e2e/studio.test.mts+++ b/packages/example/e2e/studio.test.mts@@ -839,6 +839,9 @@ test.describe('visual mode', () => {});const timelinePhase = page.getByText('Phase', {exact: true});await expect(timelinePhase).toHaveCount(1);+ await inspector+ .getByRole('button', {name: 'Collapse Effects', exact: true})+ .click();await inspector.evaluate((element) => {element.scrollTop = 0;});@@ -852,38 +855,90 @@ test.describe('visual mode', () => {).toBeVisible();});- test('should keep Effects expanded and preserve the inspector scroll position when adding an effect', async ({+ test('collapses populated Effects and opens them when adding an effect', async ({page,}) => {await page.goto(`${STUDIO_URL}/effect-keyframe-e2e`);await expect(page).toHaveURL(/effect-keyframe-e2e/, {timeout: 15_000});const addEffectButton = page.getByTitle('Add effect', {exact: true});+ const inspector = page+ .locator('.__remotion-vertical-scrollbar')+ .filter({has: addEffectButton});+ const effectPicker = page.getByRole('dialog');if (!(await page.getByRole('button', {name: 'Inspector'}).isVisible())) {await page.locator('[data-sidebar-toggle="right"]').click();}+ await expect(async () => {+ await page+ .getByTitle('Timeline expansion', {exact: true})+ .first()+ .click();+ await expect(addEffectButton).toBeVisible({timeout: 1000});+ }).toPass({timeout: 15_000});+ await expect(page.getByText('Effects', {exact: true})).toBeVisible();+ await expect(+ page.getByRole('button', {name: /^(Collapse|Expand) Effects$/}),+ ).toHaveCount(0);++ // Adding the first effect must also work after undoing a collapsed one.+ for (let i = 0; i < 2; i++) {+ await addEffectButton.click();+ await effectPicker.getByPlaceholder('Search effects...').fill('blur');+ await effectPicker.getByText('blur()', {exact: true}).click();+ await expect(inspector.getByText('blur()', {exact: true})).toBeVisible();+ await page+ .getByRole('button', {name: 'Collapse Effects', exact: true})+ .click();+ await expect(page.getByRole('button', {name: /^Undo/})).toBeEnabled();+ await page.keyboard.press('ControlOrMeta+z');+ await expect(+ page.getByRole('button', {name: /^(Collapse|Expand) Effects$/}),+ ).toHaveCount(0);+ await expect(inspector.getByText('Effects', {exact: true})).toBeVisible();+ }+await expect(async () => {await page.getByTitle('Scale precision', {exact: true}).first().click();await expect(addEffectButton).toBeVisible({timeout: 1000});}).toPass({timeout: 15_000});await expect(page.getByText('wave()', {exact: true})).toBeVisible();+ await page+ .getByRole('button', {name: 'Collapse Effects', exact: true})+ .click();+ await expect(page.getByText('wave()', {exact: true})).toBeHidden();+ await expect(addEffectButton).toBeVisible();+ await page+ .getByRole('button', {name: 'Expand Effects', exact: true})+ .press('Enter');+ await expect(page.getByText('wave()', {exact: true})).toBeVisible();+ await page+ .locator('[data-timeline-marquee-item][title="Scale precision"]')+ .click();await expect(page.getByRole('button', {name: 'Collapse Effects', exact: true}),- ).toHaveCount(0);- const inspector = page- .locator('.__remotion-vertical-scrollbar')- .filter({has: addEffectButton});+ ).not.toBeFocused();+ await page.keyboard.press('Enter');+ const sequenceName = page.getByRole('textbox');+ await expect(sequenceName).toHaveValue('Scale precision');+ await sequenceName.press('Escape');+ await page+ .locator('[data-timeline-marquee-item][title="Scale precision"]')+ .click();+ await page+ .getByRole('button', {name: 'Collapse Effects', exact: true})+ .click();await expect(inspector).toHaveCount(1);await inspector.evaluate((element) => {element.scrollTop = element.scrollHeight;});await addEffectButton.click();+ await expect(inspector.getByText('wave()', {exact: true})).toBeVisible();const scrollTopBefore = await inspector.evaluate((element) => element.scrollTop,);expect(scrollTopBefore).toBeGreaterThan(0);- const effectPicker = page.getByRole('dialog');await effectPicker.getByPlaceholder('Search effects...').fill('blur');await effectPicker.getByText('blur()', {exact: true}).click();diff --git a/packages/example/e2e/visual-controls.test.mts b/packages/example/e2e/visual-controls.test.mtsindex 0142322137..364e29378e 100644--- a/packages/example/e2e/visual-controls.test.mts+++ b/packages/example/e2e/visual-controls.test.mts@@ -25,6 +25,14 @@ test.describe('visual controls', () => {.locator('[data-json-path="rotation"]').locator('..');await expect(rotationFieldset).toBeVisible({timeout: 10_000});+ await page+ .getByRole('button', {name: 'Collapse Visual Controls', exact: true})+ .click();+ await expect(rotationFieldset).toBeHidden();+ await page+ .getByRole('button', {name: 'Expand Visual Controls', exact: true})+ .press('Enter');+ await expect(rotationFieldset).toBeVisible();const rotationDragger = rotationFieldset.locator('button.__remotion_input_dragger',diff --git a/packages/studio/src/api/focus-default-props-path.ts b/packages/studio/src/api/focus-default-props-path.tsindex 24e913bd18..898d1e9733 100644--- a/packages/studio/src/api/focus-default-props-path.ts+++ b/packages/studio/src/api/focus-default-props-path.ts@@ -1,6 +1,8 @@+import {flushSync} from 'react-dom';import {DEFAULT_PROPS_PATH_ACTIVE_CLASSNAME,DEFAULT_PROPS_PATH_CLASSNAME,+ expandDefaultPropsEditorRef,} from '../components/RenderModal/SchemaEditor/scroll-to-default-props-path';import type {JSONPath} from '../components/RenderModal/SchemaEditor/zod-types';@@ -27,6 +29,7 @@ export const focusDefaultPropsPath = ({};}+ flushSync(() => expandDefaultPropsEditorRef.current?.());query.scrollIntoView({behavior: scrollBehavior});query.classList.add(DEFAULT_PROPS_PATH_ACTIVE_CLASSNAME);return {diff --git a/packages/studio/src/components/CaptionInspector.tsx b/packages/studio/src/components/CaptionInspector.tsxindex 3ddb7556c1..3da0a1752e 100644--- a/packages/studio/src/components/CaptionInspector.tsx+++ b/packages/studio/src/components/CaptionInspector.tsx@@ -47,6 +47,8 @@ export const CaptionInspector: React.FC<{readOnlyTitle,}) => {const fileInput = useRef<HTMLInputElement>(null);+ const expansionRef = useRef({expanded, onToggle});+ expansionRef.current = {expanded, onToggle};const [isImporting, setIsImporting] = useState(false);const {setSelectedModal} = React.useContext(SetSelectedModalContext);@@ -64,12 +66,14 @@ export const CaptionInspector: React.FC<{setIsImporting(true);try {- onReplaceCaptions(- parseCaptionFile({- fileName,- contents: await contents,- }),- );+ const imported = parseCaptionFile({+ fileName,+ contents: await contents,+ });+ onReplaceCaptions(imported);+ if (imported.length > 0 && !expansionRef.current.expanded) {+ expansionRef.current.onToggle();+ }} catch (error) {showNotification(`Could not import ${fileName}: ${error instanceof Error ? error.message : String(error)}`,@@ -159,10 +163,10 @@ export const CaptionInspector: React.FC<{}expanded={expanded}label="Captions"- onToggle={onToggle}+ onToggle={captions.length > 0 ? onToggle : null}/></InspectorSectionHeader>- {expanded ? (+ {expanded || captions.length === 0 ? (<CaptionTextEditorcaptions={captions}onChange={onTextChange}diff --git a/packages/studio/src/components/CurrentAsset.tsx b/packages/studio/src/components/CurrentAsset.tsxindex bcc7394f7e..c51c93ddee 100644--- a/packages/studio/src/components/CurrentAsset.tsx+++ b/packages/studio/src/components/CurrentAsset.tsx@@ -25,12 +25,11 @@ import {SetSelectedModalContext} from '../state/modals';import {AssetAudioVolume} from './AssetAudioVolume';import {InlineEditableTitle} from './InlineEditableTitle';import {InspectorInfoHeader} from './InspectorInfoHeader';+import {CollapsibleInspectorSection} from './InspectorPanel/CollapsibleInspectorSection';import {InspectorDetailRow,- InspectorQuickActionsSection,InspectorQuickAction,- InspectorSection,- InspectorSectionHeader,+ InspectorQuickActionsSection,} from './InspectorPanel/common';import {INSPECTOR_PANEL_HORIZONTAL_PADDING} from './InspectorPanelLayout';import {COMPACT_CONTROL_ROW_HEIGHT} from './layout';@@ -331,7 +330,11 @@ export const AssetInfo: React.FC<{/></InspectorInfoHeader>{fileDetails.length > 0 ? (- <InspectorSection header="File">+ <CollapsibleInspectorSection+ collapsible+ label="File"+ sectionId="asset-file"+ ><div style={assetMetadataStyle}>{fileDetails.map((detail) => (<InspectorDetailRow key={detail.label} label={detail.label}>@@ -339,10 +342,14 @@ export const AssetInfo: React.FC<{</InspectorDetailRow>))}</div>- </InspectorSection>+ </CollapsibleInspectorSection>) : null}{mediaSections && mediaSections.video ? (- <InspectorSection header="Video">+ <CollapsibleInspectorSection+ collapsible+ label="Video"+ sectionId="asset-video"+ ><div style={assetMetadataStyle}>{mediaSections.video.map((detail) => (<InspectorDetailRow key={detail.label} label={detail.label}>@@ -350,10 +357,14 @@ export const AssetInfo: React.FC<{</InspectorDetailRow>))}</div>- </InspectorSection>+ </CollapsibleInspectorSection>) : null}{mediaSections && mediaSections.audio !== null ? (- <InspectorSection header="Audio">+ <CollapsibleInspectorSection+ collapsible={mediaSections.audio.length > 0}+ label="Audio"+ sectionId="asset-audio"+ >{mediaSections.audio.length === 0 ? (<div style={assetEmptyStateStyle}>None</div>) : (@@ -383,78 +394,89 @@ export const AssetInfo: React.FC<{) : null}</div>)}- </InspectorSection>+ </CollapsibleInspectorSection>) : null}- <InspectorSectionHeader>Actions</InspectorSectionHeader>- <InspectorQuickActionsSection>- {fileManagerAvailable ? (- <InspectorQuickAction- disabled={fileManagerDisabled}- onClick={onShowInFileManager}- renderIcon={(color) => (- <ExpandedFolderIcon color={color} style={quickActionIconStyle} />- )}- >- Show in {fileManagerName}- </InspectorQuickAction>- ) : null}- {src ? (- <InspectorQuickAction- disabled={mutationsDisabled}- onClick={onTranscribe}- renderIcon={(color) => (- <TranscriptionIcon color={color} style={quickActionIconStyle} />- )}- >- Transcribe- </InspectorQuickAction>- ) : null}- {fileType === 'video' ? (+ <CollapsibleInspectorSection+ collapsible+ label="Actions"+ sectionId="asset-actions"+ >+ <InspectorQuickActionsSection>+ {fileManagerAvailable ? (+ <InspectorQuickAction+ disabled={fileManagerDisabled}+ onClick={onShowInFileManager}+ renderIcon={(color) => (+ <ExpandedFolderIcon+ color={color}+ style={quickActionIconStyle}+ />+ )}+ >+ Show in {fileManagerName}+ </InspectorQuickAction>+ ) : null}+ {src ? (+ <InspectorQuickAction+ disabled={mutationsDisabled}+ onClick={onTranscribe}+ renderIcon={(color) => (+ <TranscriptionIcon color={color} style={quickActionIconStyle} />+ )}+ >+ Transcribe+ </InspectorQuickAction>+ ) : null}+ {fileType === 'video' ? (+ <InspectorQuickAction+ disabled={mutationsDisabled}+ onClick={onTrackMatting}+ renderIcon={(color) => (+ <SeparationIcon color={color} style={quickActionIconStyle} />+ )}+ >+ Separate foreground+ </InspectorQuickAction>+ ) : null}+ {src ? (+ <InspectorQuickAction+ disabled={false}+ onClick={onOpenConvert}+ renderIcon={(color) => (+ <RemotionConvertIcon+ color={color}+ style={quickActionIconStyle}+ />+ )}+ >+ Convert+ <svg+ aria-hidden="true"+ viewBox="0 0 16 16"+ style={convertArrowStyle}+ >+ <path+ d="M4 12 12 4M6 4h6v6"+ fill="none"+ stroke={CURRENT_COLOR}+ strokeLinecap="round"+ strokeLinejoin="round"+ strokeWidth="1.5"+ />+ </svg>+ </InspectorQuickAction>+ ) : null}<InspectorQuickActiondisabled={mutationsDisabled}- onClick={onTrackMatting}- renderIcon={(color) => (- <SeparationIcon color={color} style={quickActionIconStyle} />- )}- >- Separate foreground- </InspectorQuickAction>- ) : null}- {src ? (- <InspectorQuickAction- disabled={false}- onClick={onOpenConvert}+ onClick={onDelete}renderIcon={(color) => (- <RemotionConvertIcon color={color} style={quickActionIconStyle} />+ <TrashIcon color={color} style={quickActionIconStyle} />)}>- Convert- <svg- aria-hidden="true"- viewBox="0 0 16 16"- style={convertArrowStyle}- >- <path- d="M4 12 12 4M6 4h6v6"- fill="none"- stroke={CURRENT_COLOR}- strokeLinecap="round"- strokeLinejoin="round"- strokeWidth="1.5"- />- </svg>+ Delete</InspectorQuickAction>- ) : null}- <InspectorQuickAction- disabled={mutationsDisabled}- onClick={onDelete}- renderIcon={(color) => (- <TrashIcon color={color} style={quickActionIconStyle} />- )}- >- Delete- </InspectorQuickAction>- </InspectorQuickActionsSection>+ </InspectorQuickActionsSection>+ </CollapsibleInspectorSection></>);};diff --git a/packages/studio/src/components/InspectorPanel/CollapsibleInspectorSection.tsx b/packages/studio/src/components/InspectorPanel/CollapsibleInspectorSection.tsxnew file mode 100644index 0000000000..e7668685e0--- /dev/null+++ b/packages/studio/src/components/InspectorPanel/CollapsibleInspectorSection.tsx@@ -0,0 +1,29 @@+import React from 'react';+import {CollapsibleInspectorSectionHeader} from './CollapsibleInspectorSectionHeader';+import {InspectorSectionBody, InspectorSectionHeader} from './common';+import {useInspectorSectionExpanded} from './use-inspector-section-expanded';++export const CollapsibleInspectorSection: React.FC<{+ readonly children: React.ReactNode;+ readonly collapsible: boolean;+ readonly label: string;+ readonly sectionId: string;+}> = ({children, collapsible, label, sectionId}) => {+ const [expanded, setExpanded] = useInspectorSectionExpanded(sectionId);++ return (+ <>+ <InspectorSectionHeader>+ <CollapsibleInspectorSectionHeader+ action={null}+ expanded={expanded}+ label={label}+ onToggle={collapsible ? () => setExpanded(!expanded) : null}+ />+ </InspectorSectionHeader>+ <InspectorSectionBody expanded={!collapsible || expanded}>+ {children}+ </InspectorSectionBody>+ </>+ );+};diff --git a/packages/studio/src/components/InspectorPanel/CollapsibleInspectorSectionHeader.tsx b/packages/studio/src/components/InspectorPanel/CollapsibleInspectorSectionHeader.tsxindex 4efc332656..16eebb9a28 100644--- a/packages/studio/src/components/InspectorPanel/CollapsibleInspectorSectionHeader.tsx+++ b/packages/studio/src/components/InspectorPanel/CollapsibleInspectorSectionHeader.tsx@@ -1,14 +1,13 @@import React from 'react';import {LIGHT_TEXT, TRANSPARENT, WHITE} from '../../helpers/colors';-import {HOVERABLE_CLASS_NAME, hoverableStyle} from '../../helpers/hoverable';+import {+ FOCUS_VISIBLE_ONLY_CLASS_NAME,+ HOVERABLE_CLASS_NAME,+ hoverableStyle,+} from '../../helpers/hoverable';import {sectionHeaderRow} from './styles';-const collapsibleSectionHeaderButton: React.CSSProperties = {- appearance: 'none',- backgroundColor: 'transparent',- border: 'none',- borderRadius: 3,- cursor: 'default',+const sectionTitle: React.CSSProperties = {display: 'block',flex: 1,fontFamily: 'Arial, Helvetica, sans-serif',@@ -23,6 +22,20 @@ const collapsibleSectionHeaderButton: React.CSSProperties = {textOverflow: 'ellipsis',userSelect: 'none',whiteSpace: 'nowrap',+};++const staticSectionTitle: React.CSSProperties = {+ ...sectionTitle,+ color: LIGHT_TEXT,+};++const collapsibleSectionHeaderButton: React.CSSProperties = {+ ...sectionTitle,+ appearance: 'none',+ backgroundColor: 'transparent',+ border: 'none',+ borderRadius: 3,+ cursor: 'default',...hoverableStyle({idleBackground: TRANSPARENT,hoverBackground: TRANSPARENT,@@ -31,24 +44,38 @@ const collapsibleSectionHeaderButton: React.CSSProperties = {}),};+const stopActivationKeyPropagation = (+ event: React.KeyboardEvent<HTMLButtonElement>,+) => {+ if (event.key === 'Enter' || event.key === ' ') {+ event.stopPropagation();+ }+};+export const CollapsibleInspectorSectionHeader: React.FC<{readonly action: React.ReactNode;readonly expanded: boolean;readonly label: string;- readonly onToggle: () => void;+ readonly onToggle: (() => void) | null;}> = ({action, expanded, label, onToggle}) => {return (<div style={sectionHeaderRow}>- <button- type="button"- aria-expanded={expanded}- aria-label={`${expanded ? 'Collapse' : 'Expand'} ${label}`}- className={`__remotion-inspector-section-title ${HOVERABLE_CLASS_NAME}`}- onClick={onToggle}- style={collapsibleSectionHeaderButton}- >- {label}- </button>+ {onToggle === null ? (+ <div style={staticSectionTitle}>{label}</div>+ ) : (+ <button+ type="button"+ aria-expanded={expanded}+ aria-label={`${expanded ? 'Collapse' : 'Expand'} ${label}`}+ className={`__remotion-inspector-section-title ${HOVERABLE_CLASS_NAME} ${FOCUS_VISIBLE_ONLY_CLASS_NAME}`}+ onClick={onToggle}+ onKeyDown={stopActivationKeyPropagation}+ onKeyUp={stopActivationKeyPropagation}+ style={collapsibleSectionHeaderButton}+ >+ {label}+ </button>+ )}{action}</div>);diff --git a/packages/studio/src/components/InspectorPanel/CompositionInspector.tsx b/packages/studio/src/components/InspectorPanel/CompositionInspector.tsxindex 284bda37c4..1e2989abec 100644--- a/packages/studio/src/components/InspectorPanel/CompositionInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/CompositionInspector.tsx@@ -2,6 +2,7 @@ import React, {useCallback,useContext,useEffect,+ useImperativeHandle,useMemo,useState,} from 'react';@@ -29,6 +30,7 @@ import {useDataEditorWarningVisibility,} from '../RenderModal/DataEditor';import {resolveCompositionSchema} from '../RenderModal/SchemaEditor/infer-zod-schema-from-value';+import {expandDefaultPropsEditorRef} from '../RenderModal/SchemaEditor/scroll-to-default-props-path';import type {AnyZodSchema} from '../RenderModal/SchemaEditor/zod-schema-type';import {getZodSchemaType} from '../RenderModal/SchemaEditor/zod-schema-type';import type {UpdaterFunction} from '../RenderModal/SchemaEditor/ZodSwitch';@@ -36,10 +38,13 @@ import {WarningIndicatorButton} from '../RenderModal/WarningIndicatorButton';import type {SegmentedControlItem} from '../SegmentedControl';import {SegmentedControl} from '../SegmentedControl';import {VisualControlsContent} from '../VisualControls/VisualControlsContent';+import {CollapsibleInspectorSection} from './CollapsibleInspectorSection';+import {CollapsibleInspectorSectionHeader} from './CollapsibleInspectorSectionHeader';import {- InspectorQuickActionsSection,InspectorDefaultPropsWarnings,InspectorQuickAction,+ InspectorQuickActionsSection,+ InspectorSectionBody,InspectorSectionHeader,} from './common';import {CompositionInspectorHeader} from './CompositionInspectorHeader';@@ -47,16 +52,13 @@ import {CompositionMetadata} from './CompositionMetadata';import {ElementLibraryButton} from './ElementLibraryButton';import {compositionDefaultPropsSection,- compositionVisualControlsSection,defaultPropsWarningContainer,inspectorOverviewSection,scrollableContainer,- sectionHeaderEnd,sectionHeaderRow,- sectionHeaderStart,- sectionHeaderTitle,} from './styles';import {useCompositionActions} from './use-composition-actions';+import {useInspectorSectionExpanded} from './use-inspector-section-expanded';const actionIconStyle: React.CSSProperties = {height: 18,@@ -155,8 +157,11 @@ const CompositionActions: React.FC = () => {}return (- <>- <InspectorSectionHeader>Actions</InspectorSectionHeader>+ <CollapsibleInspectorSection+ collapsible+ label="Actions"+ sectionId="composition-actions"+ ><InspectorQuickActionsSection>{canShowInsertSolid ? (<InspectorQuickAction@@ -204,7 +209,7 @@ const CompositionActions: React.FC = () => {</InspectorQuickAction>) : null}</InspectorQuickActionsSection>- </>+ </CollapsibleInspectorSection>);};@@ -219,6 +224,14 @@ const CompositionDefaultPropsSection: React.FC<{const canSaveDefaultProps = useContext(ObserveDefaultPropsContext);const [defaultPropsMode, setDefaultPropsMode] =useState<DataEditorMode>('schema');+ const [expanded, setExpanded] = useInspectorSectionExpanded(+ 'composition-default-props',+ );+ useImperativeHandle(+ expandDefaultPropsEditorRef,+ () => () => setExpanded(true),+ [setExpanded],+ );const compositionId = composition.id;useEffect(() => {@@ -277,48 +290,54 @@ const CompositionDefaultPropsSection: React.FC<{return (<div style={compositionDefaultPropsSection}><InspectorSectionHeader>- <div style={sectionHeaderRow}>- <div style={sectionHeaderStart}>- <span style={sectionHeaderTitle}>Default Props</span>- <SegmentedControl- items={defaultPropsModeItems}- needsWrapping={false}- size="compact"- />- </div>- <div style={sectionHeaderEnd}>- {defaultPropsWarnings.length > 0 ? (- <WarningIndicatorButton- setShowWarning={setShowWarning}- showWarning={showWarning}- warningCount={defaultPropsWarnings.length}- size="compact"- />- ) : null}- </div>- </div>+ <CollapsibleInspectorSectionHeader+ action={+ expanded ? (+ <div style={sectionHeaderRow}>+ <SegmentedControl+ items={defaultPropsModeItems}+ needsWrapping={false}+ size="compact"+ />+ {defaultPropsWarnings.length > 0 ? (+ <WarningIndicatorButton+ setShowWarning={setShowWarning}+ showWarning={showWarning}+ warningCount={defaultPropsWarnings.length}+ size="compact"+ />+ ) : null}+ </div>+ ) : null+ }+ expanded={expanded}+ label="Default Props"+ onToggle={() => setExpanded(!expanded)}+ /></InspectorSectionHeader>- {defaultPropsWarnings.length > 0 && showWarning ? (- <div style={defaultPropsWarningContainer}>- <InspectorDefaultPropsWarnings warnings={defaultPropsWarnings} />- </div>- ) : null}- <DefaultPropsEditor- key={composition.id}- unresolvedComposition={composition}- defaultProps={currentDefaultProps}- setDefaultProps={setDefaultProps}- propsEditType="default-props"- schemaErrorMode="compact"- layout="inspector"- mode={defaultPropsMode}- onModeChange={setDefaultPropsMode}- hideModeControls={canShowDefaultPropsSection}- warnings={defaultPropsWarnings}- showWarning={false}- setShowWarning={setShowWarning}- hideWarningButton- />+ <InspectorSectionBody expanded={expanded}>+ {defaultPropsWarnings.length > 0 && showWarning ? (+ <div style={defaultPropsWarningContainer}>+ <InspectorDefaultPropsWarnings warnings={defaultPropsWarnings} />+ </div>+ ) : null}+ <DefaultPropsEditor+ key={composition.id}+ unresolvedComposition={composition}+ defaultProps={currentDefaultProps}+ setDefaultProps={setDefaultProps}+ propsEditType="default-props"+ schemaErrorMode="compact"+ layout="inspector"+ mode={defaultPropsMode}+ onModeChange={setDefaultPropsMode}+ hideModeControls={canShowDefaultPropsSection}+ warnings={defaultPropsWarnings}+ showWarning={false}+ setShowWarning={setShowWarning}+ hideWarningButton+ />+ </InspectorSectionBody></div>);};@@ -337,10 +356,13 @@ const CompositionVisualControlsSection: React.FC<{}return (- <div style={compositionVisualControlsSection}>- <InspectorSectionHeader>Visual Controls</InspectorSectionHeader>+ <CollapsibleInspectorSection+ collapsible+ label="Visual Controls"+ sectionId="composition-visual-controls"+ ><VisualControlsContent />- </div>+ </CollapsibleInspectorSection>);};@@ -356,12 +378,17 @@ export const CompositionInspector: React.FC<{<div style={scrollableContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}><div style={inspectorOverviewSection}><CompositionInspectorHeader />- <InspectorSectionHeader>Metadata</InspectorSectionHeader>- <CompositionMetadata- compositionId={composition.id}- disabled={readOnlyStudio || previewServerState.type !== 'connected'}- stack={composition.stack}- />+ <CollapsibleInspectorSection+ collapsible+ label="Metadata"+ sectionId="composition-metadata"+ >+ <CompositionMetadata+ compositionId={composition.id}+ disabled={readOnlyStudio || previewServerState.type !== 'connected'}+ stack={composition.stack}+ />+ </CollapsibleInspectorSection></div><CompositionDefaultPropsSectioncomposition={composition}diff --git a/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsx b/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsxindex d666e23e11..8449f72a1e 100644--- a/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsx+++ b/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsx@@ -12,7 +12,8 @@ import {ContextMenu} from '../ContextMenu';import {useSelectComposition} from '../InitialCompositionLoader';import {useResolvedStack} from '../Timeline/use-resolved-stack';import {useEditorOpening} from '../use-default-editor-info';-import {InspectorQuickAction, InspectorSectionHeader} from './common';+import {CollapsibleInspectorSection} from './CollapsibleInspectorSection';+import {InspectorQuickAction} from './common';const compositionIconStyle: React.CSSProperties = {height: 18,@@ -49,8 +50,11 @@ export const ConnectedCompositionsSection: React.FC<{readonly connectedCompositions: readonly _InternalTypes['AnyComposition'][];}> = ({connectedCompositions}) => {return (- <>- <InspectorSectionHeader>Connected compositions</InspectorSectionHeader>+ <CollapsibleInspectorSection+ collapsible+ label="Connected compositions"+ sectionId="connected-compositions"+ ><div style={compositionListStyle}>{connectedCompositions.map((composition) => (<ConnectedCompositionRow@@ -59,7 +63,7 @@ export const ConnectedCompositionsSection: React.FC<{/>))}</div>- </>+ </CollapsibleInspectorSection>);};diff --git a/packages/studio/src/components/InspectorPanel/GuideInspector.tsx b/packages/studio/src/components/InspectorPanel/GuideInspector.tsxindex c53c783f12..aa2ffe50ad 100644--- a/packages/studio/src/components/InspectorPanel/GuideInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/GuideInspector.tsx@@ -7,11 +7,8 @@ import {import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {InputDragger} from '../NewComposition/InputDragger';import type {TimelineSelection} from '../Timeline/TimelineSelection';-import {- InspectorDetailRow,- InspectorMessage,- InspectorSectionHeader,-} from './common';+import {CollapsibleInspectorSection} from './CollapsibleInspectorSection';+import {InspectorDetailRow, InspectorMessage} from './common';import {guideDetailsContainer, selectedContainer} from './styles';const updateGuidePosition = ({@@ -84,27 +81,32 @@ export const GuideInspector: React.FC<{return (<div style={selectedContainer} className={VERTICAL_SCROLLBAR_CLASSNAME}>- <InspectorSectionHeader>- {guide.orientation === 'vertical' ? 'Vertical' : 'Horizontal'} guide- </InspectorSectionHeader>- <div style={guideDetailsContainer}>- <InspectorDetailRow- label={guide.orientation === 'vertical' ? 'X position' : 'Y position'}- >- <InputDragger- type="number"- value={guide.position}- status="ok"- onValueChange={onValueChange}- onValueChangeEnd={onValueChangeEnd}- onTextChange={() => undefined}- step={1}- formatter={(value) => String(Math.round(Number(value)))}- rightAlign- small- />- </InspectorDetailRow>- </div>+ <CollapsibleInspectorSection+ collapsible+ label={`${guide.orientation === 'vertical' ? 'Vertical' : 'Horizontal'} guide`}+ sectionId="guide"+ >+ <div style={guideDetailsContainer}>+ <InspectorDetailRow+ label={+ guide.orientation === 'vertical' ? 'X position' : 'Y position'+ }+ >+ <InputDragger+ type="number"+ value={guide.position}+ status="ok"+ onValueChange={onValueChange}+ onValueChangeEnd={onValueChangeEnd}+ onTextChange={() => undefined}+ step={1}+ formatter={(value) => String(Math.round(Number(value)))}+ rightAlign+ small+ />+ </InspectorDetailRow>+ </div>+ </CollapsibleInspectorSection></div>);};diff --git a/packages/studio/src/components/InspectorPanel/KeyframeSettings.tsx b/packages/studio/src/components/InspectorPanel/KeyframeSettings.tsxindex 47b23a9def..67d362da9e 100644--- a/packages/studio/src/components/InspectorPanel/KeyframeSettings.tsx+++ b/packages/studio/src/components/InspectorPanel/KeyframeSettings.tsx@@ -16,7 +16,8 @@ import {callUpdateSequenceKeyframeSettings,} from '../Timeline/call-update-keyframe-settings';import type {SelectedEasingUpdate} from '../Timeline/update-selected-easing';-import {InspectorDetailRow, InspectorSectionHeader} from './common';+import {CollapsibleInspectorSection} from './CollapsibleInspectorSection';+import {InspectorDetailRow} from './common';import {detailsContainer} from './styles';const comboStyle: React.CSSProperties = {@@ -201,8 +202,11 @@ export const KeyframeSettings: React.FC<{}, []);return (- <>- <InspectorSectionHeader>Keyframe settings</InspectorSectionHeader>+ <CollapsibleInspectorSection+ collapsible+ label="Keyframe settings"+ sectionId="keyframe-settings"+ ><div style={keyframeSettingsContainer}>{canEditInterpolationSettings ? (<>@@ -252,6 +256,6 @@ export const KeyframeSettings: React.FC<{/></InspectorDetailRow></div>- </>+ </CollapsibleInspectorSection>);};diff --git a/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsx b/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsxindex 7079c26602..aa473932d4 100644--- a/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsx@@ -12,11 +12,12 @@ import {INSPECTOR_PANEL_HORIZONTAL_PADDING} from '../InspectorPanelLayout';import {COMPACT_CONTROL_ROW_HEIGHT} from '../layout';import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {- TimelineRowLayoutContext,INSPECTOR_TIMELINE_ROW_LAYOUT,+ TimelineRowLayoutContext,} from '../Timeline/TimelineRowLayoutContext';import type {TimelineSelection} from '../Timeline/TimelineSelection';-import {InspectorMessage, InspectorSection} from './common';+import {CollapsibleInspectorSection} from './CollapsibleInspectorSection';+import {InspectorMessage} from './common';import {MultiSequenceField,type MultiSequenceTarget,@@ -155,7 +156,12 @@ export const MultiSequenceInspector: React.FC<{(field) => field.group === group.id,);return groupedFields.length === 0 ? null : (- <InspectorSection key={group.id} header={group.label}>+ <CollapsibleInspectorSection+ key={group.id}+ collapsible+ label={group.label}+ sectionId={`multi-sequence-${group.id}`}+ >{groupedFields.map((field) => (<MultiSequenceFieldkey={@@ -167,7 +173,7 @@ export const MultiSequenceInspector: React.FC<{readOnlyStudio={readOnlyStudio}/>))}- </InspectorSection>+ </CollapsibleInspectorSection>);})}</TimelineRowLayoutContext.Provider>diff --git a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsxindex 48a2cce3e8..fd71e699a1 100644--- a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx@@ -29,11 +29,11 @@ import {import {useDeleteTimelineItems} from '../Timeline/use-delete-timeline-items';import {getSequenceFreezeFrameMenuItem} from '../Timeline/use-sequence-freeze-frame-menu-item';import {AlignmentControls} from './AlignmentControls';+import {CollapsibleInspectorSection} from './CollapsibleInspectorSection';import {InspectorMessage,InspectorQuickAction,InspectorQuickActionsSection,- InspectorSectionHeader,} from './common';import {ConnectedCompositionsSection,@@ -335,18 +335,23 @@ const SequenceExpandedInspector: React.FC<{keyframeDisplayOffset={track.keyframeDisplayOffset}renderTransformControls={() => <AlignmentControls track={track} />}/>- <InspectorSectionHeader>Actions</InspectorSectionHeader>- <InspectorQuickActionsSection>- <SplitSequenceQuickAction- selection={sequenceSelection}- track={track}- />- <SequenceSourceQuickActions- selection={sequenceSelection}- track={track}- validatedSource={validatedLocation.source}- />- </InspectorQuickActionsSection>+ <CollapsibleInspectorSection+ collapsible+ label="Actions"+ sectionId="sequence-actions"+ >+ <InspectorQuickActionsSection>+ <SplitSequenceQuickAction+ selection={sequenceSelection}+ track={track}+ />+ <SequenceSourceQuickActions+ selection={sequenceSelection}+ track={track}+ validatedSource={validatedLocation.source}+ />+ </InspectorQuickActionsSection>+ </CollapsibleInspectorSection></>) : (<InspectorMessage>Source controls unavailable</InspectorMessage>diff --git a/packages/studio/src/components/InspectorPanel/common.tsx b/packages/studio/src/components/InspectorPanel/common.tsxindex 6a589efa83..eef130c338 100644--- a/packages/studio/src/components/InspectorPanel/common.tsx+++ b/packages/studio/src/components/InspectorPanel/common.tsx@@ -31,6 +31,29 @@ export const InspectorQuickActionsSection: React.FC<{readonly children: React.ReactNode;}> = ({children}) => <div style={inspectorQuickActionsSection}>{children}</div>;+const collapsedSectionBody: React.CSSProperties = {+ ...inspectorSectionBody,+ display: 'none',+};++export const InspectorSectionBody: React.FC<{+ readonly children: React.ReactNode;+ readonly expanded: boolean;+}> = ({children, expanded}) => {+ if (children === null) {+ return null;+ }++ return (+ <div+ hidden={!expanded}+ style={expanded ? inspectorSectionBody : collapsedSectionBody}+ >+ {children}+ </div>+ );+};+export const InspectorSection: React.FC<{readonly children: React.ReactNode;readonly header: React.ReactNode;@@ -38,9 +61,7 @@ export const InspectorSection: React.FC<{return (<><InspectorSectionHeader>{header}</InspectorSectionHeader>- {children === null ? null : (- <div style={inspectorSectionBody}>{children}</div>- )}+ <InspectorSectionBody expanded>{children}</InspectorSectionBody></>);};diff --git a/packages/studio/src/components/InspectorPanel/styles.ts b/packages/studio/src/components/InspectorPanel/styles.tsindex b68146d762..0f10b311a2 100644--- a/packages/studio/src/components/InspectorPanel/styles.ts+++ b/packages/studio/src/components/InspectorPanel/styles.ts@@ -30,11 +30,6 @@ export const compositionDefaultPropsSection: React.CSSProperties = {flexDirection: 'column',};-export const compositionVisualControlsSection: React.CSSProperties = {- display: 'flex',- flexDirection: 'column',-};-export const inspectorOverviewSection: React.CSSProperties = {display: 'flex',flexDirection: 'column',@@ -91,30 +86,6 @@ export const sectionHeaderRow: React.CSSProperties = {minWidth: 0,};-export const sectionHeaderTitle: React.CSSProperties = {- alignItems: 'center',- color: LIGHT_TEXT,- display: 'flex',- flexShrink: 0,- fontFamily: 'sans-serif',- fontSize: 12,- fontWeight: 'bold',- lineHeight: '16px',- minHeight: 24,- minWidth: 0,- overflow: 'hidden',- textOverflow: 'ellipsis',- userSelect: 'none',- whiteSpace: 'nowrap',-};--export const sectionHeaderStart: React.CSSProperties = {- alignItems: 'center',- display: 'flex',- gap: 8,- minWidth: 0,-};-export const sectionHeaderEnd: React.CSSProperties = {alignItems: 'center',display: 'flex',diff --git a/packages/studio/src/components/InspectorPanel/use-inspector-section-expanded.ts b/packages/studio/src/components/InspectorPanel/use-inspector-section-expanded.tsnew file mode 100644index 0000000000..f50b646680--- /dev/null+++ b/packages/studio/src/components/InspectorPanel/use-inspector-section-expanded.ts@@ -0,0 +1,28 @@+import {useCallback, useState} from 'react';+import {+ loadPersistedBooleanMap,+ persistBooleanMap,+} from '../../helpers/persist-boolean-map';++const storageKey = 'remotion.editor.inspectorCollapsedSections';++export const useInspectorSectionExpanded = (sectionId: string) => {+ const [collapsedSections, setCollapsedSections] = useState(() =>+ loadPersistedBooleanMap(storageKey),+ );+ const setExpanded = useCallback(+ (expanded: boolean) => {+ setCollapsedSections((previous) => ({+ ...previous,+ [sectionId]: !expanded,+ }));+ persistBooleanMap(storageKey, {+ ...loadPersistedBooleanMap(storageKey),+ [sectionId]: !expanded,+ });+ },+ [sectionId],+ );++ return [!collapsedSections[sectionId], setExpanded] as const;+};diff --git a/packages/studio/src/components/InspectorSequenceSection.tsx b/packages/studio/src/components/InspectorSequenceSection.tsxindex 24d7b8719b..87fc10a83c 100644--- a/packages/studio/src/components/InspectorSequenceSection.tsx+++ b/packages/studio/src/components/InspectorSequenceSection.tsx@@ -36,7 +36,6 @@ import {getInspectorSectionActivity,isSmartCollapsibleInspectorGroup,} from './InspectorPanel/inspector-section-collapse';-import {sectionHeaderRow, sectionHeaderTitle} from './InspectorPanel/styles';import {BORDER_RADIUS_SHORTHAND_KEY,getBorderRadiusConversion,@@ -92,11 +91,6 @@ const plusIcon: React.CSSProperties = {height: 15,};-const effectsHeaderTitle: React.CSSProperties = {- ...sectionHeaderTitle,- flexShrink: 1,-};-const borderRadiusToggleIcon: React.CSSProperties = {flexShrink: 0,height: 15,@@ -209,7 +203,7 @@ const persistInspectorCollapsedKeys = (keys: ReadonlySet<string>): void => {};type InspectorSectionExpansionOverrides = Readonly<Record<string, boolean>>;-type AdditionalInspectorSectionId = 'captions';+type AdditionalInspectorSectionId = 'captions' | 'effects';const loadInspectorSectionExpansionOverrides =(): InspectorSectionExpansionOverrides => {@@ -453,32 +447,71 @@ export const InspectorSequenceSection: React.FC<{});}, []);- const {controlRows, effectRows} = useMemo(() => {+ const isAdditionalSectionExpanded = useCallback(+ (sectionId: AdditionalInspectorSectionId): boolean => {+ const expansionKey = getInspectorSectionExpansionKey({+ nodePathInfo,+ sectionId,+ });+ return sectionExpansionOverrides[expansionKey] ?? true;+ },+ [nodePathInfo, sectionExpansionOverrides],+ );+ const setAdditionalSectionExpanded = useCallback(+ (sectionId: AdditionalInspectorSectionId, expanded: boolean) => {+ const expansionKey = getInspectorSectionExpansionKey({+ nodePathInfo,+ sectionId,+ });+ setSectionExpansionOverrides((previous) => {+ if (previous[expansionKey] === expanded) {+ return previous;+ }++ const next = {...previous, [expansionKey]: expanded};+ persistInspectorSectionExpansionOverrides(next);+ return next;+ });+ },+ [nodePathInfo],+ );+ const toggleAdditionalSection = useCallback(+ (sectionId: AdditionalInspectorSectionId) => {+ setAdditionalSectionExpanded(+ sectionId,+ !isAdditionalSectionExpanded(sectionId),+ );+ },+ [isAdditionalSectionExpanded, setAdditionalSectionExpanded],+ );+ const effectsExpanded = isAdditionalSectionExpanded('effects');+ const {controlRows, effectRows, hasEffects} = useMemo(() => {const controlNodes: TimelineTreeNode[] = [];- let effectsRoot: TimelineTreeNode | null = null;+ let root: Extract<TimelineTreeNode, {kind: 'group'}> | null = null;for (const node of tree) {if (isEffectsRoot(node)) {- effectsRoot = node;+ root = node;} else {controlNodes.push(node);}}return {+ hasEffects: root !== null && root.children.length > 0,controlRows: flattenVisibleTreeNodes({nodes: controlNodes,getIsExpanded,}),effectRows:- effectsRoot === null+ root === null || !effectsExpanded? []: flattenVisibleTreeNodes({- nodes: effectsRoot.children,+ nodes: root.children,getIsExpanded,}),};- }, [getIsExpanded, tree]);+ }, [effectsExpanded, getIsExpanded, tree]);useEffect(() => {if (@@ -504,6 +537,7 @@ export const InspectorSequenceSection: React.FC<{return;}+ setAdditionalSectionExpanded('effects', true);const parentKeys: string[] = [];let {depth} = rows[targetIndex];for (let i = targetIndex - 1; i >= 0 && depth > 0; i--) {@@ -526,7 +560,12 @@ export const InspectorSequenceSection: React.FC<{persistInspectorCollapsedKeys(next);return next;});- }, [inspectorRevealToken, selectedEffectKey, tree]);+ }, [+ inspectorRevealToken,+ selectedEffectKey,+ setAdditionalSectionExpanded,+ tree,+ ]);useEffect(() => {if (inspectorRevealToken === null) {@@ -667,31 +706,6 @@ export const InspectorSequenceSection: React.FC<{},[isControlGroupExpanded, nodePathInfo],);- const isAdditionalSectionExpanded = useCallback(- (sectionId: AdditionalInspectorSectionId): boolean => {- const expansionKey = getInspectorSectionExpansionKey({- nodePathInfo,- sectionId,- });- return sectionExpansionOverrides[expansionKey] ?? true;- },- [nodePathInfo, sectionExpansionOverrides],- );- const toggleAdditionalSection = useCallback(- (sectionId: AdditionalInspectorSectionId) => {- const expansionKey = getInspectorSectionExpansionKey({- nodePathInfo,- sectionId,- });- const nextExpanded = !isAdditionalSectionExpanded(sectionId);- setSectionExpansionOverrides((previous) => {- const next = {...previous, [expansionKey]: nextExpanded};- persistInspectorSectionExpansionOverrides(next);- return next;- });- },- [isAdditionalSectionExpanded, nodePathInfo],- );const captionsExpanded = isAdditionalSectionExpanded('captions');const visibleControlRows = controlGroups.flatMap((group) => {return isControlGroupExpanded(group) ? group.rows : [];@@ -723,8 +737,7 @@ export const InspectorSequenceSection: React.FC<{? (runtimeValues.captions as Caption[]): []: null;- const showEffectsSection =- nodePathInfo.supportsEffects || effectRows.length > 0;+ const showEffectsSection = nodePathInfo.supportsEffects || hasEffects;const canAddEffect =nodePathInfo.supportsEffects &&previewServerState.type === 'connected' &&@@ -736,6 +749,8 @@ export const InspectorSequenceSection: React.FC<{return;}+ setAdditionalSectionExpanded('effects', true);+setSelectedModal({type: 'add-effect',clientId: previewServerState.clientId,@@ -746,6 +761,7 @@ export const InspectorSequenceSection: React.FC<{canAddEffect,nodePathInfo.sequenceSubscriptionKey,previewServerState,+ setAdditionalSectionExpanded,setSelectedModal,validatedLocation.source,]);@@ -834,16 +850,20 @@ export const InspectorSequenceSection: React.FC<{);const effectsHeader = (- <div style={sectionHeaderRow}>- <div style={effectsHeaderTitle}>Effects</div>- <InlineAction- variant={null}- disabled={!canAddEffect}- onClick={onAddEffect}- title={canAddEffect ? 'Add effect' : undefined}- renderAction={(color) => <Plus color={color} style={plusIcon} />}- />- </div>+ <CollapsibleInspectorSectionHeader+ action={+ <InlineAction+ variant={null}+ disabled={!canAddEffect}+ onClick={onAddEffect}+ title={canAddEffect ? 'Add effect' : undefined}+ renderAction={(color) => <Plus color={color} style={plusIcon} />}+ />+ }+ expanded={effectsExpanded}+ label="Effects"+ onToggle={hasEffects ? () => toggleAdditionalSection('effects') : null}+ />);const renderRow = ({node, depth}: FlatTreeRow) => {diff --git a/packages/studio/src/components/RenderModal/SchemaEditor/scroll-to-default-props-path.ts b/packages/studio/src/components/RenderModal/SchemaEditor/scroll-to-default-props-path.tsindex b1030889fb..e3f8b906d1 100644--- a/packages/studio/src/components/RenderModal/SchemaEditor/scroll-to-default-props-path.ts+++ b/packages/studio/src/components/RenderModal/SchemaEditor/scroll-to-default-props-path.ts@@ -7,3 +7,5 @@ export const DEFAULT_PROPS_PATH_ACTIVE_CLASSNAME =export const defaultPropsEditorScrollableAreaRef =React.createRef<HTMLDivElement>();++export const expandDefaultPropsEditorRef = React.createRef<() => void>();diff --git a/packages/studio/src/components/Timeline/TimelineHeightContainer.tsx b/packages/studio/src/components/Timeline/TimelineHeightContainer.tsxindex 32f149451c..98da7e294b 100644--- a/packages/studio/src/components/Timeline/TimelineHeightContainer.tsx+++ b/packages/studio/src/components/Timeline/TimelineHeightContainer.tsx@@ -20,7 +20,25 @@ const TimelineHeightContainerInner: React.FC<{[totalSize],);- return <div style={style}>{children}</div>;+ return (+ <div+ style={style}+ onPointerDownCapture={(event) => {+ const {activeElement} = document;+ if (+ event.button === 0 &&+ activeElement instanceof HTMLButtonElement &&+ event.target instanceof Node &&+ !activeElement.contains(event.target)+ ) {+ // Timeline drags can prevent the browser's default focus change.+ activeElement.blur();+ }+ }}+ >+ {children}+ </div>+ );};export const TimelineHeightContainer = React.memo(TimelineHeightContainerInner);diff --git a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsxindex f6a919c95d..87e71e5507 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx@@ -1016,7 +1016,8 @@ const TimelineSequenceItemInner: React.FC<{if (document.activeElement instanceof HTMLInputElement ||- document.activeElement instanceof HTMLTextAreaElement+ document.activeElement instanceof HTMLTextAreaElement ||+ document.activeElement instanceof HTMLButtonElement) {return;}