domql 1.5.39 → 1.5.41

package/package.json

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

package/src/element/create.js

@@ -12,7 +12,7 @@ import update from './update'
 import { on } from '../event'
 import { assignClass } from './mixins/classList'
 import { isFunction, isNumber, isString, createID, isNode, exec } from '../utils'
-import { remove, lookup, setProps, log, keys, parse, parseDeep, spotByPath } from './methods'
+import { remove, lookup, setProps, log, keys, parse, parseDeep, spotByPath, nextElement, previousElement } from './methods'
 import cacheNode from './cache'
 import { registry } from './mixins'
 import OPTIONS from './options'
@@ -58,7 +58,8 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
   const { extend, props, state, childExtend, childProps } = element
 
   if (isKeyComponent(assignedKey)) {
-    if (!extend && !childExtend && !props && !state || childProps) {
+    const hasComponentAttrs = extend || childExtend || props || state || element.on
+    if (!hasComponentAttrs || childProps) {
       parent[assignedKey] = element = {
         extend: assignedKey.split('_')[0],
         props: {
@@ -147,6 +148,8 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
   element.parse = parse
   element.parseDeep = parseDeep
   element.keys = keys
+  element.nextElement = nextElement
+  element.previousElement = previousElement
   if (ENV === 'test' || ENV === 'development') {
     element.log = log
   }

package/src/element/extend.js

@@ -11,7 +11,7 @@ const ENV = process.env.NODE_ENV
 export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
-  let { extend } = element
+  let { extend, props } = element
   if (isString(extend)) extend = options.components[extend]
   const extendStack = getExtendStack(extend)
   
@@ -23,6 +23,8 @@ export const applyExtend = (element, parent, options = {}) => {
     // Assign parent attr to the element
     element.parent = parent
     if (!options.ignoreChildExtend) {
+      if (props && props.ignoreChildExtend) return
+      
       childExtendStack = getExtendStack(parent.childExtend)
 
       if (parent.childExtendRecursive) {

package/src/element/methods.js

@@ -129,5 +129,30 @@ export const isMethod = function (param) {
     param === 'setProps' ||
     param === 'parseDeep' ||
     param === 'if' ||
-    param === 'log'
+    param === 'log' || 
+    param === 'nextElement' ||
+    param === 'previousElement'
+}
+
+export const nextElement = function () {
+  const element = this
+  const { key, parent } = element
+  const { __children } = parent
+
+  const currentIndex = __children.indexOf(key)
+  const nextChild = __children[currentIndex + 1]
+  console.log(nextChild)
+
+  return parent[nextChild]
+}
+
+export const previousElement = function (el) {
+  const element = el || this
+  const { key, parent } = element
+  const { __children } = parent
+
+  if (!__children) return
+
+  const currentIndex = __children.indexOf(key)
+  return parent[__children[currentIndex - 1]]
 }

package/src/element/mixins/attr.js

@@ -8,15 +8,15 @@ import { exec, report } from '../../utils'
  */
 export default (params, element, node) => {
   const { __attr } = element
+  if (isNot('object')) report('HTMLInvalidAttr', params)
   if (params) {
-    if (isNot('object')) report('HTMLInvalidAttr', params)
     for (const attr in params) {
-      // if (!node) node = element.node
       const val = exec(params[attr], element)
-      if (__attr[attr] === val) return
+      // if (__attr[attr] === val) return
       if (val && node.setAttribute) node.setAttribute(attr, val)
       else if (node.removeAttribute) node.removeAttribute(attr)
       __attr[attr] = val
     }
   }
+  console.groupEnd(params, __attr)
 }

package/src/element/mixins/registry.js

@@ -50,6 +50,8 @@ export default {
   __classNames: {},
   __attr: {},
   __currentSnapshot: {},
+  nextElement: {},
+  previousElement: {},
   key: {},
   tag: {},
   query: {},
@@ -61,7 +63,7 @@ export default {
   remove: {},
   removeContent: {},
   lookup: {},
-  spot: {},
+  spotByPath: {},
   keys: {},
   log: {},
   parse: {},