@domql/element 2.29.38 → 2.29.40

package/dist/cjs/node.js

@@ -35,6 +35,9 @@ var import_env = require("@domql/utils/env.js");
 const createNode = async (element, options) => {
   let { node, tag, __ref: ref } = element;
   let isNewNode;
+  if (options.routerContentElement && options.lastElement) {
+    if (options.routerContentElement !== options.lastElement.content) return;
+  }
   if (!node) {
     isNewNode = true;
     if (!ref.__if) return element;

package/dist/cjs/set.js

@@ -31,7 +31,7 @@ var import_mixins = require("./mixins/index.js");
 var import_content = require("./mixins/content.js");
 var import_event = require("@domql/event");
 const resetElement = async (params, element, options) => {
-  if (!options.preventRemove) await (0, import_content.removeContent)(element, options);
+  if (!options.preventRemove) (0, import_content.removeContent)(element, options);
   const { __ref: ref } = element;
   if (params instanceof Promise) console.log(params, params instanceof Promise);
   await (0, import_create.create)(params, element, ref.contentElementKey || "content", {
@@ -51,9 +51,14 @@ const reset = async (options) => {
   });
 };
 const set = async function(params, options = {}, el) {
-  var _a;
+  var _a, _b;
   const element = el || this;
   const { __ref: ref } = element;
+  if (options.preventContentUpdate || ((_a = options.preventUpdate) == null ? void 0 : _a.includes("content")))
+    return;
+  if (options.routerContentElement && options.lastElement) {
+    if (options.routerContentElement !== options.lastElement.content) return;
+  }
   const content = (0, import_utils.setContentKey)(element, options);
   const __contentRef = content && content.__ref;
   const lazyLoad = element.props && element.props.lazyLoad;
@@ -81,7 +86,7 @@ const set = async function(params, options = {}, el) {
       params.childExtend = element.childExtend;
       props.ignoreChildExtend = true;
     }
-    if (!(props == null ? void 0 : props.childProps) && ((_a = element.props) == null ? void 0 : _a.childProps)) {
+    if (!(props == null ? void 0 : props.childProps) && ((_b = element.props) == null ? void 0 : _b.childProps)) {
       props.childProps = element.props.childProps;
       props.ignoreChildProps = true;
     }

package/dist/esm/node.js

@@ -21,6 +21,9 @@ import { isNotProduction } from "@domql/utils/env.js";
 const createNode = async (element, options) => {
   let { node, tag, __ref: ref } = element;
   let isNewNode;
+  if (options.routerContentElement && options.lastElement) {
+    if (options.routerContentElement !== options.lastElement.content) return;
+  }
   if (!node) {
     isNewNode = true;
     if (!ref.__if) return element;

package/dist/esm/set.js

@@ -5,7 +5,7 @@ import { registry } from "./mixins/index.js";
 import { removeContent } from "./mixins/content.js";
 import { triggerEventOn, triggerEventOnUpdate } from "@domql/event";
 const resetElement = async (params, element, options) => {
-  if (!options.preventRemove) await removeContent(element, options);
+  if (!options.preventRemove) removeContent(element, options);
   const { __ref: ref } = element;
   if (params instanceof Promise) console.log(params, params instanceof Promise);
   await create(params, element, ref.contentElementKey || "content", {
@@ -25,9 +25,14 @@ const reset = async (options) => {
   });
 };
 const set = async function(params, options = {}, el) {
-  var _a;
+  var _a, _b;
   const element = el || this;
   const { __ref: ref } = element;
+  if (options.preventContentUpdate || ((_a = options.preventUpdate) == null ? void 0 : _a.includes("content")))
+    return;
+  if (options.routerContentElement && options.lastElement) {
+    if (options.routerContentElement !== options.lastElement.content) return;
+  }
   const content = setContentKey(element, options);
   const __contentRef = content && content.__ref;
   const lazyLoad = element.props && element.props.lazyLoad;
@@ -55,7 +60,7 @@ const set = async function(params, options = {}, el) {
       params.childExtend = element.childExtend;
       props.ignoreChildExtend = true;
     }
-    if (!(props == null ? void 0 : props.childProps) && ((_a = element.props) == null ? void 0 : _a.childProps)) {
+    if (!(props == null ? void 0 : props.childProps) && ((_b = element.props) == null ? void 0 : _b.childProps)) {
       props.childProps = element.props.childProps;
       props.ignoreChildProps = true;
     }

package/mixins/content.js

@@ -17,6 +17,7 @@ export const updateContent = async function (params, options) {
 export const removeContent = function (el, opts = {}) {
   const element = el || this
   const { __ref: ref } = element
+  // console.warn('removing content', ref.path)
   const contentElementKey = setContentKey(element, opts)
 
   if (opts.contentElementKey !== 'content') opts.contentElementKey = 'content'

package/node.js

@@ -29,6 +29,11 @@ export const createNode = async (element, options) => {
 
   let isNewNode
 
+  // handle content duplication bug with delayed rendering
+  if (options.routerContentElement && options.lastElement) {
+    if (options.routerContentElement !== options.lastElement.content) return
+  }
+
   if (!node) {
     isNewNode = true
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.29.38",
+  "version": "2.29.40",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -27,12 +27,12 @@
     "prepublish": "npx rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.29.38",
-    "@domql/render": "^2.29.38",
-    "@domql/state": "^2.29.38",
-    "@domql/utils": "^2.29.38"
+    "@domql/event": "^2.29.40",
+    "@domql/render": "^2.29.40",
+    "@domql/state": "^2.29.40",
+    "@domql/utils": "^2.29.40"
   },
-  "gitHead": "3384cf7d920f77cf693d9145edc0b3ad9ecf3f33",
+  "gitHead": "8095929229562388221836b361480f3ecc22b20f",
   "devDependencies": {
     "@babel/core": "^7.27.1"
   }

package/set.js

@@ -9,8 +9,9 @@ import { removeContent } from './mixins/content.js'
 import { triggerEventOn, triggerEventOnUpdate } from '@domql/event'
 
 export const resetElement = async (params, element, options) => {
-  if (!options.preventRemove) await removeContent(element, options)
+  if (!options.preventRemove) removeContent(element, options)
   const { __ref: ref } = element
+  // console.warn('resetting content', ref.path)
   if (params instanceof Promise) console.log(params, params instanceof Promise)
   await create(params, element, ref.contentElementKey || 'content', {
     ignoreChildExtend: true,
@@ -34,6 +35,16 @@ export const set = async function (params, options = {}, el) {
   const element = el || this
   const { __ref: ref } = element
 
+  if (
+    options.preventContentUpdate ||
+    options.preventUpdate?.includes('content')
+  )
+    return
+
+  if (options.routerContentElement && options.lastElement) {
+    if (options.routerContentElement !== options.lastElement.content) return
+  }
+
   const content = setContentKey(element, options)
   const __contentRef = content && content.__ref
   const lazyLoad = element.props && element.props.lazyLoad
@@ -73,6 +84,8 @@ export const set = async function (params, options = {}, el) {
       props.ignoreChildProps = true
     }
 
+    // console.warn('setting content', ref.path)
+
     if (lazyLoad) {
       window.requestAnimationFrame(async () => {
         await resetElement(params, element, options)