domql 1.5.4 → 1.5.6

package/package.json

@@ -3,7 +3,7 @@
   "description": "DOM rendering Javascript framework at early stage.",
   "private": false,
   "author": "rackai",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "repository": "https://github.com/rackai/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/create.js

@@ -5,7 +5,7 @@ import createNode from './node'
 import { appendNode, assignNode } from './assign'
 import { applyExtend } from './extend'
 import nodes from './nodes'
-import set from './set'
+import set, { removeContentElement } from './set'
 import createState from './state'
 import createProps from './props'
 import update from './update'
@@ -95,6 +95,7 @@ const create = (element, parent, key, options = {}) => {
   element.set = set
   element.update = update
   element.remove = remove
+  element.removeContent = removeContentElement
   element.setProps = setProps
   element.lookup = lookup
   element.parse = parse
@@ -116,6 +117,10 @@ const create = (element, parent, key, options = {}) => {
   // enable CHANGES storing
   if (!element.__changes) element.__changes = []
 
+  // assign context
+  if (options.context && !root.context) root.context = options.context
+  element.context = root.context
+
   // Add _root element property
   const hasRoot = parent.parent && parent.parent.key === ':root'
   if (!element.__root) element.__root = hasRoot ? parent : parent.__root
@@ -133,10 +138,6 @@ const create = (element, parent, key, options = {}) => {
     on.beforeClassAssign(element.on.beforeClassAssign, element, element.state)
   }
 
-  // assign context
-  if (options.context && !root.context) root.context = options.context
-  element.context = root.context
-
   // generate a CLASS name
   assignClass(element)
 

package/src/element/methods.js

@@ -1,7 +1,8 @@
 'use strict'
 
-import { isObject, isObjectLike } from '../utils'
+import { isFunction, isObject, isObjectLike } from '../utils'
 import { registry } from './mixins'
+import { removeContentElement } from './set'
 
 // TODO: update these files
 export const lookup = function (key) {
@@ -18,7 +19,9 @@ export const lookup = function (key) {
 
 export const remove = function (params) {
   const element = this
-  element.node.remove()
+  // element.node.remove()
+  if (isFunction(element.node.remove)) element.node.remove()
+  // else removeContentElement(element)
   delete element.parent[element.key]
 }
 
@@ -94,6 +97,7 @@ export const isMethod = function (param) {
   return param === 'set' ||
     param === 'update' ||
     param === 'remove' ||
+    param === 'removeContent' ||
     param === 'lookup' ||
     param === 'keys' ||
     param === 'parse' ||

package/src/element/mixins/registry.js

@@ -48,6 +48,7 @@ export default {
   update: {},
   setProps: {},
   remove: {},
+  removeContent: {},
   lookup: {},
   keys: {},
   log: {},

package/src/element/set.js

@@ -4,8 +4,9 @@ import create from './create'
 import { isEqualDeep } from '../utils'
 import { registry } from './mixins'
 
-const removeContentElement = (params, element) => {
-  if (params && element.content) {
+export const removeContentElement = function (el) {
+  const element = el || this
+  if (element.content) {
     if (element.content.node) {
       if (element.content.tag === 'fragment') element.node.innerHTML = ''
       else element.node.removeChild(element.content.node)
@@ -20,13 +21,13 @@ const removeContentElement = (params, element) => {
   }
 }
 
-const set = function (params, options) {
-  const element = this
+const set = function (params, options, el) {
+  const element = el || this
 
   const isEqual = isEqualDeep(params, element.content)
   if (isEqual && element.content.__cached) return element
 
-  removeContentElement(params, element)
+  removeContentElement(element)
 
   if (params) {
     const { childExtend } = params