neo.mjs 6.17.1 → 6.18.0

package/src/manager/DomEvent.mjs

@@ -76,10 +76,9 @@ class DomEvent extends Base {
             console.error('For using resize domListeners, you must include main.addon.ResizeObserver.', event)
         }
 
-        Neo.main.addon.ResizeObserver.register({
-            appName: component.appName,
-            id     : component.id
-        })
+        let {id, windowId} = component;
+
+        Neo.main.addon.ResizeObserver.register({id, windowId})
     }
 
     /**
@@ -87,15 +86,15 @@ class DomEvent extends Base {
      * @protected
      */
     fire(event) {
-        let me         = this,
-            bubble     = true,
-            data       = event.data || {},
-            eventName  = event.eventName,
-            i          = 0,
-            listeners  = null,
-            pathIds    = data.path.map(e => e.id),
-            path       = ComponentManager.getParentPath(pathIds),
-            len        = path.length,
+        let me          = this,
+            bubble      = true,
+            data        = event.data || {},
+            {eventName} = event,
+            i           = 0,
+            listeners   = null,
+            pathIds     = data.path.map(e => e.id),
+            path        = ComponentManager.getParentPath(pathIds),
+            len         = path.length,
             component, delegationTargetId, id, preventFire;
 
         for (; i < len; i++) {
@@ -103,7 +102,7 @@ class DomEvent extends Base {
             component = Neo.getComponent(id);
 
             if (!component || component.disabled) {
-                break;
+                break
             }
 
             listeners = me.items[id]?.[eventName];
@@ -117,14 +116,19 @@ class DomEvent extends Base {
                         let result;
 
                         if (listener && listener.fn) {
-                            delegationTargetId = me.verifyDelegationPath(listener, data.path);
+                            if (eventName === 'resize') {
+                                // we do not want delegation for custom main.addon.ResizeObserver events
+                                delegationTargetId = data.id === component.id ? data.id : false
+                            } else {
+                                delegationTargetId = me.verifyDelegationPath(listener, data.path)
+                            }
 
                             if (delegationTargetId !== false) {
                                 preventFire = false;
 
                                 // we only want mouseenter & leave to fire on their top level nodes, not for children
                                 if (eventName === 'mouseenter' || eventName === 'mouseleave') {
-                                    preventFire = !DomEvent.verifyMouseEnterLeave(component, data, delegationTargetId, eventName);
+                                    preventFire = !DomEvent.verifyMouseEnterLeave(component, data, delegationTargetId, eventName)
                                 }
 
                                 if (!preventFire) {
@@ -135,17 +139,18 @@ class DomEvent extends Base {
 
                                     // Handler needs to know which actual target matched the delegate
                                     data.currentTarget = delegationTargetId;
+
                                     result = listener.fn.apply(listener.scope || globalThis, [data]);
 
                                     if (!listener.bubble) {
-                                        bubble = false;
+                                        bubble = false
                                     }
                                 }
                             }
                         }
                         // If a listener returns false, we stop iterating the listeners
                         return result !== false
-                    });
+                    })
                 }
             }
 
@@ -156,12 +161,12 @@ class DomEvent extends Base {
                     data
                 });
 
-                break;
+                break
             }
 
-            // Honour the Event cancelBubble property
+            // Honor the Event cancelBubble property
             if (!bubble || data.cancelBubble) {
-                break;
+                break
             }
         }
 
@@ -174,7 +179,7 @@ class DomEvent extends Base {
                     'drop'      : 'onDrop',
                     'drop:enter': 'onDropEnter',
                     'drop:leave': 'onDropLeave',
-                }[eventName]].call(dragZone, data);
+                }[eventName]].call(dragZone, data)
             }
         }
     }
@@ -201,12 +206,12 @@ class DomEvent extends Base {
         if (Neo.isObject(config)) {
             Object.keys(config).forEach(key => {
                 if (!eventConfigKeys.includes(key)) {
-                    eventName = key;
+                    eventName = key
                 }
-            });
+            })
         }
 
