neo.mjs 6.12.1 → 6.14.0

package/src/tree/Accordion.mjs

@@ -473,6 +473,6 @@ class AccordionTree extends TreeList {
     }
 }
 
-Neo.applyClassConfig(AccordionTree);
+Neo.setupClass(AccordionTree);
 
 export default AccordionTree

package/src/tree/List.mjs

@@ -126,7 +126,7 @@ class Tree extends Base {
     beforeSetSelectionModel(value, oldValue) {
         oldValue?.destroy();
 
-        return ClassSystemUtil.beforeSetInstance(value, TreeModel);
+        return ClassSystemUtil.beforeSetInstance(value, TreeModel)
     }
 
     /**
@@ -140,10 +140,10 @@ class Tree extends Base {
         if (!value) {
             value = Neo.create(Collection, {
                 keyProperty: 'id'
-            });
+            })
         }
 
-        return super.beforeSetStore(value, oldValue);
+        return super.beforeSetStore(value, oldValue)
     }
 
 
@@ -169,7 +169,7 @@ class Tree extends Base {
         });
 
         if (hasMatch) {
-            me[silent ? '_vdom' : 'vdom'] = vdom;
+            me[silent ? '_vdom' : 'vdom'] = vdom
         }
     }
 
@@ -177,15 +177,16 @@ class Tree extends Base {
      * @param {String} [parentId] The parent node
      * @param {Object} [vdomRoot] The vdom template root for the current sub tree
      * @param {Number} level The hierarchy level of the tree
+     * @param {Boolean} hidden=false
      * @returns {Object} vdomRoot
      * @protected
      */
-    createItems(parentId, vdomRoot, level) {
+    createItems(parentId, vdomRoot, level, hidden=false) {
         let me        = this,
             items     = me.store.find('parentId', parentId),
             itemCls   = me.itemCls,
             folderCls = me.folderCls,
-            cls, tmpRoot;
+            cls, itemVdom, tmpRoot;
 
         if (items.length > 0) {
             if (!vdomRoot.cn) {
@@ -198,54 +199,59 @@ class Tree extends Base {
                     cls  : ['neo-list'],
                     cn   : [],
                     style: {
+                        display    : hidden ? 'none' : null,
                         paddingLeft: '15px'
                     }
                 });
 
-                tmpRoot = vdomRoot.cn[vdomRoot.cn.length - 1];
+                tmpRoot = vdomRoot.cn[vdomRoot.cn.length - 1]
             } else {
-                tmpRoot = vdomRoot;
+                tmpRoot = vdomRoot
             }
 
             items.forEach(item => {
                 cls = [itemCls];
 
                 if (item.isLeaf) {
-                    cls.push(itemCls + (item.singleton ? '-leaf-singleton' : '-leaf'));
+                    cls.push(itemCls + (item.singleton ? '-leaf-singleton' : '-leaf'))
                 } else {
                     cls.push(folderCls);
 
                     if (!item.collapsed) {
-                        cls.push('neo-folder-open');
+                        cls.push('neo-folder-open')
                     }
                 }
 
-                tmpRoot.cn.push({
-                    tag      : 'li',
-                    tabIndex : -1,
+                itemVdom = {
+                    tag: 'li',
                     cls,
-                    id       : me.getItemId(item.id),
-                    cn       : [{
+                    id : me.getItemId(item.id),
+                    cn : [{
                         tag      : 'span',
                         cls      : [itemCls + '-content', item.iconCls],
                         innerHTML: item.name,
-                        style    : {
-                            pointerEvents: 'none'
-                        }
+                        style    : {pointerEvents: 'none'}
                     }],
-                    style    : {
+                    style: {
+                        display : item.hidden ? 'none' : 'flex',
                         padding : '10px',
                         position: item.isLeaf ? null : 'sticky',
                         top     : item.isLeaf ? null : (level * 38) + 'px',
-                        zIndex  : item.isLeaf ? null : (20 / (level + 1)),
+                        zIndex  : item.isLeaf ? null : (20 / (level + 1))
                     }
-                });
+                };
 
-                tmpRoot = me.createItems(item.id, tmpRoot, level + 1);
-            });
+                if (me.itemsFocusable) {
+                    itemVdom.tabIndex = -1
+                }
+
+                tmpRoot.cn.push(itemVdom);
+
+                me.createItems(item.id, tmpRoot, level + 1, item.hidden || hidden)
+            })
         }
 
-        return vdomRoot;
+        return vdomRoot
     }
 
     /**
@@ -264,13 +270,13 @@ class Tree extends Base {
 
                 if (!node.cls.includes('neo-folder-open')) {
                     NeoArray.add(node.cls, 'neo-folder-open');
-                    hasMatch = true;
+                    hasMatch = true
                 }
             }
         });
 
         if (hasMatch) {
-            me[silent ? '_vdom' : 'vdom'] = vdom;
+            me[silent ? '_vdom' : 'vdom'] = vdom
         }
     }
 
@@ -289,46 +295,46 @@ class Tree extends Base {
             childReturnValue, directMatch, node;
 
         if (!value) {
-            value = '';
+            value = ''
         }
 
         me.store.items.forEach(item => {
             if (item.parentId === parentId) {
                 directMatch = false;
-                node = me.getVdomChild(me.getItemId(item.id), me.vdom);
+                node        = me.getVdomChild(me.getItemId(item.id), me.vdom);
 
                 node.cn[0].innerHTML = item[property].replace(valueRegEx, match => {
                     directMatch = true;
-                    return `<span class="neo-highlight-search">${match}</span>`;
+                    return `<span class="neo-highlight-search">${match}</span>`
                 });
 
                 if (item.isLeaf) {
-                    childReturnValue = true;
+                    childReturnValue = true
                 } else {
-                    childReturnValue = me.filter(property, value, item.id, directMatch || parentMatch);
+                    childReturnValue = me.filter(property, value, item.id, directMatch || parentMatch)
                 }
 
                 if (directMatch || parentMatch || childReturnValue === false || value === '') {
-                    isFiltered = false;
+                    isFiltered = false
                 }
 
-                node.style.display = isFiltered ? 'none' : 'list-item';
+                node.style.display = isFiltered ? 'none' : 'list-item'
             }
         });
 
         if (parentId === null) {
             me.expandAll(true);
-            me.update();
+            me.update()
         }
 
-        return isFiltered;
+        return isFiltered
     }
 
     /**
      * @returns {Object}
      */
     getListItemsRoot() {
-        return this.vdom.cn[this.showCollapseExpandAllIcons ? 2 : 0];
+        return this.vdom.cn[this.showCollapseExpandAllIcons ? 2 : 0]
     }
 
     /**
@@ -336,9 +342,9 @@ class Tree extends Base {
      */
     onClick(data) {
         if (data.target.cls.includes('neo-treelist-menu-item')) {
-            this.onMenuItemClick(data.target.cls);
+            this.onMenuItemClick(data.target.cls)
         } else {
-            super.onClick(data);
+            super.onClick(data)
         }
     }
 
@@ -365,7 +371,7 @@ class Tree extends Base {
                 }]
             });
 
