Skip to content

🎥 Make videos programmatically with React

Open responsive inspector on selection

JonnyBurger5b335764b1e4
diff --git a/packages/studio/src/components/SidebarCollapserControls.tsx b/packages/studio/src/components/SidebarCollapserControls.tsx
index d4a07b2a77..93be53ca90 100644
--- a/packages/studio/src/components/SidebarCollapserControls.tsx
+++ b/packages/studio/src/components/SidebarCollapserControls.tsx
@@ -5,6 +5,7 @@ import {
TRANSPARENT,
WHITE_ALPHA_80,
} from '../helpers/colors';
+import {useBreakpoint} from '../helpers/use-breakpoint';
import {
areKeyboardShortcutsDisabled,
useKeybinding,
@@ -13,7 +14,10 @@ import {
useKeyboardShortcutAriaKeyShortcuts,
useKeyboardShortcutLabel,
} from '../helpers/use-keyboard-shortcut-label';
-import {useResponsiveSidebarStatus} from '../helpers/use-responsive-sidebar-status';
+import {
+ SIDEBAR_RESPONSIVE_BREAKPOINT,
+ useResponsiveSidebarStatus,
+} from '../helpers/use-responsive-sidebar-status';
import {SidebarContext} from '../state/sidebar';
import {ActionTooltip} from './ActionTooltip';
import {ContextMenu} from './ContextMenu';
@@ -35,12 +39,15 @@ export const SidebarCollapserControl: React.FC<{
readonly side: 'left' | 'right';
}> = ({side}) => {
const {
+ rightSidebarTemporaryExpansion,
+ setRightSidebarTemporaryExpansion,
setSidebarCollapsedState,
sidebarCollapsedStateLeft,
sidebarCollapsedStateRight,
sidebarCollapsedDuringDrag,
} = useContext(SidebarContext);
const keybindings = useKeybinding();
+ const isNarrowLayout = useBreakpoint(SIDEBAR_RESPONSIVE_BREAKPOINT);
const leftSidebarStatus = useResponsiveSidebarStatus('left');
const rightSidebarStatus = useResponsiveSidebarStatus('right');
@@ -92,6 +99,15 @@ export const SidebarCollapserControl: React.FC<{
}, [leftSidebarStatus, setSidebarCollapsedState]);
const toggleRight = useCallback(() => {
+ if (
+ isNarrowLayout &&
+ rightSidebarTemporaryExpansion &&
+ sidebarCollapsedStateRight === 'responsive'
+ ) {
+ setRightSidebarTemporaryExpansion(false);
+ return;
+ }
+
setSidebarCollapsedState({
right: (s) => {
if (s === 'responsive') {
@@ -102,10 +118,25 @@ export const SidebarCollapserControl: React.FC<{
},
left: null,
});
- }, [rightSidebarStatus, setSidebarCollapsedState]);
+ }, [
+ isNarrowLayout,
+ rightSidebarStatus,
+ rightSidebarTemporaryExpansion,
+ setRightSidebarTemporaryExpansion,
+ setSidebarCollapsedState,
+ sidebarCollapsedStateRight,
+ ]);
const toggleBoth = useCallback(() => {
if (rightSidebarStatus === leftSidebarStatus) {
+ const closeTemporaryRightSidebar =
+ isNarrowLayout &&
+ rightSidebarTemporaryExpansion &&
+ sidebarCollapsedStateRight === 'responsive';
+ if (closeTemporaryRightSidebar) {
+ setRightSidebarTemporaryExpansion(false);
+ }
+
setSidebarCollapsedState({
left: (s) => {
if (s === 'responsive') {
@@ -114,15 +145,17 @@ export const SidebarCollapserControl: React.FC<{
return s === 'collapsed' ? 'expanded' : 'collapsed';
},
- right: (s) => {
- if (s === 'responsive') {
- return rightSidebarStatus === 'collapsed'
- ? 'expanded'
- : 'collapsed';
- }
+ right: closeTemporaryRightSidebar
+ ? null
+ : (s) => {
+ if (s === 'responsive') {
+ return rightSidebarStatus === 'collapsed'
+ ? 'expanded'
+ : 'collapsed';
+ }
- return s === 'collapsed' ? 'expanded' : 'collapsed';
- },
+ return s === 'collapsed' ? 'expanded' : 'collapsed';
+ },
});
} else if (rightSidebarStatus === 'expanded') {
toggleRight();
@@ -130,9 +163,13 @@ export const SidebarCollapserControl: React.FC<{
toggleLeft();
}
}, [
+ isNarrowLayout,
leftSidebarStatus,
rightSidebarStatus,
+ rightSidebarTemporaryExpansion,
+ setRightSidebarTemporaryExpansion,
setSidebarCollapsedState,
+ sidebarCollapsedStateRight,
toggleLeft,
toggleRight,
]);
diff --git a/packages/studio/src/components/Timeline/TimelineSelection.tsx b/packages/studio/src/components/Timeline/TimelineSelection.tsx
index 1c295b0022..aa835d1df2 100644
--- a/packages/studio/src/components/Timeline/TimelineSelection.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSelection.tsx
@@ -61,8 +61,11 @@ import {
TIMELINE_PADDING,
} from '../../helpers/timeline-layout';
import {timelineNodePathInfoToKey} from '../../helpers/timeline-node-path-key';
+import {useBreakpoint} from '../../helpers/use-breakpoint';
import {useKeybinding} from '../../helpers/use-keybinding';
+import {SIDEBAR_RESPONSIVE_BREAKPOINT} from '../../helpers/use-responsive-sidebar-status';
import {useSyncExternalStore} from '../../helpers/use-sync-external-store';
+import {SidebarContext} from '../../state/sidebar';
import {useZIndex} from '../../state/z-index';
import {
ExpandedTracksGetterContext,
@@ -941,6 +944,9 @@ export const TimelineSelectionProvider: React.FC<{
const timelineSelectionScope =
canvasContent?.type === 'composition' ? canvasContent.compositionId : null;
const {expandParentTracks} = useContext(ExpandedTracksSetterContext);
+ const {setRightSidebarTemporaryExpansion, sidebarCollapsedStateRight} =
+ useContext(SidebarContext);
+ const isNarrowLayout = useBreakpoint(SIDEBAR_RESPONSIVE_BREAKPOINT);
const canSelect =
isStudioSelectionEnabled() &&
(previewServerState.type === 'connected' ||
@@ -991,6 +997,31 @@ export const TimelineSelectionProvider: React.FC<{
? selectionState
: EMPTY_TIMELINE_SELECTION_STATE;
const availableSelectedItems = availableSelectionState.selectedItems;
+ const previousSelectedSequenceKeys = useRef<ReadonlySet<string>>(new Set());
+ useEffect(() => {
+ const selectedSequenceKeys = new Set(
+ availableSelectedItems
+ .filter((item) => item.type === 'sequence')
+ .map(getTimelineSelectionKey),
+ );
+ const sequenceWasSelected = [...selectedSequenceKeys].some(
+ (key) => !previousSelectedSequenceKeys.current.has(key),
+ );
+ previousSelectedSequenceKeys.current = selectedSequenceKeys;
+
+ if (
+ sequenceWasSelected &&
+ isNarrowLayout &&
+ sidebarCollapsedStateRight === 'responsive'
+ ) {
+ setRightSidebarTemporaryExpansion(true);
+ }
+ }, [
+ availableSelectedItems,
+ isNarrowLayout,
+ setRightSidebarTemporaryExpansion,
+ sidebarCollapsedStateRight,
+ ]);
const getAvailableSelectionState = useCallback(
() =>
selectionScope.current === timelineSelectionScope
diff --git a/packages/studio/src/components/TopPanel.tsx b/packages/studio/src/components/TopPanel.tsx
index 474406498f..861661fa28 100644
--- a/packages/studio/src/components/TopPanel.tsx
+++ b/packages/studio/src/components/TopPanel.tsx
@@ -1,6 +1,10 @@
import React, {useCallback, useContext, useEffect, useMemo} from 'react';
import {Internals} from 'remotion';
-import {useResponsiveSidebarStatus} from '../helpers/use-responsive-sidebar-status';
+import {useBreakpoint} from '../helpers/use-breakpoint';
+import {
+ SIDEBAR_RESPONSIVE_BREAKPOINT,
+ useResponsiveSidebarStatus,
+} from '../helpers/use-responsive-sidebar-status';
import {RULER_WIDTH} from '../state/editor-rulers';
import {SidebarContext} from '../state/sidebar';
import {CanvasIfSizeIsAvailable} from './CanvasIfSizeIsAvailable';
@@ -46,9 +50,15 @@ const TopPanelInner: React.FC<{
readonly drawRef: React.Ref<HTMLDivElement>;
readonly bufferStateDelayInMilliseconds: number;
}> = ({readOnlyStudio, onMounted, drawRef, bufferStateDelayInMilliseconds}) => {
- const {setSidebarCollapsedState, setSidebarCollapsedDuringDrag} =
- useContext(SidebarContext);
+ const {
+ rightSidebarTemporaryExpansion,
+ setRightSidebarTemporaryExpansion,
+ setSidebarCollapsedState,
+ setSidebarCollapsedDuringDrag,
+ sidebarCollapsedStateRight,
+ } = useContext(SidebarContext);
const rulersAreVisible = useIsRulerVisible();
+ const isNarrowLayout = useBreakpoint(SIDEBAR_RESPONSIVE_BREAKPOINT);
const {canvasContent} = useContext(Internals.CompositionManager);
@@ -76,8 +86,23 @@ const TopPanelInner: React.FC<{
}, [setSidebarCollapsedState]);
const onCollapseRight = useCallback(() => {
+ if (
+ isNarrowLayout &&
+ rightSidebarTemporaryExpansion &&
+ sidebarCollapsedStateRight === 'responsive'
+ ) {
+ setRightSidebarTemporaryExpansion(false);
+ return;
+ }
+
setSidebarCollapsedState({left: null, right: 'collapsed'});
- }, [setSidebarCollapsedState]);
+ }, [
+ isNarrowLayout,
+ rightSidebarTemporaryExpansion,
+ setRightSidebarTemporaryExpansion,
+ setSidebarCollapsedState,
+ sidebarCollapsedStateRight,
+ ]);
return (
<ObserveDefaultProps
diff --git a/packages/studio/src/helpers/use-responsive-sidebar-status.ts b/packages/studio/src/helpers/use-responsive-sidebar-status.ts
index d28e9e494a..22e85f633b 100644
--- a/packages/studio/src/helpers/use-responsive-sidebar-status.ts
+++ b/packages/studio/src/helpers/use-responsive-sidebar-status.ts
@@ -3,13 +3,20 @@ import {SidebarContext} from '../state/sidebar';
import {useMobileLayout} from './mobile-layout';
import {useBreakpoint} from './use-breakpoint';
+export const SIDEBAR_RESPONSIVE_BREAKPOINT = 1200;
+
export const useResponsiveSidebarStatus = (
side: 'left' | 'right',
): 'collapsed' | 'expanded' => {
- const {sidebarCollapsedStateLeft, sidebarCollapsedStateRight} =
- useContext(SidebarContext);
+ const {
+ rightSidebarTemporaryExpansion,
+ sidebarCollapsedStateLeft,
+ sidebarCollapsedStateRight,
+ } = useContext(SidebarContext);
const isMobileLayout = useMobileLayout();
- const responsiveStatus = useBreakpoint(1200) ? 'collapsed' : 'expanded';
+ const responsiveStatus = useBreakpoint(SIDEBAR_RESPONSIVE_BREAKPOINT)
+ ? 'collapsed'
+ : 'expanded';
const collapsedState =
side === 'left' ? sidebarCollapsedStateLeft : sidebarCollapsedStateRight;
@@ -26,10 +33,20 @@ export const useResponsiveSidebarStatus = (
return 'expanded';
}
+ if (side === 'right' && rightSidebarTemporaryExpansion) {
+ return 'expanded';
+ }
+
if (isMobileLayout) {
return 'collapsed';
}
return responsiveStatus;
- }, [collapsedState, isMobileLayout, responsiveStatus, side]);
+ }, [
+ collapsedState,
+ isMobileLayout,
+ responsiveStatus,
+ rightSidebarTemporaryExpansion,
+ side,
+ ]);
};
diff --git a/packages/studio/src/state/sidebar.tsx b/packages/studio/src/state/sidebar.tsx
index b3d203bdeb..d8ef473a62 100644
--- a/packages/studio/src/state/sidebar.tsx
+++ b/packages/studio/src/state/sidebar.tsx
@@ -3,6 +3,10 @@ import React, {createContext, useMemo, useState} from 'react';
export type SidebarCollapsedState = 'collapsed' | 'expanded' | 'responsive';
type Context = {
+ rightSidebarTemporaryExpansion: boolean;
+ setRightSidebarTemporaryExpansion: React.Dispatch<
+ React.SetStateAction<boolean>
+ >;
sidebarCollapsedDuringDrag: Sidebars | null;
setSidebarCollapsedDuringDrag: (side: Sidebars | null) => void;
sidebarCollapsedStateLeft: SidebarCollapsedState;
@@ -56,6 +60,8 @@ const saveCollapsedState = (type: SidebarCollapsedState, sidebar: Sidebars) => {
};
export const SidebarContext = createContext<Context>({
+ rightSidebarTemporaryExpansion: false,
+ setRightSidebarTemporaryExpansion: () => undefined,
sidebarCollapsedDuringDrag: null,
setSidebarCollapsedDuringDrag: () => undefined,
sidebarCollapsedStateLeft: 'responsive',
@@ -81,9 +87,13 @@ export const SidebarContextProvider: React.FC<{
const [sidebarCollapsedDuringDrag, setSidebarCollapsedDuringDrag] =
useState<Sidebars | null>(null);
+ const [rightSidebarTemporaryExpansion, setRightSidebarTemporaryExpansion] =
+ useState(false);
const value: Context = useMemo(() => {
return {
+ rightSidebarTemporaryExpansion,
+ setRightSidebarTemporaryExpansion,
sidebarCollapsedDuringDrag,
setSidebarCollapsedDuringDrag,
sidebarCollapsedStateLeft: sidebarCollapsedState.left,
@@ -93,6 +103,10 @@ export const SidebarContextProvider: React.FC<{
right: null | React.SetStateAction<SidebarCollapsedState>;
}) => {
const {left, right} = options;
+ if (right !== null) {
+ setRightSidebarTemporaryExpansion(false);
+ }
+
setSidebarCollapsedState((f) => {
const copied = {...f};
if (left) {
@@ -113,7 +127,11 @@ export const SidebarContextProvider: React.FC<{
});
},
};
- }, [sidebarCollapsedState, sidebarCollapsedDuringDrag]);
+ }, [
+ rightSidebarTemporaryExpansion,
+ sidebarCollapsedState,
+ sidebarCollapsedDuringDrag,
+ ]);
return (
<SidebarContext.Provider value={value}>{children}</SidebarContext.Provider>
diff --git a/packages/studio/src/test/transcription-modal.test.tsx b/packages/studio/src/test/transcription-modal.test.tsx
index 9347a150d5..652f5a0260 100644
--- a/packages/studio/src/test/transcription-modal.test.tsx
+++ b/packages/studio/src/test/transcription-modal.test.tsx
@@ -119,6 +119,8 @@ test('serializes transcription modal settings into caption jobs', async () => {
>
<SidebarContext.Provider
value={{
+ rightSidebarTemporaryExpansion: false,
+ setRightSidebarTemporaryExpansion: () => undefined,
sidebarCollapsedDuringDrag: null,
sidebarCollapsedStateLeft: 'collapsed',
sidebarCollapsedStateRight: 'collapsed',