domql 1.6.8 → 1.6.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/state.js

@@ -1,7 +1,18 @@
 'use strict'
 
 import { triggerEventOn } from '@domql/event'
-import { is, isObject, exec, isFunction, isUndefined, arrayContainsOtherArray, isObjectLike, isArray, removeFromArray, removeFromObject } from '@domql/utils'
+import {
+  is,
+  isObject,
+  exec,
+  isFunction,
+  arrayContainsOtherArray,
+  isObjectLike,
+  isArray,
+  removeFromArray,
+  removeFromObject,
+  isNot
+} from '@domql/utils'
 import { deepClone, overwriteShallow, overwriteDeep } from '../utils'
 import { create } from '.'
 
@@ -179,7 +190,7 @@ const getChildStateInKey = (stateKey, parentState) => {
 const createInheritedState = function (element, parent) {
   const __elementRef = element.__ref
   let stateKey = __elementRef.__state
-  if (!stateKey) return element.state
+  if (!stateKey || isNot(stateKey)('number', 'string')) return element.state
 
   let parentState = parent.state
   if (stateKey.includes('../')) {
@@ -206,7 +217,10 @@ export const createState = function (element, parent, opts) {
   const skip = (opts && opts.skip) ? opts.skip : false
   let { state, __ref: __elementRef } = element
 
-  if (isFunction(state)) element.state = exec(state, element)
+  if (isFunction(state)) {
+    __elementRef.__state = state
+    state = element.state = exec(state, element)
+  }
 
   if (is(state)('string', 'number')) {
     __elementRef.__state = state

package/src/element/update.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { window } from '@domql/globals'
-import { isFunction, isNumber, isObject, isString } from '@domql/utils'
+import { exec, isFunction, isNumber, isObject, isString } from '@domql/utils'
 import { applyEvent, triggerEventOn } from '@domql/event'
 import { isMethod } from '@domql/methods'
 import { createSnapshotId } from '@domql/key'
@@ -158,13 +158,21 @@ const checkIfOnUpdate = (element, options) => {
 const inheritStateUpdates = (element, options) => {
   const { __ref } = element
   const stateKey = __ref.__state
-  const { parent } = element
+  const { parent, state } = element
+
+  if (options.preventUpdateTriggerStateUpdate) return
 
   if (!stateKey && !__ref.__hasRootState) {
     element.state = (parent && parent.state) || {}
     return
   }
 
+  if (isFunction(stateKey)) {
+    const execState = exec(stateKey, element)
+    state.update(execState, { preventUpdateTriggerStateUpdate: true, ...options })
+    return false
+  }
+
   const parentState = (parent && parent.state) || {}
   const keyInParentState = parentState[stateKey]