neo.mjs 6.17.2 → 6.18.1

package/src/selection/Model.mjs

@@ -59,10 +59,10 @@ class Model extends Base {
      */
     beforeGetItems(value) {
         if (!value) {
-            this._items = value = [];
+            this._items = value = []
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -71,7 +71,7 @@ class Model extends Base {
      * @returns {Neo.component.Base}
      */
     beforeGetView(value) {
-        return Neo.getComponent(this._view);
+        return Neo.getComponent(this._view)
     }
 
     /**
@@ -79,7 +79,7 @@ class Model extends Base {
      * @returns {String} the view id
      */
     beforeSetView(value) {
-        return value && value.id;
+        return value && value.id
     }
 
     /**
@@ -98,13 +98,13 @@ class Model extends Base {
         item = item.isRecord ? view.getItemId(item) : Neo.isObject(item) ? item.id : item;
 
         if (itemCollection.includes(item)) {
-            let me   = this,
-                view = me.view,
-                node = view.getVdomChild(item);
+            let me     = this,
+                {view} = me,
+                node   = view.getVdomChild(item);
 
             if (node) {
                 node.cls = NeoArray.remove(node.cls || [], selectedCls || me.selectedCls);
-                node['aria-selected'] = false;
+                node['aria-selected'] = false
             }
 
             NeoArray.remove(itemCollection, item);
@@ -113,12 +113,12 @@ class Model extends Base {
                 view.update();
 
                 me.fire('selectionChange', {
-                    selection : itemCollection
-                });
+                    selection: itemCollection
+                })
             }
         }
         else if (!silent) {
-            this.fire('noChange');
+            this.fire('noChange')
         }
     }
 
@@ -126,48 +126,48 @@ class Model extends Base {
      * @param {Boolean} [silent] true to prevent a vdom update
      */
     deselectAll(silent) {
-        let me    = this,
-            items = [...me.items],
-            view  = me.view;
+        let me     = this,
+            items  = [...me.items],
+            {view} = me;
 
         if (items.length) {
             items.forEach(item => {
-                me.deselect(item, true);
+                me.deselect(item, true)
             });
 
             if (!silent && items.length > 0) {
-                view.update();
+                view.update()
             }
 
             me.fire('selectionChange', {
-                selection : this.items
-            });
+                selection: this.items
+            })
         }
         else if (!silent) {
-            me.fire('noChange');
+            me.fire('noChange')
         }
     }
 
     /**
      *
      */
-    destroy() {
+    destroy(...args) {
         this.unregister();
-        super.destroy();
+        super.destroy(...args)
     }
 
     /**
      * @returns {Array} this.items
      */
     getSelection() {
-        return this.items;
+        return this.items
     }
 
     /**
      * @returns {Boolean} true in case there is a selection
      */
     hasSelection() {
-        return this.items.length > 0;
+        return this.items.length > 0
     }
 
     /**
@@ -175,7 +175,7 @@ class Model extends Base {
      * @returns {Boolean} true in case the item is selected
      */
     isSelected(id) {
-        return this.items.includes(id);
+        return this.items.includes(id)
     }
 
     /**
@@ -187,11 +187,11 @@ class Model extends Base {
 
         if (me.cls && !cls.includes(me.cls)) {
             cls.push(me.cls);
-            component.cls = cls;
+            component.cls = cls
         }
 
         me.view = component;
-        me.addDomListener();
+        me.addDomListener()
     }
 
     /**
@@ -204,11 +204,11 @@ class Model extends Base {
 
         component.domListeners.forEach(listener => {
             if (listener.scope === me) {
-                NeoArray.remove(domListeners, listener);
+                NeoArray.remove(domListeners, listener)
             }
         });
 
-        component.domListeners = domListeners;
+        component.domListeners = domListeners
     }
 
     /**
@@ -222,7 +222,7 @@ class Model extends Base {
 
         // We hold vdom ids for now, so all incoming selections must be converted.
         items = (items = Array.isArray(items) ?
-            items : [items]).map(item => item.isRecord ? view.getItemId(item) : Neo.isObject(item) ? item.id : item);
+            items: [items]).map(item => item.isRecord ? view.getItemId(item) : Neo.isObject(item) ? item.id : item);
 
         if (!Neo.isEqual(itemCollection, items)) {
             if (me.singleSelect) {
@@ -275,12 +275,12 @@ class Model extends Base {
 
         if (me.cls && cls.includes(me.cls)) {
             NeoArray.remove(cls, me.cls);
-            me.view.cls = cls;
+            me.view.cls = cls
         }
 
         me.deselectAll();
 
-        me.removeDomListeners();
+        me.removeDomListeners()
     }
 }
 

package/src/selection/TreeAccordionModel.mjs

@@ -25,18 +25,18 @@ class TreeAccordionModel extends TreeModel {
      * @returns {Object|null}
      */
     checkForChild(record) {
-        const view     = this.view,
-              recordId = record[view.getKeyProperty()];
-        let childRecord = null;
+        let {view}      = this,
+            recordId    = record[view.getKeyProperty()],
+            childRecord = null;
 
         for (const item of view.store.items) {
             if (item.parentId === recordId) {
                 childRecord = item;
-                break;
+                break
             }
         }
 
-        return childRecord;
+        return childRecord
     }
 
     /**
@@ -44,14 +44,8 @@ class TreeAccordionModel extends TreeModel {
      * @param {Object} record
      * @returns {Object|null}
      */
-    checkForParent(record) {
-        if (record.parentId) {
-            const view = this.view;
-
-            return view.store.get(record.parentId);
-        } else {
-            return null;
-        }
+    checkForParent({parentId}) {
+        return parentId ? this.view.store.get(parentId) : null
     }
 
     /**
@@ -64,31 +58,31 @@ class TreeAccordionModel extends TreeModel {
      * @returns {Object|null}
      */
     checkForSibling(record, step) {
-        const view           = this.view,
-              store          = view.store,
-              parentRecordId = record.parentId,
-              recordId       = record[view.getKeyProperty()];
-        let hasFoundNext   = false,
+        let {view}         = this,
+            {store}        = view,
+            parentRecordId = record.parentId,
+            recordId       = record[view.getKeyProperty()],
+            hasFoundNext   = false,
             nextItemRecord = null,
             previousItemRecord;
 
         for (let item of store.items) {
             if (hasFoundNext && item.parentId === parentRecordId) {
                 nextItemRecord = item;
-                break;
+                break
             }
 
             if (!hasFoundNext && item.parentId === parentRecordId) {
                 if (!hasFoundNext && item[view.getKeyProperty()] === recordId) {
                     if (step === -1) break;
-                    hasFoundNext = true;
+                    hasFoundNext = true
                 } else {
-                    previousItemRecord = item;
+                    previousItemRecord = item
                 }
             }
         }
 
-        return step === 1 ? nextItemRecord : (previousItemRecord || store.get(parentRecordId));
+        return step === 1 ? nextItemRecord : (previousItemRecord || store.get(parentRecordId))
     }
 
     /**
@@ -97,12 +91,15 @@ class TreeAccordionModel extends TreeModel {
      * @returns {Object|null}
      */
     checkNextParentSibling(record) {
-        const parent = this.view.store.get(record.parentId);
-        let parentSibling = this.checkForSibling(parent, 1);
+        let me            = this,
+            parent        = me.view.store.get(record.parentId),
+            parentSibling = me.checkForSibling(parent, 1);
 
-        if (!parentSibling && parent.parentId) this.checkNextParentSibling(parent);
+        if (!parentSibling && parent.parentId) {
+            me.checkNextParentSibling(parent)
+        }
 
-        return parentSibling;
+        return parentSibling
     }
 
     /**
@@ -112,14 +109,14 @@ class TreeAccordionModel extends TreeModel {
      */
     onKeyDownEnter(data) {
         let me     = this,
-            view   = me.view,
+            {view} = me,
             itemId = me.getSelection()[0],
             record = view.store.get(view.getItemRecordId(itemId));
 
         if (record.isLeaf || record.collapsed) {
-            me.onKeyDownRight(data);
+            me.onKeyDownRight(data)
         } else {
-            me.onKeyDownLeft(data);
+            me.onKeyDownLeft(data)
         }
     }
 
@@ -129,9 +126,7 @@ class TreeAccordionModel extends TreeModel {
      * @param {Object} data
      */
     onKeyDownEscape(data) {
-        let me = this;
-
-        me.deselectAll();
+        this.deselectAll()
     }
 
     /**
@@ -139,21 +134,22 @@ class TreeAccordionModel extends TreeModel {
      * @param {Object} data
      */
     onKeyDownLeft(data) {
-        const me     = this,
-              view   = me.view,
-              itemId = me.getSelection()[0];
+        let me     = this,
+            {view} = me,
+            itemId = me.getSelection()[0],
+            record;
 
         if (!itemId) {
             me.selectRoot();
-            return;
+            return
         }
 
-        const record = view.store.get(view.getItemRecordId(itemId));
+        record = view.store.get(view.getItemRecordId(itemId));
 
         if (record.isLeaf || record.collapsed || !view.rootParentsAreCollapsible) {
-            me.onNavKey(data, -1);
+            me.onNavKey(data, -1)
         } else {
-            me.toggleCollapsed(record, itemId, true);
+            me.toggleCollapsed(record, itemId, true)
         }
     }
 
@@ -162,21 +158,22 @@ class TreeAccordionModel extends TreeModel {
      * @param {Object} data
      */
     onKeyDownRight(data) {
-        const me     = this,
-              view   = me.view,
-              itemId = me.getSelection()[0];
+        let me     = this,
+            {view} = me,
+            itemId = me.getSelection()[0],
+            record;
 
         if (!itemId) {
             me.selectRoot();
-            return;
+            return
         }
 
-        const record = view.store.get(view.getItemRecordId(itemId));
+        record = view.store.get(view.getItemRecordId(itemId));
 
         if (record.isLeaf || !record.collapsed) {
-            me.onNavKey(data, 1);
+            me.onNavKey(data, 1)
         } else {
-            me.toggleCollapsed(record, itemId, false);
+            me.toggleCollapsed(record, itemId, false)
         }
     }
 
@@ -186,53 +183,53 @@ class TreeAccordionModel extends TreeModel {
      * @param {Number} step
      */
     onNavKey(data, step) {
-        const me   = this,
-              view = me.view,
-              item = me.getSelection()[0];
-        let newRecord;
+        let me     = this,
+            {view} = me,
+            item   = me.getSelection()[0],
+            newRecord, record, recordId;
 
         if (item) {
-            const recordId = view.getItemRecordId(item);
-            let record = view.store.get(recordId);
+            recordId = view.getItemRecordId(item);
+            record   = view.store.get(recordId);
 
             if (step === 1) {
                 if (!record.isLeaf && !record.collapsed) {
                     // find first child
-                    newRecord = this.checkForChild(record);
+                    newRecord = me.checkForChild(record)
                 } else {
                     // find next sibling
-                    newRecord = this.checkForSibling(record, step);
+                    newRecord = me.checkForSibling(record, step);
                     // no ==> loop through parent next siblings until no parent
                     if (!newRecord) {
-                        newRecord = this.checkNextParentSibling(record);
+                        newRecord = me.checkNextParentSibling(record)
                     }
                 }
                 // current item was the last item
                 if (!newRecord) {
                     me.deselectAll();
-                    view.fire('selectPostLastItem');
+                    view.fire('selectPostLastItem')
                 }
             } else if (step === -1) {
                 // check previous sibling
-                newRecord = this.checkForSibling(record, step);
+                newRecord = me.checkForSibling(record, step);
                 // no ==> get parent
                 if (!newRecord) {
-                    newRecord = this.checkForParent(record);
+                    newRecord = me.checkForParent(record)
                 }
                 // current item was the first item
                 if (!newRecord) {
                     me.deselectAll();
-                    view.fire('selectPreFirstItem');
+                    view.fire('selectPreFirstItem')
                 }
             }
         } else {
-            me.selectRoot();
+            me.selectRoot()
         }
 
         if (newRecord) {
             const itemId = view.getItemId(newRecord[me.view.getKeyProperty()]);
 
-            me.selectAndScrollIntoView(itemId);
+            me.selectAndScrollIntoView(itemId)
         }
     }
 
@@ -241,33 +238,31 @@ class TreeAccordionModel extends TreeModel {
      * @param {String} itemId
      */
     selectAndScrollIntoView(itemId) {
-        const me = this;
-
-        me.select(itemId);
+        this.select(itemId);
 
         Neo.main.DomAccess.scrollIntoView({
-            id   : itemId,
-            block: 'center'
-        });
+            id      : itemId,
+            block   : 'center',
+            windowId: this.view.windowId
+        })
     }
 
     /**
      * Select the root item of the tree
      */
     selectRoot() {
-        const me    = this,
-              view  = me.view,
-              store = view.store;
-        let rootItemId;
+        let {view}  = this,
+            {store} = view,
+            record, rootItemId;
 
-        for (let record of store.items) {
+        for (record of store.items) {
             if (!record.parentId) {
-                rootItemId = view.getItemId(record[me.view.getKeyProperty()]);
-                break;
+                rootItemId = view.getItemId(record[view.getKeyProperty()]);
+                break
             }
         }
 
-        me.selectAndScrollIntoView(rootItemId);
+        this.selectAndScrollIntoView(rootItemId)
     }
 
     /**
@@ -277,14 +272,13 @@ class TreeAccordionModel extends TreeModel {
      * @param {Boolean} collapse
      */
     toggleCollapsed(record, itemId, collapse) {
-        const me    = this,
-              item  = me.view.getVdomChild(itemId),
-              clsFn = collapse ? 'remove' : 'add';
+        let item  = this.view.getVdomChild(itemId),
+            clsFn = collapse ? 'remove' : 'add';
 
         NeoArray[clsFn](item.cls, 'neo-folder-open');
-        me.view.update();
+        this.view.update();
 
-        record.collapsed = collapse;
+        record.collapsed = collapse
     }
 }
 

package/src/selection/grid/CellColumnModel.mjs

@@ -41,7 +41,7 @@ class CellColumnModel extends CellModel {
     construct(config) {
         super.construct(config);
 
-        this.selectedColumnCellIds = [];
+        this.selectedColumnCellIds = []
     }
 
     /**
@@ -50,13 +50,13 @@ class CellColumnModel extends CellModel {
     deselectAllCells(silent) {
         let me      = this,
             cellIds = [...me.selectedColumnCellIds],
-            view    = me.view;
+            {view}  = me
 
         cellIds.forEach(cellId => {
-            me.deselect(cellId, true, me.selectedColumnCellIds, me.selectedColumnCellCls);
+            me.deselect(cellId, true, me.selectedColumnCellIds, me.selectedColumnCellCls)
         });
 
-        !silent && view.update();
+        !silent && view.update()
     }
 
     /**
@@ -73,10 +73,10 @@ class CellColumnModel extends CellModel {
             columnNodeIds = VDomUtil.getColumnNodesIds(tbodyNode, index);
 
             me.deselectAllCells(true);
-            me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls);
+            me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls)
         }
 
-        super.onCellClick(data);
+        super.onCellClick(data)
     }
 
     /**
@@ -87,13 +87,13 @@ class CellColumnModel extends CellModel {
         let me            = this,
             idArray       = ColumnModel.getCellId(data.path).split('__'),
             currentColumn = idArray[2],
-            view          = me.view,
+            {view}        = me,
             fields        = view.columns.map(c => c.field),
             newIndex      = (fields.indexOf(currentColumn) + step) % fields.length,
             columnNodeIds, tbodyNode;
 
         while (newIndex < 0) {
-            newIndex += fields.length;
+            newIndex += fields.length
         }
 
         tbodyNode     = VDomUtil.findVdomChild(me.view.vdom, {cls: 'neo-grid-view'}).vdom;
@@ -102,7 +102,7 @@ class CellColumnModel extends CellModel {
         me.deselectAllCells(true);
         me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls);
 
-        super.onNavKeyColumn(data, step);
+        super.onNavKeyColumn(data, step)
     }
 
     /**
@@ -110,7 +110,7 @@ class CellColumnModel extends CellModel {
      */
     unregister() {
         this.deselectAllCells();
-        super.unregister();
+        super.unregister()
     }
 }
 

package/src/selection/grid/CellColumnRowModel.mjs

@@ -41,7 +41,7 @@ class CellColumnRowModel extends CellRowModel {
     construct(config) {
         super.construct(config);
 
-        this.selectedColumnCellIds = [];
+        this.selectedColumnCellIds = []
     }
 
     /**
@@ -50,13 +50,13 @@ class CellColumnRowModel extends CellRowModel {
     deselectAllCells(silent) {
         let me      = this,
             cellIds = [...me.selectedColumnCellIds],
-            view    = me.view;
+            {view}  = me;
 
         cellIds.forEach(cellId => {
-            me.deselect(cellId, true, me.selectedColumnCellIds, me.selectedColumnCellCls);
+            me.deselect(cellId, true, me.selectedColumnCellIds, me.selectedColumnCellCls)
         });
 
-        !silent && view.update();
+        !silent && view.update()
     }
 
     /**
@@ -73,10 +73,10 @@ class CellColumnRowModel extends CellRowModel {
             columnNodeIds = VDomUtil.getColumnNodesIds(tbodyNode, index);
 
             me.deselectAllCells(true);
-            me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls);
+            me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls)
         }
 
-        super.onCellClick(data);
+        super.onCellClick(data)
     }
 
     /**
@@ -87,13 +87,13 @@ class CellColumnRowModel extends CellRowModel {
         let me            = this,
             idArray       = ColumnModel.getCellId(data.path).split('__'),
             currentColumn = idArray[2],
-            view          = me.view,
+            {view}        = me,
             fields        = view.columns.map(c => c.field),
             newIndex      = (fields.indexOf(currentColumn) + step) % fields.length,
             columnNodeIds, tbodyNode;
 
         while (newIndex < 0) {
-            newIndex += fields.length;
+            newIndex += fields.length
         }
 
         tbodyNode     = VDomUtil.findVdomChild(me.view.vdom, {cls: 'neo-grid-view'}).vdom;
@@ -102,7 +102,7 @@ class CellColumnRowModel extends CellRowModel {
         me.deselectAllCells(true);
         me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls);
 
-        super.onNavKeyColumn(data, step);
+        super.onNavKeyColumn(data, step)
     }
 
     /**
@@ -110,7 +110,7 @@ class CellColumnRowModel extends CellRowModel {
      */
     unregister() {
         this.deselectAllCells();
-        super.unregister();
+        super.unregister()
     }
 }