@domql/element 2.5.91 → 2.5.94

package/dist/cjs/methods/index.js

@@ -53,12 +53,20 @@ const spotByPath = function(path) {
   }
   return active;
 };
-const lookup = function(key) {
-  const element = this;
-  let { parent } = element;
-  while (parent.key !== key) {
-    if (parent[key])
-      return parent[key];
+const lookup = function(param) {
+  const el = this;
+  let { parent } = el;
+  if ((0, import_utils.isFunction)(param)) {
+    if (parent.state && param(parent, parent.state, parent.context))
+      return parent;
+    else if (parent.parent)
+      return parent.lookup(param);
+    else
+      return;
+  }
+  while (parent.param !== param) {
+    if (parent[param])
+      return parent[param];
     parent = parent.parent;
     if (!parent)
       return;

package/dist/cjs/utils/component.js

@@ -95,7 +95,7 @@ const createValidDomqlObjectFromSugar = (el, parent, key, options) => {
 const extendizeByKey = (element, parent, key) => {
   const { context, tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element;
   const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data;
-  const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? key.split("_")[0] : key.includes(".") ? key.split(".")[0] : [key];
+  const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? key.split("_")[0] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? key.split(".")[0] : [key];
   const isExtendKeyComponent = context && context.components[extendFromKey];
   if (element === isExtendKeyComponent)
     return element;

package/dist/cjs/utils/propEvents.js

@@ -28,13 +28,14 @@ const propagateEventsFromProps = (element) => {
   eventKeysFromProps.forEach((v) => {
     const eventName = (0, import_utils.lowercaseFirstLetter)(v.split("on")[1]);
     const origEvent = on[eventName];
+    const funcFromProps = props[v];
     if ((0, import_utils.isFunction)(origEvent)) {
       on[eventName] = (...args) => {
         const originalEventRetunrs = origEvent(...args);
         if (originalEventRetunrs !== false)
-          props[v](...args);
+          funcFromProps(...args);
       };
     } else
-      on[eventName] = props[v];
+      on[eventName] = funcFromProps;
   });
 };

package/methods/index.js

@@ -23,12 +23,18 @@ export const spotByPath = function (path) {
 }
 
 // TODO: update these files
-export const lookup = function (key) {
-  const element = this
-  let { parent } = element
+export const lookup = function (param) {
+  const el = this
+  let { parent } = el
+
+  if (isFunction(param)) {
+    if (parent.state && param(parent, parent.state, parent.context)) return parent
+    else if (parent.parent) return parent.lookup(param)
+    else return
+  }
 
-  while (parent.key !== key) {
-    if (parent[key]) return parent[key]
+  while (parent.param !== param) {
+    if (parent[param]) return parent[param]
     parent = parent.parent
     if (!parent) return
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.91",
+  "version": "2.5.94",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "15a57f968b6c8832cb843c886e251a89ff17cc24",
+  "gitHead": "76edeab829524b706fd1a0bd3fac3fd5563a3b84",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/utils/component.js

@@ -73,7 +73,7 @@ export const extendizeByKey = (element, parent, key) => {
     ? key.split('+') // get array of componentKeys
     : key.includes('_')
       ? key.split('_')[0] // get component key split _
-      : key.includes('.')
+      : key.includes('.') && !checkIfKeyIsComponent(key.split('.')[1])
         ? key.split('.')[0] // get component key split .
         : [key]
 

package/utils/propEvents.js

@@ -8,11 +8,12 @@ export const propagateEventsFromProps = (element) => {
   eventKeysFromProps.forEach(v => {
     const eventName = lowercaseFirstLetter(v.split('on')[1])
     const origEvent = on[eventName]
+    const funcFromProps = props[v]
     if (isFunction(origEvent)) {
       on[eventName] = (...args) => {
         const originalEventRetunrs = origEvent(...args)
-        if (originalEventRetunrs !== false) props[v](...args)
+        if (originalEventRetunrs !== false) funcFromProps(...args)
       }
-    } else on[eventName] = props[v]
+    } else on[eventName] = funcFromProps
   })
 }