@y14e/disclosure 2.1.4 → 2.2.0

package/dist/index.js

@@ -1,17 +1,54 @@
 import { restoreAttributes, saveAttributes } from '@y14e/attribute-utils';
 import { createRovingTabIndex } from '@y14e/roving-tabindex';
 
+// src/index.ts
+
+// src/defaults.ts
+var defaults = {
+  animation: {
+    duration: 300,
+    easing: "ease"
+  },
+  collapsible: true
+};
+
+// src/options.ts
+function resolveOptions(defaults2, source) {
+  const merged = {
+    ...defaults2,
+    ...source,
+    animation: { ...defaults2.animation, ...source.animation ?? {} }
+  };
+  const mergedAnimation = merged.animation;
+  const duration = mergedAnimation.duration;
+  const defaultAnimation = defaults2.animation;
+  if (typeof duration !== "number" || Number.isNaN(duration)) {
+    const duration2 = defaultAnimation.duration;
+    console.warn(`Invalid animation duration. Fallback: ${duration2} (ms).`);
+    mergedAnimation.duration = duration2;
+  }
+  if (duration < 0) {
+    console.warn("Invalid animation duration. Fallback: 0 (ms).");
+    mergedAnimation.duration = 0;
+  }
+  if (!CSS.supports("animation-timing-function", mergedAnimation.easing)) {
+    const easing = defaultAnimation.easing;
+    console.warn(`Invalid animation easing. Fallback: '${easing}'.`);
+    mergedAnimation.easing = easing;
+  }
+  if (typeof merged.collapsible !== "boolean") {
+    const collapsible = defaults2.collapsible;
+    console.warn(`Invalid collapsible option. Fallback: ${collapsible}.`);
+    merged.collapsible = collapsible;
+  }
+  return merged;
+}
+
 // src/index.ts
 var Disclosure = class _Disclosure {
   static defaults = {};
   #rootElement;
-  #defaults = {
-    animation: {
-      duration: 300,
-      easing: "ease"
-    },
-    collapsible: true
-  };
+  #defaults = defaults;
   #settings;
   #detailsElements;
   #summaryElements;
@@ -31,8 +68,8 @@ var Disclosure = class _Disclosure {
       return;
     }
     this.#rootElement = root;
-    this.#defaults = this.#resolveOptions(this.#defaults, _Disclosure.defaults);
-    this.#settings = this.#resolveOptions(this.#defaults, options);
+    this.#defaults = resolveOptions(this.#defaults, _Disclosure.defaults);
+    this.#settings = resolveOptions(this.#defaults, options);
     matchMedia("(prefers-reduced-motion: reduce)").matches && Object.assign(this.#settings.animation, { duration: 0 });
     const NOT_NESTED = ":not(:scope summary + * *)";
     this.#detailsElements = [
@@ -255,37 +292,6 @@ var Disclosure = class _Disclosure {
   #isFocusable(element) {
     return element.tabIndex >= 0;
   }
-  #resolveOptions(target, source) {
-    const merged = {
-      ...target,
-      ...source,
-      animation: { ...target.animation, ...source.animation ?? {} }
-    };
-    const mergedAnimation = merged.animation;
-    const duration = mergedAnimation.duration;
-    const defaults = this.#defaults;
-    const defaultAnimation = defaults.animation;
-    if (typeof duration !== "number" || Number.isNaN(duration)) {
-      const duration2 = defaultAnimation.duration;
-      console.warn(`Invalid animation duration. Fallback: ${duration2} (ms).`);
-      mergedAnimation.duration = duration2;
-    }
-    if (duration < 0) {
-      console.warn("Invalid animation duration. Fallback: 0 (ms).");
-      mergedAnimation.duration = 0;
-    }
-    if (!CSS.supports("animation-timing-function", mergedAnimation.easing)) {
-      const easing = defaultAnimation.easing;
-      console.warn(`Invalid animation easing. Fallback: '${easing}'.`);
-      mergedAnimation.easing = easing;
-    }
-    if (typeof merged.collapsible !== "boolean") {
-      const collapsible = defaults.collapsible;
-      console.warn(`Invalid collapsible option. Fallback: ${collapsible}.`);
-      merged.collapsible = collapsible;
-    }
-    return merged;
-  }
   async #waitAnimationsFinish() {
     const promises = [];
     for (const content of this.#contentElements) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/disclosure",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "WAI-ARIA compliant disclosure pattern implementation in TypeScript",
   "keywords": [
     "a11y",
@@ -42,10 +42,6 @@
     "lint": "tsc --noEmit",
     "prepublishOnly": "npm run build"
   },
-  "dependencies": {
-    "@y14e/attribute-utils": "^2.0.15",
-    "@y14e/roving-tabindex": "^3.3.8"
-  },
   "devDependencies": {
     "bun-types": "latest",
     "tsup": "^8.0.0",
@@ -56,5 +52,9 @@
   },
   "allowScripts": {
     "esbuild": true
+  },
+  "dependencies": {
+    "@y14e/attribute-utils": "^2.0.16",
+    "@y14e/roving-tabindex": "^3.4.0"
   }
 }