neo.mjs 6.10.3 → 6.10.5

package/src/main/addon/WindowPosition.mjs

@@ -1,7 +1,6 @@
 import Base from '../../core/Base.mjs';
 
 /**
- *
  * @class Neo.main.addon.WindowPosition
  * @extends Neo.core.Base
  * @singleton
@@ -13,14 +12,22 @@ class WindowPosition extends Base {
          * @protected
          */
         className: 'Neo.main.addon.WindowPosition',
+        /**
+         * @member {Boolean} adjustWindowPositions=false
+         */
+        adjustWindowPositions: false,
         /**
          * @member {String|null} intervalId=null
          */
         intervalId: null,
         /**
-         * @member {Number} intervalTime=100
+         * @member {Number} intervalTime=20
          */
         intervalTime: 20,
+        /**
+         * @member {Boolean} observeResize_=false
+         */
+        observeResize_: false,
         /**
          * Remote method access for other workers
          * @member {Object} remote
@@ -29,6 +36,7 @@ class WindowPosition extends Base {
         remote: {
             app: [
                 'registerWindow',
+                'setConfigs',
                 'setDock',
                 'unregisterWindow'
             ]
@@ -53,6 +61,12 @@ class WindowPosition extends Base {
         windows: {}
     }
 
+    /**
+     * @member {Function|null} resizeListener=null
+     * @protected
+     */
+    resizeListener = null
+
     /**
      * @param {Object} config
      */
@@ -65,8 +79,23 @@ class WindowPosition extends Base {
         me.screenLeft = win.screenLeft;
         me.screenTop  = win.screenTop;
 
-        win.addEventListener('mouseout', me.onMouseOut.bind(me));
-        win.addEventListener('resize',   me.onResize.bind(me));
+        win.addEventListener('mouseout', me.onMouseOut.bind(me))
+    }
+
+    /**
+     * Triggered after the observeResize config got changed
+     * @param {Boolean} value
+     * @param {Boolean} oldValue
+     * @protected
+     */
+    afterSetObserveResize(value, oldValue) {
+        let me = this;
+
+        if (!me.resizeListener) {
+            me.resizeListener =  me.onResize.bind(me)
+        }
+
+        window[value ? 'addEventListener' : 'removeEventListener']('resize', me.resizeListener)
     }
 
     /**
@@ -82,8 +111,8 @@ class WindowPosition extends Base {
                 windowName: key,
                 x         : position.left,
                 y         : position.top
-            });
-        });
+            })
+        })
     }
 
     /**
@@ -100,7 +129,7 @@ class WindowPosition extends Base {
         if (me.screenLeft !== screenLeft || me.screenTop !== screenTop) {
             winData = Neo.Main.getWindowData();
 
-            me.adjustPositions();
+            me.adjustWindowPositions && me.adjustPositions();
 
             Manager.sendMessage('app', {
                 action: 'windowPositionChange',
@@ -111,7 +140,7 @@ class WindowPosition extends Base {
             });
 
             me.screenLeft = screenLeft;
-            me.screenTop  = screenTop;
+            me.screenTop  = screenTop
         }
     }
 
@@ -124,7 +153,7 @@ class WindowPosition extends Base {
      */
     dockDirectionChange(oldValue, newValue) {
         return (oldValue === 'bottom' || oldValue === 'top') && (newValue === 'left' || newValue === 'right')
-            || (newValue === 'bottom' || newValue === 'top') && (oldValue === 'left' || oldValue === 'right');
+            || (newValue === 'bottom' || newValue === 'top') && (oldValue === 'left' || oldValue === 'right')
     }
 
     /**
@@ -134,29 +163,26 @@ class WindowPosition extends Base {
         let win = window,
             left, top;
 
-        switch (data.dock) {
+        switch(data.dock) {
             case 'bottom':
                 left = win.screenLeft;
                 top  = win.outerHeight + win.screenTop - 50;
-                break;
+                break
             case 'left':
                 left = win.screenLeft - data.size;
                 top  = win.screenTop  + 28;
-                break;
+                break
             case 'right':
                 left = win.outerWidth + win.screenLeft;
                 top  = win.screenTop  + 28;
-                break;
+                break
             case 'top':
                 left = win.screenLeft;
                 top  = win.screenTop - data.size + 78;
-                break;
+                break
         }
 
-        return {
-            left: left,
-            top : top
-        };
+        return {left, top}
     }
 
     /**
@@ -167,18 +193,18 @@ class WindowPosition extends Base {
 
         if (!event.toElement) {
             if (!me.intervalId) {
-                me.intervalId = setInterval(me.checkMovement.bind(me), me.intervalTime);
+                me.intervalId = setInterval(me.checkMovement.bind(me), me.intervalTime)
             }
         } else if (me.intervalId) {
             clearInterval(me.intervalId);
-            me.intervalId = null;
+            me.intervalId = null
         }
     }
 
     /**
      * @param {Object} event
      */
