🎥 Make videos programmatically with React
@remotion/studio: Save Sequence Activity settings to the config file
Jonny Burgere6310752f100
diff --git a/packages/browser-studio/src/BrowserStudio.tsx b/packages/browser-studio/src/BrowserStudio.tsxindex 7ac9e050ce..f4c820cccd 100644--- a/packages/browser-studio/src/BrowserStudio.tsx+++ b/packages/browser-studio/src/BrowserStudio.tsx@@ -1,6 +1,7 @@import type {RenderDefaults} from '@remotion/studio-shared';import {studioHtml} from '@remotion/studio-shared/studio-html';import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';+import {NoReactInternals} from 'remotion/no-react';import {createBrowserStudioHmrAssetManager,type BrowserStudioHmrBridge,@@ -675,6 +676,9 @@ export const BrowserStudio: React.FC<BrowserStudioProps> = ({studioRuntimeConfig: {showPremounting: null,defaultPremountInSeconds: null,+ experimentalSequenceActivityEnabled: false,+ experimentalSequenceActivityLimit:+ NoReactInternals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT,askAIEnabled: false,bufferStateDelayInMilliseconds: null,defaultCodingAgent: null,diff --git a/packages/bundler/src/bundle.ts b/packages/bundler/src/bundle.tsindex 12ed324f4f..2f7bbebcd2 100644--- a/packages/bundler/src/bundle.ts+++ b/packages/bundler/src/bundle.ts@@ -462,6 +462,9 @@ export const internalBundle = async (studioRuntimeConfig: {showPremounting: null,defaultPremountInSeconds: null,+ experimentalSequenceActivityEnabled: false,+ experimentalSequenceActivityLimit:+ NoReactInternals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT,askAIEnabled: actualArgs.askAIEnabled,bufferStateDelayInMilliseconds: actualArgs.bufferStateDelayInMilliseconds,canvasTabsEnabled: true,diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.tsindex fcbcf524bf..e1dce35ce9 100644--- a/packages/cli/src/config/index.ts+++ b/packages/cli/src/config/index.ts@@ -150,6 +150,8 @@ const {forceNewStudioOption,experimentalKeepAudioContextAliveOption,experimentalTracksOption,+ experimentalSequenceActivityOption,+ experimentalSequenceActivityLimitOption,numberOfSharedAudioTagsOption,ipv4Option,pixelFormatOption,@@ -663,6 +665,10 @@ type FlatConfig = RemotionConfigObject &* @default false*/setExperimentalTracksEnabled: (enabled: boolean) => void;+ /** Enable experimental Sequence Activity in Studio. Default: false. */+ setExperimentalSequenceActivityEnabled: (enabled: boolean) => void;+ /** Set the hidden Sequence Activity limit in Studio. Default: 20. */+ setExperimentalSequenceActivityLimit: (limit: number) => void;/*** Set the audio codec to use for the output video.* See the Encoding guide in the docs for defaults and available options.@@ -819,6 +825,10 @@ export const Config: FlatConfig = {setInteractivityEnabled: interactivityOption.setConfig,setCanvasTabsEnabled: canvasTabsOption.setConfig,setExperimentalTracksEnabled: experimentalTracksOption.setConfig,+ setExperimentalSequenceActivityEnabled:+ experimentalSequenceActivityOption.setConfig,+ setExperimentalSequenceActivityLimit:+ experimentalSequenceActivityLimitOption.setConfig,setAllowHtmlInCanvasEnabled: allowHtmlInCanvasOption.setConfig,setRspack: rspackOption.setConfig,setExperimentalRspackEnabled: rspackOption.setConfig,diff --git a/packages/cli/src/parsed-cli.ts b/packages/cli/src/parsed-cli.tsindex a5767b8b6a..9ae8a649a1 100644--- a/packages/cli/src/parsed-cli.ts+++ b/packages/cli/src/parsed-cli.ts@@ -40,6 +40,8 @@ const {forceNewStudioOption,experimentalKeepAudioContextAliveOption,experimentalTracksOption,+ experimentalSequenceActivityOption,+ experimentalSequenceActivityLimitOption,numberOfSharedAudioTagsOption,ipv4Option,pixelFormatOption,@@ -130,6 +132,12 @@ export type CommandLineOptions = {[experimentalKeepAudioContextAliveOption.cliFlag]: TypeOfOption<typeof experimentalKeepAudioContextAliveOption> | null;+ [experimentalSequenceActivityOption.cliFlag]: TypeOfOption<+ typeof experimentalSequenceActivityOption+ > | null;+ [experimentalSequenceActivityLimitOption.cliFlag]: TypeOfOption<+ typeof experimentalSequenceActivityLimitOption+ >;[experimentalTracksOption.cliFlag]: TypeOfOption<typeof experimentalTracksOption> | null;@@ -263,6 +271,7 @@ export const BooleanFlags = [forceNewStudioOption.cliFlag,experimentalKeepAudioContextAliveOption.cliFlag,experimentalTracksOption.cliFlag,+ experimentalSequenceActivityOption.cliFlag,bundleCacheOption.cliFlag,rspackOption.cliFlag,skipSkillsOption.cliFlag,@@ -292,6 +301,7 @@ export const parsedCli = minimist<CommandLineOptions>(process.argv.slice(2), {[forceNewStudioOption.cliFlag]: null,[experimentalKeepAudioContextAliveOption.cliFlag]: null,[experimentalTracksOption.cliFlag]: null,+ [experimentalSequenceActivityOption.cliFlag]: null,[mutedOption.cliFlag]: null,[enableCancellationOption.cliFlag]: null,[rspackOption.cliFlag]: null,diff --git a/packages/cli/src/print-help.ts b/packages/cli/src/print-help.tsindex e31bf259ef..2e4e35f9e6 100644--- a/packages/cli/src/print-help.ts+++ b/packages/cli/src/print-help.ts@@ -82,6 +82,8 @@ const studioOptions = options('disable-canvas-tabs','disable-interactivity','experimental-tracks',+ 'experimental-sequence-activity',+ 'experimental-sequence-activity-limit','allow-html-in-canvas','editor','coding-agent',diff --git a/packages/cli/src/studio.ts b/packages/cli/src/studio.tsindex bf94843921..37b81fb809 100644--- a/packages/cli/src/studio.ts+++ b/packages/cli/src/studio.ts@@ -46,6 +46,8 @@ const {forceNewStudioOption,experimentalKeepAudioContextAliveOption,experimentalTracksOption,+ experimentalSequenceActivityOption,+ experimentalSequenceActivityLimitOption,numberOfSharedAudioTagsOption,audioLatencyHintOption,ipv4Option,@@ -179,6 +181,13 @@ export const studioCommand = async (commandLine: parsedCli,}).value,elementLibraries: ConfigInternals.getElementLibraries(),+ experimentalSequenceActivityEnabled:+ experimentalSequenceActivityOption.getValue({commandLine: parsedCli})+ .value,+ experimentalSequenceActivityLimit:+ experimentalSequenceActivityLimitOption.getValue({+ commandLine: parsedCli,+ }).value,experimentalTracksEnabled: experimentalTracksOption.getValue({commandLine: parsedCli,}).value,@@ -211,6 +220,10 @@ export const studioCommand = async (enableCrossSiteIsolation:enableCrossSiteIsolationOption.getConfigValue(),experimentalTracksEnabled: experimentalTracksOption.getConfigValue(),+ experimentalSequenceActivityEnabled:+ experimentalSequenceActivityOption.getConfigValue(),+ experimentalSequenceActivityLimit:+ experimentalSequenceActivityLimitOption.getConfigValue(),interactivityEnabled: interactivityOption.getConfigValue(),keyboardShortcutsEnabled: keyboardShortcutsOption.getConfigValue(),logLevel: logLevelOption.getConfigValue(),diff --git a/packages/core/src/no-react.ts b/packages/core/src/no-react.tsindex 0ee1fc48ef..c5f08c1b3c 100644--- a/packages/core/src/no-react.ts+++ b/packages/core/src/no-react.ts@@ -2,6 +2,7 @@ import {evaluateSourceNumericValue,evaluateSourcePropStatuses,} from './evaluate-source-expressions.js';+import {DEFAULT_SEQUENCE_ACTIVITY_LIMIT} from './sequence-activity-defaults.js';export type {ArtifactAsset,AudioOrVideoAsset,@@ -63,6 +64,7 @@ import {getOffthreadVideoSource} from './video/offthread-video-source';export const NoReactInternals = {DEFAULT_PREMOUNT_IN_SECONDS,+ DEFAULT_SEQUENCE_ACTIVITY_LIMIT,validateDefaultPremountInSeconds,evaluateSourceNumericValue,evaluateSourcePropStatuses,diff --git a/packages/core/src/sequence-activity-context.ts b/packages/core/src/sequence-activity-context.tsindex 68d0e79cf2..ae2b526f45 100644--- a/packages/core/src/sequence-activity-context.ts+++ b/packages/core/src/sequence-activity-context.ts@@ -1,7 +1,7 @@import {createContext, useContext} from 'react';import type {TimelineContextValue} from './TimelineContext.js';-export const DEFAULT_SEQUENCE_ACTIVITY_LIMIT = 20;+export {DEFAULT_SEQUENCE_ACTIVITY_LIMIT} from './sequence-activity-defaults.js';// Internal Studio experiment. Hidden Activity trees register on commit, so the// experiment is disabled when the sequence manager falls back to effects.@@ -10,8 +10,6 @@ export const SequenceActivityDormantContext = createContext(false);export const SequenceActivitySettingsContext = createContext<{readonly enabled: boolean;readonly limit: number;- readonly setEnabled: (enabled: boolean) => void;- readonly setLimit: (limit: number) => void;} | null>(null);// React propagates changed ancestor contexts through hidden Activity trees,diff --git a/packages/core/src/sequence-activity-defaults.ts b/packages/core/src/sequence-activity-defaults.tsnew file mode 100644index 0000000000..52a356fe79--- /dev/null+++ b/packages/core/src/sequence-activity-defaults.ts@@ -0,0 +1 @@+export const DEFAULT_SEQUENCE_ACTIVITY_LIMIT = 20;diff --git a/packages/docs/docs/cli/studio.mdx b/packages/docs/docs/cli/studio.mdxindex d7d673f516..c36ea542a7 100644--- a/packages/docs/docs/cli/studio.mdx+++ b/packages/docs/docs/cli/studio.mdx@@ -65,6 +65,14 @@ Inline JSON string isn't supported on Windows shells because it removes the `"`<Options id="experimental-tracks" />+### `--experimental-sequence-activity`<AvailableFrom v="4.0.535" />++<Options id="experimental-sequence-activity" />++### `--experimental-sequence-activity-limit`<AvailableFrom v="4.0.535" />++<Options id="experimental-sequence-activity-limit" />+### `--allow-html-in-canvas`<AvailableFrom v="4.0.447" /><Options id="allow-html-in-canvas" />diff --git a/packages/docs/docs/config.mdx b/packages/docs/docs/config.mdxindex 8339c52148..b1454693a4 100644--- a/packages/docs/docs/config.mdx+++ b/packages/docs/docs/config.mdx@@ -299,6 +299,34 @@ Changes apply immediately in the Studio without reloading the page.The [`--experimental-tracks`](/docs/options/experimental-tracks) flag takes precedence over this option.+## `setExperimentalSequenceActivityEnabled()`<AvailableFrom v="4.0.535" />++<Options id="experimental-sequence-activity" />++```ts twoslash title="remotion.config.ts"+import {Config} from '@remotion/cli/config';+// ---cut---+Config.setExperimentalSequenceActivityEnabled(true);+```++Changes apply immediately in the Studio without reloading the page.++The [`--experimental-sequence-activity`](/docs/options/experimental-sequence-activity) flag takes precedence over this option.++## `setExperimentalSequenceActivityLimit()`<AvailableFrom v="4.0.535" />++<Options id="experimental-sequence-activity-limit" />++```ts twoslash title="remotion.config.ts"+import {Config} from '@remotion/cli/config';+// ---cut---+Config.setExperimentalSequenceActivityLimit(20);+```++Changes apply immediately in the Studio without reloading the page.++The [`--experimental-sequence-activity-limit`](/docs/options/experimental-sequence-activity-limit) flag takes precedence over this option.+## `setShowPremounting()`<AvailableFrom v="4.0.535" /><Options id="show-premounting" />diff --git a/packages/docs/docs/options/experimental-sequence-activity-limit.mdx b/packages/docs/docs/options/experimental-sequence-activity-limit.mdxnew file mode 100644index 0000000000..b662b639b3--- /dev/null+++ b/packages/docs/docs/options/experimental-sequence-activity-limit.mdx@@ -0,0 +1,34 @@+---+image: /generated/articles-docs-options-experimental-sequence-activity-limit.png+# Generated by packages/docs/generate-option-docs.ts. Do not edit directly.+# Regenerate: cd packages/docs && bun run generate-option-docs+title: "Experimental hidden Sequence Activity limit"+crumb: Options+custom_edit_url: https://github.com/remotion-dev/remotion/edit/main/packages/renderer/src/options/experimental-sequence-activity-limit.tsx+---++# Experimental hidden Sequence Activity limit<AvailableFrom v="4.0.535" />++Limit nearby hidden scenes discovered by experimental Sequence Activity in the Remotion Studio, including nested sequences and their ancestors. Visible, premounted, and postmounted scenes always render. Defaults to 20. Must be a non-negative safe integer. Set to 0 to disable hidden discovery. Only applies when experimental Sequence Activity is enabled. Does not affect rendering.++## CLI flag++```text+--experimental-sequence-activity-limit <value>+```++The following CLI commands accept this option:++- [`remotion studio`](/docs/cli/studio)++## Config file++```ts twoslash title="remotion.config.ts"+import {Config} from '@remotion/cli/config';+// ---cut---+Config.setExperimentalSequenceActivityLimit(20);+```++## See also++- [All options](/docs/options)diff --git a/packages/docs/docs/options/experimental-sequence-activity.mdx b/packages/docs/docs/options/experimental-sequence-activity.mdxnew file mode 100644index 0000000000..8eca076c25--- /dev/null+++ b/packages/docs/docs/options/experimental-sequence-activity.mdx@@ -0,0 +1,34 @@+---+image: /generated/articles-docs-options-experimental-sequence-activity.png+# Generated by packages/docs/generate-option-docs.ts. Do not edit directly.+# Regenerate: cd packages/docs && bun run generate-option-docs+title: "Enable experimental Sequence Activity"+crumb: Options+custom_edit_url: https://github.com/remotion-dev/remotion/edit/main/packages/renderer/src/options/experimental-sequence-activity.tsx+---++# Enable experimental Sequence Activity<AvailableFrom v="4.0.535" />++Discover layers in nearby hidden scenes in the Remotion Studio before they become visible. This experimental feature may use more CPU. Disabled by default. Does not affect rendering.++## CLI flag++```text+--experimental-sequence-activity+```++The following CLI commands accept this option:++- [`remotion studio`](/docs/cli/studio)++## Config file++```ts twoslash title="remotion.config.ts"+import {Config} from '@remotion/cli/config';+// ---cut---+Config.setExperimentalSequenceActivityEnabled(true);+```++## See also++- [All options](/docs/options)diff --git a/packages/docs/docs/options/index.mdx b/packages/docs/docs/options/index.mdxindex d979960b50..e0a406b410 100644--- a/packages/docs/docs/options/index.mdx+++ b/packages/docs/docs/options/index.mdx@@ -51,12 +51,14 @@ Only the CLI reads the config file. In programmatic APIs, you need to pass all o- [Disallow parallel encoding](/docs/options/disallow-parallel-encoding) (`--disallow-parallel-encoding`)- [Enable cancellation](/docs/options/enable-cancellation) (`--enable-cancellation`)- [Enable Cross-Site Isolation](/docs/options/cross-site-isolation) (`--cross-site-isolation`)+- [Enable experimental Sequence Activity](/docs/options/experimental-sequence-activity) (`--experimental-sequence-activity`)- [Enable experimental timeline tracks](/docs/options/experimental-tracks) (`--experimental-tracks`)- [Enable Lambda Insights](/docs/options/enable-lambda-insights) (`--enable-lambda-insights`)- [Enable Multiprocess on Linux](/docs/options/enable-multiprocess-on-linux) (`--enable-multiprocess-on-linux`)- [Enforce Audio Track](/docs/options/enforce-audio-track) (`--enforce-audio-track`)- [Env File](/docs/options/env-file) (`--env-file`)- [Every nth frame](/docs/options/every-nth-frame) (`--every-nth-frame`)+- [Experimental hidden Sequence Activity limit](/docs/options/experimental-sequence-activity-limit) (`--experimental-sequence-activity-limit`)- [FFmpeg -bufsize flag](/docs/options/buffer-size) (`--buffer-size`)- [FFmpeg -maxrate flag](/docs/options/max-rate) (`--max-rate`)- [For seamless AAC concatenation](/docs/options/for-seamless-aac-concatenation) (`--for-seamless-aac-concatenation`)diff --git a/packages/docs/src/data/articles.ts b/packages/docs/src/data/articles.tsindex e7600ee722..fb1004b52e 100644--- a/packages/docs/src/data/articles.ts+++ b/packages/docs/src/data/articles.ts@@ -1008,6 +1008,24 @@ export const articles = [noAi: false,slug: 'options/experimental-keep-audio-context-alive',},+ {+ id: 'options/experimental-sequence-activity',+ title: 'Enable experimental Sequence Activity',+ relativePath: 'docs/options/experimental-sequence-activity.mdx',+ compId: 'articles-docs-options-experimental-sequence-activity',+ crumb: 'Options',+ noAi: false,+ slug: 'options/experimental-sequence-activity',+ },+ {+ id: 'options/experimental-sequence-activity-limit',+ title: 'Experimental hidden Sequence Activity limit',+ relativePath: 'docs/options/experimental-sequence-activity-limit.mdx',+ compId: 'articles-docs-options-experimental-sequence-activity-limit',+ crumb: 'Options',+ noAi: false,+ slug: 'options/experimental-sequence-activity-limit',+ },{id: 'options/experimental-tracks',title: 'Enable experimental timeline tracks',diff --git a/packages/docs/static/generated/articles-docs-options-experimental-sequence-activity-limit.png b/packages/docs/static/generated/articles-docs-options-experimental-sequence-activity-limit.pngnew file mode 100644index 0000000000..05b9b1e73bBinary files /dev/null and b/packages/docs/static/generated/articles-docs-options-experimental-sequence-activity-limit.png differdiff --git a/packages/docs/static/generated/articles-docs-options-experimental-sequence-activity.png b/packages/docs/static/generated/articles-docs-options-experimental-sequence-activity.pngnew file mode 100644index 0000000000..de4a20fc21Binary files /dev/null and b/packages/docs/static/generated/articles-docs-options-experimental-sequence-activity.png differdiff --git a/packages/renderer/src/options/experimental-sequence-activity-limit.tsx b/packages/renderer/src/options/experimental-sequence-activity-limit.tsxnew file mode 100644index 0000000000..863ccff0e6--- /dev/null+++ b/packages/renderer/src/options/experimental-sequence-activity-limit.tsx@@ -0,0 +1,57 @@+import {NoReactInternals} from 'remotion/no-react';+import type {AnyRemotionOption} from './option';++let configuredLimit: number | null = null;+const cliFlag = 'experimental-sequence-activity-limit' as const;++export const experimentalSequenceActivityLimitOption = {+ name: 'Experimental hidden Sequence Activity limit',+ addedIn: '4.0.535',+ cliFlag,+ id: cliFlag,+ description: () => (+ <>+ Limit nearby hidden scenes discovered by experimental Sequence Activity in+ the Remotion Studio, including nested sequences and their ancestors.+ Visible, premounted, and postmounted scenes always render. Defaults to 20.+ Must be a non-negative safe integer. Set to 0 to disable hidden discovery.+ Only applies when experimental Sequence Activity is enabled. Does not+ affect rendering.+ </>+ ),+ ssrName: null,+ docLink:+ 'https://www.remotion.dev/docs/options/experimental-sequence-activity-limit',+ type: 0 as number,+ getValue: ({commandLine}) => {+ if (commandLine[cliFlag] !== undefined) {+ const value = commandLine[cliFlag];+ if (!Number.isSafeInteger(value) || (value as number) < 0) {+ throw new Error(+ 'Sequence Activity limit must be a non-negative safe integer.',+ );+ }++ return {value: value as number, source: 'cli'};+ }++ return {+ value:+ configuredLimit ?? NoReactInternals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT,+ source: 'config',+ };+ },+ setConfig(value) {+ if (!Number.isSafeInteger(value) || value < 0) {+ throw new Error(+ 'Sequence Activity limit must be a non-negative safe integer.',+ );+ }++ configuredLimit = value;+ },+ getConfigValue: () => configuredLimit,+ reset: () => {+ configuredLimit = null;+ },+} satisfies AnyRemotionOption<number>;diff --git a/packages/renderer/src/options/experimental-sequence-activity.tsx b/packages/renderer/src/options/experimental-sequence-activity.tsxnew file mode 100644index 0000000000..409a72b19d--- /dev/null+++ b/packages/renderer/src/options/experimental-sequence-activity.tsx@@ -0,0 +1,46 @@+import type {AnyRemotionOption} from './option';++let experimentalSequenceActivityEnabled = false;+let configuredExperimentalSequenceActivityEnabled: boolean | null = null;++const cliFlag = 'experimental-sequence-activity' as const;++export const experimentalSequenceActivityOption = {+ name: 'Enable experimental Sequence Activity',+ addedIn: '4.0.535',+ cliFlag,+ description: () => (+ <>+ Discover layers in nearby hidden scenes in the Remotion Studio before they+ become visible. This experimental feature may use more CPU. Disabled by+ default. Does not affect rendering.+ </>+ ),+ ssrName: null,+ docLink:+ 'https://www.remotion.dev/docs/options/experimental-sequence-activity',+ type: false as boolean,+ getValue: ({commandLine}) => {+ if (commandLine[cliFlag] !== undefined && commandLine[cliFlag] !== null) {+ return {+ value: commandLine[cliFlag] as boolean,+ source: 'cli',+ };+ }++ return {+ value: experimentalSequenceActivityEnabled,+ source: 'config',+ };+ },+ setConfig(value) {+ experimentalSequenceActivityEnabled = value;+ configuredExperimentalSequenceActivityEnabled = value;+ },+ getConfigValue: () => configuredExperimentalSequenceActivityEnabled,+ reset: () => {+ experimentalSequenceActivityEnabled = false;+ configuredExperimentalSequenceActivityEnabled = null;+ },+ id: cliFlag,+} satisfies AnyRemotionOption<boolean>;diff --git a/packages/renderer/src/options/index.tsx b/packages/renderer/src/options/index.tsxindex cac9b3d131..6bdacd5376 100644--- a/packages/renderer/src/options/index.tsx+++ b/packages/renderer/src/options/index.tsx@@ -34,6 +34,8 @@ import {enforceAudioOption} from './enforce-audio';import {envFileOption} from './env-file';import {everyNthFrameOption} from './every-nth-frame';import {experimentalKeepAudioContextAliveOption} from './experimental-keep-audio-context-alive';+import {experimentalSequenceActivityOption} from './experimental-sequence-activity';+import {experimentalSequenceActivityLimitOption} from './experimental-sequence-activity-limit';import {experimentalTracksOption} from './experimental-tracks';import {folderExpiryOption} from './folder-expiry';import {forSeamlessAacConcatenationOption} from './for-seamless-aac-concatenation';@@ -179,6 +181,8 @@ export const allOptions = {forceNewStudioOption,experimentalKeepAudioContextAliveOption,experimentalTracksOption,+ experimentalSequenceActivityOption,+ experimentalSequenceActivityLimitOption,numberOfSharedAudioTagsOption,ipv4Option,stillImageFormatOption,diff --git a/packages/studio-server/src/test/file-source-route.test.ts b/packages/studio-server/src/test/file-source-route.test.tsindex 5cbffa27ce..168757de35 100644--- a/packages/studio-server/src/test/file-source-route.test.ts+++ b/packages/studio-server/src/test/file-source-route.test.ts@@ -86,6 +86,8 @@ test('serves file source from an origin-less GET request', async () => {getStudioRuntimeConfig: () => ({showPremounting: null,defaultPremountInSeconds: null,+ experimentalSequenceActivityEnabled: false,+ experimentalSequenceActivityLimit: 20,askAIEnabled: false,bufferStateDelayInMilliseconds: null,canvasTabsEnabled: true,diff --git a/packages/studio-server/src/test/update-config.test.ts b/packages/studio-server/src/test/update-config.test.tsindex 19e67133c2..b9f8792ad0 100644--- a/packages/studio-server/src/test/update-config.test.ts+++ b/packages/studio-server/src/test/update-config.test.ts@@ -15,6 +15,8 @@ import {const studioRuntimeConfig = (elementLibraryUrls: readonly string[]) => ({showPremounting: null,defaultPremountInSeconds: null,+ experimentalSequenceActivityEnabled: false,+ experimentalSequenceActivityLimit: 20,askAIEnabled: false,bufferStateDelayInMilliseconds: null,canvasTabsEnabled: true,diff --git a/packages/studio-server/src/test/upload-output-security.test.ts b/packages/studio-server/src/test/upload-output-security.test.tsindex 5e0b79cbb9..19ee89c8ce 100644--- a/packages/studio-server/src/test/upload-output-security.test.ts+++ b/packages/studio-server/src/test/upload-output-security.test.ts@@ -90,6 +90,8 @@ const requestWriteRoute = async ({getStudioRuntimeConfig: () => ({showPremounting: null,defaultPremountInSeconds: null,+ experimentalSequenceActivityEnabled: false,+ experimentalSequenceActivityLimit: 20,askAIEnabled: false,bufferStateDelayInMilliseconds: null,canvasTabsEnabled: true,diff --git a/packages/studio-shared/src/config-method-lifecycles.ts b/packages/studio-shared/src/config-method-lifecycles.tsindex 7edf94fcbb..9f77516aa3 100644--- a/packages/studio-shared/src/config-method-lifecycles.ts+++ b/packages/studio-shared/src/config-method-lifecycles.ts@@ -55,6 +55,8 @@ export const configMethodLifecycles = {setExperimentalKeepAudioContextAlive: 'reload',setExperimentalRspackEnabled: 'restart',setExperimentalTracksEnabled: 'runtime',+ setExperimentalSequenceActivityEnabled: 'runtime',+ setExperimentalSequenceActivityLimit: 'runtime',setForSeamlessAacConcatenation: 'runtime',setForceNewStudioEnabled: 'restart',setFrameRange: 'runtime',diff --git a/packages/studio-shared/src/studio-runtime-config.ts b/packages/studio-shared/src/studio-runtime-config.tsindex 46c6d5a87d..7915d02b93 100644--- a/packages/studio-shared/src/studio-runtime-config.ts+++ b/packages/studio-shared/src/studio-runtime-config.ts@@ -13,6 +13,8 @@ export type ConfigFileStudioSettings = {readonly beepOnFinish: boolean | null;readonly enableCrossSiteIsolation: boolean | null;readonly experimentalTracksEnabled?: boolean | null;+ readonly experimentalSequenceActivityEnabled: boolean | null;+ readonly experimentalSequenceActivityLimit: number | null;readonly interactivityEnabled: boolean | null;readonly keyboardShortcutsEnabled: boolean | null;readonly logLevel: LogLevel | null;@@ -35,6 +37,8 @@ export type StudioRuntimeConfig = {readonly askAIEnabled: boolean;readonly elementLibraries?: readonly StudioElementLibrary[];readonly experimentalTracksEnabled?: boolean;+ readonly experimentalSequenceActivityEnabled: boolean;+ readonly experimentalSequenceActivityLimit: number;readonly interactivityEnabled: boolean;readonly keyboardShortcutsEnabled: boolean;readonly keyboardShortcuts?: StudioKeyboardShortcuts | null;diff --git a/packages/studio/src/components/SequenceActivitySettingsProvider.tsx b/packages/studio/src/components/SequenceActivitySettingsProvider.tsxindex 23565b1db2..2a4f803f59 100644--- a/packages/studio/src/components/SequenceActivitySettingsProvider.tsx+++ b/packages/studio/src/components/SequenceActivitySettingsProvider.tsx@@ -1,105 +1,37 @@-import React, {useCallback, useEffect, useMemo, useState} from 'react';+import React, {useEffect, useState} from 'react';import {Internals} from 'remotion';--const enabledKey = 'remotion.experimentalSequenceActivity';-const limitKey = 'remotion.experimentalSequenceActivityLimit';+import {subscribeToPreviewServerEvents} from '../helpers/preview-server-events';+import {getStudioSequenceActivitySettings} from '../helpers/studio-runtime-config';export const SequenceActivitySettingsProvider: React.FC<{readonly children: React.ReactNode;}> = ({children}) => {- const [settings, setSettings] = useState(() => {- const requested = new URLSearchParams(window.location.search).get(- 'experimentalSequenceActivity',- );- let enabled = false;- let limit: number = Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT;- try {- enabled = localStorage.getItem(enabledKey) === 'true';- const storedLimit = localStorage.getItem(limitKey);- if (storedLimit !== null && storedLimit.trim() !== '') {- const parsedLimit = Number(storedLimit);- if (Number.isSafeInteger(parsedLimit) && parsedLimit >= 0) {- limit = parsedLimit;- }- }- } catch {- // The experiment remains usable when browser storage is unavailable.- }-- return {- enabled:- requested === 'true' ? true : requested === 'false' ? false : enabled,- limit,- };- });- const setEnabled = useCallback((enabled: boolean) => {- try {- localStorage.setItem(enabledKey, String(enabled));- } catch {- // Apply the setting for this session even if it cannot be persisted.- }-- setSettings((current) =>- current.enabled === enabled ? current : {...current, enabled},- );- }, []);- const setLimit = useCallback((limit: number) => {- if (!Number.isSafeInteger(limit) || limit < 0) {- return;- }-- try {- localStorage.setItem(limitKey, String(limit));- } catch {- // Apply the setting for this session even if it cannot be persisted.- }+ const [settings, setSettings] = useState(getStudioSequenceActivitySettings);- setSettings((current) =>- current.limit === limit ? current : {...current, limit},- );- }, []);useEffect(() => {- const onStorage = (event: StorageEvent) => {- try {- if (event.storageArea !== localStorage) {- return;- }- } catch {+ return subscribeToPreviewServerEvents((event) => {+ if (event.type !== 'config-file-changed') {return;}- if (event.key === enabledKey || event.key === null) {- const enabled = event.newValue === 'true';- setSettings((current) =>- current.enabled === enabled ? current : {...current, enabled},- );- }-- if (event.key === limitKey || event.key === null) {- const parsedLimit =- event.newValue === null || event.newValue.trim() === ''- ? Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT- : Number(event.newValue);- const limit =- Number.isSafeInteger(parsedLimit) && parsedLimit >= 0- ? parsedLimit- : Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT;- setSettings((current) =>- current.limit === limit ? current : {...current, limit},- );- }- };-- window.addEventListener('storage', onStorage);- return () => window.removeEventListener('storage', onStorage);+ const {+ experimentalSequenceActivityEnabled,+ experimentalSequenceActivityLimit,+ } = event.studioRuntimeConfig;+ setSettings((current) =>+ current.enabled === experimentalSequenceActivityEnabled &&+ current.limit === experimentalSequenceActivityLimit+ ? current+ : {+ enabled: experimentalSequenceActivityEnabled,+ limit: experimentalSequenceActivityLimit,+ },+ );+ });}, []);- const value = useMemo(- () => ({...settings, setEnabled, setLimit}),- [setEnabled, setLimit, settings],- );return (- <Internals.SequenceActivitySettingsContext.Provider value={value}>+ <Internals.SequenceActivitySettingsContext.Provider value={settings}>{children}</Internals.SequenceActivitySettingsContext.Provider>);diff --git a/packages/studio/src/components/StudioSettings.tsx b/packages/studio/src/components/StudioSettings.tsxindex d016a71bb7..79de580f20 100644--- a/packages/studio/src/components/StudioSettings.tsx+++ b/packages/studio/src/components/StudioSettings.tsx@@ -4,13 +4,7 @@ import type {ConfigFileStudioSettings,ConfigUpdate,} from '@remotion/studio-shared';-import React, {- useCallback,- useContext,- useEffect,- useMemo,- useState,-} from 'react';+import React, {useCallback, useEffect, useMemo, useState} from 'react';import {Internals} from 'remotion';import {NoReactInternals} from 'remotion/no-react';import {LIGHT_TEXT} from '../helpers/colors';@@ -59,6 +53,8 @@ const initialSettings: ConfigFileStudioSettings = {beepOnFinish: null,enableCrossSiteIsolation: null,experimentalTracksEnabled: null,+ experimentalSequenceActivityEnabled: null,+ experimentalSequenceActivityLimit: null,interactivityEnabled: null,keyboardShortcutsEnabled: null,logLevel: null,@@ -119,15 +115,17 @@ const ConfigNumber = ({export const StudioSettings: React.FC = () => {const {error: settingsError, revision, studioRuntimeConfig} = useSettings();- const activitySettings = useContext(- Internals.SequenceActivitySettingsContext,- );const [settings, setSettings] =useState<ConfigFileStudioSettings>(initialSettings);const [committedNumberSettings, setCommittedNumberSettings] = useState<{numberOfSharedAudioTags: number | null;defaultPremountInSeconds: number | null;- }>({numberOfSharedAudioTags: null, defaultPremountInSeconds: null});+ experimentalSequenceActivityLimit: number | null;+ }>({+ numberOfSharedAudioTags: null,+ defaultPremountInSeconds: null,+ experimentalSequenceActivityLimit: null,+ });const [editedSetters, setEditedSetters] = useState<Set<string>>(() => new Set(),);@@ -143,6 +141,9 @@ export const StudioSettings: React.FC = () => {studioRuntimeConfig.configFileStudioSettings ?? initialSettings,);setCommittedNumberSettings({+ experimentalSequenceActivityLimit:+ studioRuntimeConfig.configFileStudioSettings+ ?.experimentalSequenceActivityLimit ?? null,defaultPremountInSeconds:studioRuntimeConfig.configFileStudioSettings?.defaultPremountInSeconds ?? null,@@ -168,7 +169,10 @@ export const StudioSettings: React.FC = () => {);const previewNumberSetting = useCallback((- key: 'numberOfSharedAudioTags' | 'defaultPremountInSeconds',+ key:+ | 'numberOfSharedAudioTags'+ | 'defaultPremountInSeconds'+ | 'experimentalSequenceActivityLimit',value: number | null,) => {setSettings((current) => ({...current, [key]: value}));@@ -177,7 +181,10 @@ export const StudioSettings: React.FC = () => {);const commitNumberSetting = useCallback((- key: 'numberOfSharedAudioTags' | 'defaultPremountInSeconds',+ key:+ | 'numberOfSharedAudioTags'+ | 'defaultPremountInSeconds'+ | 'experimentalSequenceActivityLimit',setter: string,value: number | null,) => {@@ -217,6 +224,14 @@ export const StudioSettings: React.FC = () => {'setExperimentalTracksEnabled',settings.experimentalTracksEnabled,),+ update(+ 'setExperimentalSequenceActivityEnabled',+ settings.experimentalSequenceActivityEnabled,+ ),+ update(+ 'setExperimentalSequenceActivityLimit',+ committedNumberSettings.experimentalSequenceActivityLimit,+ ),update('setCanvasTabsEnabled', settings.canvasTabsEnabled),update('setLogLevel', settings.logLevel),].filter((item) => editedSetters.has(item.setter));@@ -427,100 +442,113 @@ export const StudioSettings: React.FC = () => {}value={settings.defaultPremountInSeconds}/>- {activitySettings === null ? null : (- <>- <div style={optionRow}>- <div style={label}>- Sequence Activity (experimental)- <InfoBubble- aria-label="About experimental Sequence Activity"- horizontalAlignment="right"- >- <div- style={{- padding: 12,- maxWidth: 280,- fontSize: 14,- lineHeight: 1.5,- }}- >- Discovers layers in nearby scenes before they become visible.- This experimental feature may use more CPU. Changes apply- immediately and are saved in this browser.- </div>- </InfoBubble>+ <div style={optionRow}>+ <div style={label}>+ Sequence Activity (experimental)+ <InfoBubble+ aria-label="About experimental Sequence Activity"+ horizontalAlignment="right"+ >+ <div+ style={{+ padding: 12,+ maxWidth: 280,+ fontSize: 14,+ lineHeight: 1.5,+ }}+ >+ Discovers layers in nearby scenes before they become visible. This+ experimental feature may use more CPU. Changes apply immediately+ and are saved in remotion.config.ts.</div>- <label- style={rightRow}- aria-label="Sequence Activity (experimental)"+ </InfoBubble>+ </div>+ <label style={rightRow} aria-label="Sequence Activity (experimental)">+ <Checkbox+ checked={settings.experimentalSequenceActivityEnabled === true}+ name="Sequence Activity (experimental)"+ onChange={(event) =>+ changeSetting(+ 'experimentalSequenceActivityEnabled',+ 'setExperimentalSequenceActivityEnabled',+ event.target.checked ? true : null,+ )+ }+ />+ </label>+ </div>+ {settings.experimentalSequenceActivityEnabled === true ? (+ <div style={optionRow}>+ <div style={label}>+ Hidden activity limit (experimental)+ <InfoBubble+ aria-label="About the hidden activity limit"+ horizontalAlignment="right">- <Checkbox- checked={activitySettings.enabled}- name="Sequence Activity (experimental)"- onChange={(event) =>- activitySettings.setEnabled(event.target.checked)- }- />- </label>- </div>- {activitySettings.enabled ? (- <div style={optionRow}>- <div style={label}>- Hidden activity limit (experimental)- <InfoBubble- aria-label="About the hidden activity limit"- horizontalAlignment="right"- >- <div- style={{- padding: 12,- maxWidth: 280,- fontSize: 14,- lineHeight: 1.5,- }}- >- Limits nearby hidden scenes, including nested sequences and- their ancestors. Visible, premounted, and postmounted scenes- always render. Set to 0 to disable hidden discovery.- Default: {Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT}.- </div>- </InfoBubble>- </div>- <div style={{...rightRow, gap: 6}}>- <InputDragger- aria-label="Hidden activity limit (experimental)"- buttonStyle={{textAlign: 'right', width: 140}}- formatter={String}- integerOnly- min={0}- onTextChange={() => undefined}- onValueChange={activitySettings.setLimit}- rightAlign- status="ok"- step={1}- value={activitySettings.limit}- />- <Button- disabled={- activitySettings.limit ===- Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT- }- onClick={() =>- activitySettings.setLimit(- Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT,- )- }- size="compact"- style={{color: LIGHT_TEXT}}- aria-label={`Reset hidden activity limit to ${Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT}`}- >- <UndoIcon style={resetIcon} />- </Button>+ <div+ style={{+ padding: 12,+ maxWidth: 280,+ fontSize: 14,+ lineHeight: 1.5,+ }}+ >+ Limits nearby hidden scenes, including nested sequences and+ their ancestors. Visible, premounted, and postmounted scenes+ always render. Set to 0 to disable hidden discovery. Default:{' '}+ {Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT}.</div>- </div>- ) : null}- </>- )}+ </InfoBubble>+ </div>+ <div style={{...rightRow, gap: 6}}>+ <InputDragger+ aria-label="Hidden activity limit (experimental)"+ buttonStyle={{textAlign: 'right', width: 140}}+ formatter={() =>+ settings.experimentalSequenceActivityLimit === null+ ? `Default (${Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT})`+ : String(settings.experimentalSequenceActivityLimit)+ }+ integerOnly+ max={Number.MAX_SAFE_INTEGER}+ min={0}+ onTextChange={() => undefined}+ onValueChange={(value) =>+ previewNumberSetting('experimentalSequenceActivityLimit', value)+ }+ onValueChangeEnd={(value) =>+ commitNumberSetting(+ 'experimentalSequenceActivityLimit',+ 'setExperimentalSequenceActivityLimit',+ value,+ )+ }+ rightAlign+ status="ok"+ step={1}+ value={+ settings.experimentalSequenceActivityLimit ??+ Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT+ }+ />+ <Button+ disabled={settings.experimentalSequenceActivityLimit === null}+ onClick={() =>+ commitNumberSetting(+ 'experimentalSequenceActivityLimit',+ 'setExperimentalSequenceActivityLimit',+ null,+ )+ }+ size="compact"+ style={{color: LIGHT_TEXT}}+ aria-label={`Reset hidden activity limit to ${Internals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT}`}+ >+ <UndoIcon style={resetIcon} />+ </Button>+ </div>+ </div>+ ) : null}<p style={sectionTitle}>Audio</p><ConfigSelectdiff --git a/packages/studio/src/helpers/studio-runtime-config.ts b/packages/studio/src/helpers/studio-runtime-config.tsindex f071eddc04..6721ec83df 100644--- a/packages/studio/src/helpers/studio-runtime-config.ts+++ b/packages/studio/src/helpers/studio-runtime-config.ts@@ -7,6 +7,9 @@ const defaultStudioRuntimeConfig: StudioRuntimeConfig = {showPremounting: null,defaultPremountInSeconds: null,askAIEnabled: false,+ experimentalSequenceActivityEnabled: false,+ experimentalSequenceActivityLimit:+ NoReactInternals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT,bufferStateDelayInMilliseconds: null,defaultCodingAgent: null,defaultEditor: null,@@ -67,3 +70,13 @@ export const getStudioDefaultPremountInSeconds = () => {export const getStudioShowPremounting = () => {return getStudioRuntimeConfig().showPremounting ?? true;};++export const getStudioSequenceActivitySettings = () => {+ const config = getStudioRuntimeConfig();+ return {+ enabled: config.experimentalSequenceActivityEnabled ?? false,+ limit:+ config.experimentalSequenceActivityLimit ??+ NoReactInternals.DEFAULT_SEQUENCE_ACTIVITY_LIMIT,+ };+};