@domql/element 2.5.53 → 2.5.57

package/dist/cjs/mixins/registry.js

@@ -68,8 +68,11 @@ var registry_default = {
   on: {},
   component: {},
   context: {},
-  $setStateCollection: {},
+  $collection: {},
+  $stateCollection: {},
+  $propsCollection: {},
   $setCollection: {},
+  $setStateCollection: {},
   $setPropsCollection: {}
 };
 const parseFilters = {

package/dist/cjs/set.js

@@ -41,7 +41,8 @@ const set = function(params, options = {}, el) {
   const { __ref: ref, content } = element;
   const __contentRef = content && content.__ref;
   const lazyLoad = element.props && element.props.lazyLoad;
-  if (options.preventContentUpdate === true)
+  const hasCollection = element.$collection || element.$stateCollection || element.$propsCollection;
+  if (options.preventContentUpdate === true && !hasCollection)
     return;
   if (ref.__noCollectionDifference || __contentRef && __contentRef.__cached && (0, import_utils.deepContains)(params, content)) {
     return content.update();

package/dist/cjs/update.js

@@ -57,7 +57,8 @@ const update = function(params = {}, options = UPDATE_DEFAULT_OPTIONS) {
   const element = this;
   const { parent, node, key } = element;
   const { excludes, preventInheritAtCurrentState } = options;
-  (0, import_event.triggerEventOnUpdate)("startUpdate", params, element, options);
+  if (!options.preventListeners)
+    (0, import_event.triggerEventOnUpdate)("startUpdate", params, element, options);
   if (preventInheritAtCurrentState && preventInheritAtCurrentState.__element === element)
     return;
   if (!excludes)
@@ -84,15 +85,17 @@ const update = function(params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     if (props)
       (0, import_props.updateProps)(props, element, parent);
   }
-  if (!options.preventInitUpdateListener) {
+  if (!options.preventInitUpdateListener && !options.preventListeners) {
     const initUpdateReturns = (0, import_event.triggerEventOnUpdate)("initUpdate", params, element, options);
     if (initUpdateReturns === false)
       return element;
   }
   const overwriteChanges = (0, import_utils.overwriteDeep)(element, params, import_utils2.METHODS_EXL);
   const execChanges = (0, import_iterate.throughUpdatedExec)(element, { ignore: UPDATE_DEFAULT_OPTIONS });
+  if (element.key === "Navigation")
+    debugger;
   const definedChanges = (0, import_iterate.throughUpdatedDefine)(element);
-  if (!options.isForced) {
+  if (!options.isForced && !options.preventListeners) {
     (0, import_event.triggerEventOn)("beforeClassAssign", element, options);
   }
   if (options.stackChanges && element.__stackChanges) {
@@ -109,7 +112,8 @@ const update = function(params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     const hasOnlyUpdateFalsy = options.onlyUpdate && (options.onlyUpdate !== param || !element.lookup(options.onlyUpdate));
     const isInPreventUpdate = (0, import_utils.isArray)(options.preventUpdate) && options.preventUpdate.includes(param);
     const isInPreventDefineUpdate = (0, import_utils.isArray)(options.preventDefineUpdate) && options.preventDefineUpdate.includes(param);
-    if ((0, import_utils.isUndefined)(prop) || hasOnlyUpdateFalsy || isInPreventUpdate || isInPreventDefineUpdate || options.preventDefineUpdate === true || options.preventDefineUpdate === param || options.preventContentUpdate && param === "content" || (options.preventStateUpdate && param) === "state" || (0, import_methods.isMethod)(param) || (0, import_utils.isObject)(import_mixins.registry[param]) || (0, import_utils2.isVariant)(param))
+    const hasCollection = element.$collection || element.$stateCollection || element.$propsCollection;
+    if ((0, import_utils.isUndefined)(prop) || hasOnlyUpdateFalsy || isInPreventUpdate || isInPreventDefineUpdate || options.preventDefineUpdate === true || options.preventDefineUpdate === param || options.preventContentUpdate && param === "content" && !hasCollection || (options.preventStateUpdate && param) === "state" || (0, import_methods.isMethod)(param) || (0, import_utils.isObject)(import_mixins.registry[param]) || (0, import_utils2.isVariant)(param))
       continue;
     if (options.preventStateUpdate === "once")
       options.preventStateUpdate = false;
@@ -205,13 +209,13 @@ const inheritStateUpdates = (element, options) => {
   const keyInParentState = (0, import_state.findInheritedState)(element, element.parent);
   if (!keyInParentState || options.preventInheritedStateUpdate)
     return;
-  if (!options.preventInitStateUpdateListener) {
+  if (!options.preventInitStateUpdateListener && !options.preventListeners) {
     const initStateReturns = (0, import_event.triggerEventOnUpdate)("initStateUpdate", keyInParentState, element, options);
     if (initStateReturns === false)
       return element;
   }
   const newState = createStateUpdate(element, parent, options);
-  if (!options.preventStateUpdateListener) {
+  if (!options.preventStateUpdateListener && !options.preventListeners) {
     (0, import_event.triggerEventOnUpdate)("stateUpdate", newState.parse(), element, options);
   }
 };

package/mixins/registry.js

@@ -53,8 +53,11 @@ export default {
   on: {},
   component: {},
   context: {},
-  $setStateCollection: {},
+  $collection: {},
+  $stateCollection: {},
+  $propsCollection: {},
   $setCollection: {},
+  $setStateCollection: {},
   $setPropsCollection: {}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.53",
+  "version": "2.5.57",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "aafcffa2ebe3d9c2fb96bd3adcb05325b62e68ff",
+  "gitHead": "f479a1805e3de4f53d9b3392bfe93b9d735c948c",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/set.js

@@ -13,7 +13,8 @@ const set = function (params, options = {}, el) {
   const __contentRef = content && content.__ref
   const lazyLoad = element.props && element.props.lazyLoad
 
-  if (options.preventContentUpdate === true) return
+  const hasCollection = element.$collection || element.$stateCollection || element.$propsCollection
+  if (options.preventContentUpdate === true && !hasCollection) return
 
   if (ref.__noCollectionDifference || (__contentRef && __contentRef.__cached && deepContains(params, content))) {
     return content.update()

package/update.js

@@ -44,7 +44,7 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
   const { parent, node, key } = element
   const { excludes, preventInheritAtCurrentState } = options
 
-  triggerEventOnUpdate('startUpdate', params, element, options)
+  if (!options.preventListeners) triggerEventOnUpdate('startUpdate', params, element, options)
 
   if (preventInheritAtCurrentState && preventInheritAtCurrentState.__element === element) return
   if (!excludes) merge(options, UPDATE_DEFAULT_OPTIONS)
@@ -72,16 +72,17 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     if (props) updateProps(props, element, parent)
   }
 
-  if (!options.preventInitUpdateListener) {
+  if (!options.preventInitUpdateListener && !options.preventListeners) {
     const initUpdateReturns = triggerEventOnUpdate('initUpdate', params, element, options)
     if (initUpdateReturns === false) return element
   }
 
   const overwriteChanges = overwriteDeep(element, params, METHODS_EXL)
   const execChanges = throughUpdatedExec(element, { ignore: UPDATE_DEFAULT_OPTIONS })
+  if (element.key === 'Navigation') debugger
   const definedChanges = throughUpdatedDefine(element)
 
-  if (!options.isForced) {
+  if (!options.isForced && !options.preventListeners) {
     triggerEventOn('beforeClassAssign', element, options)
   }
 
@@ -102,6 +103,8 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     const isInPreventUpdate = isArray(options.preventUpdate) && options.preventUpdate.includes(param)
     const isInPreventDefineUpdate = isArray(options.preventDefineUpdate) && options.preventDefineUpdate.includes(param)
 
+    const hasCollection = element.$collection || element.$stateCollection || element.$propsCollection
+
     if (
       isUndefined(prop) ||
       hasOnlyUpdateFalsy ||
@@ -109,7 +112,7 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
       isInPreventDefineUpdate ||
       options.preventDefineUpdate === true ||
       options.preventDefineUpdate === param ||
-      (options.preventContentUpdate && param === 'content') ||
+      (options.preventContentUpdate && param === 'content' && !hasCollection) ||
       (options.preventStateUpdate && param) === 'state' ||
       isMethod(param) || isObject(registry[param]) || isVariant(param)
     ) continue
@@ -244,7 +247,7 @@ const inheritStateUpdates = (element, options) => {
   if (!keyInParentState || options.preventInheritedStateUpdate) return
 
   // Trigger on.initStateUpdate event
-  if (!options.preventInitStateUpdateListener) {
+  if (!options.preventInitStateUpdateListener && !options.preventListeners) {
     const initStateReturns = triggerEventOnUpdate('initStateUpdate', keyInParentState, element, options)
     if (initStateReturns === false) return element
   }
@@ -253,7 +256,7 @@ const inheritStateUpdates = (element, options) => {
   const newState = createStateUpdate(element, parent, options)
 
   // Trigger on.stateUpdate event
-  if (!options.preventStateUpdateListener) {
+  if (!options.preventStateUpdateListener && !options.preventListeners) {
     triggerEventOnUpdate('stateUpdate', newState.parse(), element, options)
   }
 }