neo.mjs 6.17.2 → 6.18.0

package/src/selection/GalleryModel.mjs

@@ -36,7 +36,7 @@ class GalleryModel extends Model {
      */
     onContainerClick() {
         let me       = this,
-            view     = me.view,
+            {view}   = me,
             oldItems = [...me.items],
             deltas   = [];
 
@@ -52,22 +52,18 @@ class GalleryModel extends Model {
 
         me.items.splice(0, me.items.length);
 
-        Neo.currentWorker.promiseMessage('main', {
-            action : 'updateDom',
-            appName: view.appName,
-            deltas : deltas
-        }).then(() => {
-            me.fire('selectionChange', me.items, oldItems);
-        });
+        Neo.applyDeltas(view.appName, deltas).then(() => {
+            me.fire('selectionChange', me.items, oldItems)
+        })
     }
 
     /**
      * @param {Object} data
      */
     onItemClick(data) {
-        let i    = 0,
-            len  = data.path.length,
-            view = this.view,
+        let i      = 0,
+            len    = data.path.length,
+            {view} = this,
             key;
 
         for (; i < len; i++) {
@@ -79,7 +75,7 @@ class GalleryModel extends Model {
                     record: view.store.get(key)
                 });
 
-                break;
+                break
             }
         }
     }
@@ -88,28 +84,28 @@ class GalleryModel extends Model {
      * @param {Object} data
      */
     onKeyDownDown(data) {
-        this[this.view.orderByRow ? 'onNavKeyRow' : 'onNavKeyColumn'](1);
+        this[this.view.orderByRow ? 'onNavKeyRow' : 'onNavKeyColumn'](1)
     }
 
     /**
      * @param {Object} data
      */
     onKeyDownLeft(data) {
-        this[this.view.orderByRow ? 'onNavKeyColumn' : 'onNavKeyRow'](-1);
+        this[this.view.orderByRow ? 'onNavKeyColumn' : 'onNavKeyRow'](-1)
     }
 
     /**
      * @param {Object} data
      */
     onKeyDownRight(data) {
-        this[this.view.orderByRow ? 'onNavKeyColumn' : 'onNavKeyRow'](1);
+        this[this.view.orderByRow ? 'onNavKeyColumn' : 'onNavKeyRow'](1)
     }
 
     /**
      * @param {Object} data
      */
     onKeyDownUp(data) {
-        this[this.view.orderByRow ? 'onNavKeyRow' : 'onNavKeyColumn'](-1);
+        this[this.view.orderByRow ? 'onNavKeyRow' : 'onNavKeyColumn'](-1)
     }
 
     /**
@@ -117,22 +113,22 @@ class GalleryModel extends Model {
      */
     onNavKeyColumn(step=1) {
         let me           = this,
-            view         = me.view,
-            store        = view.store,
+            {view}       = me,
+            {store}      = view,
             selected     = me.items[0],
             countRecords = store.getCount(),
             index, record;
 
         if (selected) {
-            index = store.indexOf(selected) + step;
+            index = store.indexOf(selected) + step
         } else {
-            index = 0;
+            index = 0
         }
 
         if (index < 0) {
-            index = countRecords - 1;
+            index = countRecords - 1
         } else if (index >= countRecords) {
-            index = 0;
+            index = 0
         }
 
         record = store.getAt(index);
@@ -141,47 +137,45 @@ class GalleryModel extends Model {
 
         view.fire('select', {
             record
-        });
+        })
     }
 
     /**
      * @param {Number} step=1
      */
     onNavKeyRow(step=1) {
-        let me           = this,
-            view         = me.view,
-            store        = view.store,
-            selected     = me.items[0],
-            countRecords = store.getCount(),
-            amountRows   = view.amountRows,
-            stayInRow    = me.stayInRow,
+        let me                  = this,
+            {stayInRow, view}   = me,
+            {amountRows, store} = view,
+            selected            = me.items[0],
+            countRecords        = store.getCount(),
             index, record;
 
         if (view.orderByRow) {
-            amountRows = Math.ceil(view.store.getCount() / amountRows);
+            amountRows = Math.ceil(view.store.getCount() / amountRows)
         }
 
         step *= amountRows;
 
         if (selected) {
-            index = store.indexOf(selected) + step;
+            index = store.indexOf(selected) + step
         } else {
-            index = 0;
+            index = 0
         }
 
         if (index < 0) {
             if (!stayInRow) {
-                index++;
+                index++
             }
             while (index < (countRecords - amountRows)) {
-                index += amountRows;
+                index += amountRows
             }
         } else if (index >= countRecords) {
             if (!stayInRow) {
-                index--;
+                index--
             }
             while (index >= amountRows) {
-                index -= amountRows;
+                index -= amountRows
             }
         }
 
@@ -191,7 +185,7 @@ class GalleryModel extends Model {
 
         view.fire('select', {
             record
-        });
+        })
     }
 
     /**
@@ -200,9 +194,8 @@ class GalleryModel extends Model {
     register(component) {
         super.register(component);
 
-        let me   = this,
-            id   = me.id,
-            view = me.view;
+        let me         = this,
+            {id, view} = me;
 
         view.on({
             containerClick: me.onContainerClick,
@@ -215,25 +208,24 @@ class GalleryModel extends Model {
             {fn: 'onKeyDownLeft'  ,key: 'Left'  ,scope: id},
             {fn: 'onKeyDownRight' ,key: 'Right' ,scope: id},
             {fn: 'onKeyDownUp'    ,key: 'Up'    ,scope: id}
-        );
+        )
     }
 
     /**
      * @param {String} itemId
      */
     select(itemId) {
-        let me       = this,
-            view     = me.view,
-            items    = me.items,
-            oldItems = [...items],
-            deltas   = [],
-            vnodeId  = view?.getItemVnodeId(itemId);
+        let me            = this,
+            {items, view} = me,
+            oldItems      = [...items],
+            deltas        = [],
+            vnodeId       = view?.getItemVnodeId(itemId);
 
         // a select() call can happen before the view is registered
         if (!view) {
             // will get picked up by view.afterSetMounted()
             NeoArray['add'](items, itemId);
-            return;
+            return
         }
 
         if (me.singleSelect) {
@@ -245,11 +237,11 @@ class GalleryModel extends Model {
                             add   : [],
                             remove: ['neo-selected']
                         }
-                    });
+                    })
                 }
             });
 
