@argos-ci/storybook 4.0.5 → 4.0.7

package/dist/test-runner.js

@@ -107,6 +107,8 @@ async function storybookArgosScreenshot(handler, context, options) {
         }
       });
       allAttachments.push(...attachments);
+      await context.setViewportSize("default");
+      await setStorybookGlobals({ handler, globals: {} });
     }
   } else {
     const attachments = await runHooksAndScreenshot({
@@ -118,14 +120,7 @@ async function storybookArgosScreenshot(handler, context, options) {
     });
     allAttachments.push(...attachments);
   }
-  await context.setViewportSize("default");
-  await setStorybookGlobals({ handler, globals: {} });
-  if (context.afterScreenshot) {
-    await context.afterScreenshot({
-      handler,
-      globals: {}
-    });
-  }
+  await context.afterScreenshot?.({ handler, globals: {} });
   return allAttachments;
 }
 async function setStorybookGlobals(args) {
@@ -154,12 +149,6 @@ async function setStorybookGlobals(args) {
 async function runHooksAndScreenshot(args) {
   const { handler, context, options, globals, metadata } = args;
   await setStorybookGlobals({ handler, globals });
-  if (context.beforeScreenshot) {
-    await context.beforeScreenshot({
-      handler,
-      globals
-    });
-  }
   const viewportFromGlobals = globals.viewport ? getViewport(context.story.parameters, globals.viewport) : null;
   const viewport = viewportFromGlobals ?? getDefaultViewport(context.story.parameters) ?? "default";
   await context.setViewportSize(viewport);
@@ -167,6 +156,7 @@ async function runHooksAndScreenshot(args) {
     ...metadata,
     viewport: viewport && viewport !== "default" ? viewport : void 0
   });
+  await context.beforeScreenshot?.({ handler, globals });
   return argosPlaywrightScreenshot(
     handler,
     context.name + (args.suffix ?? ""),
@@ -175,6 +165,7 @@ async function runHooksAndScreenshot(args) {
 }
 
 // src/test-runner.ts
+var DEFAULT_PLAYWRIGHT_VIEWPORT_SIZE = { width: 1280, height: 720 };
 async function argosScreenshot(page, context, options) {
   const storyContext = await getStoryContext(page, context);
   const fitToContent = getFitToContentFromParameters(storyContext.parameters);
@@ -193,10 +184,14 @@ async function argosScreenshot(page, context, options) {
         globals: null
       },
       setViewportSize: async (size) => {
-        if (size === "default") {
-          await page.setViewportSize({ width: 1280, height: 720 });
-        } else {
-          await page.setViewportSize(size);
+        const actualSize = await page.viewportSize();
+        const absoluteSize = size === "default" ? DEFAULT_PLAYWRIGHT_VIEWPORT_SIZE : size;
+        if (!actualSize || actualSize.height !== absoluteSize.height || actualSize.width !== absoluteSize.width) {
+          await page.setViewportSize(absoluteSize);
+          await page.waitForFunction(
+            ({ width, height }) => window.innerWidth === width && window.innerHeight === height,
+            { width: absoluteSize.width, height: absoluteSize.height }
+          );
         }
       }
     },

package/dist/vitest-plugin.js

@@ -104,6 +104,8 @@ async function storybookArgosScreenshot(handler, context, options) {
         }
       });
       allAttachments.push(...attachments);
+      await context.setViewportSize("default");
+      await setStorybookGlobals({ handler, globals: {} });
     }
   } else {
     const attachments = await runHooksAndScreenshot({
@@ -115,14 +117,7 @@ async function storybookArgosScreenshot(handler, context, options) {
     });
     allAttachments.push(...attachments);
   }
-  await context.setViewportSize("default");
-  await setStorybookGlobals({ handler, globals: {} });
-  if (context.afterScreenshot) {
-    await context.afterScreenshot({
-      handler,
-      globals: {}
-    });
-  }
+  await context.afterScreenshot?.({ handler, globals: {} });
   return allAttachments;
 }
 async function setStorybookGlobals(args) {
@@ -151,12 +146,6 @@ async function setStorybookGlobals(args) {
 async function runHooksAndScreenshot(args) {
   const { handler, context, options, globals, metadata } = args;
   await setStorybookGlobals({ handler, globals });
-  if (context.beforeScreenshot) {
-    await context.beforeScreenshot({
-      handler,
-      globals
-    });
-  }
   const viewportFromGlobals = globals.viewport ? getViewport(context.story.parameters, globals.viewport) : null;
   const viewport = viewportFromGlobals ?? getDefaultViewport(context.story.parameters) ?? "default";
   await context.setViewportSize(viewport);
@@ -164,6 +153,7 @@ async function runHooksAndScreenshot(args) {
     ...metadata,
     viewport: viewport && viewport !== "default" ? viewport : void 0
   });
+  await context.beforeScreenshot?.({ handler, globals });
   return argosPlaywrightScreenshot(
     handler,
     context.name + (args.suffix ?? ""),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/storybook",
   "description": "Visual testing for Storybook test runner.",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "author": "Smooth Code",
   "license": "MIT",
   "repository": {
@@ -50,12 +50,12 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@argos-ci/playwright": "6.0.4",
-    "@argos-ci/util": "3.0.0"
+    "@argos-ci/playwright": "6.1.0",
+    "@argos-ci/util": "3.1.0"
   },
   "devDependencies": {
-    "@argos-ci/cli": "3.0.2",
-    "@argos-ci/core": "4.0.2",
+    "@argos-ci/cli": "3.0.3",
+    "@argos-ci/core": "4.0.3",
     "@argos-ci/util": "workspace:*",
     "@storybook/addon-docs": "^9.1.0",
     "@storybook/addon-links": "^9.1.0",
@@ -97,5 +97,5 @@
     "check-format": "prettier --check --ignore-unknown --ignore-path=./.gitignore --ignore-path=../../.gitignore --ignore-path=../../.prettierignore .",
     "lint": "eslint ."
   },
-  "gitHead": "cc53d0519b6e07fd339bd3e200626ec7833fc495"
+  "gitHead": "dfad527145f58037c1991c2a85ad8cdc0d8a1a3f"
 }