@domql/element 2.5.139 → 2.5.141

package/create.js

@@ -259,10 +259,11 @@ const checkIfPrimitive = (element) => is(element)('string', 'number')
 const applyValueAsText = (element, parent, key) => {
   const extendTag = element.extend && element.extend.tag
   const childExtendTag = parent.childExtend && parent.childExtend.tag
+  const childPropsTag = parent.props.childProps && parent.props.childProps.tag
   const isKeyValidHTMLTag = ((HTML_TAGS.body.indexOf(key) > -1) && key)
   return {
     text: element,
-    tag: extendTag || childExtendTag || isKeyValidHTMLTag || 'string'
+    tag: extendTag || childExtendTag || childPropsTag || isKeyValidHTMLTag || 'string'
   }
 }
 

package/dist/cjs/create.js

@@ -208,10 +208,11 @@ const checkIfPrimitive = (element) => (0, import_utils.is)(element)("string", "n
 const applyValueAsText = (element, parent, key) => {
   const extendTag = element.extend && element.extend.tag;
   const childExtendTag = parent.childExtend && parent.childExtend.tag;
+  const childPropsTag = parent.props.childProps && parent.props.childProps.tag;
   const isKeyValidHTMLTag = import_utils.HTML_TAGS.body.indexOf(key) > -1 && key;
   return {
     text: element,
-    tag: extendTag || childExtendTag || isKeyValidHTMLTag || "string"
+    tag: extendTag || childExtendTag || childPropsTag || isKeyValidHTMLTag || "string"
   };
 };
 const applyContext = (element, parent, options) => {

package/dist/cjs/mixins/content.js

@@ -38,15 +38,19 @@ var import_utils = require("@domql/utils");
 var import_set = __toESM(require("../set"), 1);
 const updateContent = function(params, options) {
   const element = this;
-  if (!element.content)
+  const ref = element.__ref;
+  const contentKey = ref.contentElementKey;
+  if (!element[contentKey])
     return;
-  if (element.content.update)
-    element.content.update(params, options);
+  if (element[contentKey].update)
+    element[contentKey].update(params, options);
 };
 const removeContent = function(el, opts = {}) {
   const element = el || this;
-  const { __ref } = element;
-  const contentElementKey = opts.contentElementKey || "content";
+  const { __ref: ref } = element;
+  const contentElementKey = (0, import_utils.setContentKey)(element, opts);
+  if (opts.contentElementKey !== "content")
+    opts.contentElementKey = "content";
   if (element[contentElementKey]) {
     if (element[contentElementKey].node && element.node) {
       if (element[contentElementKey].tag === "fragment")
@@ -57,22 +61,23 @@ const removeContent = function(el, opts = {}) {
           element.node.removeChild(element[contentElementKey].node);
       }
     }
-    const { __cached } = __ref;
+    const { __cached } = ref;
     if (__cached && __cached[contentElementKey]) {
       if (__cached[contentElementKey].tag === "fragment")
         __cached[contentElementKey].parent.node.innerHTML = "";
       else if (__cached[contentElementKey] && (0, import_utils.isFunction)(__cached[contentElementKey].remove))
         __cached[contentElementKey].remove();
     }
-    delete element.content;
+    delete element[contentElementKey];
   }
 };
-const setContent = (param, element, node, options) => {
+const setContent = (param, element, node, opts) => {
+  const contentElementKey = (0, import_utils.setContentKey)(element, opts);
   if (param && element) {
-    if (element.content.update) {
-      element.content.update({}, options);
+    if (element[contentElementKey].update) {
+      element[contentElementKey].update({}, opts);
     } else {
-      import_set.default.call(element, param, options);
+      import_set.default.call(element, param, opts);
     }
   }
 };

package/dist/cjs/set.js

@@ -42,7 +42,8 @@ var import_event = require("@domql/event");
 const resetElement = (params, element, options) => {
   if (!options.preventRemove)
     (0, import_content.removeContent)(element, options);
-  (0, import_create.default)(params, element, options.contentElementKey || "content", {
+  const { __ref: ref } = element;
+  (0, import_create.default)(params, element, ref.contentElementKey || "content", {
     ignoreChildExtend: true,
     ...import_mixins.registry.defaultOptions,
     ...import_options.default.create,
@@ -59,8 +60,10 @@ const reset = (options) => {
   });
 };
 const set = function(params, options = {}, el) {
+  var _a;
   const element = el || this;
-  const { __ref: ref, content } = element;
+  const { __ref: ref } = element;
+  const content = (0, import_utils.setContentKey)(element, options);
   const __contentRef = content && content.__ref;
   const lazyLoad = element.props && element.props.lazyLoad;
   if (!options.preventBeforeUpdateListener && !options.preventListeners) {
@@ -77,9 +80,14 @@ const set = function(params, options = {}, el) {
     return;
   }
   if (params) {
-    const { childExtend } = params;
+    const { childExtend, childProps, props } = params;
     if (!childExtend && element.childExtend)
       params.childExtend = element.childExtend;
+    if (!childProps && element.childProps)
+      params.childProps = element.childProps;
+    if (!(props == null ? void 0 : props.childProps) && ((_a = element.props) == null ? void 0 : _a.childProps)) {
+      params.props.childProps = element.props.childProps;
+    }
     if (lazyLoad) {
       window.requestAnimationFrame(() => resetElement(params, element, options));
     } else

package/dist/cjs/update.js

@@ -198,10 +198,11 @@ const checkIfOnUpdate = (element, parent, options) => {
         element.node.remove();
         delete element.node;
       }
+      const contentKey = ref.contentElementKey;
       if (element.$collection || element.$stateCollection || element.$propsCollection) {
         element.removeContent();
-      } else if ((_b = element.content) == null ? void 0 : _b.parseDeep)
-        element.content = element.content.parseDeep();
+      } else if ((_b = element[contentKey]) == null ? void 0 : _b.parseDeep)
+        element[contentKey] = element[contentKey].parseDeep();
       const previousElement = element.previousElement();
       const previousNode = previousElement == null ? void 0 : previousElement.node;
       const hasPrevious = previousNode == null ? void 0 : previousNode.parentNode;

package/mixins/content.js

@@ -1,20 +1,23 @@
 'use strict'
 
-import { isFunction } from '@domql/utils'
+import { isFunction, setContentKey } from '@domql/utils'
 import set from '../set'
 
 export const updateContent = function (params, options) {
   const element = this
+  const ref = element.__ref
 
-  if (!element.content) return
-  if (element.content.update) element.content.update(params, options)
+  const contentKey = ref.contentElementKey
+
+  if (!element[contentKey]) return
+  if (element[contentKey].update) element[contentKey].update(params, options)
 }
 
 export const removeContent = function (el, opts = {}) {
   const element = el || this
-  const { __ref } = element
-  const contentElementKey = opts.contentElementKey || 'content'
-
+  const { __ref: ref } = element
+  const contentElementKey = setContentKey(element, opts)
+  if (opts.contentElementKey !== 'content') opts.contentElementKey = 'content'
   if (element[contentElementKey]) {
     if (element[contentElementKey].node && element.node) {
       if (element[contentElementKey].tag === 'fragment') element.node.innerHTML = ''
@@ -24,13 +27,13 @@ export const removeContent = function (el, opts = {}) {
       }
     }
 
-    const { __cached } = __ref
+    const { __cached } = ref
     if (__cached && __cached[contentElementKey]) {
       if (__cached[contentElementKey].tag === 'fragment') __cached[contentElementKey].parent.node.innerHTML = ''
       else if (__cached[contentElementKey] && isFunction(__cached[contentElementKey].remove)) __cached[contentElementKey].remove()
     }
 
-    delete element.content
+    delete element[contentElementKey]
   }
 }
 
@@ -38,12 +41,13 @@ export const removeContent = function (el, opts = {}) {
  * Appends anything as content
  * an original one as a child
  */
-export const setContent = (param, element, node, options) => {
+export const setContent = (param, element, node, opts) => {
+  const contentElementKey = setContentKey(element, opts)
   if (param && element) {
-    if (element.content.update) {
-      element.content.update({}, options)
+    if (element[contentElementKey].update) {
+      element[contentElementKey].update({}, opts)
     } else {
-      set.call(element, param, options)
+      set.call(element, param, opts)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.139",
+  "version": "2.5.141",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -26,12 +26,12 @@
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.5.139",
-    "@domql/render": "^2.5.139",
-    "@domql/state": "^2.5.139",
-    "@domql/utils": "^2.5.139"
+    "@domql/event": "^2.5.141",
+    "@domql/render": "^2.5.141",
+    "@domql/state": "^2.5.141",
+    "@domql/utils": "^2.5.141"
   },
-  "gitHead": "db49c6131a93bd7e9c1f1c95bc5de7752a8f48d1",
+  "gitHead": "c77d004ddb710821445be4dce056410b004f13ea",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/set.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { deepContains } from '@domql/utils'
+import { deepContains, setContentKey } from '@domql/utils'
 
 import create from './create'
 import OPTIONS from './cache/options'
@@ -10,7 +10,8 @@ import { triggerEventOn, triggerEventOnUpdate } from '@domql/event'
 
 export const resetElement = (params, element, options) => {
   if (!options.preventRemove) removeContent(element, options)
-  create(params, element, options.contentElementKey || 'content', {
+  const { __ref: ref } = element
+  create(params, element, ref.contentElementKey || 'content', {
     ignoreChildExtend: true,
     ...registry.defaultOptions,
     ...OPTIONS.create,
@@ -30,7 +31,9 @@ export const reset = (options) => {
 
 const set = function (params, options = {}, el) {
   const element = el || this
-  const { __ref: ref, content } = element
+  const { __ref: ref } = element
+
+  const content = setContentKey(element, options)
   const __contentRef = content && content.__ref
   const lazyLoad = element.props && element.props.lazyLoad
 
@@ -48,8 +51,12 @@ const set = function (params, options = {}, el) {
   }
 
   if (params) {
-    const { childExtend } = params
+    const { childExtend, childProps, props } = params
     if (!childExtend && element.childExtend) params.childExtend = element.childExtend
+    if (!childProps && element.childProps) params.childProps = element.childProps
+    if (!props?.childProps && element.props?.childProps) {
+      params.props.childProps = element.props.childProps
+    }
 
     if (lazyLoad) {
       window.requestAnimationFrame(() => resetElement(params, element, options))

package/update.js

@@ -207,9 +207,11 @@ const checkIfOnUpdate = (element, parent, options) => {
         delete element.node
       }
 
+      const contentKey = ref.contentElementKey
+
       if (element.$collection || element.$stateCollection || element.$propsCollection) {
         element.removeContent()
-      } else if (element.content?.parseDeep) element.content = element.content.parseDeep()
+      } else if (element[contentKey]?.parseDeep) element[contentKey] = element[contentKey].parseDeep()
 
       const previousElement = element.previousElement()
       const previousNode = previousElement?.node // document.body.contains(previousElement.node)