neo.mjs 7.2.0 → 7.4.0

package/src/calendar/view/MainContainer.mjs

@@ -346,11 +346,12 @@ class MainContainer extends Container {
             let me = this;
 
             me._editEventContainer = value = Neo.create({
-                module : EditEventContainer,
-                appName: me.appName,
-                model  : {parent: me.getModel()},
-                owner  : me,
-                width  : 250,
+                module  : EditEventContainer,
+                appName : me.appName,
+                model   : {parent: me.getModel()},
+                owner   : me,
+                width   : 250,
+                windowId: me.windowId,
                 ...me.editEventContainerConfig
             })
         }

package/src/component/Base.mjs

@@ -829,7 +829,7 @@ class Base extends CoreBase {
                     me.alignTo();
 
                     // Focus will be pushed into the first input field or other focusable item
-                    Neo.main.DomAccess.focus({id, children: true, windowId})
+                    me.focus(id, true)
                 }
 
                 me.fire('mounted', me.id)
@@ -1516,9 +1516,10 @@ class Base extends CoreBase {
     /**
      * Calls focus() on the top level DOM node of this component or on a given node via id
      * @param {String} id=this.id
+     * @param {Boolean} children=false
      */
-    focus(id=this.id) {
-        Neo.main.DomAccess.focus({id, windowId: this.windowId})
+    focus(id=this.id, children=false) {
+        Neo.main.DomAccess.focus({children, id, windowId: this.windowId})
     }
 
     /**

package/src/component/DateSelector.mjs

@@ -166,7 +166,8 @@ class DateSelector extends Component {
      * @protected
      */
     afterSetCurrentDate(value, oldValue) {
-        let me = this,
+        let me             = this,
+            {id, windowId} = me,
             dayIncrement, method, methodParams,  monthIncrement, yearIncrement;
 
         if (me.mounted) {
@@ -181,14 +182,12 @@ class DateSelector extends Component {
                 method       = 'changeYear';
                 methodParams = [yearIncrement]
             } else if (dayIncrement !== 0) {
-                me.selectionModel.select(me.id + '__' + DateUtil.convertToyyyymmdd(value))
+                me.selectionModel.select(id + '__' + DateUtil.convertToyyyymmdd(value))
             }
 
             if (method) {
                 if (me.containsFocus) {
-                    Neo.main.DomAccess.focus({
-                        id: me.id
-                    }).then(data => {
+                    Neo.main.DomAccess.focus({id, windowId}).then(data => {
                         me[method](...methodParams)
                     })
                 } else {

package/src/dialog/Base.mjs

@@ -668,7 +668,9 @@ class Base extends Panel {
 
                 // we need a reset, otherwise we do not get a change event for the next onDragStart() call
                 me.dragZone.boundaryContainerId = null;
-                me.isDragging                   = false
+                me.isDragging                   = false;
+
+                me.focus(me.id, true)
             })
         }
     }

package/src/form/field/Time.mjs

@@ -294,8 +294,9 @@ class Time extends Picker {
         let me = this;
 
         Neo.main.DomAccess.focus({
-            appName: me.appName,
-            id     : me.getInputElId()
+            appName : me.appName,
+            id      : me.getInputElId(),
+            windowId: me.windowId
         }).then(() => {
             callback?.apply(me)
         })

package/src/list/Base.mjs

@@ -465,7 +465,7 @@ class Base extends Component {
             itemId           = me.getItemId(record[me.getKeyProperty()]),
             {selectionModel} = me,
             isSelected       = !me.disableSelection && selectionModel?.isSelected(itemId),
-            item;
+            item, removeDom;
 
         isHeader && cls.push('neo-list-header');
 
@@ -492,7 +492,7 @@ class Base extends Component {
             item.tabIndex = -1
         }
 
-        if (record.hidden) {
+        if (record.hidden || itemContent.removeDom) {
             item.removeDom = true
         }
 
@@ -507,6 +507,19 @@ class Base extends Component {
 
             case 'Array': {
                 item.cn = itemContent;
+
+                removeDom = true;
+
+                itemContent.forEach(item => {
+                    if (!item.removeDom) {
+                        removeDom = false
+                    }
+                })
+
+                if (removeDom) {
+                    item.removeDom = true
+                }
+
                 break
             }
 

package/src/main/DomAccess.mjs

@@ -392,15 +392,17 @@ class DomAccess extends Base {
     /**
      * Calls focus() on a node for a given dom node id
      * @param {Object} data
+     * @param {Boolean} data.children
+     * @param {String} data.id
      * @returns {Object} obj.id => the passed id
      */
-    focus(data) {
-        let node = this.getElement(data.id);
+    focus({children, id}) {
+        let node = this.getElement(id);
 
         if (node) {
             // The children property means focus inner elements if possible.
-            if (!DomUtils.isFocusable(node) && data.children) {
-                // query for the first focusable decendent
+            if (!DomUtils.isFocusable(node) && children) {
+                // query for the first focusable descendent
                 node = DomUtils.query(node, DomUtils.isFocusable)
             }
 
@@ -413,7 +415,7 @@ class DomAccess extends Base {
             }
         }
 
-        return {id: data.id}
+        return {id}
     }
 
     /**

package/src/main/DomEvents.mjs

@@ -319,7 +319,7 @@ class DomEvents extends Base {
      * @returns {Object}
      */
     getMouseEventData(event) {
-        let {altKey, clientX, clientY, ctrlKey, metaKey, offsetX, offsetY, pageX, pageY, screenX, screenY, shiftKey} = event;
+        let {altKey, clientX, clientY, ctrlKey, detail, metaKey, offsetX, offsetY, pageX, pageY, screenX, screenY, shiftKey} = event;
 
         return {
             ...this.getEventData(event),
@@ -327,6 +327,7 @@ class DomEvents extends Base {
             clientX,
             clientY,
             ctrlKey,
+            detail,
             metaKey,
             offsetX,
             offsetY,

package/src/selection/grid/CellColumnModel.mjs

@@ -64,7 +64,7 @@ class CellColumnModel extends CellModel {
      */
     onCellClick(data) {
         let me = this,
-            id = ColumnModel.getCellId(data.path),
+            id = data.data.currentTarget,
             columnNodeIds, index, tbodyNode;
 
         if (id) {

package/src/selection/grid/CellColumnRowModel.mjs

@@ -63,8 +63,8 @@ class CellColumnRowModel extends CellRowModel {
      * @param {Object} data
      */
     onCellClick(data) {
-        let me   = this,
-            id   = ColumnModel.getCellId(data.path),
+        let me = this,
+            id = ColumnModel.getCellId(data.data.path),
             columnNodeIds, index, tbodyNode;
 
         if (id) {

package/src/selection/grid/CellModel.mjs

@@ -17,7 +17,7 @@ class CellModel extends Model {
          */
         ntype: 'selection-grid-cellmodel',
         /**
-         * @member {String} cls='selection-cellmodel'
+         * @member {String} cls='neo-selection-cellmodel'
          * @protected
          */
         cls: 'neo-selection-cellmodel'
@@ -27,34 +27,27 @@ class CellModel extends Model {
      *
      */
     addDomListener() {
-        let me     = this,
-            {view} = me;
-
-        view.addDomListeners({
-            click   : me.onCellClick,
-            delegate: '.neo-grid-cell',
-            scope   : me
-        })
+        let me = this;
+
+        me.view.on('cellClick', me.onCellClick, me)
     }
 
     /**
-     * @param {Object} data
+     * @param args
      */
-    onCellClick(data) {
-        let me     = this,
-            {path} = data,
-            i      = 0,
-            len    = path.length,
-            id;
+    destroy(...args) {
+        let me = this;
 
-        for (; i < len; i++) {
-            if (path[i].cls.includes('neo-grid-cell')) {
-                id = path[i].id;
-                break
-            }
-        }
+        me.view.un('cellClick', me.onCellClick, me);
 
-        id && me.toggleSelection(id)
+        super.destroy(...args);
+    }
+
+    /**
+     * @param {Object} data
+     */
+    onCellClick(data) {
+        this.toggleSelection(data.data.currentTarget)
     }
 
     /**

package/src/selection/grid/CellRowModel.mjs

@@ -81,7 +81,7 @@ class CellRowModel extends CellModel {
      */
     onCellClick(data) {
         let me   = this,
-            node = RowModel.getRowNode(data.path), // we could add a separate export for this method
+            node = RowModel.getRowNode(data.data.path), // we could add a separate export for this method
             id   = node?.id;
 
         if (id) {

package/src/selection/grid/ColumnModel.mjs

@@ -28,14 +28,20 @@ class ColumnModel extends Model {
      *
      */
     addDomListener() {
-        let me     = this,
-            {view} = me;
+        let me = this;
 
-        view.addDomListeners({
-            click   : me.onCellClick,
-            delegate: '.neo-grid-cell',
-            scope   : me
-        })
+        me.view.on('cellClick', me.onCellClick, me)
+    }
+
+    /**
+     * @param args
+     */
+    destroy(...args) {
+        let me = this;
+
+        me.view.un('cellClick', me.onCellClick, me);
+
+        super.destroy(...args);
     }
 
     /**
@@ -76,7 +82,7 @@ class ColumnModel extends Model {
      */
     onCellClick(data) {
         let me = this,
-            id = ColumnModel.getCellId(data.path),
+            id = data.data.currentTarget,
             columnNodeIds, index, tbodyNode;
 
         if (id) {

package/src/selection/grid/RowModel.mjs

@@ -18,7 +18,7 @@ class RowModel extends Model {
          */
         ntype: 'selection-grid-rowmodel',
         /**
-         * @member {String} cls='selection-rowmodel'
+         * @member {String} cls='neo-selection-rowmodel'
          * @protected
          */
         cls: 'neo-selection-rowmodel'
@@ -28,14 +28,20 @@ class RowModel extends Model {
      *
      */
     addDomListener() {
-        let me     = this,
-            {view} = me;
+        let me = this;
 
-        view.addDomListeners({
-            click   : me.onRowClick,
-            delegate: '.neo-grid-row',
-            scope   : me
-        })
+        me.view.on('rowClick', me.onRowClick, me)
+    }
+
+    /**
+     * @param args
+     */
+    destroy(...args) {
+        let me = this;
+
+        me.view.un('rowClick', me.onRowClick, me);
+
+        super.destroy(...args);
     }
 
     /**
@@ -120,8 +126,7 @@ class RowModel extends Model {
      */
     onRowClick(data) {
         let me     = this,
-            node   = RowModel.getRowNode(data.path),
-            id     = node?.id,
+            id     = data.data.currentTarget,
             {view} = me,
             isSelected, record;
 

package/src/selection/table/CellColumnModel.mjs

@@ -64,7 +64,7 @@ class CellColumnModel extends CellModel {
      */
     onCellClick(data) {
         let me = this,
-            id = ColumnModel.getCellId(data.path),
+            id = data.data.currentTarget,
             columnNodeIds, index, tbodyNode;
 
         if (id) {

package/src/selection/table/CellColumnRowModel.mjs

@@ -64,7 +64,7 @@ class CellColumnRowModel extends CellRowModel {
      */
     onCellClick(data) {
         let me = this,
-            id = ColumnModel.getCellId(data.path),
+            id = data.data.currentTarget,
             columnNodeIds, index, tbodyNode;
 
         if (id) {

package/src/selection/table/CellModel.mjs

@@ -17,7 +17,7 @@ class CellModel extends Model {
          */
         ntype: 'selection-table-cellmodel',
         /**
-         * @member {String} cls='selection-cellmodel'
+         * @member {String} cls='neo-selection-cellmodel'
          * @protected
          */
         cls: 'neo-selection-cellmodel'
@@ -27,36 +27,27 @@ class CellModel extends Model {
      *
      */
     addDomListener() {
-        let me     = this,
-            {view} = me;
-
-        view.addDomListeners({
-            click   : me.onCellClick,
-            delegate: '.neo-table-cell',
-            scope   : me
-        })
+        let me = this;
+
+        me.view.on('cellClick', me.onCellClick, me)
+    }
+
+    /**
+     * @param args
+     */
+    destroy(...args) {
+        let me = this;
+
+        me.view.un('cellClick', me.onCellClick, me);
+
+        super.destroy(...args);
     }
 
     /**
      * @param {Object} data
      */
     onCellClick(data) {
-        let me     = this,
-            id     = null,
-            {path} = data,
-            i      = 0,
-            len    = path.length;
-
-        for (; i < len; i++) {
-            if (path[i].tagName === 'td') {
-                id = path[i].id;
-                break
-            }
-        }
-
-        if (id) {
-            me.toggleSelection(id)
-        }
+        this.toggleSelection(data.data.currentTarget)
     }
 
     /**

package/src/selection/table/CellRowModel.mjs

@@ -81,7 +81,7 @@ class CellRowModel extends CellModel {
      */
     onCellClick(data) {
         let me   = this,
-            node = RowModel.getRowNode(data.path), // we could add a separate export for this method
+            node = RowModel.getRowNode(data.data.path), // we could add a separate export for this method
             id   = node?.id;
 
         if (id) {

package/src/selection/table/ColumnModel.mjs

@@ -18,7 +18,7 @@ class ColumnModel extends Model {
          */
         ntype: 'selection-table-columnmodel',
         /**
-         * @member {String} cls='selection-columnmodel'
+         * @member {String} cls='neo-selection-columnmodel'
          * @protected
          */
         cls: 'neo-selection-columnmodel'
@@ -28,14 +28,20 @@ class ColumnModel extends Model {
      *
      */
     addDomListener() {
-        let me     = this,
-            {view} = me;
-
-        view.addDomListeners({
-            click   : me.onCellClick,
-            delegate: '.neo-table-cell',
-            scope   : me
-        })
+        let me = this;
+
+        me.view.on('cellClick', me.onCellClick, me)
+    }
+
+    /**
+     * @param args
+     */
+    destroy(...args) {
+        let me = this;
+
+        me.view.un('cellClick', me.onCellClick, me);
+
+        super.destroy(...args);
     }
 
     /**
@@ -76,7 +82,7 @@ class ColumnModel extends Model {
      */
     onCellClick(data) {
         let me = this,
-            id = ColumnModel.getCellId(data.path),
+            id = data.data.currentTarget,
             columnNodeIds, index, tbodyNode;
 
         if (id) {

package/src/selection/table/RowModel.mjs

@@ -28,14 +28,20 @@ class RowModel extends Model {
      *
      */
     addDomListener() {
-        let me     = this,
-            {view} = me;
+        let me = this;
+
+        me.view.on('rowClick', me.onRowClick, me)
+    }
+
+    /**
+     * @param args
+     */
+    destroy(...args) {
+        let me = this;
+
+        me.view.un('rowClick', me.onRowClick, me);
 
-        view.addDomListeners({
-            click   : me.onRowClick,
-            delegate: '.neo-table-row',
-            scope   : me
-        })
+        super.destroy(...args);
     }
 
     /**
@@ -120,8 +126,7 @@ class RowModel extends Model {
      */
     onRowClick(data) {
         let me     = this,
-            node   = RowModel.getRowNode(data.path),
-            id     = node?.id,
+            id     = data.data.currentTarget,
             {view} = me,
             isSelected, record;
 

package/src/table/View.mjs

@@ -273,7 +273,7 @@ class View extends Component {
      */
     fireCellEvent(data, eventName) {
         let me        = this,
-            {id}      = data.target,
+            id        = data.currentTarget,
             dataField = me.getCellDataField(id),
             record    = me.getRecord(id);
 
@@ -286,7 +286,7 @@ class View extends Component {
      */
     fireRowEvent(data, eventName) {
         let me     = this,
-            {id}   = data.target,
+            id     = data.currentTarget,
             record = me.getRecord(id);
 
         me.parent.fire(eventName, {id: me, data, record})

package/src/worker/App.mjs

@@ -376,6 +376,17 @@ class App extends Base {
             })
         })
     }
+    /**
+     * Triggered in case a connected ServiceWorker receives a new version.
+     * Especially inside dist envs, a reload of the connecting window is required,
+     * since the SW will clear its caches and the app can receive conflicting bundle versions.
+     * @param {Object} data
+     * @param {String} data.newVersion
+     * @param {String} data.oldVersion
+     */
+    onNewVersion(data) {
+        Neo.Main.reloadWindow({});
+    }
 
     /**
      * Fire event on all apps

package/src/worker/ServiceBase.mjs

@@ -250,16 +250,25 @@ class ServiceBase extends Base {
      * @param {ExtendableMessageEvent} event
      */
     async onRegisterNeoConfig(msg, event) {
-        let me = this;
+        let me        = this,
+            {version} = me;
 
         Neo.config = Neo.config || {};
         Object.assign(Neo.config, msg.data);
 
-        if (me.version !== Neo.config.version) {
-            await me.clearCaches()
-        }
+        if (version !== Neo.config.version) {
+            await me.clearCaches();
 
-        me.onConnect(event.source)
+            me.version = Neo.config.version;
+
+            me.sendMessage('app', {
+                action    : 'newVersion',
+                newVersion: Neo.config.version,
+                oldVersion: version
+            })
+        } else {
+            me.onConnect(event.source)
+        }
     }
 
     /**