wj-elements 0.1.129 → 0.1.130

package/dist/{router-links-I2vcmVCs.js → router-links-CJnOdbas.js}

@@ -1,12 +1,10 @@
 const routerLinksData = Symbol("routerLinksData");
-const unbindRouterLinks = Symbol("unbindRouterLinks");
-const resolved = Promise.resolve();
 const linkContainers = /* @__PURE__ */ new Set();
 let router;
 const delegate = function(el, eventName, selector, listener, context) {
   const handler = function(e) {
-    var node = e.target;
-    for (; node; node = node.parentNode) {
+    let node = e.target;
+    for (; node && node !== el; node = node.parentNode) {
       if (node.matches && node.matches(selector)) {
         e.selectorTarget = node;
         listener.call(context, e);
@@ -39,13 +37,13 @@ function mutationHandler(mutations, observer) {
     if (mutation.type === "attributes") {
       const attr = mutation.attributeName;
       if (attr.indexOf("param-") === 0 || attr.indexOf("query-") === 0) {
-        updateLink(mutation.target, observer.ownerEl);
+        updateLink(mutation.target, observer.rootEl);
       }
     } else {
       mutation.addedNodes.forEach((node) => {
         if (node.nodeType === 1) {
-          if (node.getAttribute("route")) updateLink(node, observer.ownerEl);
-          createLinks(observer.ownerEl, node);
+          if (node.getAttribute("route")) updateLink(node, observer.rootEl);
+          createLinks(observer.rootEl);
         }
       });
     }
@@ -63,18 +61,15 @@ function getAttributeValues(el, prefix, result) {
   }
   return result;
 }
-function getDefaults(ownerEl, routeName, propName, routeEl, options) {
+function getDefaults(rootEl, routeName, propName, routeEl, options) {
   let result = options[propName];
-  if (typeof result === "function") result = result.call(ownerEl, routeName, routeEl);
+  if (typeof result === "function") result = result.call(rootEl, routeName, routeEl);
   return result || {};
 }
-function getRouteProp(ownerEl, routeName, routeEl, propName, attrPrefix) {
-  const options = ownerEl[routerLinksData].options;
-  const defaults = getDefaults(ownerEl, routeName, propName, routeEl, options);
-  const rootEl = routeEl.closest(options.selector || "[routerlinks]");
-  if (rootEl) {
-    getAttributeValues(rootEl, attrPrefix, defaults);
-  }
+function getRouteProp(rootEl, routeName, routeEl, propName, attrPrefix) {
+  const options = rootEl[routerLinksData].options;
+  const defaults = getDefaults(rootEl, routeName, propName, routeEl, options);
+  getAttributeValues(rootEl, attrPrefix, defaults);
   return getAttributeValues(routeEl, attrPrefix, defaults);
 }
 function updateActiveClass(el, routeName, params, query) {
@@ -84,11 +79,11 @@ function updateActiveClass(el, routeName, params, query) {
     el.classList.toggle(activeClass, isActive);
   }
 }
-function updateLink(el, ownerEl) {
+function updateLink(el, rootEl) {
   const routeName = el.getAttribute("route");
   if (!routeName) return;
-  const params = getRouteProp(ownerEl, routeName, el, "params", "param-");
-  const query = getRouteProp(ownerEl, routeName, el, "query", "query-");
+  const params = getRouteProp(rootEl, routeName, el, "params", "param-");
+  const query = getRouteProp(rootEl, routeName, el, "query", "query-");
   try {
     const href = router.generate(routeName, params, query);
     const anchorEl = el.tagName === "A" ? el : el.querySelector("a");
@@ -100,10 +95,10 @@ function updateLink(el, ownerEl) {
     console.warn(`Error generating link for "${routeName}": ${error}`);
   }
 }
-function createLinks(ownerEl, rootEl) {
+function createLinks(rootEl) {
   const routeEls = rootEl.querySelectorAll("[route]");
   routeEls.forEach((el) => {
-    updateLink(el, ownerEl);
+    updateLink(el, rootEl);
   });
 }
 function linkClickHandler(e) {
@@ -117,70 +112,29 @@ function linkClickHandler(e) {
   const method = el.hasAttribute("replace") ? "replaceWith" : "transitionTo";
   router[method](routeName, params, query);
 }
-function bindRouterLinks(ownerEl, options = {}) {
-  const { selector = "[routerlinks]" } = options;
-  const rootEls = selector ? ownerEl.querySelectorAll(selector) : [ownerEl];
+function bindRouterLinks(rootEl, options = {}) {
   const observer = new MutationObserver(mutationHandler);
-  const eventHandlers = [];
-  observer.ownerEl = ownerEl;
-  ownerEl[routerLinksData] = { options, rootEls, observer };
-  rootEls.forEach((rootEl) => {
-    eventHandlers.push(delegate(rootEl, "click", "[route]", linkClickHandler, ownerEl));
-    createLinks(ownerEl, rootEl);
-    observer.observe(rootEl, elementsObserverConfig);
-  });
-  linkContainers.add(ownerEl);
+  observer.rootEl = rootEl;
+  rootEl[routerLinksData] = { options, observer };
+  const eventHandler = delegate(rootEl, "click", "[route]", linkClickHandler, rootEl);
+  createLinks(rootEl);
+  observer.observe(rootEl, elementsObserverConfig);
+  linkContainers.add(rootEl);
   return function() {
-    linkContainers.delete(ownerEl);
-    eventHandlers.forEach((eventHandler, i) => undelegate(rootEls[i], eventHandler));
+    linkContainers.delete(rootEl);
+    undelegate(rootEl, eventHandler);
   };
 }
-const createClass = (ctor, options = {}) => {
-  return class extends ctor {
-    connectedCallback() {
-      super.connectedCallback && super.connectedCallback();
-      const renderWait = this.updateComplete || resolved;
-      renderWait.then(() => {
-        this[unbindRouterLinks] = bindRouterLinks(this, options);
-      });
-    }
-    disconnectedCallback() {
-      super.disconnectedCallback && super.disconnectedCallback();
-      if (this[unbindRouterLinks]) {
-        this[unbindRouterLinks]();
-      }
-    }
-  };
-};
-const withRouterLinks = (optionsOrCtorOrDescriptor, options) => {
-  if (typeof optionsOrCtorOrDescriptor === "function") {
-    return createClass(optionsOrCtorOrDescriptor, options);
-  }
-  if (optionsOrCtorOrDescriptor.kind === "class") {
-    const { kind, elements } = optionsOrCtorOrDescriptor;
-    return {
-      kind,
-      elements,
-      finisher(ctor) {
-        return createClass(ctor, options);
-      }
-    };
-  }
-  return (ctorOrDescriptor) => {
-    return withRouterLinks(ctorOrDescriptor, optionsOrCtorOrDescriptor);
-  };
-};
 function create(instance) {
   router = instance;
 }
 function done() {
-  linkContainers.forEach((ownerEl) => {
-    const data = ownerEl[routerLinksData];
-    data.rootEls.forEach((el) => {
+  linkContainers.forEach((rootEl) => {
+    rootEl.querySelectorAll("[route]").forEach((el) => {
       const routeName = el.getAttribute("route");
       if (!routeName) return;
-      const params = getRouteProp(ownerEl, routeName, el, "params", "param-");
-      const query = getRouteProp(ownerEl, routeName, el, "query", "query-");
+      const params = getRouteProp(rootEl, routeName, el, "params", "param-");
+      const query = getRouteProp(rootEl, routeName, el, "query", "query-");
       updateActiveClass(el, routeName, params, query);
     });
   });
@@ -191,6 +145,5 @@ const routerLinks = {
 };
 export {
   bindRouterLinks as b,
-  routerLinks as r,
-  withRouterLinks as w
+  routerLinks as r
 };