@y14e/accordion 2.1.3 → 2.1.4

package/README.md

@@ -13,11 +13,11 @@ npm i @y14e/accordion
 import { Accordion } from '@y14e/accordion';
 
 // CDNs
-import { Accordion } from 'https://esm.sh/@y14e/accordion@2.1.3';
+import { Accordion } from 'https://esm.sh/@y14e/accordion@2.1.4';
 // or
-import { Accordion } from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@2.1.3/+esm';
+import { Accordion } from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@2.1.4/+esm';
 // or
-import { Accordion } from 'https://esm.unpkg.com/@y14e/accordion@2.1.3';
+import { Accordion } from 'https://esm.unpkg.com/@y14e/accordion@2.1.4';
 ```
 
 ## Usage

package/dist/index.bundle.cjs

@@ -1009,25 +1009,21 @@ var Accordion = class _Accordion {
       console.warn(`Invalid collapsible option. Fallback: ${collapsible}.`);
       merged.collapsible = collapsible;
     }
-    const selector = merged.selector;
-    function resolveSelector(name, target2, source2) {
+    const mergedSelector = merged.selector;
+    const defaultSelector = defaults.selector;
+    for (const key of Object.keys(
+      defaultSelector
+    )) {
       try {
-        document.querySelector(source2);
-        return source2;
+        document.querySelector(mergedSelector[key]);
       } catch {
+        const selector = defaultSelector[key];
         console.warn(
-          `Invalid ${name.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${target2}'.`
+          `Invalid ${key.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${selector}'.`
         );
-        return target2;
+        mergedSelector[key] = selector;
       }
     }
-    for (const name of ["content", "trigger"]) {
-      selector[name] = resolveSelector(
-        name,
-        defaults.selector[name],
-        selector[name]
-      );
-    }
     return merged;
   }
   async #waitAnimationsFinish() {

package/dist/index.bundle.js

@@ -1007,25 +1007,21 @@ var Accordion = class _Accordion {
       console.warn(`Invalid collapsible option. Fallback: ${collapsible}.`);
       merged.collapsible = collapsible;
     }
-    const selector = merged.selector;
-    function resolveSelector(name, target2, source2) {
+    const mergedSelector = merged.selector;
+    const defaultSelector = defaults.selector;
+    for (const key of Object.keys(
+      defaultSelector
+    )) {
       try {
-        document.querySelector(source2);
-        return source2;
+        document.querySelector(mergedSelector[key]);
       } catch {
+        const selector = defaultSelector[key];
         console.warn(
-          `Invalid ${name.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${target2}'.`
+          `Invalid ${key.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${selector}'.`
         );
-        return target2;
+        mergedSelector[key] = selector;
       }
     }
-    for (const name of ["content", "trigger"]) {
-      selector[name] = resolveSelector(
-        name,
-        defaults.selector[name],
-        selector[name]
-      );
-    }
     return merged;
   }
   async #waitAnimationsFinish() {

package/dist/index.cjs

@@ -285,25 +285,21 @@ var Accordion = class _Accordion {
       console.warn(`Invalid collapsible option. Fallback: ${collapsible}.`);
       merged.collapsible = collapsible;
     }
-    const selector = merged.selector;
-    function resolveSelector(name, target2, source2) {
+    const mergedSelector = merged.selector;
+    const defaultSelector = defaults.selector;
+    for (const key of Object.keys(
+      defaultSelector
+    )) {
       try {
-        document.querySelector(source2);
-        return source2;
+        document.querySelector(mergedSelector[key]);
       } catch {
+        const selector = defaultSelector[key];
         console.warn(
-          `Invalid ${name.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${target2}'.`
+          `Invalid ${key.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${selector}'.`
         );
-        return target2;
+        mergedSelector[key] = selector;
       }
     }
-    for (const name of ["content", "trigger"]) {
-      selector[name] = resolveSelector(
-        name,
-        defaults.selector[name],
-        selector[name]
-      );
-    }
     return merged;
   }
   async #waitAnimationsFinish() {

package/dist/index.js

@@ -283,25 +283,21 @@ var Accordion = class _Accordion {
       console.warn(`Invalid collapsible option. Fallback: ${collapsible}.`);
       merged.collapsible = collapsible;
     }
-    const selector = merged.selector;
-    function resolveSelector(name, target2, source2) {
+    const mergedSelector = merged.selector;
+    const defaultSelector = defaults.selector;
+    for (const key of Object.keys(
+      defaultSelector
+    )) {
       try {
-        document.querySelector(source2);
-        return source2;
+        document.querySelector(mergedSelector[key]);
       } catch {
+        const selector = defaultSelector[key];
         console.warn(
-          `Invalid ${name.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${target2}'.`
+          `Invalid ${key.replace(/[A-Z]/g, (c) => ` ${c.toLowerCase()}`)} selector. Fallback: '${selector}'.`
         );
-        return target2;
+        mergedSelector[key] = selector;
       }
     }
-    for (const name of ["content", "trigger"]) {
-      selector[name] = resolveSelector(
-        name,
-        defaults.selector[name],
-        selector[name]
-      );
-    }
     return merged;
   }
   async #waitAnimationsFinish() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "keywords": [
     "a11y",