neo.mjs 8.43.1 → 9.0.1

package/src/selection/grid/RowModel.mjs

@@ -43,14 +43,6 @@ class RowModel extends BaseModel {
         super.destroy(...args)
     }
 
-    /**
-     * @param {Record} record
-     * @returns {Boolean}
-     */
-    hasAnnotations(record) {
-        return !!Object.getOwnPropertyDescriptor(record.__proto__, this.view.selectedRecordField)
-    }
-
     /**
      * @param {Object} data
      */
@@ -73,14 +65,11 @@ class RowModel extends BaseModel {
             {view}       = me,
             {store}      = view,
             countRecords = store.getCount(),
-            currentIndex = 0,
-            newIndex, record, rowId;
-
-        if (me.hasSelection()) {
-            currentIndex = store.indexOf(view.getRecordByRowId(me.items[0]))
-        }
-
-        newIndex = (currentIndex + step) % countRecords;
+            keyProperty  = store.getKeyProperty(),
+            recordId     = me.selectedRows[0] || store.getAt(0)[keyProperty],
+            record       = store.get(recordId),
+            index        = store.indexOf(record),
+            newIndex     = (index + step) % countRecords;
 
         while (newIndex < 0) {
             newIndex += countRecords
@@ -91,12 +80,12 @@ class RowModel extends BaseModel {
         if (me.hasAnnotations(record)) {
             me.updateAnnotations(record)
         } else {
-            rowId = view.getRowId(record);
+            recordId = record[keyProperty];
 
-            if (rowId) {
-                me.select(rowId);
+            if (recordId) {
+                me.selectRow(recordId);
 
-                view.scrollByRows(currentIndex, step);
+                view.scrollByRows(index, step);
                 view.fire('select', {record})
             }
         }
@@ -105,25 +94,21 @@ class RowModel extends BaseModel {
     /**
      * @param {Object} data
      */
-    onRowClick(data) {
+    onRowClick({data}) {
         let me     = this,
-            id     = data.data.currentTarget,
             {view} = me,
-            isSelected, record;
-
-        if (id) {
-            record = view.getRecord(id);
+            record = me.getRecord(data.path),
+            recordId;
 
+        if (record) {
             if (me.hasAnnotations(record)) {
                 me.updateAnnotations(record)
             } else {
-                me.toggleSelection(id);
-
-                isSelected = me.isSelected(id);
+                recordId = record[view.store.getKeyProperty()];
 
-                !isSelected && view.onDeselect?.(record);
+                me.toggleRowSelection(recordId);
 
-                view.fire(isSelected ? 'select' : 'deselect', {record})
+                view.fire(me.isSelectedRow(recordId) ? 'select' : 'deselect', {record})
             }
         }
     }
@@ -162,17 +147,18 @@ class RowModel extends BaseModel {
     updateAnnotations(record) {
         let me               = this,
             {view}           = me,
-            rowId            = view.getRowId(record),
-            isSelected       = me.isSelected(rowId),
+            {store}          = view,
+            recordId         = record[store.getKeyProperty()],
+            isSelected       = me.isSelectedRow(recordId),
             annotationsField = view.selectedRecordField;
 
         if (me.singleSelect) {
             if (isSelected) {
                 record[annotationsField] = false
             } else {
-                me.items.forEach(rowId => {
+                me.selectedRows.forEach(recordId => {
                     // We can use setSilent(), since the last change will trigger a view update
-                    view.getRecordByRowId(rowId).setSilent({[annotationsField]: false})
+                    store.get(recordId).setSilent({[annotationsField]: false})
                 });
 
                 record[annotationsField] = true

package/src/state/Provider.mjs

@@ -155,17 +155,12 @@ class Provider extends Base {
      */
     beforeSetStores(value, oldValue) {
         if (value) {
-            let me         = this,
-                controller = me.getController();
+            let me = this;
 
             Object.entries(value).forEach(([key, storeValue]) => {
-                controller?.parseConfig(storeValue);
-
                 // support mapping string based listeners into the stateProvider instance
-                Object.entries(storeValue.listeners || {}).forEach(([listenerKey,listener]) => {
-                    if (Neo.isString(listener) && Neo.isFunction(me[listener])) {
-                        storeValue.listeners[listenerKey] = me[listener].bind(me)
-                    }
+                Object.entries(storeValue.listeners || {}).forEach(([listenerKey, listener]) => {
+                    me.bindCallback(listener, listenerKey, me, storeValue.listeners)
                 })
 
                 value[key] = ClassSystemUtil.beforeSetInstance(storeValue)

package/src/tab/Container.mjs

@@ -281,7 +281,23 @@ class Container extends BaseContainer {
             items                : tabComponents,
             layout               : {ntype: 'card', activeIndex: me.activeIndex, removeInactiveCards: me.removeInactiveCards},
             useActiveTabIndicator: me.useActiveTabIndicator,
-            ...me.contentContainer
+            ...me.contentContainer,
+
+            insert(index, item, silent) {
+                if (item?.isTab) {
+                    me.insert(index, item, silent)
+                } else {
+                    super.insert(index, item, silent)
+                }
+            },
+
+            remove(component, destroyItem, silent) {
+                if (component?.isTab) {
+                    me.remove(component, destroyItem, silent)
+                } else {
+                    super.remove(component, destroyItem, silent)
+                }
+            }
         }];
 
         me.itemDefaults = null;

package/src/table/Container.mjs

@@ -58,12 +58,6 @@ class Container extends BaseContainer {
          * @protected
          */
         scrollbarsCssApplied: false,
-        /**
-         * Will get removed in neo v9, assign selection models to table.View instead
-         * @member {Neo.selection.Model} selectionModel_=null
-         * @deprecated
-         */
-        selectionModel_: null,
         /**
          * @member {Boolean} showHeaderFilters_=false
          */
@@ -139,11 +133,10 @@ class Container extends BaseContainer {
             sortable         : me.sortable,
             ...me.headerToolbarConfig
         }, {
-            module        : View,
-            containerId   : me.id,
-            id            : me.viewId,
-            selectionModel: me.selectionModel, // todo: remove this line in neo v9
-            store         : me.store,
+            module     : View,
+            containerId: me.id,
+            id         : me.viewId,
+            store      : me.store,
             ...me.viewConfig
         }];
 
@@ -195,19 +188,6 @@ class Container extends BaseContainer {
         }
     }
 
-    /**
-     * Triggered after the selectionModel config got changed
-     * @param {Neo.selection.Model} value
-     * @param {Neo.selection.Model} oldValue
-     * @protected
-     * @deprecated
-     */
-    afterSetSelectionModel(value, oldValue) {
-        if (value && this.view) {
-            this.view.selectionModel = value
-        }
-    }
-
     /**
      * Triggered after the showHeaderFilters config got changed
      * @param {Boolean} value
@@ -232,6 +212,29 @@ class Container extends BaseContainer {
         }
     }
 
+    /**
+     * Triggered after the store config got changed
+     * @param {Number} value
+     * @param {Number} oldValue
+     * @protected
+     */
+    afterSetStore(value, oldValue) {
+        let me        = this,
+            listeners = {
+                filter: me.onStoreFilter,
+                load  : me.onStoreLoad,
+                scope : me
+            };
+
+        value   ?.on(listeners);
+        oldValue?.un(listeners);
+
+        // in case we dynamically change the store, the view needs to get the new reference
+        if (me.view) {
+            me.view.store = value
+        }
+    }
+
     /**
      * Triggered after the useCustomScrollbars config got changed
      * @param {Boolean} value
@@ -293,35 +296,13 @@ class Container extends BaseContainer {
 
     /**
      * Triggered before the store config gets changed.
-     * @param {Neo.data.Store} value
-     * @param {Neo.data.Store} oldValue
+     * @param {Object|Neo.data.Store|null} value
+     * @param {Neo.data.Store}             oldValue
      * @protected
      */
     beforeSetStore(value, oldValue) {
-        oldValue?.destroy();
-
         if (value) {
-            let me = this,
-
-            listeners = {
-                filter      : me.onStoreFilter,
-                load        : me.onStoreLoad,
-                recordChange: me.onStoreRecordChange,
-                scope       : me
-            };
-
-            if (value instanceof Store) {
-                value.on(listeners)
-            } else {
-                value = ClassSystemUtil.beforeSetInstance(value, Store, {
-                    listeners
-                })
-            }
-
-            // in case we dynamically change the store, the view needs to get the new reference
-            if (me.view) {
-                me.view.store = value
-            }
+            value = ClassSystemUtil.beforeSetInstance(value, Store)
         }
 
         return value
@@ -404,19 +385,6 @@ class Container extends BaseContainer {
         return columns
     }
 
-    /**
-     *
-     */
-    createViewData() {
-        let me = this;
-
-        me.view.createViewData();
-
-        if (me.useCustomScrollbars && me.scrollbarsCssApplied === false) {
-            me.applyCustomScrollbarsCss()
-        }
-    }
-
     /**
      * @override
      * @returns {*}
@@ -458,50 +426,29 @@ class Container extends BaseContainer {
 
         me.store.sort(opts);
         me.removeSortingCss(opts.property);
-        me.onStoreLoad(me.store.items)
+        opts.direction && me.view.onStoreLoad()
     }
 
     /**
      *
      */
     onStoreFilter() {
-        this.onStoreLoad(this.store.items)
+        this.onStoreLoad()
     }
 
     /**
-     * @param {Object[]} data
      * @protected
      */
-    onStoreLoad(data) {
+    onStoreLoad() {
         let me = this;
 
-        if (me.rendered) {
-            me.createViewData();
-
-            if (me.store.sorters.length < 1) {
-                me.removeSortingCss()
-            }
-        } else {
-            me.on('rendered', () => {
-                me.timeout(50).then(() => {
-                    me.createViewData()
-                })
-            }, me, {once: true})
+        if (me.useCustomScrollbars && me.scrollbarsCssApplied === false) {
+            me.applyCustomScrollbarsCss()
         }
-    }
 
-    /**
-     * Gets triggered after changing the value of a record field.
-     * E.g. myRecord.foo = 'bar';
-     * @param {Object} opts
-     * @param {String} opts.field The name of the field which got changed
-     * @param {Neo.data.Model} opts.model The model instance of the changed record
-     * @param {*} opts.oldValue
-     * @param {Object} opts.record
-     * @param {*} opts.value
-     */
-    onStoreRecordChange(opts) {
-        this.view.onStoreRecordChange(opts)
+        if (me.store.sorters?.length < 1) {
+            me.removeSortingCss()
+        }
     }
 
     /**

package/src/table/View.mjs

@@ -56,9 +56,9 @@ class View extends Component {
          */
         selectedRecordField: 'annotations.selected',
         /**
-         * @member {Neo.data.Store|null} store=null
+         * @member {Neo.data.Store|null} store_=null
          */
-        store: null,
+        store_: null,
         /**
          * @member {Boolean} useRowRecordIds=true
          */
@@ -112,6 +112,25 @@ class View extends Component {
         this.rendered && value.register(this)
     }
 
+    /**
+     * Triggered after the store config got changed
+     * @param {Number} value
+     * @param {Number} oldValue
+     * @protected
+     */
+    afterSetStore(value, oldValue) {
+        let me        = this,
+            listeners = {
+                filter      : me.onStoreFilter,
+                load        : me.onStoreLoad,
+                recordChange: me.onStoreRecordChange,
+                scope       : me
+            };
+
+        oldValue?.un(listeners);
+        value   ?.on(listeners);
+    }
+
     /**
      * @param {Object} data
      * @param {String} [data.cellId]
@@ -145,6 +164,8 @@ class View extends Component {
             fieldValue = ''
         }
 
+        me.bindCallback(column.renderer, 'renderer', column.rendererScope || tableContainer, column);
+
         rendererOutput = column.renderer.call(column.rendererScope || tableContainer, {
             column,
             columnIndex,
@@ -523,6 +544,33 @@ class View extends Component {
         this.fireRowEvent(data, 'rowDoubleClick')
     }
 
+    /**
+     *
+     */
+    onStoreFilter() {
+        this.onStoreLoad()
+    }
+
+    /**
+     * @param {Object[]} data
+     * @protected
+     */
+    onStoreLoad(data) {
+        let me = this;
+
+        me.createViewData();
+
+        if (me.mounted) {
+            me.timeout(50).then(() => {
+                Neo.main.DomAccess.scrollTo({
+                    direction: 'top',
+                    id       : me.vdom.id,
+                    value    : 0
+                })
+            })
+        }
+    }
+
     /**
      * Gets triggered after changing the value of a record field.
      * E.g. myRecord.foo = 'bar';
@@ -531,7 +579,7 @@ class View extends Component {
      * @param {Neo.data.Model} opts.model The model instance of the changed record
      * @param {Object} opts.record
      */
-    onStoreRecordChange({fields, model, record}) {
+    onStoreRecordChange({fields, record}) {
         let me                     = this,
             fieldNames             = fields.map(field => field.name),
             needsUpdate            = false,

package/src/table/header/Button.mjs

@@ -197,25 +197,11 @@ class Button extends BaseButton {
      * @param {Boolean} oldValue
      * @protected
      */
-     afterSetSortable(value, oldValue) {
+    afterSetSortable(value, oldValue) {
         let me    = this,
             {cls} = me;
 
-        if (value === true) {
-            NeoArray.remove(cls, 'neo-sort-hidden');
-
-            me.addDomListeners({
-                click: me.onButtonClick,
-                scope: me
-            })
-        } else {
-            NeoArray.add(cls, 'neo-sort-hidden');
-
-            me.removeDomListeners({
-                click: me.onButtonClick,
-                scope: me
-            })
-        }
+        NeoArray.toggle(cls, 'neo-sort-hidden', !value);
 
         me.cls = cls;
         me.update()
@@ -354,9 +340,10 @@ class Button extends BaseButton {
     }
 
     /**
+     * @param {Object} data
      * @protected
      */
-    onButtonClick() {
+    onClick(data) {
         let me = this,
             map;
 
@@ -374,7 +361,9 @@ class Button extends BaseButton {
             }
         }
 
-        me.isSorted = map[me.isSorted + '']
+        me.isSorted = map[me.isSorted + ''];
+
+        super.onClick(data)
     }
 
     /**

package/src/util/Function.mjs

@@ -135,10 +135,12 @@ export function intercept(target, targetMethodName, interceptFunction, scope, pr
  * @returns {Object}
  */
 export function resolveCallback(fn, scope=this) {
-    if (typeof fn === 'string') {
+    if (Neo.isString(fn)) {
         if (!scope[fn] && fn.startsWith('up.')) {
             fn = fn.slice(3);
             while (!scope[fn] && (scope = scope.parent));
+        } else {
+            scope = scope.getController?.()?.getHandlerScope(fn, null) || scope
         }
 
         fn = scope[fn]

package/src/util/VDom.mjs

@@ -393,10 +393,10 @@ class VDom extends Base {
             }
 
             if (childNodes) {
-                cn   = childNodes.map(item => VDom.getVdom(item));
-                cn   = cn.filter(item => item.removeDom !== true);
-                i    = 0;
-                len  = cn?.length || 0;
+                cn  = childNodes.map(item => VDom.getVdom(item));
+                cn  = cn.filter(item => item.removeDom !== true);
+                i   = 0;
+                len = cn?.length || 0;
 
                 for (; i < len; i++) {
                     if (vnode.childNodes) {