-            me.update();
+            me.update()
         }
     }
 
@@ -388,14 +394,14 @@ class Tree extends Base {
             if (path.includes(vnodeId)) {
                 record = tmpItem;
                 item = me.getVdomChild(vnodeId);
-                break;
+                break
             }
         }
 
         if (item) {
             if (item.cls?.includes(me.folderCls)) {
                 NeoArray.toggle(item.cls, 'neo-folder-open');
-                me.update();
+                me.update()
             } else {
                 me.onLeafItemClick(record);
 
@@ -405,10 +411,10 @@ class Tree extends Base {
                  * @event leafItemClick
                  * @returns {Object} record
                  */
-                me.fire('leafItemClick', record);
+                me.fire('leafItemClick', record)
             }
 
-            super.onItemClick(node, data);
+            super.onItemClick(node, data)
         }
     }
 
@@ -427,13 +433,13 @@ class Tree extends Base {
      */
     onMenuItemClick(cls) {
         if (cls.includes('neo-treelist-collapse-all-icon')) {
-            this.collapseAll();
+            this.collapseAll()
         } else {
-            this.expandAll();
+            this.expandAll()
         }
     }
 }
 
-Neo.applyClassConfig(Tree);
+Neo.setupClass(Tree);
 
 export default Tree;

package/src/util/Array.mjs

