storybook-addon-pseudo-states 1.14.0 → 1.15.1

package/dist/esm/splitSelectors.test.js

@@ -1,14 +1,14 @@
 import { splitSelectors } from "./splitSelectors";
-describe("splitSelectors", function () {
-  test("handles basic selectors", function () {
+describe("splitSelectors", () => {
+  test("handles basic selectors", () => {
     expect(splitSelectors(".a")).toEqual([".a"]);
     expect(splitSelectors(".a, .b")).toEqual([".a", ".b"]);
   });
-  test("supports ::slotted and :is", function () {
+  test("supports ::slotted and :is", () => {
     expect(splitSelectors("::slotted(:is(button, a):active)")).toEqual(["::slotted(:is(button, a):active)"]);
     expect(splitSelectors("::slotted(:is(button, a):active), ::slotted(:is(button, a):hover)")).toEqual(["::slotted(:is(button, a):active)", "::slotted(:is(button, a):hover)"]);
   });
-  test("supports :host", function () {
+  test("supports :host", () => {
     expect(splitSelectors(":host([type='secondary']) ::slotted(:is(button, a)), :host([type='primary']) ::slotted(:is(button, a):active)")).toEqual([":host([type='secondary']) ::slotted(:is(button, a))", ":host([type='primary']) ::slotted(:is(button, a):active)"]);
     expect(splitSelectors(":host([outline]) ::slotted(:is(button, a):focus-within:focus-visible:not(:active))")).toEqual([":host([outline]) ::slotted(:is(button, a):focus-within:focus-visible:not(:active))"]);
   });

package/dist/esm/withPseudoState.js

@@ -1,99 +1,72 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 /* eslint-env browser */
 import { addons, useEffect } from "@storybook/addons";
-import { DOCS_RENDERED, STORY_CHANGED, STORY_RENDERED } from "@storybook/core-events";
-import { UPDATE_GLOBALS } from '@storybook/core-events';
+import { DOCS_RENDERED, STORY_CHANGED, STORY_RENDERED, UPDATE_GLOBALS } from "@storybook/core-events";
 import { PSEUDO_STATES } from "./constants";
-import { splitSelectors } from "./splitSelectors";
-var pseudoStates = Object.values(PSEUDO_STATES);
-var matchOne = new RegExp(":(".concat(pseudoStates.join("|"), ")"));
-var matchAll = new RegExp(":(".concat(pseudoStates.join("|"), ")"), "g"); // Drops any existing pseudo state classnames that carried over from a previously viewed story
+import { rewriteStyleSheet } from "./rewriteStyleSheet";
+const channel = addons.getChannel();
+const shadowHosts = new Set(); // Drops any existing pseudo state classnames that carried over from a previously viewed story
 // before adding the new classnames. We do this the old-fashioned way, for IE compatibility.
 
-var applyClasses = function applyClasses(element, classnames) {
-  var _element$className$sp;
-
-  element.className = (_element$className$sp = element.className.split(" ").filter(function (classname) {
-    return classname && classname.indexOf("pseudo-") !== 0;
-  })).concat.apply(_element$className$sp, _toConsumableArray(classnames)).join(" ");
+const applyClasses = (element, classnames) => {
+  element.className = element.className.split(" ").filter(classname => classname && classname.indexOf("pseudo-") !== 0).concat(...classnames).join(" ");
 };
 
-var applyParameter = function applyParameter(element, parameter) {
-  return applyClasses(element, Object.entries(parameter || {}).filter(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-        _ = _ref2[0],
-        value = _ref2[1];
+const applyParameter = (rootElement, parameter) => {
+  const map = new Map([[rootElement, new Set()]]);
 
-    return value;
-  }).map(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 1),
-        key = _ref4[0];
+  const add = (target, state) => map.set(target, new Set([...(map.get(target) || []), state]));
 
-    return "pseudo-".concat(PSEUDO_STATES[key]);
-  }));
+  Object.entries(parameter || {}).forEach(_ref => {
+    let [state, value] = _ref;
+
+    if (typeof value === "boolean") {
+      // default API - applying pseudo class to root element.
+      add(rootElement, value && state);
+    } else if (typeof value === "string") {
+      // explicit selectors API - applying pseudo class to a specific element
+      rootElement.querySelectorAll(value).forEach(el => add(el, state));
+    } else if (Array.isArray(value)) {
+      // explicit selectors API - we have an array (of strings) recursively handle each one
+      value.forEach(sel => rootElement.querySelectorAll(sel).forEach(el => add(el, state)));
+    }
+  });
+  map.forEach((states, target) => {
+    const classnames = [];
+    states.forEach(key => PSEUDO_STATES[key] && classnames.push("pseudo-".concat(PSEUDO_STATES[key])));
+    applyClasses(target, classnames);
+  });
 }; // Traverses ancestry to collect relevant pseudo classnames, and applies them to the shadow host.
 // Shadow DOM can only access classes on its host. Traversing is needed to mimic the CSS cascade.
 
 
-var updateShadowHost = function updateShadowHost(shadowHost) {
-  var classnames = new Set();
+const updateShadowHost = shadowHost => {
+  const classnames = new Set();
 
-  for (var element = shadowHost.parentElement; element; element = element.parentElement) {
+  for (let element = shadowHost.parentElement; element; element = element.parentElement) {
     if (!element.className) continue;
-    element.className.split(" ").filter(function (classname) {
-      return classname.indexOf("pseudo-") === 0;
-    }).forEach(function (classname) {
-      return classnames.add(classname);
-    });
+    element.className.split(" ").filter(classname => classname.indexOf("pseudo-") === 0).forEach(classname => classnames.add(classname));
   }
 
   applyClasses(shadowHost, classnames);
-}; // Keep track of attached shadow host elements for the current story
-
-
-var shadowHosts = new Set();
-addons.getChannel().on(STORY_CHANGED, function () {
-  return shadowHosts.clear();
-}); // Global decorator that rewrites stylesheets and applies classnames to render pseudo styles
-
-export var withPseudoState = function withPseudoState(StoryFn, _ref5) {
-  var viewMode = _ref5.viewMode,
-      parameters = _ref5.parameters,
-      id = _ref5.id,
-      globalsArgs = _ref5.globals;
-  var parameter = parameters.pseudo;
-  var globals = globalsArgs.pseudo;
-  var channel = addons.getChannel(); // Sync parameter to globals, used by the toolbar (only in canvas as this
+}; // Global decorator that rewrites stylesheets and applies classnames to render pseudo styles
+
+
+export const withPseudoState = (StoryFn, _ref2) => {
+  let {
+    viewMode,
+    parameters,
+    id,
+    globals: globalsArgs
+  } = _ref2;
+  const {
+    pseudo: parameter
+  } = parameters;
+  const {
+    pseudo: globals
+  } = globalsArgs; // Sync parameter to globals, used by the toolbar (only in canvas as this
   // doesn't make sense for docs because many stories are displayed at once)
 
-  useEffect(function () {
+  useEffect(() => {
     if (parameter !== globals && viewMode === "story") {
       channel.emit(UPDATE_GLOBALS, {
         globals: {
@@ -104,131 +77,31 @@ export var withPseudoState = function withPseudoState(StoryFn, _ref5) {
   }, [parameter, viewMode]); // Convert selected states to classnames and apply them to the story root element.
   // Then update each shadow host to redetermine its own pseudo classnames.
 
-  useEffect(function () {
-    var timeout = setTimeout(function () {
-      var element = document.getElementById(viewMode === "docs" ? "story--".concat(id) : "root");
-      applyParameter(element, parameter);
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      const element = document.getElementById(viewMode === "docs" ? "story--".concat(id) : "root");
+      applyParameter(element, globals || parameter);
       shadowHosts.forEach(updateShadowHost);
     }, 0);
-    return function () {
-      return clearTimeout(timeout);
-    };
-  }, [parameter, viewMode]);
+    return () => clearTimeout(timeout);
+  }, [globals, parameter, viewMode]);
   return StoryFn();
-};
-var warnings = new Set();
-
-var warnOnce = function warnOnce(message) {
-  if (warnings.has(message)) return; // eslint-disable-next-line no-console
-
-  console.warn(message);
-  warnings.add(message);
 }; // Rewrite CSS rules for pseudo-states on all stylesheets to add an alternative selector
 
-
-function rewriteStyleSheets(shadowRoot) {
+const rewriteStyleSheets = shadowRoot => {
   var _shadowRoot$adoptedSt;
 
-  var styleSheets = shadowRoot ? shadowRoot.styleSheets : document.styleSheets;
+  let styleSheets = shadowRoot ? shadowRoot.styleSheets : document.styleSheets;
   if (shadowRoot !== null && shadowRoot !== void 0 && (_shadowRoot$adoptedSt = shadowRoot.adoptedStyleSheets) !== null && _shadowRoot$adoptedSt !== void 0 && _shadowRoot$adoptedSt.length) styleSheets = shadowRoot.adoptedStyleSheets;
+  Array.from(styleSheets).forEach(sheet => rewriteStyleSheet(sheet, shadowRoot, shadowHosts));
+}; // Only track shadow hosts for the current story
 
-  var _iterator = _createForOfIteratorHelper(styleSheets),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var sheet = _step.value;
-
-      if (sheet._pseudoStatesRewritten) {
-        continue;
-      } else {
-        sheet._pseudoStatesRewritten = true;
-      }
-
-      try {
-        var index = 0;
-
-        var _iterator2 = _createForOfIteratorHelper(sheet.cssRules),
-            _step2;
-
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var _step2$value = _step2.value,
-                cssText = _step2$value.cssText,
-                selectorText = _step2$value.selectorText;
-
-            if (matchOne.test(selectorText)) {
-              var selectors = splitSelectors(selectorText);
-              var newRule = cssText.replace(selectorText, selectors.flatMap(function (selector) {
-                if (selector.includes(".pseudo-")) return [];
-                var states = [];
-                var plainSelector = selector.replace(matchAll, function (_, state) {
-                  states.push(state);
-                  return "";
-                });
-                var stateSelector;
-
-                if (!matchOne.test(selector)) {
-                  return [selector];
-                }
-
-                if (selector.startsWith(":host(") || selector.startsWith("::slotted(")) {
-                  stateSelector = states.reduce(function (acc, state) {
-                    return acc.replaceAll(":".concat(state), ".pseudo-".concat(state));
-                  }, selector);
-                } else if (shadowRoot) {
-                  stateSelector = ":host(".concat(states.map(function (s) {
-                    return ".pseudo-".concat(s);
-                  }).join(""), ") ").concat(plainSelector);
-                } else {
-                  stateSelector = "".concat(states.map(function (s) {
-                    return ".pseudo-".concat(s);
-                  }).join(""), " ").concat(plainSelector);
-                }
-
-                return [selector, stateSelector];
-              }).join(", "));
-              sheet.deleteRule(index);
-              sheet.insertRule(newRule, index);
-              if (shadowRoot) shadowHosts.add(shadowRoot.host);
-            }
-
-            index++;
-
-            if (index > 1000) {
-              warnOnce("Reached maximum of 1000 pseudo selectors per sheet, skipping the rest.");
-              break;
-            }
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-      } catch (e) {
-        if (e.toString().includes("cssRules")) {
-          warnOnce("Can't access cssRules, likely due to CORS restrictions: ".concat(sheet.href));
-        } else {
-          // eslint-disable-next-line no-console
-          console.error(e, sheet.href);
-        }
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-} // Reinitialize CSS enhancements every time the story changes
 
+channel.on(STORY_CHANGED, () => shadowHosts.clear()); // Reinitialize CSS enhancements every time the story changes
 
-addons.getChannel().on(STORY_RENDERED, function () {
-  return rewriteStyleSheets();
-}); // Reinitialize CSS enhancements every time a docs page is rendered
+channel.on(STORY_RENDERED, () => rewriteStyleSheets()); // Reinitialize CSS enhancements every time a docs page is rendered
 
-addons.getChannel().on(DOCS_RENDERED, function () {
-  return rewriteStyleSheets();
-}); // IE doesn't support shadow DOM
+channel.on(DOCS_RENDERED, () => rewriteStyleSheets()); // IE doesn't support shadow DOM
 
 if (Element.prototype.attachShadow) {
   // Monkeypatch the attachShadow method so we can handle pseudo styles inside shadow DOM
@@ -236,12 +109,12 @@ if (Element.prototype.attachShadow) {
 
   Element.prototype.attachShadow = function attachShadow(init) {
     // Force "open" mode, so we can access the shadowRoot
-    var shadowRoot = this._attachShadow(_objectSpread(_objectSpread({}, init), {}, {
+    const shadowRoot = this._attachShadow({ ...init,
       mode: "open"
-    })); // Wait for it to render and apply its styles before rewriting them
+    }); // Wait for it to render and apply its styles before rewriting them
 
 
-    requestAnimationFrame(function () {
+    requestAnimationFrame(() => {
       rewriteStyleSheets(shadowRoot);
       updateShadowHost(shadowRoot.host);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-addon-pseudo-states",
-  "version": "1.14.0",
+  "version": "1.15.1",
   "description": "CSS pseudo states for Storybook",
   "keywords": [
     "storybook-addons",
@@ -38,8 +38,8 @@
     "@babel/core": "^7.12.3",
     "@babel/preset-env": "^7.12.1",
     "@babel/preset-react": "^7.12.5",
-    "@storybook/addon-docs": "^6.4.19",
-    "@storybook/react": "^6.4.19",
+    "@storybook/addon-docs": "^6.5.0",
+    "@storybook/react": "^6.5.0",
     "auto": "^10.16.8",
     "babel-loader": "^8.1.0",
     "chromatic": "^5.6.0",
@@ -50,13 +50,13 @@
     "rimraf": "^3.0.2"
   },
   "peerDependencies": {
-    "@storybook/addons": "^6.4.19",
-    "@storybook/api": "^6.4.19",
-    "@storybook/components": "^6.4.19",
-    "@storybook/core-events": "^6.4.19",
-    "@storybook/theming": "^6.4.19",
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
+    "@storybook/addons": "^6.5.0",
+    "@storybook/api": "^6.5.0",
+    "@storybook/components": "^6.5.0",
+    "@storybook/core-events": "^6.5.0",
+    "@storybook/theming": "^6.5.0",
+    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "peerDependenciesMeta": {
     "react": {