From a0e5b1920248e2075521b84be6c85bf18604b436 Mon Sep 17 00:00:00 2001 From: bertfy Date: Tue, 20 Oct 2026 14:13:25 -0700 Subject: [PATCH 01/10] fix(website): refine VFX hero comparison interactions --- apps/website/e2e/vfx-v3.spec.ts | 45 ++++++++- .../campaign/VfxHeroPrototype.test.ts | 19 +++- .../components/campaign/VfxHeroPrototype.vue | 17 ++-- .../components/campaign/VfxSampleScene.vue | 1 + .../common/VideoCompareSlider.test.ts | 97 +++++++++++++++++++ .../components/common/VideoCompareSlider.vue | 18 +++- 6 files changed, 178 insertions(+), 19 deletions(-) diff --git a/apps/website/e2e/vfx-v3.spec.ts b/apps/website/e2e/vfx-v3.spec.ts index 625dc37c02e..79e790210f2 100644 --- a/apps/website/e2e/vfx-v3.spec.ts +++ b/apps/website/e2e/vfx-v3.spec.ts @@ -984,8 +984,11 @@ async function startHeroPlayback( play: string, reducedMotion: 'reduce' | 'no-preference' ) { - if (reducedMotion === 'reduce') - await hero.getByRole('button', { name: play, exact: true }).click() + if (reducedMotion === 'reduce') { + const control = hero.getByRole('button', { name: play, exact: true }) + await control.focus() + await control.press('Space') + } await comparison.scrollIntoViewIfNeeded() } @@ -1037,7 +1040,8 @@ for (const { path, pause, play, sample, reducedMotion, mobile } of [ ) ) .toBe(true) - await control.click() + await control.focus() + await control.press('Space') await hero.getByRole('button', { name: sample, exact: true }).click() await comparison.scrollIntoViewIfNeeded() await expect @@ -1057,7 +1061,9 @@ for (const { path, pause, play, sample, reducedMotion, mobile } of [ 'aria-valuenow', '50' ) - await hero.getByRole('button', { name: play, exact: true }).click() + const resume = hero.getByRole('button', { name: play, exact: true }) + await resume.focus() + await resume.press('Space') await comparison.scrollIntoViewIfNeeded() await expect .poll(() => @@ -1149,3 +1155,34 @@ for (const { demo, sample } of [ ).toBeVisible() }) } + +test('VFX hero follows fine-pointer hover without a press and preserves keyboard and page scrolling', async ({ + page +}) => { + await page.goto('/solutions/vfx/v3/') + const hero = page.locator('[data-vfx-demo="hero"]') + await expectIslandHydrated(page, hero) + const comparison = hero.getByTestId('video-compare-surface') + await comparison.scrollIntoViewIfNeeded() + const bounds = await comparison.boundingBox() + assert(bounds) + const slider = hero.getByRole('slider') + await page.mouse.move( + bounds.x + bounds.width * 0.25, + bounds.y + bounds.height / 2 + ) + await expect(slider).toHaveAttribute('aria-valuenow', '25') + await slider.focus() + await slider.press('ArrowRight') + await expect(slider).toHaveAttribute('aria-valuenow', '27') + await page.mouse.move( + bounds.x + bounds.width * 0.75, + bounds.y + bounds.height / 2 + ) + await expect(slider).toHaveAttribute('aria-valuenow', '75') + const beforeScroll = await page.evaluate(() => window.scrollY) + await page.mouse.wheel(0, 200) + await expect + .poll(() => page.evaluate(() => window.scrollY)) + .toBeGreaterThan(beforeScroll) +}) diff --git a/apps/website/src/components/campaign/VfxHeroPrototype.test.ts b/apps/website/src/components/campaign/VfxHeroPrototype.test.ts index f68cdf05a2f..6797006b095 100644 --- a/apps/website/src/components/campaign/VfxHeroPrototype.test.ts +++ b/apps/website/src/components/campaign/VfxHeroPrototype.test.ts @@ -81,7 +81,8 @@ it('keeps both hero clips paused after selecting another sample', async () => { const user = userEvent.setup() const { beforeVideo, afterVideo } = await renderReadyHero() await waitFor(() => expect(beforeVideo.paused).toBe(false)) - await user.click(screen.getByRole('button', { name: /^Pause$/ })) + screen.getByRole('button', { name: /^Pause$/ }).focus() + await user.keyboard(' ') await waitFor(() => { expect(beforeVideo.paused).toBe(true) expect(afterVideo.paused).toBe(true) @@ -96,7 +97,10 @@ it('keeps both hero clips paused after selecting another sample', async () => { expect(beforeVideo.paused).toBe(true) expect(selectedVideo.paused).toBe(true) - expect(screen.getByRole('button', { name: /^Play$/ })).toBeVisible() + expect(screen.getByRole('button', { name: /^Play$/ })).toHaveAttribute( + 'aria-pressed', + 'true' + ) }) it('lets reduced-motion visitors play both clips and keeps that choice after selection', async () => { @@ -104,7 +108,8 @@ it('lets reduced-motion visitors play both clips and keeps that choice after sel motion.reduced = true const { beforeVideo, afterVideo } = await renderReadyHero('zh-CN') expect(beforeVideo.paused).toBe(true) - await user.click(screen.getByRole('button', { name: /^播放$/ })) + screen.getByRole('button', { name: /^播放$/ }).focus() + await user.keyboard(' ') await waitFor(() => { expect(beforeVideo.paused).toBe(false) expect(afterVideo.paused).toBe(false) @@ -120,7 +125,10 @@ it('lets reduced-motion visitors play both clips and keeps that choice after sel expect(beforeVideo.paused).toBe(false) expect(selectedVideo.paused).toBe(false) }) - expect(screen.getByRole('button', { name: /^暂停$/ })).toBeVisible() + expect(screen.getByRole('button', { name: /^暂停$/ })).toHaveAttribute( + 'aria-pressed', + 'false' + ) }) it('resumes a new hero sample after a media failure when the visitor has not paused', async () => { @@ -146,7 +154,8 @@ it('does not move the comparison divider when playback is toggled', async () => const user = userEvent.setup() await renderReadyHero() - await user.click(screen.getByRole('button', { name: /^Pause$/ })) + screen.getByRole('button', { name: /^Pause$/ }).focus() + await user.keyboard(' ') expect(screen.getByRole('slider')).toHaveAttribute('aria-valuenow', '50') }) diff --git a/apps/website/src/components/campaign/VfxHeroPrototype.vue b/apps/website/src/components/campaign/VfxHeroPrototype.vue index 2a674de5100..608f9cfafd9 100644 --- a/apps/website/src/components/campaign/VfxHeroPrototype.vue +++ b/apps/website/src/components/campaign/VfxHeroPrototype.vue @@ -2,7 +2,6 @@ import { onMounted, onUnmounted, ref, useTemplateRef, watch } from 'vue' import { useIntersectionObserver } from '@vueuse/core' import { prefersReducedMotion } from '@/composables/useReducedMotion' -import BrandButton from '@/components/common/BrandButton.vue' import ProductHeroBadge from '@/components/common/ProductHeroBadge.vue' import HeroSplit01 from '@/components/blocks/HeroSplit01.vue' import VfxSampleScene from '@/components/campaign/VfxSampleScene.vue' @@ -97,14 +96,14 @@ onUnmounted(() => clearTimeout(assemblyTimer)) :slider-label="t('modelLaunch.beforeAfter.sliderLabel')" :choices-label="t('modelLaunch.beforeAfter.tabsLabel')" /> -
- {{ paused ? t('player.play') : t('player.pause') }} -
+ diff --git a/apps/website/src/components/campaign/VfxSampleScene.vue b/apps/website/src/components/campaign/VfxSampleScene.vue index c39294d144d..ad9e152330d 100644 --- a/apps/website/src/components/campaign/VfxSampleScene.vue +++ b/apps/website/src/components/campaign/VfxSampleScene.vue @@ -41,6 +41,7 @@ function selectVariant(id: string) { v-model:paused="paused" comparison-style="workflow" synchronized-playback + follow-pointer-on-hover fit="cover" :before-src="`${vfxMediaRoot}/${source}.mp4`" :after-src="result" diff --git a/apps/website/src/components/common/VideoCompareSlider.test.ts b/apps/website/src/components/common/VideoCompareSlider.test.ts index a6360bcef8d..5642ba61436 100644 --- a/apps/website/src/components/common/VideoCompareSlider.test.ts +++ b/apps/website/src/components/common/VideoCompareSlider.test.ts @@ -391,3 +391,100 @@ describe('VideoCompareSlider', () => { expect(play).toHaveBeenCalledOnce() }) }) + +function pointerCapabilities(fine: boolean) { + vi.spyOn(window, 'matchMedia').mockImplementation((media) => + Object.assign(new EventTarget(), { + media, + matches: fine, + onchange: null, + addListener: vi.fn(), + removeListener: vi.fn() + }) + ) +} + +it.for([ + { clientX: 200, expected: '25' }, + { clientX: 50, expected: '0' }, + { clientX: 600, expected: '100' } +])( + 'follows a fine mouse pointer to $expected without pressing or preventing scroll', + async ({ clientX, expected }) => { + pointerCapabilities(true) + const { surface, slider } = await renderSlider({ + followPointerOnHover: true + }) + vi.spyOn(surface, 'getBoundingClientRect').mockReturnValue( + new DOMRect(100, 0, 400, 225) + ) + const event = new PointerEvent('pointermove', { + pointerType: 'mouse', + clientX, + bubbles: true, + cancelable: true + }) + surface.dispatchEvent(event) + await nextTick() + expect(slider).toHaveAttribute('aria-valuenow', expected) + expect(event.defaultPrevented).toBe(false) + } +) + +it.for([ + { enabled: false, fine: true, pointerType: 'mouse', buttons: 0 }, + { enabled: true, fine: false, pointerType: 'mouse', buttons: 0 }, + { enabled: true, fine: true, pointerType: 'touch', buttons: 0 }, + { enabled: true, fine: true, pointerType: 'mouse', buttons: 1 } +])( + 'does not hover-follow with $enabled/$fine/$pointerType/$buttons', + async ({ enabled, fine, pointerType, buttons }) => { + pointerCapabilities(fine) + const { surface, slider } = await renderSlider({ + followPointerOnHover: enabled + }) + vi.spyOn(surface, 'getBoundingClientRect').mockReturnValue( + new DOMRect(100, 0, 400, 225) + ) + surface.dispatchEvent( + new PointerEvent('pointermove', { + pointerType, + buttons, + clientX: 200, + bubbles: true + }) + ) + await nextTick() + expect(slider).toHaveAttribute('aria-valuenow', '50') + } +) + +it('keeps touch dragging and keyboard adjustment when hover-follow is enabled', async () => { + pointerCapabilities(false) + const { surface, slider } = await renderSlider({ followPointerOnHover: true }) + vi.spyOn(surface, 'getBoundingClientRect').mockReturnValue( + new DOMRect(100, 0, 400, 225) + ) + surface.dispatchEvent( + new PointerEvent('pointerdown', { + pointerType: 'touch', + button: 0, + buttons: 1, + clientX: 200, + bubbles: true + }) + ) + window.dispatchEvent( + new PointerEvent('pointermove', { + pointerType: 'touch', + buttons: 1, + clientX: 400 + }) + ) + window.dispatchEvent(new PointerEvent('pointerup', { pointerType: 'touch' })) + await nextTick() + expect(slider).toHaveAttribute('aria-valuenow', '75') + slider.focus() + await userEvent.setup().keyboard('{ArrowRight}') + expect(slider).toHaveAttribute('aria-valuenow', '77') +}) diff --git a/apps/website/src/components/common/VideoCompareSlider.vue b/apps/website/src/components/common/VideoCompareSlider.vue index 93f8158085c..df59d27e0fd 100644 --- a/apps/website/src/components/common/VideoCompareSlider.vue +++ b/apps/website/src/components/common/VideoCompareSlider.vue @@ -1,6 +1,6 @@