From 6c4651b5ae024e8cf45d0cf122cee1621d6634ba Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 21 Aug 2024 16:36:27 +0200 Subject: [PATCH 1/2] Fix default viewports --- code/addons/vitest/src/plugin/viewports.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/addons/vitest/src/plugin/viewports.ts b/code/addons/vitest/src/plugin/viewports.ts index c68047877006..c779eb3a6633 100644 --- a/code/addons/vitest/src/plugin/viewports.ts +++ b/code/addons/vitest/src/plugin/viewports.ts @@ -3,7 +3,7 @@ import { UnsupportedViewportDimensionError } from 'storybook/internal/preview-er import { page } from '@vitest/browser/context'; -import { INITIAL_VIEWPORTS } from '../../../viewport/src/defaults'; +import { MINIMAL_VIEWPORTS } from '../../../viewport/src/defaults'; import type { ViewportMap, ViewportStyles } from '../../../viewport/src/types'; declare global { @@ -50,12 +50,12 @@ const parseDimension = (value: string, dimension: 'width' | 'height') => { export const setViewport = async (viewportsParam: ViewportsParam = {} as ViewportsParam) => { const defaultViewport = viewportsParam.defaultViewport; - if (!page || !globalThis.__vitest_browser__ || !defaultViewport) { + if (!page || !globalThis.__vitest_browser__) { return; } const viewports = { - ...INITIAL_VIEWPORTS, + ...MINIMAL_VIEWPORTS, ...viewportsParam.viewports, }; From 840c1bb6a2658dccb0b00092ab7d82728dff230e Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 21 Aug 2024 16:51:16 +0200 Subject: [PATCH 2/2] Fix tests --- code/addons/vitest/src/plugin/viewports.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/addons/vitest/src/plugin/viewports.test.ts b/code/addons/vitest/src/plugin/viewports.test.ts index cd83f5edc518..a175077cf649 100644 --- a/code/addons/vitest/src/plugin/viewports.test.ts +++ b/code/addons/vitest/src/plugin/viewports.test.ts @@ -1,6 +1,8 @@ /* eslint-disable no-underscore-dangle */ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; +import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'; + import { page } from '@vitest/browser/context'; import { DEFAULT_VIEWPORT_DIMENSIONS, type ViewportsParam, setViewport } from './viewports'; @@ -42,6 +44,7 @@ describe('setViewport', () => { it('should set the dimensions of viewport from INITIAL_VIEWPORTS', async () => { const viewportsParam: any = { + viewports: INITIAL_VIEWPORTS, // supported by default in addon viewports defaultViewport: 'ipad', };