-    onResize(event) {
+    onResize(event) { console.log('onResize');
         let me  = this,
             win = window,
             height, width;
@@ -188,21 +214,23 @@ class WindowPosition extends Base {
                 case 'bottom':
                 case 'top':
                     width = win.outerWidth;
-                    break;
+                    break
                 case 'left':
                 case 'right':
                     height = win.outerHeight - 28;
-                    break;
+                    break
             }
 
-            Neo.Main.windowResizeTo({
-                height    : height,
-                width     : width,
-                windowName: key
-            });
-        });
+            if (me.adjustWindowPositions) {
+                Neo.Main.windowResizeTo({
+                    height,
+                    width,
+                    windowName: key
+                });
 
-        me.adjustPositions();
+                me.adjustPositions()
+            }
+        })
     }
 
     /**
@@ -212,7 +240,17 @@ class WindowPosition extends Base {
      * @param {Number} data.size
      */
     registerWindow(data) {
-        this.windows[data.name] = data;
+        this.windows[data.name] = data
+    }
+
+    /**
+     * Set configs from within the app worker
+     * @param {Object} data
+     * @param {String} data.appName
+     */
+    setConfigs(data) {
+        delete data.appName;
+        this.set(data)
     }
 
     /**
@@ -239,14 +277,14 @@ class WindowPosition extends Base {
                     height    : dock === 'bottom' || dock === 'top'   ? win.size : window.outerHeight - 28,
                     width     : dock === 'left'   || dock === 'right' ? win.size : window.outerWidth,
                     windowName: name
-                });
+                })
             }
 
             Neo.Main.windowMoveTo({
                 windowName: name,
                 x         : position.left,
                 y         : position.top
-            });
+            })
         }
     }
 
@@ -255,7 +293,7 @@ class WindowPosition extends Base {
      * @param {String} data.name
      */
     unregisterWindow(data) {
-        delete this.windows[data.name];
+        delete this.windows[data.name]
     }
 }
 

package/src/tab/Strip.mjs

