Skip to content

🎥 Make videos programmatically with React

Fix responsive sidebar CI

JonnyBurger54c6298c61a4
diff --git a/packages/browser-studio/e2e/browser-studio.test.ts b/packages/browser-studio/e2e/browser-studio.test.ts
index 0484f82669..fbe9ed9e80 100644
--- a/packages/browser-studio/e2e/browser-studio.test.ts
+++ b/packages/browser-studio/e2e/browser-studio.test.ts
@@ -91,7 +91,13 @@ test('selects a composition inserted from the Add composition dialog', async ({
await page.goBack();
await expect.poll(() => new URL(page.url()).search).toBe('?/MyComp');
- await studio.locator('[data-sidebar-toggle="right"]').click();
+ const expandRightSidebar = studio.getByRole('button', {
+ name: 'Expand right sidebar',
+ });
+ if (await expandRightSidebar.isVisible()) {
+ await expandRightSidebar.click();
+ }
+
await studio.getByRole('button', {name: 'Add composition...'}).click();
await studio.getByPlaceholder('Search compositions...').fill('MyComp1');
await page.keyboard.press('Enter');
@@ -828,7 +834,9 @@ test('drops a local image onto the canvas and imports it into the virtual projec
page,
target: canvas,
});
- await expect(studio.getByText('<CanvasImage>', {exact: true})).toBeVisible();
+ await expect(
+ studio.locator('[data-timeline-marquee-item][aria-label="<CanvasImage>"]'),
+ ).toBeVisible();
await expect
.poll(() =>
@@ -868,7 +876,9 @@ test('drops a local image onto the canvas and imports it into the virtual projec
page,
target: canvas,
});
- await expect(studio.getByText('framer.webm', {exact: true})).toBeVisible();
+ await expect(
+ studio.getByRole('button', {name: 'framer.webm', exact: true}),
+ ).toBeVisible();
await expect
.poll(() =>
page.evaluate(() =>
@@ -1332,7 +1342,9 @@ export const BrowserElement = ({logoSrc}: {logoSrc: string}) => <>
studio.getByRole('img', {name: 'Element asset'}),
).toHaveJSProperty('naturalWidth', 20);
await expect(
- studio.getByText('Browser Element', {exact: true}),
+ studio.locator(
+ '[data-timeline-marquee-item][aria-label="Browser Element"]',
+ ),
).toBeVisible();
});
@@ -1494,7 +1506,13 @@ test('clears hover backgrounds even if pointer leave events are lost', async ({
await expect(studio.locator('[data-compname="MyComp"]')).toBeVisible();
await waitForBrowserStudioOperations(studio);
await studio.locator('[data-compname="MyComp"]').click();
- await studio.locator('[data-sidebar-toggle="right"]').click();
+ const expandRightSidebar = studio.getByRole('button', {
+ name: 'Expand right sidebar',
+ });
+ if (await expandRightSidebar.isVisible()) {
+ await expandRightSidebar.click();
+ }
+
await studio.locator('body').evaluate(async () => {
await window.remotion_browserStudio.writeStaticFile({
contents: new TextEncoder().encode('hover test').buffer,
diff --git a/packages/example/e2e/render-output-drag.test.mts b/packages/example/e2e/render-output-drag.test.mts
index b75c8ae58a..c0ca7f8f5c 100644
--- a/packages/example/e2e/render-output-drag.test.mts
+++ b/packages/example/e2e/render-output-drag.test.mts
@@ -57,7 +57,7 @@ test.describe('render output dragging', () => {
await expect(page.getByRole('button', {name: 'Schema'})).toBeVisible();
await page.evaluate(() => {
window.localStorage.setItem(
- 'remotion.sidebarRightCollapsing',
+ 'remotion.sidebarRightCollapsing.v2',
'expanded',
);
window.localStorage.setItem('remotion.sidebarPanel', 'renders');
diff --git a/packages/example/e2e/studio-protocol.test.mts b/packages/example/e2e/studio-protocol.test.mts
index 3373679c7e..dc9bb1744d 100644
--- a/packages/example/e2e/studio-protocol.test.mts
+++ b/packages/example/e2e/studio-protocol.test.mts
@@ -1,3 +1,4 @@
+import {expect, test} from '@playwright/test';
import type {ChildProcess} from 'node:child_process';
import {spawn} from 'node:child_process';
import fs from 'node:fs';
@@ -5,7 +6,6 @@ import {createServer} from 'node:http';
import os from 'node:os';
import path from 'node:path';
import {fileURLToPath} from 'node:url';
-import {expect, test} from '@playwright/test';
import {remotionBin} from './constants.mts';
const waitForUrl = async (url: string, process: ChildProcess) => {
@@ -324,7 +324,13 @@ const CloseupPlaceholder = () => {
studioPage.getByRole('button', {name: '45', exact: true}),
).toBeVisible();
- await studioPage.locator('[data-sidebar-toggle="right"]').click();
+ const expandRightSidebar = studioPage.getByRole('button', {
+ name: 'Expand right sidebar',
+ });
+ if (await expandRightSidebar.isVisible()) {
+ await expandRightSidebar.click();
+ }
+
const browseElements = studioPage.getByRole('button', {
name: 'Browse Elements',
});
diff --git a/packages/example/e2e/studio-server.mts b/packages/example/e2e/studio-server.mts
index 4e6c8e4c06..03ce0a7d2d 100644
--- a/packages/example/e2e/studio-server.mts
+++ b/packages/example/e2e/studio-server.mts
@@ -120,7 +120,7 @@ export async function startStudio(): Promise<void> {
origin: STUDIO_URL,
localStorage: [
{
- name: 'remotion.sidebarRightCollapsing',
+ name: 'remotion.sidebarRightCollapsing.v2',
value: 'expanded',
},
],
diff --git a/packages/skills/skills/remotion-best-practices/SKILL.md b/packages/skills/skills/remotion-best-practices/SKILL.md
index 4d49a5abd3..57a0cc91af 100644
--- a/packages/skills/skills/remotion-best-practices/SKILL.md
+++ b/packages/skills/skills/remotion-best-practices/SKILL.md
@@ -79,7 +79,7 @@ The preview also has a more intuitive rendering interface, so consider using it
npx remotion render
```
-For more options, see [Rendering](../remotion-render/SKILL.md).
+For more options, see [Rendering](./remotion-render/SKILL.md).
For advanced rendering beyond simple `npx remotion render`, see: [Rendering Best Practices](./remotion-render/SKILL.md)
diff --git a/packages/studio/src/state/sidebar.tsx b/packages/studio/src/state/sidebar.tsx
index d8ef473a62..942f90aead 100644
--- a/packages/studio/src/state/sidebar.tsx
+++ b/packages/studio/src/state/sidebar.tsx
@@ -21,10 +21,10 @@ type Sidebars = 'left' | 'right';
const storageKey = (sidebar: Sidebars) => {
if (sidebar === 'right') {
- return 'remotion.sidebarRightCollapsing';
+ return 'remotion.sidebarRightCollapsing.v2';
}
- return 'remotion.sidebarCollapsing';
+ return 'remotion.sidebarCollapsing.v2';
};
const getSavedCollapsedStateLeft = (): SidebarCollapsedState => {