Skip to content

🎥 Make videos programmatically with React

Restore composition browser overlay in narrow Studio layouts

Igor Samokhovets23452e5b471e
diff --git a/packages/studio/src/components/CompositionSelector.tsx b/packages/studio/src/components/CompositionSelector.tsx
index b7bad74f47..8d1d224fbd 100644
--- a/packages/studio/src/components/CompositionSelector.tsx
+++ b/packages/studio/src/components/CompositionSelector.tsx
@@ -144,7 +144,9 @@ const getAutoScrollSpeed = ({
return 0;
};
-export const CompositionSelector: React.FC = () => {
+export const CompositionSelector: React.FC<{
+ readonly onCompositionSelected: (() => void) | null;
+}> = ({onCompositionSelected}) => {
const {compositions, canvasContent, folders} = useContext(
Internals.CompositionManager,
);
@@ -176,6 +178,13 @@ export const CompositionSelector: React.FC = () => {
const {tabIndex} = useZIndex();
const selectComposition = useSelectComposition();
+ const onSelectComposition = useCallback(
+ (composition: Parameters<typeof selectComposition>[0], push: boolean) => {
+ selectComposition(composition, push);
+ onCompositionSelected?.();
+ },
+ [onCompositionSelected, selectComposition],
+ );
const items = useMemo(() => {
const tree = createFolderTree(compositions, folders, foldersExpanded);
@@ -403,7 +412,7 @@ export const CompositionSelector: React.FC = () => {
? canvasContent.compositionId
: null
}
- selectComposition={selectComposition}
+ selectComposition={onSelectComposition}
toggleFolder={toggleFolder}
clearRootDragHover={clearRootDragHover}
canReorder={compositionSortOrder === 'registration'}
diff --git a/packages/studio/src/components/ExplorerPanel.tsx b/packages/studio/src/components/ExplorerPanel.tsx
index 2ffd3159ca..b77a202b44 100644
--- a/packages/studio/src/components/ExplorerPanel.tsx
+++ b/packages/studio/src/components/ExplorerPanel.tsx
@@ -40,9 +40,11 @@ const persistSelectedOptionsSidebarPanel = (panel: ExplorerSidebarPanel) => {
export const ExplorerPanel: React.FC<{
readOnlyStudio: boolean;
-}> = ({readOnlyStudio}) => {
- const [panel, setPanel] = useState<ExplorerSidebarPanel>(() =>
- getSelectedPanel(),
+ initialPanel: ExplorerSidebarPanel | null;
+ onCompositionSelected: (() => void) | null;
+}> = ({readOnlyStudio, initialPanel, onCompositionSelected}) => {
+ const [panel, setPanel] = useState<ExplorerSidebarPanel>(
+ () => initialPanel ?? getSelectedPanel(),
);
const assetTabFocusTimer = useRef<number | null>(null);
const onCompositionsSelected = useCallback(() => {
@@ -126,7 +128,7 @@ export const ExplorerPanel: React.FC<{
</Tabs>
</div>
{panel === 'compositions' ? (
- <CompositionSelector />
+ <CompositionSelector onCompositionSelected={onCompositionSelected} />
) : (
<AssetSelector readOnlyStudio={readOnlyStudio} />
)}
diff --git a/packages/studio/src/components/MenuToolbar.tsx b/packages/studio/src/components/MenuToolbar.tsx
index 22f516396c..9202f52c0e 100644
--- a/packages/studio/src/components/MenuToolbar.tsx
+++ b/packages/studio/src/components/MenuToolbar.tsx
@@ -5,17 +5,7 @@ import {canShowUpdates} from '../helpers/can-show-updates';
import {StudioServerConnectionCtx} from '../helpers/client-id';
import {BACKGROUND, BORDER_BLACK, WHITE} from '../helpers/colors';
import {useMobileLayout} from '../helpers/mobile-layout';
-import {areKeyboardShortcutsDisabled} from '../helpers/use-keybinding';
-import {
- useKeyboardShortcutAriaKeyShortcuts,
- useKeyboardShortcutLabel,
-} from '../helpers/use-keyboard-shortcut-label';
import {useToolbarMenuStructure} from '../helpers/use-menu-structure';
-import {SearchIcon} from '../icons/search';
-import {SetSelectedModalContext} from '../state/modals';
-import {ActionTooltip} from './ActionTooltip';
-import type {RenderInlineAction} from './InlineAction';
-import {InlineAction} from './InlineAction';
import {Row} from './layout';
import {MENU_TOOLBAR_HEIGHT} from './menu-toolbar-height';
import type {MenuId} from './Menu/MenuItem';
@@ -58,7 +48,6 @@ export const MenuToolbar: React.FC<{
}> = React.memo(({readOnlyStudio}) => {
const [selected, setSelected] = useState<string | null>(null);
const {previewServerState} = useContext(StudioServerConnectionCtx);
- const {setSelectedModal} = useContext(SetSelectedModalContext);
const browserStudioOperations = getBrowserStudioOperations();
const canUndoAndRedo =
!readOnlyStudio ||
@@ -93,6 +82,7 @@ export const MenuToolbar: React.FC<{
minWidth: '330px',
}),
display: 'flex',
+ flexShrink: 0,
alignItems: 'center',
justifyContent: 'flex-start',
};
@@ -156,25 +146,6 @@ export const MenuToolbar: React.FC<{
e.stopPropagation();
}, []);
- const openQuickSwitcher = useCallback(() => {
- setSelectedModal({
- type: 'quick-switcher',
- mode: 'compositions',
- invocationTimestamp: Date.now(),
- assetSelection: null,
- compositionSelection: null,
- });
- }, [setSelectedModal]);
-
- const renderSearchIcon: RenderInlineAction = useCallback((color) => {
- return <SearchIcon color={color} width={18} height={18} />;
- }, []);
-
- const quickSwitcherShortcut = useKeyboardShortcutLabel('quickSwitcher');
- const quickSwitcherAriaShortcut =
- useKeyboardShortcutAriaKeyShortcuts('quickSwitcher');
- const shortcutsDisabled = areKeyboardShortcutsDisabled();
-
return (
<Row
align="center"
@@ -183,28 +154,7 @@ export const MenuToolbar: React.FC<{
onPointerDown={onPointerDown}
>
<div style={fixedWidthLeft}>
- {mobileLayout ? (
- <ActionTooltip
- label="Quick switcher"
- shortcut={shortcutsDisabled ? null : quickSwitcherShortcut}
- delay={800}
- dismissOnClick
- >
- <InlineAction
- variant={null}
- onClick={openQuickSwitcher}
- renderAction={renderSearchIcon}
- aria-label="Quick switcher"
- aria-keyshortcuts={
- shortcutsDisabled
- ? undefined
- : quickSwitcherAriaShortcut || undefined
- }
- />
- </ActionTooltip>
- ) : (
- <SidebarCollapserControl side="left" />
- )}
+ <SidebarCollapserControl side="left" />
<div style={menuItems}>
{structure.map((s) => {
const props = {
diff --git a/packages/studio/src/components/MobilePanel.tsx b/packages/studio/src/components/MobilePanel.tsx
index 349a34c7dd..5c7d58ac92 100644
--- a/packages/studio/src/components/MobilePanel.tsx
+++ b/packages/studio/src/components/MobilePanel.tsx
@@ -18,6 +18,7 @@ const panel: React.CSSProperties = {
top: MENU_TOOLBAR_HEIGHT,
height: `calc(100% - ${MENU_TOOLBAR_HEIGHT}px)`,
overflow: 'hidden',
+ outline: 'none',
background: BACKGROUND,
boxShadow: SHADOW_BLACK,
};
@@ -32,6 +33,32 @@ export default function MobilePanel({
onClose: () => void;
}) {
const {currentZIndex} = useZIndex();
+ const panelRef = React.useRef<HTMLDivElement>(null);
+
+ React.useEffect(() => {
+ const panelElement = panelRef.current;
+ const trigger = document
+ .querySelector('[data-sidebar-toggle="left"]')
+ ?.closest('button');
+ panelElement?.focus();
+
+ return () => {
+ if (
+ document.activeElement === document.body ||
+ panelElement?.contains(document.activeElement)
+ ) {
+ trigger?.focus();
+ }
+ };
+ }, []);
+
+ const onPointerDown = React.useCallback(
+ (event: React.PointerEvent<HTMLDivElement>) => {
+ event.stopPropagation();
+ },
+ [],
+ );
+
const onOutsideClick = React.useCallback(
(target: Node) => {
const element = target instanceof Element ? target : null;
@@ -49,9 +76,14 @@ export default function MobilePanel({
);
return ReactDOM.createPortal(
- <div style={overlay}>
+ <div style={overlay} className="css-reset" onPointerDown={onPointerDown}>
<HigherZIndex onEscape={onClose} onOutsideClick={onOutsideClick}>
<div
+ ref={panelRef}
+ role="dialog"
+ aria-label="Composition browser"
+ aria-modal="true"
+ tabIndex={-1}
style={{
...panel,
width: sidebarWidth,
diff --git a/packages/studio/src/components/SidebarCollapserControls.tsx b/packages/studio/src/components/SidebarCollapserControls.tsx
index 31dc1b18b2..d9f8ac0384 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 {useMobileLayout} from '../helpers/mobile-layout';
import {useBreakpoint} from '../helpers/use-breakpoint';
import {
areKeyboardShortcutsDisabled,
@@ -39,6 +40,8 @@ export const SidebarCollapserControl: React.FC<{
readonly side: 'left' | 'right';
}> = ({side}) => {
const {
+ leftSidebarOverlayOpen,
+ setLeftSidebarOverlayOpen,
rightSidebarTemporaryExpansion,
setRightSidebarTemporaryExpansion,
setSidebarCollapsedState,
@@ -48,7 +51,11 @@ export const SidebarCollapserControl: React.FC<{
} = useContext(SidebarContext);
const keybindings = useKeybinding();
const isNarrowLayout = useBreakpoint(SIDEBAR_RESPONSIVE_BREAKPOINTS.right);
- const leftSidebarStatus = useResponsiveSidebarStatus('left');
+ const mobileLayout = useMobileLayout();
+ const responsiveLeftSidebarStatus = useResponsiveSidebarStatus('left');
+ const leftSidebarStatus = leftSidebarOverlayOpen
+ ? 'expanded'
+ : responsiveLeftSidebarStatus;
const rightSidebarStatus = useResponsiveSidebarStatus('right');
const leftIcon = useCallback(
@@ -86,6 +93,11 @@ export const SidebarCollapserControl: React.FC<{
);
const toggleLeft = useCallback(() => {
+ if (mobileLayout || leftSidebarOverlayOpen) {
+ setLeftSidebarOverlayOpen((open) => !open);
+ return;
+ }
+
setSidebarCollapsedState({
left: (s) => {
if (s === 'responsive') {
@@ -96,7 +108,13 @@ export const SidebarCollapserControl: React.FC<{
},
right: null,
});
- }, [leftSidebarStatus, setSidebarCollapsedState]);
+ }, [
+ leftSidebarOverlayOpen,
+ leftSidebarStatus,
+ mobileLayout,
+ setLeftSidebarOverlayOpen,
+ setSidebarCollapsedState,
+ ]);
const toggleRight = useCallback(() => {
if (
@@ -128,6 +146,19 @@ export const SidebarCollapserControl: React.FC<{
]);
const toggleBoth = useCallback(() => {
+ if (mobileLayout || leftSidebarOverlayOpen) {
+ if (leftSidebarStatus === rightSidebarStatus) {
+ toggleLeft();
+ toggleRight();
+ } else if (rightSidebarStatus === 'expanded') {
+ toggleRight();
+ } else {
+ toggleLeft();
+ }
+
+ return;
+ }
+
if (rightSidebarStatus === leftSidebarStatus) {
const closeTemporaryRightSidebar =
isNarrowLayout &&
@@ -164,7 +195,9 @@ export const SidebarCollapserControl: React.FC<{
}
}, [
isNarrowLayout,
+ leftSidebarOverlayOpen,
leftSidebarStatus,
+ mobileLayout,
rightSidebarStatus,
rightSidebarTemporaryExpansion,
setRightSidebarTemporaryExpansion,
@@ -242,7 +275,10 @@ export const SidebarCollapserControl: React.FC<{
const expanded =
(side === 'left' ? leftSidebarStatus : rightSidebarStatus) === 'expanded' &&
sidebarCollapsedDuringDrag !== side;
- const label = `${expanded ? 'Collapse' : 'Expand'} ${side} sidebar`;
+ const label =
+ side === 'left' && (mobileLayout || leftSidebarOverlayOpen)
+ ? `${expanded ? 'Close' : 'Open'} compositions`
+ : `${expanded ? 'Collapse' : 'Expand'} ${side} sidebar`;
const colorStyle = useCallback((color: string): React.CSSProperties => {
return {
@@ -295,6 +331,10 @@ export const SidebarCollapserControl: React.FC<{
</ActionTooltip>
);
+ if (side === 'left' && (mobileLayout || leftSidebarOverlayOpen)) {
+ return control;
+ }
+
return (
<ContextMenu
getItems={getSidebarContextMenuItems}
diff --git a/packages/studio/src/components/TopPanel.tsx b/packages/studio/src/components/TopPanel.tsx
index a9df9d6869..1572c0d743 100644
--- a/packages/studio/src/components/TopPanel.tsx
+++ b/packages/studio/src/components/TopPanel.tsx
@@ -6,12 +6,14 @@ import {
useResponsiveSidebarStatus,
} from '../helpers/use-responsive-sidebar-status';
import {RULER_WIDTH} from '../state/editor-rulers';
+import {SelectedModalContext} from '../state/modals';
import {SidebarContext} from '../state/sidebar';
import {CanvasIfSizeIsAvailable} from './CanvasIfSizeIsAvailable';
import {CanvasTabs} from './CanvasTabs';
import {TitleUpdater} from './CurrentCompositionSideEffects';
import {useIsRulerVisible} from './EditorRuler/use-is-ruler-visible';
import {ExplorerPanel} from './ExplorerPanel';
+import MobilePanel from './MobilePanel';
import {ObserveDefaultProps} from './ObserveDefaultPropsContext';
import {OptionsPanel} from './OptionsPanel';
import {PreviewToolbar} from './PreviewToolbar';
@@ -51,12 +53,15 @@ const TopPanelInner: React.FC<{
readonly bufferStateDelayInMilliseconds: number;
}> = ({readOnlyStudio, onMounted, drawRef, bufferStateDelayInMilliseconds}) => {
const {
+ leftSidebarOverlayOpen,
+ setLeftSidebarOverlayOpen,
rightSidebarTemporaryExpansion,
setRightSidebarTemporaryExpansion,
setSidebarCollapsedState,
setSidebarCollapsedDuringDrag,
sidebarCollapsedStateRight,
} = useContext(SidebarContext);
+ const selectedModal = useContext(SelectedModalContext);
const rulersAreVisible = useIsRulerVisible();
const isNarrowLayout = useBreakpoint(SIDEBAR_RESPONSIVE_BREAKPOINTS.right);
@@ -81,6 +86,16 @@ const TopPanelInner: React.FC<{
[rulersAreVisible],
);
+ const closeLeftSidebarOverlay = useCallback(() => {
+ setLeftSidebarOverlayOpen(false);
+ }, [setLeftSidebarOverlayOpen]);
+
+ useEffect(() => {
+ if (selectedModal !== null) {
+ closeLeftSidebarOverlay();
+ }
+ }, [closeLeftSidebarOverlay, selectedModal]);
+
const onCollapseLeft = useCallback(() => {
setSidebarCollapsedState({left: 'collapsed', right: null});
}, [setSidebarCollapsedState]);
@@ -114,6 +129,15 @@ const TopPanelInner: React.FC<{
readOnlyStudio={readOnlyStudio}
>
<div style={container}>
+ {leftSidebarOverlayOpen && selectedModal === null ? (
+ <MobilePanel onClose={closeLeftSidebarOverlay}>
+ <ExplorerPanel
+ readOnlyStudio={readOnlyStudio}
+ initialPanel="compositions"
+ onCompositionSelected={closeLeftSidebarOverlay}
+ />
+ </MobilePanel>
+ ) : null}
<div style={row}>
<SplitterContainer
minFlex={0.15}
@@ -126,12 +150,16 @@ const TopPanelInner: React.FC<{
id="sidebar-to-preview"
orientation="vertical"
>
- {actualStateLeft === 'expanded' ? (
+ {actualStateLeft === 'expanded' && !leftSidebarOverlayOpen ? (
<SplitterElement sticky={null} type="flexer">
- <ExplorerPanel readOnlyStudio={readOnlyStudio} />
+ <ExplorerPanel
+ readOnlyStudio={readOnlyStudio}
+ initialPanel={null}
+ onCompositionSelected={null}
+ />
</SplitterElement>
) : null}
- {actualStateLeft === 'expanded' ? (
+ {actualStateLeft === 'expanded' && !leftSidebarOverlayOpen ? (
<SplitterHandle
allowToCollapse="left"
onCollapse={onCollapseLeft}
diff --git a/packages/studio/src/state/sidebar.tsx b/packages/studio/src/state/sidebar.tsx
index 942f90aead..d538775817 100644
--- a/packages/studio/src/state/sidebar.tsx
+++ b/packages/studio/src/state/sidebar.tsx
@@ -3,6 +3,9 @@ import React, {createContext, useMemo, useState} from 'react';
export type SidebarCollapsedState = 'collapsed' | 'expanded' | 'responsive';
type Context = {
+ leftSidebarOverlayOpen: boolean;
+ setLeftSidebarOverlayOpen: React.Dispatch<React.SetStateAction<boolean>>;
+
rightSidebarTemporaryExpansion: boolean;
setRightSidebarTemporaryExpansion: React.Dispatch<
React.SetStateAction<boolean>
@@ -60,6 +63,8 @@ const saveCollapsedState = (type: SidebarCollapsedState, sidebar: Sidebars) => {
};
export const SidebarContext = createContext<Context>({
+ leftSidebarOverlayOpen: false,
+ setLeftSidebarOverlayOpen: () => undefined,
rightSidebarTemporaryExpansion: false,
setRightSidebarTemporaryExpansion: () => undefined,
sidebarCollapsedDuringDrag: null,
@@ -85,6 +90,8 @@ export const SidebarContextProvider: React.FC<{
right: getSavedCollapsedStateRight(),
}));
+ const [leftSidebarOverlayOpen, setLeftSidebarOverlayOpen] = useState(false);
+
const [sidebarCollapsedDuringDrag, setSidebarCollapsedDuringDrag] =
useState<Sidebars | null>(null);
const [rightSidebarTemporaryExpansion, setRightSidebarTemporaryExpansion] =
@@ -92,6 +99,8 @@ export const SidebarContextProvider: React.FC<{
const value: Context = useMemo(() => {
return {
+ leftSidebarOverlayOpen,
+ setLeftSidebarOverlayOpen,
rightSidebarTemporaryExpansion,
setRightSidebarTemporaryExpansion,
sidebarCollapsedDuringDrag,
@@ -128,6 +137,7 @@ export const SidebarContextProvider: React.FC<{
},
};
}, [
+ leftSidebarOverlayOpen,
rightSidebarTemporaryExpansion,
sidebarCollapsedState,
sidebarCollapsedDuringDrag,
diff --git a/packages/studio/src/test/transcription-modal.test.tsx b/packages/studio/src/test/transcription-modal.test.tsx
index 1cda7f8b18..53dbd7ca82 100644
--- a/packages/studio/src/test/transcription-modal.test.tsx
+++ b/packages/studio/src/test/transcription-modal.test.tsx
@@ -130,6 +130,8 @@ test('serializes transcription modal settings into caption jobs', async () => {
>
<SidebarContext.Provider
value={{
+ leftSidebarOverlayOpen: false,
+ setLeftSidebarOverlayOpen: () => undefined,
rightSidebarTemporaryExpansion: false,
setRightSidebarTemporaryExpansion: () => undefined,
sidebarCollapsedDuringDrag: null,