@@ -44,44 +44,28 @@ class Strip extends Component {
      * @protected
      */
     afterSetUseActiveTabIndicator(value, oldValue) {
-        if (oldValue !== undefined) {
-            let me = this;
-
-            me.vdom.cn[0].removeDom = !value;
-
-            if (me.mounted && value) {
-                me.getActiveTabRectThenMove();
-            } else {
-                me.update();
-            }
-        }
+        this.vdom.cn[0].removeDom = !value;
+        this.update()
     }
 
     /**
+     * Gets the DomRect of the active tab, then moves the indicator
      * @param {Object|null} opts
      * @param {Number} opts.oldValue
      * @param {Number} opts.value
-     * Gets the DomRect of the active tab, then moves the indicator
      */
     getActiveTabRectThenMove(opts) {
         let me           = this,
-            ids          = [],
+            ids          = [me.id],
             tabContainer = me.getTabContainer();
 
-        if (me.vnode) {
-            if (opts) {
-                ids.push(tabContainer.getTabAtIndex(opts.value), tabContainer.getTabAtIndex(opts.oldValue));
-            } else {
-                ids.push(tabContainer.getTabAtIndex(tabContainer.activeIndex));
-            }
-
-            ids = ids.map(e => e?.id).filter(Boolean);
+        // We do not need a movement, in case there is no oldValue
+        if (me.useActiveTabIndicator && me.vnode && Neo.isNumber(opts?.oldValue)) {
+            ids.push(tabContainer.getTabAtIndex(opts.value).id, tabContainer.getTabAtIndex(opts.oldValue).id);
 
-            if (me.useActiveTabIndicator) {
-                me.getDomRect(ids).then(data => {
-                    me.moveActiveIndicator(data);
-                });
-            }
+            me.getDomRect(ids).then(data => {
+                me.moveActiveIndicator(data)
+            })
         }
     }
 
@@ -89,7 +73,7 @@ class Strip extends Component {
      *
      */
     getTabContainer() {
-        return Neo.getComponent(this.tabContainerId);
+        return Neo.getComponent(this.tabContainerId)
     }
 
     /**
@@ -105,8 +89,9 @@ class Strip extends Component {
      * @param {Number} rects[0].y
      */
     moveActiveIndicator(rects) {
-        let me   = this,
-            rect = rects[1] || rects[0],
+        let me           = this,
+            tabStripRect = rects.shift(),
+            rect         = rects[1] || rects[0],
             activeTabIndicator, tabContainer;
 
         if (me.useActiveTabIndicator) {
@@ -118,20 +103,20 @@ class Strip extends Component {
                 case 'top':
                     activeTabIndicator.style = {
                         height: null,
-                        left  : `${rect.left}px`,
+                        left  : `${rect.left - tabStripRect.left}px`,
                         top   : null,
                         width : `${rect.width}px`
                     };
-                    break;
+                    break
                 case 'left':
                 case 'right':
                     activeTabIndicator.style = {
                         height: `${rect.height}px`,
                         left  : null,
-                        top   : `${rect.top}px`,
+                        top   : `${rect.top - tabStripRect.top}px`,
                         width : null
                     };
-                    break;
+                    break
             }
 
             // in case there is a dynamic change (oldValue), call this method again
@@ -140,7 +125,7 @@ class Strip extends Component {
                 me.update();
 
                 setTimeout(() => {
-                    me.moveActiveIndicator([rects[0]]);
+                    me.moveActiveIndicator([tabStripRect, rects[0]])
                 }, 50)
             } else {
                 activeTabIndicator.style.opacity = 1;
@@ -148,8 +133,8 @@ class Strip extends Component {
 
                 setTimeout(() => {
                     activeTabIndicator.style.opacity = 0;
-                    me.update();
-                }, 300);
+                    me.update()
+                }, 300)
             }
         }
     }

package/src/tab/header/Button.mjs

@@ -71,26 +71,24 @@ class Button extends BaseButton {
      * @protected
      */
     afterSetUseActiveTabIndicator(value, oldValue) {
-        this.updateUseActiveTabIndicator();
+        this.updateUseActiveTabIndicator()
     }
 
     /**
      * @param {Object} data
      */
     showRipple(data) {
-        !this.pressed && super.showRipple(data);
+        !this.pressed && super.showRipple(data)
     }
 
     /**
      * @param {Boolean} silent=false
      */
     updateUseActiveTabIndicator(silent=false) {
-        let me   = this,
-            vdom = me.vdom;
-
-        vdom.cn[4].removeDom = !me.useActiveTabIndicator;
+        let me = this;
 
-        me[silent ? '_vdom' : 'vdom'] = vdom;
+        me.vdom.cn[4].removeDom = !me.useActiveTabIndicator;
+        !silent && me.update()
     }
 }
 

package/src/worker/App.mjs

@@ -29,6 +29,7 @@ class App extends Base {
             main: [
                 'createNeoInstance',
                 'destroyNeoInstance',
+                'fireEvent',
                 'setConfigs'
             ]
         },
@@ -189,6 +190,30 @@ class App extends Base {
         return false
     }
 
+    /**
+     * Fires a custom event based on core.Observable on any app realm based Neo instance from main
+     * @param {Object} data
+     * @param {String} data.id
+     * @param {String} data.name
+     */
+    fireEvent(data) {
+        let instance = Neo.get(data.id),
+            name;
+
+        if (instance) {
+            name = data.name;
+
+            delete data.id;
+            delete data.name;
+
+            instance.fire(name, data);
+
+            return true
+        }
+
+        return false
+    }
+
     /**
      * Only needed for the SharedWorkers context
      * @param {String} eventName
@@ -196,7 +221,7 @@ class App extends Base {
      */
     fireMainViewsEvent(eventName, data) {
         this.ports.forEach(port => {
-            Neo.apps[port.appName].mainViewInstance.fire(eventName, data)
+            Neo.apps[port.appName].mainView.fire(eventName, data)
         })
     }
 

package/src/worker/Base.mjs

@@ -112,10 +112,8 @@ class Base extends CoreBase {
     onConnect(data) {
         // short delay to ensure app VCs are in place
         setTimeout(() => {
-            this.fire('connect', {
-                appName: data.appName
-            });
-        }, 10);
+            this.fire('connect', {appName: data.appName})
+        }, 10)
     }
 
     /**
@@ -129,9 +127,10 @@ class Base extends CoreBase {
         me.isConnected = true;
 
         me.ports.push({
-            appName: null,
+            appName : null,
             id,
-            port   : e.ports[0]
+            port    : e.ports[0],
+            windowId: null
         });
 
         me.ports[me.ports.length - 1].port.onmessage = me.onMessage.bind(me);
@@ -141,7 +140,7 @@ class Base extends CoreBase {
 
         me.sendMessage('main', {action: 'workerConstructed', port: id});
 
-        me.afterConnect();
+        me.afterConnect()
     }
 
     /**
@@ -154,7 +153,7 @@ class Base extends CoreBase {
 
         if (!me.isSharedWorker) {
             me.sendMessage('main', {action: 'workerConstructed'});
-            me.afterConnect();
+            me.afterConnect()
         }
     }
 
@@ -163,9 +162,7 @@ class Base extends CoreBase {
      * @param {Object} data
      */
     onDisconnect(data) {
-        this.fire('disconnect', {
-            appName: data.appName
-        });
+        this.fire('disconnect', {appName: data.appName})
     }
 
     /**
@@ -186,12 +183,12 @@ class Base extends CoreBase {
             me['on' + Neo.capitalize(action)](data);
         } else if (promise = action === 'reply' && me.promises[replyId]) {
             if (data.reject) {
-                promise.reject(data.data);
+                promise.reject(data.data)
             } else {
-                promise.resolve(data.data);
+                promise.resolve(data.data)
             }
 
-            delete me.promises[replyId];
+            delete me.promises[replyId]
         }
     }
 
@@ -199,9 +196,7 @@ class Base extends CoreBase {
      * @param {Object} msg
      */
     onPing(msg) {
-        this.resolve(msg, {
-            originMsg: msg
-        });
+        this.resolve(msg, {originMsg: msg})
     }
 
     /**
@@ -217,8 +212,8 @@ class Base extends CoreBase {
         for (port of me.ports) {
             if (!port.appName) {
                 port.appName = appName;
-                me.onConnect({ appName });
-                break;
+                me.onConnect({appName});
+                break
             }
         }
     }
@@ -228,7 +223,19 @@ class Base extends CoreBase {
      */
     onRegisterNeoConfig(msg) {
         Neo.config = Neo.config || {};
-        Object.assign(Neo.config, msg.data);
+
+        let me         = this,
+            {windowId} = msg.data,
+            port;
+
+        for (port of me.ports) {
+            if (!port.windowId) {
+                port.windowId = windowId;
+                break
+            }
+        }
+
+        Object.assign(Neo.config, msg.data)
     }
 
     /**
@@ -246,12 +253,12 @@ class Base extends CoreBase {
             let message = me.sendMessage(dest, opts, transfer),
                 msgId   = message.id;
 
-            me.promises[msgId] = { reject, resolve };
-        });
+            me.promises[msgId] = { reject, resolve }
+        })
     }
 
     /**
-     * @param {String} dest app, data, main or vdom (excluding the current worker)
+     * @param {String} dest app, canvas, data, main or vdom (excluding the current worker)
      * @param {Object} opts configs for Neo.worker.Message
      * @param {Array} [transfer] An optional array of Transferable objects to transfer ownership of.
      * If the ownership of an object is transferred, it becomes unusable (neutered) in the context it was sent from
@@ -268,24 +275,29 @@ class Base extends CoreBase {
         if (me.channelPorts[dest]) {
             port = me.channelPorts[dest];
         } else if (!me.isSharedWorker) {
-            port = globalThis;
+            port = globalThis
         } else {
             if (opts.port) {
-                port = me.getPort({id: opts.port}).port;
-            } else if (opts.appName) {
+                port = me.getPort({id: opts.port}).port
+            } else if (opts.windowId) {
+                portObject = me.getPort({windowId: opts.windowId});
+                port       = portObject.port;
+
+                opts.port = portObject.id
+            }  else if (opts.appName) {
                 portObject = me.getPort({appName: opts.appName});
                 port       = portObject.port;
 
-                opts.port = portObject.id;
+                opts.port = portObject.id
             } else {
-                port = me.ports[0].port;
+                port = me.ports[0].port
             }
         }
 
         message = new Message(opts);
 
         port.postMessage(message, transfer);
-        return message;
+        return message
     }
 }
 

package/src/worker/Canvas.mjs

@@ -45,7 +45,7 @@ class Canvas extends Base {
 
         me.sendMessage('app', {action: 'registerPort', transfer: port2}, [port2]);
 
-        me.channelPorts.app = port1;
+        me.channelPorts.app = port1
     }
 
     /**
@@ -58,7 +58,7 @@ class Canvas extends Base {
             action : 'reply',
             replyId: data.id,
             success: true
-        });
+        })
     }
 
     /**
@@ -75,8 +75,8 @@ class Canvas extends Base {
             /* webpackMode: "lazy" */
             `../../${path}/canvas.mjs`
         ).then(module => {
-            module.onStart();
-        });
+            module.onStart()
+        })
     }
 }
 

package/src/worker/Manager.mjs

@@ -6,7 +6,8 @@ import Observable         from '../core/Observable.mjs';
 import RemoteMethodAccess from './mixin/RemoteMethodAccess.mjs';
 
 const NeoConfig = Neo.config,
-      devMode   = NeoConfig.environment === 'development';
+      devMode   = NeoConfig.environment === 'development',
+      windowId  = new Date().getTime();
 
 /**
  * The worker manager lives inside the main thread and creates the App, Data & VDom worker.
@@ -207,8 +208,8 @@ class Manager extends Base {
 
             me.sendMessage(key, {
                 action: 'registerNeoConfig',
-                data  : config
-            });
+                data  : {...config, windowId}
+            })
         }
     }