domql 1.6.16 → 1.6.17

package/package.json

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

package/src/element/create.js

@@ -34,7 +34,10 @@ const ENV = process.env.NODE_ENV
  * Creating a domQL element using passed parameters
  */
 const create = (element, parent, key, options = OPTIONS.create || {}) => {
-  if (options && !OPTIONS.create) OPTIONS.create = options
+  if (options && !OPTIONS.create) {
+    OPTIONS.create = options
+    OPTIONS.create.context = element.context || options.context
+  }
 
   // if ELEMENT is not given
   if (element === undefined) {

package/src/element/extend.js

@@ -13,9 +13,10 @@ export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
   let { extend, props, context, __ref } = element
+
   const COMPONENTS = (context && context.components) || options.components
+  if (isString(extend) && COMPONENTS) extend = COMPONENTS[extend]
 
-  if (isString(extend)) extend = COMPONENTS[extend]
   const extendStack = getExtendStack(extend)
 
   if (ENV !== 'test' || ENV !== 'development') delete element.extend

package/src/element/update.js

@@ -13,6 +13,7 @@ import create from './create'
 import { throughUpdatedDefine, throughUpdatedExec } from './iterate'
 import { registry } from './mixins'
 import { applyParam } from './applyParam'
+import OPTIONS from './options'
 
 const snapshot = {
   snapshotId: createSnapshotId
@@ -30,8 +31,10 @@ const UPDATE_DEFAULT_OPTIONS = {
 const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
   const element = this
   const { parent, node, key } = element
+  const { excludes, preventInheritAtCurrentState } = options
 
-  if (!options.excludes) merge(options, UPDATE_DEFAULT_OPTIONS)
+  if (preventInheritAtCurrentState && preventInheritAtCurrentState.__element === element) return
+  if (!excludes) merge(options, UPDATE_DEFAULT_OPTIONS)
 
   let __ref = element.__ref
   if (!__ref) __ref = element.__ref = {}
@@ -43,7 +46,7 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     params = { text: params }
   }
 
-  const ifFails = checkIfOnUpdate(element, options)
+  const ifFails = checkIfOnUpdate(element, parent, options,)
   if (ifFails) return
 
   const inheritState = inheritStateUpdates(element, options)
@@ -128,25 +131,25 @@ const captureSnapshot = (element, options) => {
   return [snapshotOnCallee, calleeElement]
 }
 
-const checkIfOnUpdate = (element, options) => {
+const checkIfOnUpdate = (element, parent, options) => {
   if (!isFunction(element.if)) return
 
-  const __ref = element.__ref
+  const ref = element.__ref
   const ifPassed = element.if(element, element.state)
-  const itWasFalse = __ref.__if !== true
+  const itWasFalse = ref.__if !== true
 
   if (ifPassed) {
-    __ref.__if = true
+    ref.__if = true
     if (itWasFalse) {
       delete element.__hash
       delete element.extend
-      if (!__ref.__hasRootState) {
+      if (!ref.__hasRootState) {
         delete element.state
       }
-      if (__ref.__state) {
-        element.state = __ref.__state
+      if (ref.__state) {
+        element.state = ref.__state
       }
-      const created = create(element, element.parent, element.key)
+      const created = create(element, parent, element.key, OPTIONS.create)
       if (!options.preventUpdate && element.on && isFunction(element.on.update)) {
         applyEvent(element.on.update, created, created.state)
       }
@@ -154,7 +157,7 @@ const checkIfOnUpdate = (element, options) => {
     }
   } else if (element.node && !ifPassed) {
     element.node.remove()
-    delete __ref.__if
+    delete ref.__if
   }
 }