Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Reuse query-string canvas routes

Jonny Burger1c200127e3c4
diff --git a/packages/browser-studio/e2e/browser-studio.test.ts b/packages/browser-studio/e2e/browser-studio.test.ts
index 0f860dc1cc..6066f0cb8f 100644
--- a/packages/browser-studio/e2e/browser-studio.test.ts
+++ b/packages/browser-studio/e2e/browser-studio.test.ts
@@ -194,9 +194,7 @@ test('loads Browser Studio, opens external links, and can add, delete, and dupli
await expect(
studio.locator('.remotion-studio-composition-container'),
).toBeVisible();
- await expect
- .poll(() => new URL(page.url()).searchParams.get('remotion-route'))
- .toBe('/MyComp');
+ await expect.poll(() => new URL(page.url()).search).toBe('?/MyComp');
await studio.locator('button:has(svg[viewBox="0 0 415 426"])').click();
const popupPromise = page.waitForEvent('popup');
await studio.getByText('About Remotion', {exact: true}).click();
@@ -330,13 +328,9 @@ test('loads Browser Studio, opens external links, and can add, delete, and dupli
await expect(
studio.getByTitle('/project').getByText('MyComp1'),
).toBeVisible();
- await expect
- .poll(() => new URL(page.url()).searchParams.get('remotion-route'))
- .toBe('/MyComp1');
+ await expect.poll(() => new URL(page.url()).search).toBe('?/MyComp1');
await page.goBack();
- await expect
- .poll(() => new URL(page.url()).searchParams.get('remotion-route'))
- .toBe('/MyComp');
+ await expect.poll(() => new URL(page.url()).search).toBe('?/MyComp');
await studio.getByRole('button', {name: 'Render on web'}).click();
await expect(
studio.getByText('Render MyComp', {exact: true}),
@@ -477,6 +471,9 @@ export const Root = () => <Composition id="OpfsComp" component={OpfsComposition}
await expect(
studio.getByTitle('/project').getByText('OpfsComp'),
).toBeVisible();
+ await expect
+ .poll(() => new URL(page.url()).search)
+ .toBe('?/OpfsComp&github=1');
await studio.locator('[data-compname="OpfsComp"]').click();
await expect(
studio.locator('.remotion-studio-composition-container img'),
diff --git a/packages/studio/src/helpers/url-state.ts b/packages/studio/src/helpers/url-state.ts
index 6db6bf02c9..4031d06bfa 100644
--- a/packages/studio/src/helpers/url-state.ts
+++ b/packages/studio/src/helpers/url-state.ts
@@ -1,7 +1,5 @@
type UrlHandling = 'browser-studio' | 'query-string' | 'spa';
-const browserStudioRouteParameter = 'remotion-route';
-
const getUrlHandlingType = (): UrlHandling => {
if (window.remotion_browserStudio) {
return 'browser-studio';
@@ -26,11 +24,13 @@ export const getUrlForRoute = (route: string) => {
if (getUrlHandlingType() === 'browser-studio') {
const navigationWindow = getNavigationWindow();
const currentSearch = navigationWindow.location.search.substring(1);
- const searchParams = currentSearch.startsWith('/')
- ? new URLSearchParams()
- : new URLSearchParams(currentSearch);
- searchParams.set(browserStudioRouteParameter, route);
- return `${navigationWindow.location.pathname}?${searchParams.toString()}`;
+ const firstSeparator = currentSearch.indexOf('&');
+ const hostSearch = currentSearch.startsWith('/')
+ ? firstSeparator === -1
+ ? ''
+ : currentSearch.substring(firstSeparator + 1)
+ : currentSearch;
+ return `${navigationWindow.location.pathname}?${route}${hostSearch ? `&${hostSearch}` : ''}`;
}
if (getUrlHandlingType() === 'query-string') {
@@ -59,12 +59,10 @@ export const reloadUrl = () => {
export const getRoute = () => {
if (getUrlHandlingType() === 'browser-studio') {
const search = getNavigationWindow().location.search.substring(1);
- const route = new URLSearchParams(search).get(browserStudioRouteParameter);
- if (route !== null) {
- return route.startsWith('/') ? route : '';
- }
-
- return search.startsWith('/') ? search : '';
+ const firstSeparator = search.indexOf('&');
+ const route =
+ firstSeparator === -1 ? search : search.substring(0, firstSeparator);
+ return route.startsWith('/') ? route : '';
}
if (getUrlHandlingType() === 'query-string') {
diff --git a/packages/studio/src/test/url-state.test.ts b/packages/studio/src/test/url-state.test.ts
index f8a1a2d5ab..9afa2a7918 100644
--- a/packages/studio/src/test/url-state.test.ts
+++ b/packages/studio/src/test/url-state.test.ts
@@ -62,10 +62,6 @@ test('uses query-string routing in Browser Studio', () => {
expect(getRoute()).toBe('');
replaceUrl('/assets/other.mp4');
expect(replaceStateCalls).toEqual([
- [
- {},
- 'Studio',
- '/experimental_new?source=release&remotion-route=%2Fassets%2Fother.mp4',
- ],
+ [{}, 'Studio', '/experimental_new?/assets/other.mp4&source=release'],
]);
});