@@ -155,6 +155,6 @@ class NeoArray extends Base {
     }
 }
 
-Neo.applyClassConfig(NeoArray);
+Neo.setupClass(NeoArray);
 
 export default NeoArray;

package/src/util/ClassSystem.mjs

@@ -61,6 +61,6 @@ class ClassSystem extends Base {
     }
 }
 
-Neo.applyClassConfig(ClassSystem);
+Neo.setupClass(ClassSystem);
 
 export default ClassSystem;

package/src/util/Css.mjs

@@ -39,6 +39,6 @@ class Css extends Base {
     }
 }
 
-Neo.applyClassConfig(Css);
+Neo.setupClass(Css);
 
 export default Css;

package/src/util/Date.mjs

@@ -129,6 +129,6 @@ class DateUtil extends Base {
     }
 }
 
-Neo.applyClassConfig(DateUtil);
+Neo.setupClass(DateUtil);
 
 export default DateUtil;

package/src/util/Function.mjs

@@ -12,6 +12,37 @@ export function bindAppend(fn, scope) {
     }
 }
 
+/**
+ * @param {Function} callback
+ * @param {Neo.core.Base} scope
+ * @param {Number} delay=300
+ * @returns {Function}
+ */
+export function buffer(callback, scope, delay=300) {
+    let timeoutId;
+
+    const wrapper = function(...args) {
+        // callback invocation comes "delay" ms after the last call to wrapper
+        // so cancel any pending invocation.
+        clearTimeout(timeoutId);
+
+        wrapper.isPending = true;
+
+        timeoutId = setTimeout(() => {
+            timeoutId = 0;
+            wrapper.isPending = false;
+            callback.apply(scope, args)
+        }, delay);
+    };
+
+    wrapper.cancel = () => {
+        wrapper.isPending = false;
+        clearTimeout(timeoutId)
+    };
+
+    return wrapper
+}
+
 /**
  * Intended for functions with 1 param where the interceptor can change the value
  * @param {Object} target
@@ -121,34 +152,3 @@ export function throttle(callback, scope, delay=300) {
         }
     }
 }
-
-/**
- * @param {Function} callback
- * @param {Neo.core.Base} scope
- * @param {Number} delay=300
- * @returns {Function}
- */
-export function buffer(callback, scope, delay=300) {
-    let timeoutId;
-
-    const wrapper = function(...args) {
-        // callback invocation comes "delay" ms after the last call to wrapper
-        // so cancel any pending invocation.
-        clearTimeout(timeoutId);
-
-        wrapper.isPending = true;
-
-        timeoutId = setTimeout(() => {
-            timeoutId = 0;
-            wrapper.isPending = false;
-            callback.apply(scope, args);
-        }, delay);
-    };
-
-    wrapper.cancel = () => {
-        wrapper.isPending = false;
-        clearTimeout(timeoutId);
-    };
-
-    return wrapper;
-}

package/src/util/HashHistory.mjs

