neo.mjs 7.3.0 → 7.5.0

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)
+        }
     }
 
     /**

package/test/siesta/tests/ClassConfigsAndFields.mjs

@@ -20,7 +20,7 @@ class TestClass extends core.Base {
     }
 }
 
-Neo.applyClassConfig(TestClass);
+TestClass = Neo.setupClass(TestClass);
 
 StartTest(t => {
     t.it('Default class fields inside constructors', t => {
@@ -73,7 +73,7 @@ StartTest(t => {
             }
         }
 
-        Neo.applyClassConfig(NeoCtorTest);
+        Neo.setupClass(NeoCtorTest);
 
         Neo.create(NeoCtorTest);
 
@@ -243,9 +243,10 @@ StartTest(t => {
             fieldB = 1;
 
             static config = {
-                configA_: 0,
-                configB_: 0,
-                configC_: 0
+                className: 'AdvancedClass',
+                configA_ : 0,
+                configB_ : 0,
+                configC_ : 0
             }
 
             afterSetConfigA(value, oldValue) {
@@ -280,7 +281,7 @@ StartTest(t => {
             }
         }
 
-        Neo.applyClassConfig(AdvancedClass);
+        AdvancedClass = Neo.setupClass(AdvancedClass);
 
         let instance = Neo.create(AdvancedClass);
 

package/test/siesta/tests/ClassSystem.mjs

@@ -46,7 +46,7 @@ StartTest(t => {
             }
         }
 
-        Neo.applyClassConfig(TestClass);
+        Neo.setupClass(TestClass);
 
         instance = Neo.create(TestClass);