-        return eventName;
+        return eventName
     }
 
     /**
@@ -226,7 +231,7 @@ class DomEvent extends Base {
         if (listeners?.[config.id]) {
             event = listeners[config.id][config.eventName];
 
-            return event || null;
+            return event || null
         }
     }
 
@@ -285,24 +290,21 @@ class DomEvent extends Base {
      * @returns {Boolean} true if the listener got registered successfully (false in case it was already there)
      */
     register(config) {
-        let alreadyRegistered = false,
-            eventName         = config.eventName,
-            id                = config.id,
-            listeners         = this.items,
-            opts              = config.opts,
-            scope             = config.scope,
-            fnType            = typeof opts,
+        let alreadyRegistered            = false,
+            {eventName, id, opts, scope} = config,
+            listeners                    = this.items,
+            fnType                       = typeof opts,
             fn, listener, listenerConfig, listenerId;
 
         if (fnType === 'function' || fnType === 'string') {
-            fn = opts;
+            fn = opts
         } else {
             fn    = opts.fn;
-            scope = opts.scope || scope;
+            scope = opts.scope || scope
         }
 
         if (!listeners[id]) {
-            listeners[id] = {};
+            listeners[id] = {}
         }
 
         if (listeners[id][eventName]) {
@@ -314,11 +316,11 @@ class DomEvent extends Base {
                     listener[key].scope         === scope &&
                     listener[key].delegate      === config.delegate
                 ) {
-                    alreadyRegistered = true;
+                    alreadyRegistered = true
                 }
             })
         } else {
-            listeners[id][eventName] = [];
+            listeners[id][eventName] = []
         }
 
         if (alreadyRegistered === true) {
@@ -373,7 +375,7 @@ class DomEvent extends Base {
         let listener = this.getListener(config);
 
         if (listener) {
-            console.log('listener found', listener);
+            console.log('listener found', listener)
         }
     }
 
@@ -399,7 +401,7 @@ class DomEvent extends Base {
                         for (; i < len; i++) {
                             if (listeners[i].originalConfig === oldDomListener) {
                                 NeoArray.remove(listeners, listeners[i]);
-                                break;
+                                break
                             }
                         }
                     }
@@ -430,7 +432,7 @@ class DomEvent extends Base {
                 }, 100)
             }
         } else {
-            Logger.logError('Component.domListeners have to be an array', component);
+            Logger.logError('Component.domListeners have to be an array', component)
         }
     }
 
@@ -440,14 +442,16 @@ class DomEvent extends Base {
      * @returns {Boolean|String} true in case the delegation string matches the event path
      */
     verifyDelegationPath(listener, path) {
-        const { delegate } = listener;
-
-        let j = 0, pathLen = path.length, targetId;
+        let {delegate} = listener,
+            j          = 0,
+            pathLen    = path.length,
+            targetId;
 
         if (typeof delegate === 'function') {
             j = delegate(path);
+
             if (j != null) {
-                targetId = path[j].id;
+                targetId = path[j].id
             }
         }
         else {
@@ -461,7 +465,7 @@ class DomEvent extends Base {
                 isId     = item.startsWith('#');
 
                 if (isId || item.startsWith('.')) {
-                    item = item.substr(1);
+                    item = item.substr(1)
                 }
 
                 for (; j < pathLen; j++) {
@@ -484,7 +488,7 @@ class DomEvent extends Base {
         // ensure the delegation path is a child of the owner components root node
         for (; j < pathLen; j++) {
             if (path[j].id === listener.vnodeId) {
-                return targetId;
+                return targetId
             }
         }
 
@@ -516,6 +520,4 @@ class DomEvent extends Base {
     }
 }
 
-let instance = Neo.setupClass(DomEvent);
-
-export default instance;
+export default Neo.setupClass(DomEvent);

package/src/manager/Focus.mjs

@@ -60,7 +60,7 @@ class Focus extends CoreBase {
         let history = this.history;
 
         history.unshift(opts);
-        history.length >= this.maxHistoryLength && history.pop();
+        history.length >= this.maxHistoryLength && history.pop()
     }
 
     /**
@@ -71,7 +71,7 @@ class Focus extends CoreBase {
      */
     focusEnter(opts) {
         this.setComponentFocus(opts, true);
-        this.addToHistory(opts);
+        this.addToHistory(opts)
     }
 
     /**
@@ -81,7 +81,7 @@ class Focus extends CoreBase {
      * @protected
      */
     focusLeave(opts) {
-        this.setComponentFocus(opts, false);
+        this.setComponentFocus(opts, false)
     }
 
     /**
@@ -92,7 +92,7 @@ class Focus extends CoreBase {
      */
     focusMove(opts) {
         let me               = this,
-            history          = me.history,
+            {history}        = me,
             newComponentPath = opts.componentPath,
             oldComponentPath = history[0].componentPath,
             focusEnter       = NeoArray.difference(newComponentPath, oldComponentPath),
@@ -117,11 +117,11 @@ class Focus extends CoreBase {
                 component.fire('focusMove', data);
 
                 component.onFocusChange?.(data);
-                component.fire('focusChange', data);
+                component.fire('focusChange', data)
             }
         });
 
-        me.addToHistory(opts);
+        me.addToHistory(opts)
     }
 
     /**
@@ -136,9 +136,9 @@ class Focus extends CoreBase {
         me.lastFocusInDate = new Date();
 
         if (me.lastFocusOutDate && me.lastFocusInDate - me.lastFocusOutDate < me.maxFocusInOutGap) {
-            me.focusMove(opts);
+            me.focusMove(opts)
         } else {
-            me.focusEnter(opts);
+            me.focusEnter(opts)
         }
     }
 
@@ -155,7 +155,7 @@ class Focus extends CoreBase {
 
         setTimeout(() => {
             if (me.lastFocusOutDate > me.lastFocusInDate) {
-                me.focusLeave(opts);
+                me.focusLeave(opts)
             }
         }, me.maxFocusInOutGap);
     }
@@ -169,14 +169,14 @@ class Focus extends CoreBase {
      */
     setComponentFocus(opts, containsFocus) {
         let data = {
-                relatedTarget : opts.data.relatedTarget
+                relatedTarget: opts.data.relatedTarget
             },
             components = opts.componentPath.map(id => Neo.getComponent(id)),
             handler;
 
         components.forEach(component => {
             if (component) {
-                component.containsFocus = containsFocus;
+                component.containsFocus = containsFocus
             }
         });
 
@@ -192,12 +192,10 @@ class Focus extends CoreBase {
                 component.fire(containsFocus ? 'focusEnter' : 'focusLeave', data);
 
                 component.onFocusChange?.(data);
-                component.fire('focusChange', data);
+                component.fire('focusChange', data)
             }
-        });
+        })
     }
 }
 
