@domql/element 2.31.37 → 2.32.1

package/set.js

@@ -11,12 +11,20 @@ import { triggerEventOn, triggerEventOnUpdate } from '@domql/event'
 export const resetElement = async (params, element, options) => {
   if (!options.preventRemove) removeContent(element, options)
   const { __ref: ref } = element
-  await create(params, element, ref.contentElementKey || 'content', {
-    ignoreChildExtend: true,
-    ...registry.defaultOptions,
-    ...OPTIONS.create,
-    ...options
-  })
+  const contentElementKey = setContentKey(element, options)
+  const { __cached } = ref
+  const newContent = await create(
+    params,
+    element,
+    ref.contentElementKey || 'content',
+    {
+      ignoreChildExtend: true,
+      ...registry.defaultOptions,
+      ...OPTIONS.create,
+      ...options
+    }
+  )
+  __cached[contentElementKey] = newContent
 }
 
 export const reset = async (options) => {
@@ -31,7 +39,9 @@ export const reset = async (options) => {
 
 export const set = async function (params, options = {}, el) {
   const element = el || this
-  // const { __ref: ref } = element
+  const { __ref: ref } = element
+
+  // console.warn(params)
 
   if (
     options.preventContentUpdate ||
@@ -43,36 +53,40 @@ export const set = async function (params, options = {}, el) {
     if (options.routerContentElement !== options.lastElement.content) return
   }
 
-  // const contentKey = setContentKey(element, options)
-  // const content = element[contentKey]
-  // const __contentRef = content && content.__ref
+  const contentKey = setContentKey(element, options)
+  const content = element[contentKey]
+  const __contentRef = content && content.__ref
   const lazyLoad = element.props && element.props.lazyLoad
 
   const hasCollection =
-    element.$collection || element.$stateCollection || element.$propsCollection
+    element.$collection ||
+    element.$stateCollection ||
+    element.$propsCollection ||
+    element.props?.children
   if (options.preventContentUpdate === true && !hasCollection) return
 
   // console.log(deepClone(params), deepClone(content))
   // console.log(deepContains(params, content))
 
-  // if (
-  //   ref.__noCollectionDifference ||
-  //   (__contentRef && __contentRef.__cached && deepContains(params, content))
-  // ) {
-  //   // if (!options.preventBeforeUpdateListener && !options.preventListeners) {
-  //   //   const beforeUpdateReturns = await triggerEventOnUpdate(
-  //   //     'beforeUpdate',
-  //   //     params,
-  //   //     element,
-  //   //     options
-  //   //   )
-  //   //   if (beforeUpdateReturns === false) return element
-  //   // }
-  //   // if (content?.update) await content.update()
-  //   // if (!options.preventUpdateListener)
-  //   //   await triggerEventOn('update', element, options)
-  //   return
-  // }
+  if (
+    !options.forceReset &&
+    (ref.__noCollectionDifference ||
+      (__contentRef && __contentRef.__cached && deepContains(params, content)))
+  ) {
+    if (!options.preventBeforeUpdateListener && !options.preventListeners) {
+      const beforeUpdateReturns = await triggerEventOnUpdate(
+        'beforeUpdate',
+        params,
+        element,
+        options
+      )
+      if (beforeUpdateReturns === false) return element
+    }
+    if (content?.update) await content.update({}, options)
+    if (!options.preventUpdateListener)
+      await triggerEventOn('update', element, options)
+    return
+  }
 
   if (params) {
     let { childExtend, props } = params
@@ -85,6 +99,7 @@ export const set = async function (params, options = {}, el) {
       props.childProps = element.props.childProps
       props.ignoreChildProps = true
     }
+    // TODO: check for fragment and ignore if these attrs ^
 
     // console.warn('setting content', ref.path)
 

package/update.js

@@ -70,9 +70,9 @@ export const update = async function (params = {}, opts) {
     element,
     options
   )
-  if (snapshotHasUpdated) return
+  if (snapshotHasUpdated) return false
 
-  if (checkIfStorm(element, options)) return
+  if (checkIfStorm(element, options)) return false
 
   if (!options.preventListeners)
     await triggerEventOn('eventStart', element, options)
@@ -84,7 +84,7 @@ export const update = async function (params = {}, opts) {
     preventInheritAtCurrentState &&
     preventInheritAtCurrentState.__element === element
   )
-    return
+    return false
   if (!excludes) merge(options, UPDATE_DEFAULT_OPTIONS)
 
   if (isString(params) || isNumber(params)) {
@@ -92,17 +92,17 @@ export const update = async function (params = {}, opts) {
   }
 
   const inheritState = await inheritStateUpdates(element, options)
-  if (inheritState === false) return
+  if (inheritState === false) return false
 
   const ifFails = checkIfOnUpdate(element, parent, options)
-  if (ifFails) return
+  if (ifFails) return false
 
   if (ref.__if && !options.preventPropsUpdate) {
     const hasParentProps =
       parent.props && (parent.props[key] || parent.props.childProps)
     const hasFunctionInProps = ref.__props.filter((v) => isFunction(v))
     const props = params.props || hasParentProps || hasFunctionInProps.length
-    if (props) updateProps(props, element, parent)
+    if (props) updateProps(props, element, parent, options)
   }
 
   if (!options.preventBeforeUpdateListener && !options.preventListeners) {
@@ -119,9 +119,9 @@ export const update = async function (params = {}, opts) {
   overwriteDeep(element, params, { exclude: METHODS_EXL })
 
   // exec updates
-  throughExecProps(element)
+  throughExecProps(element, options)
   await throughUpdatedExec(element, { ignore: UPDATE_DEFAULT_OPTIONS })
-  await throughUpdatedDefine(element)
+  await throughUpdatedDefine(element, options)
 
   if (!options.isForced && !options.preventListeners) {
     await triggerEventOn('beforeClassAssign', element, options)
@@ -129,8 +129,13 @@ export const update = async function (params = {}, opts) {
 
   if (!ref.__if) return false
   if (!node) {
+    // if (!node || !document.body.contains(node)) {
     // return createNode(element, options)
-    return
+    return false
+  }
+
+  if (element.tag !== 'fragment' && !document.body.contains(node)) {
+    // console.log(element, node)
   }
 
   const {

package/utils/applyParam.js

@@ -5,7 +5,13 @@ import { REGISTRY } from '../mixins/index.js'
 
 export const applyParam = async (param, element, options) => {
   const { node, context, __ref: ref } = element
-  const prop = await exec(element[param], element)
+  const prop = await exec(
+    element[param],
+    element,
+    element.state,
+    element.context,
+    options
+  )
 
   const { onlyUpdate } = options