neo.mjs 6.19.4 → 6.20.1

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='6.19.4'
+         * @member {String} version='6.20.1'
          */
-        version: '6.19.4'
+        version: '6.20.1'
     }
 
     /**

package/examples/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='6.19.4'
+         * @member {String} version='6.20.1'
          */
-        version: '6.19.4'
+        version: '6.20.1'
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "6.19.4",
+    "version": "6.20.1",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -52,7 +52,7 @@
         "envinfo": "^7.13.0",
         "fs-extra": "^11.2.0",
         "highlightjs-line-numbers.js": "^2.8.0",
-        "inquirer": "^10.1.0",
+        "inquirer": "^10.1.2",
         "marked": "^13.0.2",
         "monaco-editor": "^0.50.0",
         "neo-jsdoc": "1.0.1",

package/src/DefaultConfig.mjs

@@ -260,12 +260,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '6.19.4'
+     * @default '6.20.1'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '6.19.4'
+    version: '6.20.1'
 };
 
 Object.assign(DefaultConfig, {

package/src/component/Helix.mjs

@@ -258,9 +258,10 @@ class Helix extends Component {
         me[lockWheel]    = true;
 
         me.addDomListeners({
-            click: me.onClick,
-            wheel: me.onMouseWheel,
-            scope: me
+            click    : me.onClick,
+            touchmove: me.onTouchMove,
+            wheel    : me.onMouseWheel,
+            scope    : me
         })
     }
 
@@ -871,6 +872,13 @@ class Helix extends Component {
         this.createItems()
     }
 
+    /**
+     * @param {Object} data
+     */
+    onTouchMove(data) {
+        this.onMouseWheel(data)
+    }
+
     /**
      * @protected
      */

package/src/list/Base.mjs

@@ -769,7 +769,6 @@ class Base extends Component {
      * @param {Number} data.index
      * @param {Neo.data.Model} data.model
      * @param {Object} data.record
-     *
      */
     onStoreRecordChange(data) {
         let me      = this,

package/src/main/DomEvents.mjs

@@ -27,7 +27,7 @@ const touchEvents = [
     {name: 'touchend',    handler: 'onTouchEnd'},
     {name: 'touchenter',  handler: 'onTouchEnter'},
     {name: 'touchleave',  handler: 'onTouchLeave'},
-    {name: 'touchmove',   handler: 'onTouchMove'},
+    {name: 'touchmove',   handler: 'onTouchMove', options: {passive: false}},
     {name: 'touchstart',  handler: 'onTouchStart'}
 ];
 
@@ -111,6 +111,12 @@ class DomEvents extends Base {
         }
     }
 
+    /**
+     *
+     * @member {Object} touch
+     */
+    lastTouch = null
+
     /**
      * @param {Object} config
      */
@@ -606,7 +612,7 @@ class DomEvents extends Base {
      */
     onScroll(event) {
         let {clientHeight, clientWidth, scrollLeft, scrollTop} = event.target;
-
+event.preventDefault();
         this.sendMessageToApp({
             ...this.getEventData(event),
             clientHeight,

package/src/main/mixin/TouchDomEvents.mjs

@@ -19,14 +19,20 @@ class TouchDomEvents extends Base {
      * @param {Object} event
      */
     onTouchCancel(event) {
-        this.sendMessageToApp(this.getEventData(event))
+        let me = this;
+
+        me.sendMessageToApp(me.getEventData(event));
+        me.lastTouch = null
     }
 
     /**
      * @param {Object} event
      */
     onTouchEnd(event) {
-        this.sendMessageToApp(this.getEventData(event))
+        let me = this;
+
+        me.sendMessageToApp(me.getEventData(event));
+        me.lastTouch = null
     }
 
     /**
@@ -47,14 +53,36 @@ class TouchDomEvents extends Base {
      * @param {Object} event
      */
     onTouchMove(event) {
-        this.sendMessageToApp(this.getEventData(event))
+        let me          = this,
+            data        = me.getEventData(event),
+            touch       = event.touches[0],
+            {lastTouch} = me;
+
+        if (lastTouch) {
+            Object.assign(data, {
+                deltaX: touch.clientX - lastTouch.clientX,
+                deltaY: touch.clientY - lastTouch.clientY
+            })
+        }
+
+        me.sendMessageToApp(data);
+
+        me.lastTouch = touch;
+
+        if (me.testPathInclusion(event, ['neo-helix'])) {
+            event.preventDefault()
+        }
     }
 
     /**
      * @param {Object} event
      */
     onTouchStart(event) {
-        this.sendMessageToApp(this.getEventData(event))
+        let me = this;
+
+        me.lastTouch = event.touches[0];
+
+        me.sendMessageToApp(me.getEventData(event))
     }
 }
 

package/src/manager/DomEvent.mjs

@@ -34,6 +34,7 @@ const globalDomEvents = [
     'neonavigate',
     'scroll',
     'selectionchange',
+    'touchmove',
     'wheel'
 ];
 

package/src/tree/List.mjs

@@ -3,6 +3,7 @@ import ClassSystemUtil from '../util/ClassSystem.mjs';
 import Collection      from '../collection/Base.mjs';
 import NeoArray        from '../util/Array.mjs';
 import TreeModel       from '../selection/TreeModel.mjs';
+import VDomUtil        from "../util/VDom.mjs";
 
 /**
  * @class Neo.tree.List
@@ -172,6 +173,53 @@ class Tree extends Base {
         }
     }
 
+    /**
+     *
+     * @param {Object} record
+     * @returns {Object}
+     */
+    createItem(record) {
+        let me                   = this,
+            {folderCls, itemCls} = me,
+            cls                  = [itemCls],
+            itemVdom;
+
+        if (record.isLeaf) {
+            cls.push(itemCls + (record.singleton ? '-leaf-singleton' : '-leaf'))
+        } else {
+            cls.push(folderCls);
+
+            if (!record.collapsed) {
+                cls.push('neo-folder-open')
+            }
+        }
+
+        itemVdom = {
+            tag: 'li',
+            cls,
+            id : me.getItemId(record.id),
+            cn : [{
+                tag      : 'span',
+                cls      : [itemCls + '-content', record.iconCls],
+                innerHTML: record.name,
+                style    : {pointerEvents: 'none'}
+            }],
+            style: {
+                display : record.hidden ? 'none' : 'flex',
+                padding : '10px',
+                position: record.isLeaf ? null : 'sticky',
+                top     : record.isLeaf ? null : (record.level * 38) + 'px',
+                zIndex  : record.isLeaf ? null : (20 / (record.level + 1))
+            }
+        };
+
+        if (me.itemsFocusable) {
+            itemVdom.tabIndex = -1
+        }
+
+        return itemVdom
+    }
+
     /**
      * @param {String} [parentId] The parent node
      * @param {Object} [vdomRoot] The vdom template root for the current sub tree
@@ -181,10 +229,9 @@ class Tree extends Base {
      * @protected
      */
     createItems(parentId, vdomRoot, level, hidden=false) {
-        let me                   = this,
-            items                = me.store.find('parentId', parentId),
-            {folderCls, itemCls} = me,
-            cls, itemVdom, tmpRoot;
+        let me    = this,
+            items = me.store.find('parentId', parentId),
+            tmpRoot;
 
         if (items.length > 0) {
             if (!vdomRoot.cn) {
@@ -207,45 +254,12 @@ class Tree extends Base {
                 tmpRoot = vdomRoot
             }
 
-            items.forEach(item => {
-                cls = [itemCls];
-
-                if (item.isLeaf) {
-                    cls.push(itemCls + (item.singleton ? '-leaf-singleton' : '-leaf'))
-                } else {
-                    cls.push(folderCls);
-
-                    if (!item.collapsed) {
-                        cls.push('neo-folder-open')
-                    }
-                }
+            items.forEach(record => {
+                record.level = level;
 
-                itemVdom = {
-                    tag: 'li',
-                    cls,
-                    id : me.getItemId(item.id),
-                    cn : [{
-                        tag      : 'span',
-                        cls      : [itemCls + '-content', item.iconCls],
-                        innerHTML: item.name,
-                        style    : {pointerEvents: 'none'}
-                    }],
-                    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))
-                    }
-                };
+                tmpRoot.cn.push(me.createItem(record));
 
-                if (me.itemsFocusable) {
-                    itemVdom.tabIndex = -1
-                }
-
-                tmpRoot.cn.push(itemVdom);
-
-                me.createItems(item.id, tmpRoot, level + 1, item.hidden || hidden)
+                me.createItems(record.id, tmpRoot, level + 1, record.hidden || hidden)
             })
         }
 
@@ -435,6 +449,23 @@ class Tree extends Base {
             this.expandAll()
         }
     }
+
+    /**
+     * @param {Object} data
+     * @param {Object[]} data.fields Each field object contains the keys: name, oldValue, value
+     * @param {Number} data.index
+     * @param {Neo.data.Model} data.model
+     * @param {Object} data.record
+     */
+    onStoreRecordChange(data) {
+        let me                  = this,
+            {record}            = data,
+            {index, parentNode} = VDomUtil.findVdomChild(me.vdom, me.getItemId(record.id));
+
+        parentNode.cn[index] = me.createItem(record);
+
+        me.update()
+    }
 }
 
 Neo.setupClass(Tree);