creevey 0.8.1-sb7.3 → 0.8.1-sb7.4

package/lib/cjs/client/addon/withCreevey.js

@@ -10,6 +10,8 @@ var Events = _interopRequireWildcard(require("@storybook/core-events"));
 
 var polyfill = _interopRequireWildcard(require("event-source-polyfill"));
 
+var _testingLibrary = require("@storybook/testing-library");
+
 var _addons = require("@storybook/addons");
 
 var _types = require("../../types");
@@ -18,6 +20,8 @@ var _shared = require("../../shared");
 
 var _helpers = require("../shared/helpers");
 
+var _utils = require("./utils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -26,7 +30,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // @ts-nocheck
 
 /* eslint-disable */
-// import { buildQueries, within } from '@storybook/testing-library';
 if (typeof process != 'object' || typeof process.version != 'string') {
   // NOTE If you don't use babel-polyfill or any other polyfills that add EventSource for IE11
   // You don't get hot reload in IE11. So put polyfill for that to better UX
@@ -286,48 +289,48 @@ function withCreevey() {
 
   const getMultipleError = (_, query) => "Found multiple elements by query: ".concat(query);
 
-  const getMissingError = (_, query) => "Unable to find an element by query: ".concat(query); // const [queryByQuery, getAllByQuery, getByQuery, findAllByQuery, findByQuery] = buildQueries(
-  //   queryAllByQuery,
-  //   getMultipleError,
-  //   getMissingError,
-  // );
-  // const queries = {
-  //   queryByQuery,
-  //   getAllByQuery,
-  //   getByQuery,
-  //   findAllByQuery,
-  //   findByQuery,
-  // };
-
+  const getMissingError = (_, query) => "Unable to find an element by query: ".concat(query);
 
+  const [queryByQuery, getAllByQuery, getByQuery, findAllByQuery, findByQuery] = (0, _testingLibrary.buildQueries)(queryAllByQuery, getMultipleError, getMissingError);
+  const queries = {
+    queryByQuery,
+    getAllByQuery,
+    getByQuery,
+    findAllByQuery,
+    findByQuery
+  };
   return (0, _addons.makeDecorator)({
     name: 'withCreevey',
     parameterName: 'creevey',
     wrapper: (getStory, context) => {
+      var _ref2;
+
       // TODO Define proper types, like captureElement is a promise
-      // const { captureElement } = (context.parameters.creevey =
-      //   (context.parameters.creevey as CreeveyStoryParams) ?? {});
-      // Object.defineProperty(context.parameters.creevey, 'captureElement', {
-      //   get() {
-      //     switch (true) {
-      //       case captureElement === undefined:
-      //         return Promise.resolve(context.canvasElement);
-      //       case captureElement === null:
-      //         return Promise.resolve(document.documentElement);
-      //       case typeof captureElement == 'string':
-      //         return isInternetExplorer // some code from testing-library makes IE hang
-      //           ? Promise.resolve(context.canvasElement.querySelector(captureElement as string))
-      //           : within<typeof queries>(context.canvasElement, queries).findByQuery(captureElement as string);
-      //       case typeof captureElement == 'function':
-      //         // TODO Define type for it
-      //         return Promise.resolve(
-      //           (captureElement as unknown as (ctx: typeof context) => Promise<HTMLElement> | HTMLElement)(context),
-      //         );
-      //     }
-      //   },
-      //   enumerable: true,
-      //   configurable: true,
-      // });
+      const {
+        captureElement
+      } = context.parameters.creevey = (_ref2 = context.parameters.creevey) !== null && _ref2 !== void 0 ? _ref2 : {};
+      Object.defineProperty(context.parameters.creevey, 'captureElement', {
+        get() {
+          switch (true) {
+            case captureElement === undefined:
+              return Promise.resolve(context.canvasElement);
+
+            case captureElement === null:
+              return Promise.resolve(document.documentElement);
+
+            case typeof captureElement == 'string':
+              return _utils.isInternetExplorer // some code from testing-library makes IE hang
+              ? Promise.resolve(context.canvasElement.querySelector(captureElement)) : (0, _testingLibrary.within)(context.canvasElement, queries).findByQuery(captureElement);
+
+            case typeof captureElement == 'function':
+              // TODO Define type for it
+              return Promise.resolve(captureElement(context));
+          }
+        },
+
+        enumerable: true,
+        configurable: true
+      });
       return getStory(context);
     }
   });

package/lib/esm/client/addon/withCreevey.js

@@ -4,11 +4,12 @@
 /* eslint-disable */
 import * as Events from '@storybook/core-events';
 import * as polyfill from 'event-source-polyfill';
-// import { buildQueries, within } from '@storybook/testing-library';
+import { buildQueries, within } from '@storybook/testing-library';
 import { addons, makeDecorator } from '@storybook/addons';
 import { isObject, noop } from '../../types';
 import { denormalizeStoryParameters, serializeRawStories } from '../../shared';
 import { getConnectionUrl } from '../shared/helpers';
+import { isInternetExplorer } from './utils';
 
 if (typeof process != 'object' || typeof process.version != 'string') {
   // NOTE If you don't use babel-polyfill or any other polyfills that add EventSource for IE11
@@ -262,48 +263,48 @@ export function withCreevey() {
 
   const getMultipleError = (_, query) => "Found multiple elements by query: ".concat(query);
 
-  const getMissingError = (_, query) => "Unable to find an element by query: ".concat(query); // const [queryByQuery, getAllByQuery, getByQuery, findAllByQuery, findByQuery] = buildQueries(
-  //   queryAllByQuery,
-  //   getMultipleError,
-  //   getMissingError,
-  // );
-  // const queries = {
-  //   queryByQuery,
-  //   getAllByQuery,
-  //   getByQuery,
-  //   findAllByQuery,
-  //   findByQuery,
-  // };
-
+  const getMissingError = (_, query) => "Unable to find an element by query: ".concat(query);
 
+  const [queryByQuery, getAllByQuery, getByQuery, findAllByQuery, findByQuery] = buildQueries(queryAllByQuery, getMultipleError, getMissingError);
+  const queries = {
+    queryByQuery,
+    getAllByQuery,
+    getByQuery,
+    findAllByQuery,
+    findByQuery
+  };
   return makeDecorator({
     name: 'withCreevey',
     parameterName: 'creevey',
     wrapper: (getStory, context) => {
+      var _ref2;
+
       // TODO Define proper types, like captureElement is a promise
-      // const { captureElement } = (context.parameters.creevey =
-      //   (context.parameters.creevey as CreeveyStoryParams) ?? {});
-      // Object.defineProperty(context.parameters.creevey, 'captureElement', {
-      //   get() {
-      //     switch (true) {
-      //       case captureElement === undefined:
-      //         return Promise.resolve(context.canvasElement);
-      //       case captureElement === null:
-      //         return Promise.resolve(document.documentElement);
-      //       case typeof captureElement == 'string':
-      //         return isInternetExplorer // some code from testing-library makes IE hang
-      //           ? Promise.resolve(context.canvasElement.querySelector(captureElement as string))
-      //           : within<typeof queries>(context.canvasElement, queries).findByQuery(captureElement as string);
-      //       case typeof captureElement == 'function':
-      //         // TODO Define type for it
-      //         return Promise.resolve(
-      //           (captureElement as unknown as (ctx: typeof context) => Promise<HTMLElement> | HTMLElement)(context),
-      //         );
-      //     }
-      //   },
-      //   enumerable: true,
-      //   configurable: true,
-      // });
+      const {
+        captureElement
+      } = context.parameters.creevey = (_ref2 = context.parameters.creevey) !== null && _ref2 !== void 0 ? _ref2 : {};
+      Object.defineProperty(context.parameters.creevey, 'captureElement', {
+        get() {
+          switch (true) {
+            case captureElement === undefined:
+              return Promise.resolve(context.canvasElement);
+
+            case captureElement === null:
+              return Promise.resolve(document.documentElement);
+
+            case typeof captureElement == 'string':
+              return isInternetExplorer // some code from testing-library makes IE hang
+              ? Promise.resolve(context.canvasElement.querySelector(captureElement)) : within(context.canvasElement, queries).findByQuery(captureElement);
+
+            case typeof captureElement == 'function':
+              // TODO Define type for it
+              return Promise.resolve(captureElement(context));
+          }
+        },
+
+        enumerable: true,
+        configurable: true
+      });
       return getStory(context);
     }
   });

package/package.json

@@ -13,7 +13,7 @@
     "addon",
     "test"
   ],
-  "version": "0.8.1-sb7.3",
+  "version": "0.8.1-sb7.4",
   "bin": {
     "creevey": "./lib/cjs/cli.js"
   },
@@ -94,7 +94,7 @@
     "@octokit/core": "^4.0.4",
     "@storybook/components": "^7.6.4",
     "@storybook/csf": "0.1.2",
-    "@storybook/testing-library": "^0.2.2",
+    "@storybook/testing-library": "^0.0.13",
     "@storybook/theming": "^7.6.4",
     "@types/chai": "^4.3.1",
     "@types/selenium-webdriver": "^4.1.5",