From 07c6ddf40102354a18aa356fd072be51ef669057 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 30 Sep 2026 11:36:44 +0000 Subject: [PATCH 01/12] fix(website): smaller Cinematic Studio pickers, and format menus open upward The side panel's single-grid pickers (Framing, Light, Film, Look, Grade) are 600px wide instead of the whole output column; the camera picker keeps the column for its four lists. The aspect and resolution menus both open above their triggers. --- .../cinematic-studio/CinematicOutputControls.vue | 4 ++-- .../workshop/cinematic-studio/CinematicStudioPanel.vue | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicOutputControls.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicOutputControls.vue index 42e283c7a0d..0df6793fa4c 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicOutputControls.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicOutputControls.vue @@ -43,7 +43,7 @@ const { aspectOptions, resolutionOptions, aspectValue, resolutionValue } = v-model="aspectValue" :options="aspectOptions" :heading="tc('cinematic.output.aspect', locale)" - side="bottom" + side="top" tooltip :trigger-class="FORMAT_TRIGGER_CLASS" > @@ -60,7 +60,7 @@ const { aspectOptions, resolutionOptions, aspectValue, resolutionValue } = v-model="resolutionValue" :options="resolutionOptions" :heading="tc('cinematic.output.resolution', locale)" - side="bottom" + side="top" tooltip :trigger-class="FORMAT_TRIGGER_CLASS" > diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue index ede203ce0fc..a0fe1306259 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue @@ -1,11 +1,14 @@ + + diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts index 2bc25e771e8..ce751612668 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts @@ -48,6 +48,24 @@ describe('CinematicColors', () => { expect(main.value).toBeUndefined() }) + it('edits the chosen swatch from the hex field', async () => { + const { colors, user } = renderColors(['#aa0000', '#00aa00']) + await user.click(screen.getByRole('button', { name: 'Color 2: #00aa00' })) + const hex = screen.getByRole('textbox', { name: 'Hex color' }) + await user.clear(hex) + await user.type(hex, '3b1b6e{Enter}') + expect(colors.value).toEqual(['#aa0000', '#3b1b6e']) + }) + + it('keeps the color when the hex field holds no color', async () => { + const { colors, user } = renderColors(['#aa0000']) + const hex = screen.getByRole('textbox', { name: 'Hex color' }) + await user.clear(hex) + await user.type(hex, 'nope{Enter}') + expect(colors.value).toEqual(['#aa0000']) + expect(hex).toHaveValue('#aa0000') + }) + it('clears every color', async () => { const { colors, main, user } = renderColors(['#aa0000'], 0) await user.click(screen.getByRole('button', { name: 'Clear colors' })) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue index 9ee70c6d158..ca2b871c001 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue @@ -1,19 +1,20 @@ - - diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicStudio.test.ts b/apps/website/src/components/workshop/cinematic-studio/CinematicStudio.test.ts index f0bbe23e3d9..ca53e4413c6 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicStudio.test.ts +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicStudio.test.ts @@ -1900,7 +1900,9 @@ describe('CinematicStudio', () => { ).toBeInTheDocument() await user.click( - screen.getByRole('button', { name: tc('cinematic.reference.remove') }) + screen.getByRole('button', { + name: `${tc('cinematic.reference.remove')}: ${tc('cinematic.reference.cast')}` + }) ) expect(screen.getByRole('button', { name: action })).toBeInTheDocument() expect( @@ -1909,5 +1911,25 @@ describe('CinematicStudio', () => { }) ).toBeNull() }) + + it('offers the starting frame beside the scene in video mode', async () => { + render(CinematicStudioPanel, { + props: { models: [...models, ...videoModels] } + }) + const user = userEvent.setup() + + await user.click(screen.getByRole('button', { name: 'Video' })) + + expect( + screen.getByRole('button', { + name: tc('cinematic.video.addFirstFrame') + }) + ).toBeInTheDocument() + expect( + screen.queryByRole('heading', { + name: tc('cinematic.section.references') + }) + ).toBeNull() + }) }) }) From 1b7ac1c9888b5c2f1c4941b2d872b9ae061f1a0d Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 30 Sep 2026 12:03:03 +0000 Subject: [PATCH 04/12] fix(website): keep the Cinematic picker inside the layout, and give the shade slider a value A single-grid picker is capped at 600px between its left offset and the output column's edge, so it cannot pass the layout at the minimum lg width. The colour picker's saturation/brightness slider reports saturation through aria-valuenow with a 0-100 range. --- .../workshop/cinematic-studio/CinematicColorPicker.vue | 3 +++ .../workshop/cinematic-studio/CinematicStudioPanel.vue | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicColorPicker.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicColorPicker.vue index 898d35c22af..9d04615d781 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicColorPicker.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicColorPicker.vue @@ -87,6 +87,9 @@ const hueColor = computed(() => hsvToHex({ h: hsv.value.h, s: 1, v: 1 })) role="slider" tabindex="0" :aria-label="tc('cinematic.colors.shade', locale)" + aria-valuemin="0" + aria-valuemax="100" + :aria-valuenow="Math.round(hsv.s * 100)" :aria-valuetext="color" class="relative h-36 w-full cursor-crosshair touch-none rounded-lg outline-none focus-visible:ring-2 focus-visible:ring-primary-comfy-yellow/60" :style="{ diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue index fc89b3f6bea..dd0dc1486c7 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicStudioPanel.vue @@ -202,7 +202,9 @@ function generate() { :class=" cn( 'fixed inset-x-0 bottom-0 z-50 max-h-[85svh] rounded-b-none lg:absolute lg:top-(--anchor-top) lg:bottom-auto lg:left-[calc((100%-1.5rem)*0.4+1.5rem)] lg:z-20 lg:max-h-[calc(100svh-8rem)] lg:rounded-b-2xl', - picker === 'camera' || editingPalette ? 'lg:right-0' : 'lg:w-150' + picker === 'camera' || editingPalette + ? 'lg:right-0' + : 'lg:right-0 lg:max-w-150' ) " :style="{ '--anchor-top': `${anchorTop}px` }" From a28cd0ffe7af2f810ea2f35d195cdd8d02ec46d1 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 30 Sep 2026 12:11:51 +0000 Subject: [PATCH 05/12] test(website): cover Grade palette editing and the video starting frame end to end On the built page, a Grade palette's first swatch is edited through the hex field and keeps the grade on "Your palette"; in video mode the starting frame button sits beside the scene with no References section. --- apps/website/e2e/workshop-apps.spec.ts | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/apps/website/e2e/workshop-apps.spec.ts b/apps/website/e2e/workshop-apps.spec.ts index 3058e907a19..1a0c8ac917a 100644 --- a/apps/website/e2e/workshop-apps.spec.ts +++ b/apps/website/e2e/workshop-apps.spec.ts @@ -324,5 +324,27 @@ test('makes a Cinematic Studio grade palette from an uploaded image', async ({ 'Your palette' ) await page.getByRole('button', { name: 'Edit palette' }).click() - await expect(page.getByLabel(/^Color 1: #/)).toBeVisible() + await page.getByLabel(/^Color 1: #/).click() + const hex = page.getByRole('textbox', { name: 'Hex color' }) + await hex.fill('#3b1b6e') + await hex.press('Enter') + await expect(page.getByLabel('Color 1: #3b1b6e')).toBeVisible() + await expect(page.getByRole('button', { name: /^Grade/ })).toContainText( + 'Your palette' + ) +}) + +test('offers the starting frame beside the Cinematic Studio scene in video mode', async ({ + page, + context +}) => { + await mockFlags(context, { apps: true, workflows: false }) + await page.goto('/hub/apps/cinematic-studio/') + + await page.getByRole('button', { name: 'Video', exact: true }).click() + + await expect( + page.getByRole('button', { name: 'Add a starting frame' }) + ).toBeVisible() + await expect(page.getByRole('heading', { name: 'References' })).toHaveCount(0) }) From b7998643ed4d92cb3b437499cea65eb6d339b2f3 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 30 Sep 2026 13:56:48 +0000 Subject: [PATCH 06/12] feat(website): Cinematic Studio panel reads as a new shot, with a calmer palette editor The side panel's header says "New shot" and carries the Image/Video switch, which leaves the page heading area; the Model, Scene, Shot and Format labels go, with the scene label kept for screen readers and Shot and Format named as regions. The palette editor loses its divider and outline, slides in beside the Grade grid while the picker widens smoothly, and Done spans the column. A test drives the shade square from the keyboard and checks its reported saturation. --- .../cinematic-studio/CinematicColors.test.ts | 16 +++++ .../cinematic-studio/CinematicColors.vue | 4 +- .../cinematic-studio/CinematicModeSwitch.vue | 15 +++- .../cinematic-studio/CinematicPanel.vue | 70 ++++++++----------- .../cinematic-studio/CinematicPicker.vue | 29 +++++--- .../cinematic-studio/CinematicSceneField.vue | 6 +- .../cinematic-studio/CinematicStudio.test.ts | 11 ++- .../cinematic-studio/CinematicStudioPanel.vue | 25 ++++--- .../src/lib/workshop/cinematic-studio/copy.ts | 1 + 9 files changed, 104 insertions(+), 73 deletions(-) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts index ce751612668..5e32cd86655 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.test.ts @@ -66,6 +66,22 @@ describe('CinematicColors', () => { expect(hex).toHaveValue('#aa0000') }) + it('moves the shade square from the keyboard and reports its saturation', async () => { + const { colors, user } = renderColors(['#808080']) + const shade = screen.getByRole('slider', { + name: 'Saturation and brightness' + }) + expect(shade).toHaveAttribute('aria-valuemin', '0') + expect(shade).toHaveAttribute('aria-valuemax', '100') + expect(shade).toHaveAttribute('aria-valuenow', '0') + + shade.focus() + await user.keyboard('{ArrowRight}{ArrowRight}') + + expect(shade).toHaveAttribute('aria-valuenow', '4') + expect(colors.value[0]).not.toBe('#808080') + }) + it('clears every color', async () => { const { colors, main, user } = renderColors(['#aa0000'], 0) await user.click(screen.getByRole('button', { name: 'Clear colors' })) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue index ca2b871c001..ce337914d73 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicColors.vue @@ -48,7 +48,7 @@ function clear() {