Skip to content

🎥 Make videos programmatically with React

Align model lists in settings

JonnyBurger12bfa71da878
diff --git a/packages/studio/src/components/ModelManager.tsx b/packages/studio/src/components/ModelManager.tsx
index 1ffb4fc57b..8c8ecded15 100644
--- a/packages/studio/src/components/ModelManager.tsx
+++ b/packages/studio/src/components/ModelManager.tsx
@@ -30,6 +30,10 @@ const container: React.CSSProperties = {
minWidth: 0,
padding: '16px 16px 0',
};
+const flushContainer: React.CSSProperties = {
+ ...container,
+ padding: '16px 0 0',
+};
const descriptionStyle: React.CSSProperties = {
color: LIGHT_TEXT,
fontSize: 13,
@@ -89,6 +93,7 @@ export const ModelManager = <Model extends string>({
ariaLabel,
availableModels,
description,
+ indent,
isModelCached,
loadModel,
prepare,
@@ -98,6 +103,7 @@ export const ModelManager = <Model extends string>({
readonly ariaLabel: string;
readonly availableModels: readonly ModelInfo<Model>[];
readonly description: string;
+ readonly indent: boolean;
readonly isModelCached: (model: Model) => Promise<boolean>;
readonly loadModel: (
model: Model,
@@ -229,7 +235,7 @@ export const ModelManager = <Model extends string>({
style={visible ? modelPanel : hiddenPanel}
className={VERTICAL_SCROLLBAR_CLASSNAME}
>
- <div style={container}>
+ <div style={indent ? container : flushContainer}>
<p style={descriptionStyle}>{description}</p>
{cacheCheckError ? (
<ValidationMessage
diff --git a/packages/studio/src/components/ModelsSettings.tsx b/packages/studio/src/components/ModelsSettings.tsx
index 3535ccc6a9..8ae4f373f9 100644
--- a/packages/studio/src/components/ModelsSettings.tsx
+++ b/packages/studio/src/components/ModelsSettings.tsx
@@ -146,14 +146,14 @@ export const ModelsSettings: React.FC = () => {
packageName={WHISPER_WEBGPU_PACKAGE}
style={section}
>
- <LazyWhisperModels visible />
+ <LazyWhisperModels indent={false} visible />
</OptionalModelPackage>
<OptionalModelPackage
label="Video matting"
packageName={VIDEO_MATTING_PACKAGE}
style={lastSection}
>
- <LazyVideoMattingModels visible />
+ <LazyVideoMattingModels indent={false} visible />
</OptionalModelPackage>
</div>
);
diff --git a/packages/studio/src/components/Transcription/Models.tsx b/packages/studio/src/components/Transcription/Models.tsx
index b2ef80cef9..c3bde2c685 100644
--- a/packages/studio/src/components/Transcription/Models.tsx
+++ b/packages/studio/src/components/Transcription/Models.tsx
@@ -11,7 +11,10 @@ import {ModelManager} from '../ModelManager';
const AVAILABLE_MODELS = getAvailableModels();
-export const Models: React.FC<{readonly visible: boolean}> = ({visible}) => {
+export const Models: React.FC<{
+ readonly indent: boolean;
+ readonly visible: boolean;
+}> = ({indent, visible}) => {
const isModelCached = useCallback(
(model: WhisperWebGpuModel) => isWhisperModelCached({model}),
[],
@@ -37,6 +40,7 @@ export const Models: React.FC<{readonly visible: boolean}> = ({visible}) => {
ariaLabel="Whisper models"
availableModels={AVAILABLE_MODELS}
description="Models are downloaded automatically when a transcription starts. You can also manage the browser cache here."
+ indent={indent}
isModelCached={isModelCached}
loadModel={loadModel}
prepare={clearStaleModels}
diff --git a/packages/studio/src/components/Transcription/TranscriptionModal.tsx b/packages/studio/src/components/Transcription/TranscriptionModal.tsx
index 930bc3e75a..bd98f9021d 100644
--- a/packages/studio/src/components/Transcription/TranscriptionModal.tsx
+++ b/packages/studio/src/components/Transcription/TranscriptionModal.tsx
@@ -939,7 +939,7 @@ export const TranscriptionModal: React.FC<TranscriptionModalState> = ({
validationMessage={chunkValidationMessage}
/>
</div>
- <Models visible={tab === 'models'} />
+ <Models indent visible={tab === 'models'} />
</div>
</div>
</DismissableModal>
diff --git a/packages/studio/src/components/VideoMatting/Models.tsx b/packages/studio/src/components/VideoMatting/Models.tsx
index 8ba1950ba4..5b3a3a0ad5 100644
--- a/packages/studio/src/components/VideoMatting/Models.tsx
+++ b/packages/studio/src/components/VideoMatting/Models.tsx
@@ -10,7 +10,10 @@ import {ModelManager} from '../ModelManager';
const AVAILABLE_MODELS = getAvailableModels();
-export const Models: React.FC<{readonly visible: boolean}> = ({visible}) => {
+export const Models: React.FC<{
+ readonly indent: boolean;
+ readonly visible: boolean;
+}> = ({indent, visible}) => {
const isModelCached = useCallback(
(model: VideoMattingModel) => isVideoMattingModelCached({model}),
[],
@@ -33,6 +36,7 @@ export const Models: React.FC<{readonly visible: boolean}> = ({visible}) => {
ariaLabel="Video matting models"
availableModels={AVAILABLE_MODELS}
description="Models are downloaded automatically when video separation starts. You can also manage the browser cache here."
+ indent={indent}
isModelCached={isModelCached}
loadModel={loadModel}
prepare={null}
diff --git a/packages/studio/src/components/VideoMatting/VideoMattingModal.tsx b/packages/studio/src/components/VideoMatting/VideoMattingModal.tsx
index 338338c946..4fdaa79c48 100644
--- a/packages/studio/src/components/VideoMatting/VideoMattingModal.tsx
+++ b/packages/studio/src/components/VideoMatting/VideoMattingModal.tsx
@@ -383,7 +383,7 @@ export const VideoMattingModal: React.FC<VideoMattingModalState> = ({
</div>
</div>
</div>
- <Models visible={tab === 'models'} />
+ <Models indent visible={tab === 'models'} />
</div>
</div>
</DismissableModal>
diff --git a/packages/studio/src/test/model-manager.test.tsx b/packages/studio/src/test/model-manager.test.tsx
index bb00c18457..2b9b7d4bb5 100644
--- a/packages/studio/src/test/model-manager.test.tsx
+++ b/packages/studio/src/test/model-manager.test.tsx
@@ -15,6 +15,7 @@ test('downloads and removes models through the shared manager', async () => {
ariaLabel="Test models"
availableModels={[{name: 'test-model', webGpuDownloadSize: 100}]}
description="Manage models."
+ indent
isModelCached={() => Promise.resolve(false)}
loadModel={(_model, onProgress) => {
onProgress(0.5);