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

package/src/main/DomEvents.mjs

@@ -98,7 +98,7 @@ class DomEvents extends Base {
         singleton: true,
         /**
          * Remote method access for other workers
-         * @member {Object} remote={app: ['addDomListener']}
+         * @member {Object} remote
          * @protected
          */
         remote: {

package/src/main/DomUtils.mjs

@@ -1,22 +1,22 @@
 import Base from '../core/Base.mjs';
 
 const focusableTags = {
-    BODY     : 1,
-    BUTTON   : 1,
-    EMBED    : 1,
-    IFRAME   : 1,
-    INPUT    : 1,
-    OBJECT   : 1,
-    SELECT   : 1,
-    TEXTAREA : 1
+    BODY    : 1,
+    BUTTON  : 1,
+    EMBED   : 1,
+    IFRAME  : 1,
+    INPUT   : 1,
+    OBJECT  : 1,
+    SELECT  : 1,
+    TEXTAREA: 1
 };
 
 /**
- * @class Neo.main.DomUtils 
+ * @class Neo.main.DomUtils
  * @extends Neo.core.Base
  * @singleton
  */
-export default class DomUtils extends Base {
+class DomUtils extends Base {
     static config = {
         /**
          * @member {String} className='Neo.main.DomUtils'
@@ -31,42 +31,21 @@ export default class DomUtils extends Base {
      * @param {HTMLElement} el The element to start from.
      * @param {Function} filterFn A function which returns `true` when the desired element is reached.
      * @param {HTMLElement} [limit] The element to stop at. This is *not* considered for matching.
-     * @returns {Boolean}
+     * @returns {HTMLElement}
      */
     static closest(el, filterFn, limit = document.body) {
         while (el?.nodeType === Node.ELEMENT_NODE && el !== limit) {
             if (filterFn(el)) {
-                return el;
+                return el
             }
-            el = el.parentNode;
-        }
-    }
-
-    /**
-     * Analogous to the `HTMLElement` `querySelectorAll` method. Searches the passed element
-     * and all descendants for all elements for which the passed `filterFn` returns `true`.
-     * @param {HTMLElement} el The element to start from.
-     * @param {Function} filterFn A function which returns `true` when a desired element is reached.
-     * @returns {HTMLElement[]} An array of matching elements
-     */
-    static queryAll(el, filterFn) {
-        return [el, ...el.querySelectorAll('*')].filter(filterFn);
-    }
 
-    /**
-     * Analogous to the `HTMLElement` `querySelector` method. Searches the passed element
-     * and all descendants for the first element for which the passed `filterFn` returns `true`.
-     * @param {HTMLElement} el The element to start from.
-     * @param {Function} filterFn A function which returns `true` when the desired element is reached.
-     * @returns {HTMLElement} The first matching element
-     */
-    static query(el, filterFn) {
-        return [el, ...el.querySelectorAll('*')].find(filterFn);
+            el = el.parentNode
+        }
     }
 
     static isFocusable(e) {
         // May be used as a scopeless callback, so use "DomUtils", not "this"
-        return DomUtils.isTabbable(e) || Number(e.getAttribute('tabIndex')) < 0;
+        return DomUtils.isTabbable(e) || Number(e.getAttribute('tabIndex')) < 0
     }
 
     static isTabbable(e) {
@@ -86,4 +65,28 @@ export default class DomUtils extends Base {
             (tabIndex != null && Number(tabIndex) >= 0) ||
             e.contentEditable === 'true'
     }
+
+    /**
+     * Analogous to the `HTMLElement` `querySelector` method. Searches the passed element
+     * and all descendants for the first element for which the passed `filterFn` returns `true`.
+     * @param {HTMLElement} el The element to start from.
+     * @param {Function} filterFn A function which returns `true` when the desired element is reached.
+     * @returns {HTMLElement} The first matching element
+     */
+    static query(el, filterFn) {
+        return [el, ...el.querySelectorAll('*')].find(filterFn);
+    }
+
+    /**
+     * Analogous to the `HTMLElement` `querySelectorAll` method. Searches the passed element
+     * and all descendants for all elements for which the passed `filterFn` returns `true`.
+     * @param {HTMLElement} el The element to start from.
+     * @param {Function} filterFn A function which returns `true` when a desired element is reached.
+     * @returns {HTMLElement[]} An array of matching elements
+     */
+    static queryAll(el, filterFn) {
+        return [el, ...el.querySelectorAll('*')].filter(filterFn)
+    }
 }
+
+export default Neo.setupClass(DomUtils);

package/src/tab/Container.mjs

@@ -243,7 +243,7 @@ class Container extends BaseContainer {
         });
 
         items.forEach((item, index) => {
-            tabButtons.push(me.getTabButtonConfig(item.tabButtonConfig, index));
+            tabButtons.push(me.getTabButtonConfig(item.header, index));
 
             if (!(item instanceof Neo.component.Base)) {
                 item = {flex: 1, ...me.itemDefaults, isTab: true, ...item}
@@ -410,7 +410,7 @@ class Container extends BaseContainer {
             cardContainer = me.getCardContainer(),
             tabBar        = me.getTabBar(),
             hasItem       = false,
-            i, len, returnArray, superItem, tab, tabButtonConfig;
+            i, len, returnArray, superItem, tab;
 
         if (Array.isArray(item)) {
             i           = 0;
@@ -441,9 +441,7 @@ class Container extends BaseContainer {
             }
 
             if (!hasItem) {
-                tabButtonConfig = item.tabButtonConfig;
-
-                tab = tabBar.insert(index, me.getTabButtonConfig(tabButtonConfig, index));
+                tab = tabBar.insert(index, me.getTabButtonConfig(item.header, index));
 
                 // todo: non index based matching of tab buttons and cards
                 i = 0;

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)
             }