neo.mjs 8.0.0-alpha.1 → 8.0.0-beta.1

package/src/toolbar/Base.mjs

@@ -151,14 +151,7 @@ class Base extends Container {
         let items = this._items;
 
         if (Array.isArray(items)) {
-            items.forEach((item, index) => {
-                if (item === '->') {
-                    items[index] = Neo.create({
-                        module: Component,
-                        flex  : 1
-                    })
-                }
-            })
+            this._items = items.map(item => this.replaceSpacer(item))
         }
 
         return super.createItems()
@@ -203,6 +196,31 @@ class Base extends Container {
 
         return layoutConfig || me.layout
     }
+
+    /**
+     * Inserts an item or array of items at a specific index
+     * @param {Number} index
+     * @param {Array|Object} item
+     * @param {Boolean} [silent=false]
+     * @returns {Neo.component.Base|Neo.component.Base[]}
+     */
+    insert(index, item, silent=false) {
+        if (Array.isArray(item)) {
+            item = item.map(item => this.replaceSpacer(item))
+        } else {
+            item = this.replaceSpacer(item)
+        }
+
+        return super.insert(index, item, silent)
+    }
+
+    /**
+     * @param {Array|Object|String} item
+     * @returns {Array|Object}
+     */
+    replaceSpacer(item) {
+        return item === '->' ? {module: Component, flex: 1} : item
+    }
 }
 
 export default Neo.setupClass(Base);

package/src/util/VNode.mjs

@@ -25,7 +25,7 @@ class VNode extends Base {
      *     {String} parentId
      *     {Object} vnode
      */
-    static findChildVnode(vnode, opts, index, parentNode) {
+    static find(vnode, opts, index, parentNode) {
         vnode = VNode.getVnode(vnode);
 
         index = index || 0;
@@ -68,7 +68,7 @@ class VNode extends Base {
                             }
                         } else if (Neo.isArray(value) && Neo.isArray(vnode[key])) {
                             // todo: either search the vnode array for all keys or compare if the arrays are equal.
-                            throw new Error('findChildVnode: cls matching not supported for target & source types of Arrays')
+                            throw new Error('find: cls matching not supported for target & source types of Arrays')
                         }
                         break
                     case 'style':
@@ -98,7 +98,7 @@ class VNode extends Base {
         }
 
         for (; i < len; i++) {
-            subChild = VNode.findChildVnode(vnode.childNodes[i], opts, i, vnode);
+            subChild = VNode.find(vnode.childNodes[i], opts, i, vnode);
 
             if (subChild) {
                 return subChild
@@ -114,7 +114,7 @@ class VNode extends Base {
      * @param {String|null} id
      * @returns {Object|null} child vnode or null
      */
-    static findChildVnodeById(vnode, id) {
+    static getById(vnode, id) {
         vnode = VNode.getVnode(vnode);
 
         let childNodes = vnode.childNodes || [],
@@ -133,7 +133,7 @@ class VNode extends Base {
                 return childNode
             }
 
-            childNode = VNode.findChildVnodeById(childNode, id);
+            childNode = VNode.getById(childNode, id);
 
             if (childNode) {
                 return childNode
@@ -150,9 +150,7 @@ class VNode extends Base {
      * @returns {String[]} childIds
      */
     static getChildIds(vnode, childIds=[]) {
-        let childNodes = vnode?.childNodes || [];
-
-        childNodes.forEach(childNode => {
+        vnode?.childNodes?.forEach(childNode => {
             if (childNode.id && !childNode.componentId) {
                 childIds.push(childNode.id)
             }

package/src/vdom/Helper.mjs

@@ -309,14 +309,14 @@ class Helper extends Base {
             }
 
             if (childNode) {
-                if (oldVnodeMap.get(childNode.id)) {
-                    me.moveNode({deltas, insertDelta, oldVnodeMap, vnode: childNode, vnodeMap});
+                if (me.isMovedNode(childNode, oldVnodeMap)) {
+                    me.moveNode({deltas, insertDelta, oldVnodeMap, vnode: childNode, vnodeMap})
                 } else {
                     me.insertNode({deltas, index: i + insertDelta, oldVnodeMap, vnode: childNode, vnodeMap});
                 }
 
                 if (oldChildNode && vnodeId === vnodeMap.get(oldChildNodeId)?.parentNode.id) {
-                    len++;
+                    len++
                 }
             }
         }
@@ -600,9 +600,7 @@ class Helper extends Base {
             id = vnode?.id;
 
         if (id) {
-            let currentNode = oldVnodeMap.get(id)
-
-            if (currentNode) {
+            if (this.isMovedNode(vnode, oldVnodeMap)) {
                 movedNodes.set(id, vnodeMap.get(id))
             } else {
                 vnode.childNodes?.forEach(childNode => {
@@ -647,6 +645,21 @@ class Helper extends Base {
         })
     }
 
+    /**
+     *
+     * @param {Neo.vdom.VNode} vnode
+     * @param {Map} oldVnodeMap
+     * @returns {Boolean}
+     */
+    isMovedNode(vnode, oldVnodeMap) {
+        let oldVnode = oldVnodeMap.get(vnode.id);
+
+        return oldVnode && (
+            !oldVnode.vnode.componentId ||                   // the old vnode is not a reference
+            vnode.componentId === oldVnode.vnode.componentId // old & new nodes are the same references
+        )
+    }
+
     /**
      * @param {Object}         config
      * @param {Object}         config.deltas