-            items.splice(0, items.length);
+            items.splice(0, items.length)
         }
 
         deltas.push({
@@ -262,17 +254,13 @@ class GalleryModel extends Model {
         NeoArray['add'](items, itemId);
 
         if (deltas.length > 0 && view.mounted) {
-            Neo.currentWorker.promiseMessage('main', {
-                action : 'updateDom',
-                appName: view.appName,
-                deltas : deltas
-            }).then(() => {
+            Neo.applyDeltas(view.appName, deltas).then(() => {
                 view.onSelect?.(items);
-                me.fire('selectionChange', items, oldItems);
-            });
+                me.fire('selectionChange', items, oldItems)
+            })
         } else if (view.mounted) {
             view.onSelect?.(items);
-            me.fire('selectionChange', items, oldItems);
+            me.fire('selectionChange', items, oldItems)
         }
     }
 
@@ -280,9 +268,7 @@ class GalleryModel extends Model {
      *
      */
     unregister() {
-        let me   = this,
-            id   = me.id,
-            view = me.view;
+        let {id, view} = this;
 
         view.keys?.removeKeys([
             {fn: 'onKeyDownDown'  ,key: 'Down'  ,scope: id},
@@ -291,7 +277,7 @@ class GalleryModel extends Model {
             {fn: 'onKeyDownUp'    ,key: 'Up'    ,scope: id}
         ]);
 
-        super.unregister();
+        super.unregister()
     }
 }
 

package/src/selection/HelixModel.mjs

@@ -36,7 +36,7 @@ class HelixModel extends Model {
      */
     onContainerClick() {
         let me       = this,
-            view     = me.view,
+            {view}   = me,
             oldItems = [...me.items],
             deltas   = [];
 
@@ -52,22 +52,18 @@ class HelixModel extends Model {
 
         me.items.splice(0, me.items.length);
 
-        Neo.currentWorker.promiseMessage('main', {
-            action : 'updateDom',
-            appName: view.appName,
-            deltas : deltas
-        }).then(() => {
-            me.fire('selectionChange', me.items, oldItems);
-        });
+        Neo.applyDeltas(view.appName, deltas).then(() => {
+            me.fire('selectionChange', me.items, oldItems)
+        })
     }
 
     /**
      * @param {Object} data
      */
     onItemClick(data) {
-        let i    = 0,
-            len  = data.path.length,
-            view = this.view,
+        let i      = 0,
+            len    = data.path.length,
+            {view} = this,
             key;
 
         for (; i < len; i++) {
@@ -79,7 +75,7 @@ class HelixModel extends Model {
                     record: view.store.get(key)
                 });
 
-                break;
+                break
             }
         }
     }
@@ -88,64 +84,63 @@ class HelixModel extends Model {
      * @param {Object} data
      */
     onKeyDownDown(data) {
-        this.onNavKeyColumn(1);
+        this.onNavKeyColumn(1)
     }
 
     /**
      * @param {Object} data
      */
     onKeyDownLeft(data) {
-        this.onNavKeyRow(-1);
+        this.onNavKeyRow(-1)
     }
 
     /**
      * @param {Object} data
      */
     onKeyDownRight(data) {
-        this.onNavKeyRow(1);
+        this.onNavKeyRow(1)
     }
 
     /**
      * @param {Object} data
      */
     onKeyDownUp(data) {
-        this.onNavKeyColumn(-1);
+        this.onNavKeyColumn(-1)
     }
 
     /**
      * @param {Number} step=1
      */
     onNavKeyColumn(step=1) {
-        let me           = this,
-            view         = me.view,
-            store        = view.store,
-            selected     = me.items[0],
-            countRecords = store.getCount(),
-            itemsPerRow  = parseInt(360 / view.itemAngle),
-            stayInColumn = me.stayInColumn,
+        let me                   = this,
+            {stayInColumn, view} = me,
+            {store}              = view,
+            selected             = me.items[0],
+            countRecords         = store.getCount(),
+            itemsPerRow          = parseInt(360 / view.itemAngle),
             index, record;
 
         step *= itemsPerRow;
 
         if (selected) {
-            index = store.indexOf(selected) + step;
+            index = store.indexOf(selected) + step
         } else {
-            index = 0;
+            index = 0
         }
 
         if (index < 0) {
             if (!stayInColumn) {
-                index++;
+                index++
             }
             while (index < (countRecords - itemsPerRow)) {
-                index += itemsPerRow;
+                index += itemsPerRow
             }
         } else if (index >= countRecords) {
             if (!stayInColumn) {
-                index--;
+                index--
             }
             while (index >= itemsPerRow) {
-                index -= itemsPerRow;
+                index -= itemsPerRow
             }
         }
 
@@ -155,7 +150,7 @@ class HelixModel extends Model {
 
         view.fire('select', {
             record
-        });
+        })
     }
 
     /**
@@ -163,22 +158,22 @@ class HelixModel extends Model {
      */
     onNavKeyRow(step=1) {
         let me           = this,
-            view         = me.view,
-            store        = view.store,
+            {view}       = me,
+            {store}      = view,
             selected     = me.items[0],
             countRecords = store.getCount(),
             index, record;
 
         if (selected) {
-            index = store.indexOf(selected) + step;
+            index = store.indexOf(selected) + step
         } else {
-            index = 0;
+            index = 0
         }
 
         if (index < 0) {
-            index = countRecords - 1;
+            index = countRecords - 1
         } else if (index >= countRecords) {
-            index = 0;
+            index = 0
         }
 
         record = store.getAt(index);
@@ -187,7 +182,7 @@ class HelixModel extends Model {
 
         view.fire('select', {
             record
-        });
+        })
     }
 
     /**
@@ -196,9 +191,8 @@ class HelixModel extends Model {
     register(component) {
         super.register(component);
 
-        let me   = this,
-            id   = me.id,
-            view = me.view;
+        let me         = this,
+            {id, view} = me;
 
         view.on({
             containerClick: me.onContainerClick,
@@ -211,7 +205,7 @@ class HelixModel extends Model {
             {fn: 'onKeyDownLeft'  ,key: 'Left'  ,scope: id},
             {fn: 'onKeyDownRight' ,key: 'Right' ,scope: id},
             {fn: 'onKeyDownUp'    ,key: 'Up'    ,scope: id}
-        );
+        )
     }
 
     /**

package/src/selection/ListModel.mjs

@@ -58,14 +58,13 @@ class ListModel extends Model {
      * @param {Object} data
      */
     onListClick({ currentTarget }) {
-        const {view} = this;
+        let {view} = this,
+            record;
 
         if (!view.disableSelection) {
-            const record = view.store.get(view.getItemRecordId(currentTarget));
+            record = view.store.get(view.getItemRecordId(currentTarget));
 
-            if (record) {
-                this.select(record)
-            }
+            record && this.select(record)
         }
     }
 
@@ -73,8 +72,7 @@ class ListModel extends Model {
      * @param {Object} data
      */
     onListNavigate(data) {
-        const
-            {view}  = this,
+        let {view}  = this,
             {store} = view;
 
         data.record      = store.getAt(Math.min(data.activeIndex, store.getCount()));
@@ -126,22 +124,19 @@ class ListModel extends Model {
      * @param {Number} index
      */
     selectAt(index) {
-        let view      = this.view,
+        let {view}    = this,
             recordKey = view?.store.getKeyAt(index),
             itemId    = recordKey && view.getItemId(recordKey);
 
-        if (itemId) {
-            this.select(itemId)
-        }
+        itemId && this.select(itemId)
     }
 
     /**
      *
      */
     unregister() {
-        let me   = this,
-            id   = me.id,
-            view = me.view;
+        let me         = this,
+            {id, view} = me;
 
         view.keys?.removeKeys([
             {fn: 'onKeyDownDown'   ,key: 'Down'   ,scope: id},