Merge pull request #28943 from storybookjs/kasper/viewport

Vitest: Fix default viewport
storybookjs · Aug 22, 2024 · 4bbfb14 · 4bbfb14
2 parents accf304 + 88a0059
commit 4bbfb14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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',
     };

diff --git 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,
   };