Skip to content

🎥 Make videos programmatically with React

Revert "Limit caption styles to the Remotion catalog"

Igor Samokhovets28ed2a65ddfe
diff --git a/packages/studio/src/components/Transcription/TranscriptionModal.tsx b/packages/studio/src/components/Transcription/TranscriptionModal.tsx
index a2cb254b44..2a22b558c8 100644
--- a/packages/studio/src/components/Transcription/TranscriptionModal.tsx
+++ b/packages/studio/src/components/Transcription/TranscriptionModal.tsx
@@ -60,6 +60,7 @@ import {
import {RenderModalHr} from '../RenderModal/RenderModalHr';
import {openInFileExplorer} from '../RenderQueue/actions';
import {RenderQueueContext} from '../RenderQueue/context';
+import {useSettings} from '../SettingsContext';
import {VerticalTab} from '../Tabs/vertical';
import {useModelCacheStatus} from '../use-model-cache-status';
import {useStaticFiles} from '../use-static-files';
@@ -714,6 +715,32 @@ export const TranscriptionModal: React.FC<TranscriptionModalState> = ({
const [acceptedCaptionStyleId, setAcceptedCaptionStyleId] = useState<
string | null
>(null);
+ const [libraryUrl, setLibraryUrl] = useState(
+ 'https://www.remotion.dev/elements/captions',
+ );
+ const {studioRuntimeConfig} = useSettings();
+ const libraryOptions: ComboboxValue[] = [
+ {
+ url: 'https://www.remotion.dev/elements/captions',
+ displayName: 'Remotion captions',
+ },
+ ...(studioRuntimeConfig?.elementLibraries ?? []).filter(
+ ({url}) =>
+ url !== 'https://www.remotion.dev/elements' &&
+ url !== 'https://www.remotion.dev/elements/captions',
+ ),
+ ].map(({url, displayName: libraryName}) => ({
+ type: 'item',
+ id: url,
+ value: url,
+ label: libraryName ?? new URL(url).host,
+ leftItem: url === libraryUrl ? <Checkmark /> : null,
+ keyHint: null,
+ quickSwitcherLabel: null,
+ subMenu: null,
+ disabled: false,
+ onClick: () => setLibraryUrl(url),
+ }));
const [tab, setTab] = useState<Tab>('transcribe');
const isModelCached = useCallback(
(model: WhisperWebGpuModel) => isWhisperModelCached({model}),
@@ -1104,11 +1131,16 @@ export const TranscriptionModal: React.FC<TranscriptionModalState> = ({
>
Use Simple captions
</Button>
+ {libraryOptions.length > 1 ? (
+ <Combobox
+ values={libraryOptions}
+ selectedId={libraryUrl}
+ aria-label="Caption style library"
+ style={{marginTop: 8}}
+ />
+ ) : null}
</div>
- <ElementLibraryFrame
- name="Caption styles"
- url="https://www.remotion.dev/elements/captions"
- />
+ <ElementLibraryFrame name="Caption styles" url={libraryUrl} />
</div>
) : null}
<Models
diff --git a/packages/studio/src/test/transcription-modal.test.tsx b/packages/studio/src/test/transcription-modal.test.tsx
index 20a0dd7d36..1cda7f8b18 100644
--- a/packages/studio/src/test/transcription-modal.test.tsx
+++ b/packages/studio/src/test/transcription-modal.test.tsx
@@ -8,6 +8,7 @@ import {
waitFor,
} from '@testing-library/react';
import type {AddCaptionJobParams} from '../components/RenderQueue/caption-job-types';
+import {StudioServerConnectionCtx} from '../helpers/client-id';
const selectComboboxItem = async (
combobox: HTMLElement,
@@ -99,6 +100,7 @@ test('serializes transcription modal settings into caption jobs', async () => {
});
try {
+ const {SettingsProvider} = await import('../components/SettingsContext');
const {TranscriptionModal} =
await import('../components/Transcription/TranscriptionModal');
const {RenderQueueContext} =
@@ -114,45 +116,56 @@ test('serializes transcription modal settings into caption jobs', async () => {
} as const;
render(
- <SetSelectedModalContext.Provider
- value={{setSelectedModal: () => undefined}}
+ <StudioServerConnectionCtx.Provider
+ value={{
+ previewServerState: {type: 'init'},
+ configFileChangeRevision: 0,
+ restartRequired: false,
+ subscribeToEvent: () => () => undefined,
+ }}
>
- <SidebarContext.Provider
- value={{
- rightSidebarTemporaryExpansion: false,
- setRightSidebarTemporaryExpansion: () => undefined,
- sidebarCollapsedDuringDrag: null,
- sidebarCollapsedStateLeft: 'collapsed',
- sidebarCollapsedStateRight: 'collapsed',
- setSidebarCollapsedDuringDrag: () => undefined,
- setSidebarCollapsedState: () => undefined,
- }}
- >
- <RenderQueueContext.Provider
- value={
- {
- captionJobs: [],
- addCaptionJob: (params: AddCaptionJobParams) => {
- submittedJobs.push(params);
- return `caption-job-${submittedJobs.length}`;
- },
- } as never
- }
+ <SettingsProvider>
+ <SetSelectedModalContext.Provider
+ value={{setSelectedModal: () => undefined}}
>
- <StaticFilesProvider>
- <TranscriptionModal
- type="transcribe"
- captionStyle={null}
- audioStreamIndex={2}
- displayName="interview.wav"
- requestInit={requestInit}
- src="/media/interview.wav"
- target={null}
- />
- </StaticFilesProvider>
- </RenderQueueContext.Provider>
- </SidebarContext.Provider>
- </SetSelectedModalContext.Provider>,
+ <SidebarContext.Provider
+ value={{
+ rightSidebarTemporaryExpansion: false,
+ setRightSidebarTemporaryExpansion: () => undefined,
+ sidebarCollapsedDuringDrag: null,
+ sidebarCollapsedStateLeft: 'collapsed',
+ sidebarCollapsedStateRight: 'collapsed',
+ setSidebarCollapsedDuringDrag: () => undefined,
+ setSidebarCollapsedState: () => undefined,
+ }}
+ >
+ <RenderQueueContext.Provider
+ value={
+ {
+ captionJobs: [],
+ addCaptionJob: (params: AddCaptionJobParams) => {
+ submittedJobs.push(params);
+ return `caption-job-${submittedJobs.length}`;
+ },
+ } as never
+ }
+ >
+ <StaticFilesProvider>
+ <TranscriptionModal
+ type="transcribe"
+ captionStyle={null}
+ audioStreamIndex={2}
+ displayName="interview.wav"
+ requestInit={requestInit}
+ src="/media/interview.wav"
+ target={null}
+ />
+ </StaticFilesProvider>
+ </RenderQueueContext.Provider>
+ </SidebarContext.Provider>
+ </SetSelectedModalContext.Provider>
+ </SettingsProvider>
+ </StudioServerConnectionCtx.Provider>,
);
screen.getByRole('dialog', {
diff --git a/packages/studio/src/test/whisper-webgpu-capability.test.tsx b/packages/studio/src/test/whisper-webgpu-capability.test.tsx
index 0f8f29cc15..393ea05dfb 100644
--- a/packages/studio/src/test/whisper-webgpu-capability.test.tsx
+++ b/packages/studio/src/test/whisper-webgpu-capability.test.tsx
@@ -1,6 +1,7 @@
import {afterEach, expect, spyOn, test} from 'bun:test';
import {cleanup, fireEvent, render, waitFor} from '@testing-library/react';
import {ModalsProvider} from '../components/ModalsProvider';
+import {SettingsProvider} from '../components/SettingsContext';
import {TranscriptionModalWithOptionalWhisper} from '../components/Transcription/TranscriptionModalWithOptionalWhisper';
import {
isWhisperWebGpuInstalled,
@@ -8,6 +9,7 @@ import {
} from '../components/Transcription/whisper-webgpu-capability';
import {VIDEO_MATTING_PACKAGE} from '../components/VideoMatting/video-matting-capability';
import {VideoMattingModalWithOptionalPackage} from '../components/VideoMatting/VideoMattingModalWithOptionalPackage';
+import {StudioServerConnectionCtx} from '../helpers/client-id';
import {
TRANSFORMERS_PACKAGE,
withRequiredAuxiliaryPackages,
@@ -76,19 +78,30 @@ test('opens transcription after installing Whisper without restarting', async ()
);
try {
const {container, getByRole, getByText} = render(
- <ModalsProvider>
- <TranscriptionModalWithOptionalWhisper
- state={{
- type: 'transcribe',
- captionStyle: null,
- src: '/voice.wav',
- displayName: 'voice.wav',
- audioStreamIndex: null,
- requestInit: null,
- target: null,
- }}
- />
- </ModalsProvider>,
+ <StudioServerConnectionCtx.Provider
+ value={{
+ previewServerState: {type: 'init'},
+ configFileChangeRevision: 0,
+ restartRequired: false,
+ subscribeToEvent: () => () => undefined,
+ }}
+ >
+ <SettingsProvider>
+ <ModalsProvider>
+ <TranscriptionModalWithOptionalWhisper
+ state={{
+ type: 'transcribe',
+ captionStyle: null,
+ src: '/voice.wav',
+ displayName: 'voice.wav',
+ audioStreamIndex: null,
+ requestInit: null,
+ target: null,
+ }}
+ />
+ </ModalsProvider>
+ </SettingsProvider>
+ </StudioServerConnectionCtx.Provider>,
);
fireEvent.click(getByRole('button', {name: 'Install packages'}));