-let instance = Neo.setupClass(Focus);
-
-export default instance;
+export default Neo.setupClass(Focus);

package/src/manager/Instance.mjs

@@ -44,11 +44,9 @@ class Instance extends Base {
     consumeNeoIdMap() {
         if (Neo.idMap) {
             this.add(Object.values(Neo.idMap));
-            delete Neo.idMap;
+            delete Neo.idMap
         }
     }
 }
 
-let instance = Neo.setupClass(Instance);
-
-export default instance;
+export default Neo.setupClass(Instance);

package/src/manager/Store.mjs

@@ -45,15 +45,13 @@ class Store extends Base {
         for (; i < amountRows; i++) {
             data.push({});
 
-            j = 0;
-
-            for (; j < amountColumns; j++) {
+            for (j=0; j < amountColumns; j++) {
                 data[i]['column' + j] = 'Column' + (j + 1) + ' - ' + Math.round(Math.random() / 1.5);
-                data[i]['column' + j + 'style'] = Math.round(Math.random() / 1.7) > 0 ? 'brown' : i%2 ? '#3c3f41' : '#323232';
+                data[i]['column' + j + 'style'] = Math.round(Math.random() / 1.7) > 0 ? 'brown' : i%2 ? '#3c3f41' : '#323232'
             }
         }
 
-        return data;
+        return data
     }
 
     /**
@@ -83,6 +81,4 @@ class Store extends Base {
     }
 }
 
-let instance = Neo.setupClass(Store);
-
-export default instance;
+export default Neo.setupClass(Store);

package/src/manager/Task.mjs

@@ -56,7 +56,7 @@ class Task extends Base {
         let me = this;
 
         if (!task.id) {
-            task.id = Neo.core.IdGenerator.getId('task');
+            task.id = Neo.core.IdGenerator.getId('task')
         }
 
         task.scope          && task.run.bind(task.scope);
@@ -74,7 +74,7 @@ class Task extends Base {
 
         me.register(task);
 
-        return task;
+        return task
     }
 
     /**
@@ -82,7 +82,7 @@ class Task extends Base {
      * @param {String} taskId
      */
     removeTask(taskId) {
-        this.unregister(taskId);
+        this.unregister(taskId)
     }
 
     /**
@@ -95,7 +95,7 @@ class Task extends Base {
 
         if (task.isRunning) {
             Neo.logError('[Neo.util.TaskManager] Task is already running');
-            return task;
+            return task
         }
 
         try {
@@ -103,22 +103,22 @@ class Task extends Base {
                 task.runCount++;
 
                 if (task.addCountToArgs) {
-                    task.args[task.args.length - 1] = task.runCount;
+                    task.args[task.args.length - 1] = task.runCount
                 }
 
                 if (task.repeat && task.runCount === task.repeat) {
-                    me.stop(task.id);
+                    me.stop(task.id)
                 }
 
-                task.run(...task.args);
+                task.run(...task.args)
             };
 
             task.isRunning = true;
-            task.runner    = setInterval(fn, task.interval, task);
+            task.runner    = setInterval(fn, task.interval, task)
         } catch (taskError) {
             Neo.logError('[Neo.util.TaskManager] Error while running task ' + task.id);
             task.onError(taskError);
-            task.isRunning = false;
+            task.isRunning = false
         }
     }
 
@@ -132,24 +132,24 @@ class Task extends Base {
 
         if (Neo.isString(task)) {
             task = me.get(task);
-            !task && Neo.logError('[Neo.util.TaskManager] You passed a taskId which does not exits');
-        } else if (!task.id || !me.get(task.id)){
-            task = me.createTask(task);
+            !task && Neo.logError('[Neo.util.TaskManager] You passed a taskId which does not exits')
+        } else if (!task.id || !me.get(task.id)) {
+            task = me.createTask(task)
         }
 
         if (task.isRunning) {
             Neo.logError('[Neo.util.TaskManager] Task is already running');
-            return task;
+            return task
         }
 
         if (task.runOnStart) {
             task.runCount++;
-            task.run(...task.args);
+            task.run(...task.args)
         }
 
         me.run(task.id);
 
-        return task;
+        return task
     }
 
     /**
@@ -164,14 +164,14 @@ class Task extends Base {
         task.isRunning && clearInterval(task.runner);
 
         if (remove) {
-            this.removeTask(task);
+            this.removeTask(task)
         } else {
             task.isRunning = false;
             task.runCount  = 0;
             task.runner    = null;
 
             if (task.addCountToArgs) {
-                task.args[task.args.length - 1] = 0;
+                task.args[task.args.length - 1] = 0
             }
         }
     }
@@ -183,11 +183,9 @@ class Task extends Base {
      */
     stopAll(remove) {
         Object.keys(this.map).forEach(key => {
-            this.stop(key, remove);
-        });
+            this.stop(key, remove)
+        })
     }
 }
 