@@ -56,6 +56,7 @@ class HashHistory extends Base {
      * @param {String} data.appName
      * @param {Object} data.hash
      * @param {String} data.hashString
+     * @param {Number} data.windowId
      */
     push(data) {
         let me    = this,
@@ -80,6 +81,6 @@ class HashHistory extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(HashHistory);
+let instance = Neo.setupClass(HashHistory);
 
 export default instance;

package/src/util/KeyNavigation.mjs

@@ -192,6 +192,6 @@ class KeyNavigation extends Base {
     }
 }
 
-Neo.applyClassConfig(KeyNavigation);
+Neo.setupClass(KeyNavigation);
 
 export default KeyNavigation;

package/src/util/Logger.mjs

@@ -12,24 +12,6 @@ class Logger extends Base {
          * @protected
          */
         className: 'Neo.util.Logger',
-        /**
-         * Set this config to false to disable the logging in production
-         * To change this on the fly use:
-         *
-         *     Neo.util.Logger.enableLogsInProduction = true;
-         *
-         * @member {Boolean} enableLogsInProduction=true
-         */
-        enableLogsInProduction: false,
-        /**
-         * Set this config to false to disable the component logging using Ctrl-Right Click
-         * To turn it on, add:
-         *
-         *      Neo.util.Logger.enableComponentLogger = true;
-         *
-         * @member {Boolean} enableComponentLogger=true
-         */
-        enableComponentLogger: true,
         /**
          * Set the minimum level, which you want to output.
          * Change this at any time using a value of logLevels: ['info', 'log', 'warn', 'error']
@@ -77,10 +59,8 @@ class Logger extends Base {
     construct(config) {
         super.construct(config);
 
-        let me = this;
-
         // aliases
-        Neo.applyFromNs(Neo, me, {
+        Neo.applyFromNs(Neo, this, {
             error   : 'error',
             info    : 'info',
             log     : 'log',
@@ -89,14 +69,14 @@ class Logger extends Base {
         }, true);
 
         setTimeout(() => {
-            if (!me.enableLogsInProduction && Neo.config.environment === 'dist/production') {
-                me.write = Neo.emptyFn
+            if (!Neo.config.enableLogsInProduction && Neo.config.environment === 'dist/production') {
+                this.write = Neo.emptyFn
             }
         }, 50)
     }
 
     /**
-     * Ctrl-Right Click will show the current component
+     * Ctrl-Right-Click will show the current component
      * @param {Neo.component.Base} view
      */
     addContextMenuListener(view) {
@@ -185,10 +165,12 @@ class Logger extends Base {
      * @param {Object} data
      */
     onContextMenu(data) {
+        let config = Neo.config;
+
         if (
             data.ctrlKey
-            && this.enableComponentLogger
-            && !(Neo.config.env === 'dist/production' && this.enableLogsInProduction)
+            && config.enableComponentLogger
+            && !(config.env === 'dist/production' && config.enableLogsInProduction)
         ) {
             let isGroupSet = false,
                 component;
@@ -271,6 +253,6 @@ class Logger extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(Logger);
+let instance = Neo.setupClass(Logger);
 
 export default instance;

package/src/util/Matrix.mjs

@@ -154,6 +154,6 @@ class Matrix extends Base {
     }
 }
 
-Neo.applyClassConfig(Matrix);
+Neo.setupClass(Matrix);
 
 export default Matrix;

package/src/util/String.mjs

@@ -85,7 +85,7 @@ class StringUtil extends Base {
 
     /**
      * Returns the passed string with the first letter uncapitalized.
-     * @param {String} value 
+     * @param {String} value
      * @returns  {String}
      */
     static uncapitalize(value) {
@@ -93,6 +93,6 @@ class StringUtil extends Base {
     }
 }
 
-Neo.applyClassConfig(StringUtil);
+Neo.setupClass(StringUtil);
 
 export default StringUtil;

package/src/util/Style.mjs

@@ -62,6 +62,6 @@ class Style extends Base {
     }
 }
 
-Neo.applyClassConfig(Style);
+Neo.setupClass(Style);
 
 export default Style;

package/src/util/VDom.mjs

@@ -379,6 +379,6 @@ class VDom extends Base {
     }
 }
 
-Neo.applyClassConfig(VDom);
+Neo.setupClass(VDom);
 
 export default VDom;

package/src/util/VNode.mjs

@@ -224,6 +224,6 @@ class VNode extends Base {
     }
 }
 
-Neo.applyClassConfig(VNode);
+Neo.setupClass(VNode);
 
 export default VNode;

package/src/util/_export.mjs

@@ -2,7 +2,7 @@ import NeoArray         from './Array.mjs';
 import ClassSystem      from './ClassSystem.mjs';
 import Css              from './Css.mjs';
 import Date             from './Date.mjs';
-import Function         from './Function.mjs';
+import * as Function    from './Function.mjs';
 import HashHistory      from './HashHistory.mjs';
 import KeyNavigation    from './KeyNavigation.mjs';
 import Logger           from './Logger.mjs';

package/src/vdom/Helper.mjs

@@ -82,6 +82,7 @@ class Helper extends Base {
      * @param {String} opts.parentId
      * @param {Number} opts.parentIndex
      * @param {Object} opts.vdom
+     * @param {Number} opts.windowId
      * @returns {Neo.vdom.VNode|Promise<Neo.vdom.VNode>}
      */
     create(opts) {
@@ -90,12 +91,14 @@ class Helper extends Base {
             autoMount   = opts.autoMount === true,
             parentId    = opts.parentId,
             parentIndex = opts.parentIndex,
+            windowId    = opts.windowId,
             node;
 
         delete opts.appName;
         delete opts.autoMount;
         delete opts.parentId;
         delete opts.parentIndex;
+        delete opts.windowId;
 
         node           = me.parseHelper(opts);
         node.outerHTML = me.createStringFromVnode(node);
@@ -105,8 +108,9 @@ class Helper extends Base {
                 appName,
                 autoMount: true,
                 parentId,
-                parentIndex
-            });
+                parentIndex,
+                windowId
+            })
         }
 
         return Neo.config.useVdomWorker ? node : Promise.resolve(node);
@@ -821,6 +825,6 @@ class Helper extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(Helper);
+let instance = Neo.setupClass(Helper);
 
 export default instance;

package/src/worker/App.mjs

@@ -276,13 +276,14 @@ class App extends Base {
     /**
      * In case you don't want to include prototype based CSS files, use the className param instead
      * @param {String} appName
+     * @param {Number} windowId
      * @param {Neo.core.Base} [proto]
      * @param {String} [className]
      */
-    insertThemeFiles(appName, proto, className) {
+    insertThemeFiles(appName, windowId, proto, className) {
         if (Neo.config.themes.length > 0) {
             className = className || proto.className;
-
+            //console.log(windowId, className);
             let me       = this,
                 lAppName = appName.toLowerCase(),
                 cssMap   = Neo.cssMap,
@@ -290,7 +291,7 @@ class App extends Base {
                 classPath, classRoot, fileName, mapClassName, ns, themeFolders;
 
             if (!cssMap) {
-                me.themeFilesCache.push([appName, proto])
+                me.themeFilesCache.push([appName, windowId, proto])
             } else {
                 // we need to modify app related class names
                 if (!className.startsWith('Neo.')) {
@@ -304,18 +305,18 @@ class App extends Base {
                 }
 
                 if (parent && parent !== Neo.core.Base.prototype) {
-                    if (!Neo.ns(`${lAppName}.${parent.className}`, false, cssMap)) {
-                        me.insertThemeFiles(appName, parent)
+                    if (!Neo.ns(`${windowId}.${parent.className}`, false, cssMap)) {
+                        me.insertThemeFiles(appName, windowId, parent)
                     }
                 }
 
                 themeFolders = Neo.ns(mapClassName || className, false, cssMap.fileInfo);
-
-                if (themeFolders && !Neo.ns(`${lAppName}.${className}`, false, cssMap)) {
+                //console.log(cssMap);
+                if (themeFolders && !Neo.ns(`${windowId}.${className}`, false, cssMap)) {
                     classPath = className.split('.');
                     fileName  = classPath.pop();
                     classPath = classPath.join('.');
-                    ns        = Neo.ns(`${lAppName}.${classPath}`, true, cssMap);
+                    ns        = Neo.ns(`${windowId}.${classPath}`, true, cssMap);
 
                     ns[fileName] = true;
 
@@ -369,7 +370,11 @@ class App extends Base {
             app = module.onStart();
 
             // short delay to ensure Component Controllers are ready
-            config.hash && setTimeout(() => HashHistory.push(config.hash), 5)
+            config.hash && setTimeout(() => {
+                HashHistory.push(config.hash);
+                // apps which will get created later must not use outdated hash values
+                delete config.hash
+            }, 5)
         })
     }
 
@@ -508,6 +513,6 @@ class App extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(App);
+let instance = Neo.setupClass(App);
 
 export default instance;

package/src/worker/Base.mjs

@@ -301,6 +301,6 @@ class Base extends CoreBase {
     }
 }
 
-Neo.applyClassConfig(Base);
+Neo.setupClass(Base);
 
 export default Base;

package/src/worker/Canvas.mjs

@@ -80,6 +80,6 @@ class Canvas extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(Canvas);
+let instance = Neo.setupClass(Canvas);
 
 export default instance;