-let instance = Neo.setupClass(Task);
-
-export default instance;
+export default Neo.setupClass(Task);

package/src/manager/Toast.mjs

@@ -64,13 +64,13 @@ class Toast extends Base {
 
         if (toast.position && !me.running[toast.position]) {
             Neo.logError('[Neo.manager.Toast] Supported values for slideDirection are: tl, tc, tr, bl, bc, br');
-            return null;
+            return null
         }
 
         if (!toast.msg || !toast.appName) {
             !toast.msg     && Neo.logError('[Neo.manager.Toast] Toast has to define a msg');
             !toast.appName && Neo.logError('[Neo.manager.Toast] Toast has to define an appName. Typically me.appName.');
-            return null;
+            return null
         }
 
         toast = Neo.create({
@@ -83,7 +83,7 @@ class Toast extends Base {
             scope  : me
         })
 
-        return toast.id;
+        return toast.id
     }
 
     /**
@@ -101,13 +101,13 @@ class Toast extends Base {
             if (me.running[item.position].length < me.maxToasts) {
                 firstToast = item;
                 firstToast.running = true;
-                break;
+                break
             }
         }
 
         me.clearFilters();
 
-        return firstToast;
+        return firstToast
     }
 
     /**
@@ -115,7 +115,7 @@ class Toast extends Base {
      */
     register(item) {
         super.register(item);
-        this.runQueue();
+        this.runQueue()
     }
 
     /**
@@ -128,7 +128,7 @@ class Toast extends Base {
             position;
 
         if (!toast) {
-            return;
+            return
         }
 
         position = toast.position;
@@ -136,7 +136,7 @@ class Toast extends Base {
         // decrease total of displayed toasts for a position
         NeoArray.remove(me.running[position], toastId);
 
-        me.updateItemsInPosition(toastId);
+        me.updateItemsInPosition(toastId)
     }
 
     /**
@@ -164,8 +164,8 @@ class Toast extends Base {
 
         // todo: we could use a mounted listener
         setTimeout(() => {
-            this.updateItemsInPosition(toast.id);
-        }, 50);
+            this.updateItemsInPosition(toast.id)
+        }, 50)
     }
 
     /**
@@ -174,7 +174,7 @@ class Toast extends Base {
      */
     unregister(item) {
         super.unregister(item);
-        this.runQueue();
+        this.runQueue()
     }
 
     /**
@@ -186,7 +186,7 @@ class Toast extends Base {
     async updateItemsInPosition(id) {
         let me            = this,
             toast         = me.get(id),
-            position      = toast.position,
+            {position}    = toast,
             positionArray = me.running[position],
             acc           = 0,
             margin        = me.defaultMargin,
@@ -207,12 +207,10 @@ class Toast extends Base {
             // Sometimes the index is already reduced
             // so the last index might not be available
             if(rects[index]) {
-                acc = acc + rects[index].height;
+                acc = acc + rects[index].height
             }
         }
     }
 }
 
-let instance = Neo.setupClass(Toast);
-
-export default instance;
+export default Neo.setupClass(Toast);

package/src/manager/rpc/Api.mjs

@@ -38,6 +38,4 @@ class Api extends Base {
     }
 }
 
-let instance = Neo.setupClass(Api);
-
-export default instance;
+export default Neo.setupClass(Api);