neo.mjs 7.8.0 → 7.9.1

package/src/form/field/ComboBox.mjs

@@ -346,6 +346,7 @@ class ComboBox extends Picker {
             role          : 'listbox',
             selectionModel: {stayInList: false},
             store         : me.store,
+            windowId      : me.windowId,
             ...me.listConfig
         });
 
@@ -580,18 +581,18 @@ class ComboBox extends Picker {
     }
 
     /**
-     * @param {Object} record
+     * @param {Object} data
      * @protected
      */
-    onListItemNavigate(record) {
-        let {activeIndex} = record;
+    onListItemNavigate(data) {
+        let {activeIndex} = data;
 
         if (activeIndex >= 0) {
             let me      = this,
                 {store} = me;
 
-            me.activeRecord   = store.getAt(activeIndex);
-            me.activeRecordId = me.activeRecord[store.keyProperty || model.keyProperty];
+            me.activeRecord   = data.record || store.getAt(activeIndex);
+            me.activeRecordId = me.activeRecord[store.getKeyProperty()];
 
             // Update typeahead hint (which updates DOM), or update DOM
             me.typeAhead ? me.updateTypeAheadValue(me.lastManualInput) : me.update()
@@ -737,7 +738,7 @@ class ComboBox extends Picker {
                 if (match && inputHintEl) {
                     inputHintEl.value = value + match[displayField].substr(value.length);
                     me.activeRecord   = match;
-                    me.activeRecordId = match[store.keyProperty || store.model.keyProperty]
+                    me.activeRecordId = match[store.getKeyProperty()]
                 }
             }
 
@@ -771,7 +772,7 @@ class ComboBox extends Picker {
  * The select event fires when a list item gets selected
  * @event select
  * @param {Object} record
- * @param {value} record[store.keyProperty]
+ * @param {value} record[store.getKeyProperty()]
  * @returns {Object}
  */
 

package/src/grid/View.mjs

@@ -95,9 +95,9 @@ class View extends Component {
 
             for (; j < colCount; j++) {
                 column         = columns[j];
-                rendererValue  = record[column.field];
+                rendererValue  = Neo.ns(column.field, false, record);
 
-                if (rendererValue === undefined) {
+                if (rendererValue === null || rendererValue === undefined) {
                     rendererValue = ''
                 }
 

package/src/list/Base.mjs

@@ -689,7 +689,7 @@ class Base extends Component {
     getItemRecordId(vnodeId) {
         let itemId   = vnodeId.split('__')[1],
             {model}  = this.store,
-            keyField = model?.getField(model.keyProperty),
+            keyField = model?.getField(this.getKeyProperty()),
             keyType  = keyField?.type?.toLowerCase();
 
         if (keyType === 'int' || keyType === 'integer') {

package/src/model/Component.mjs

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

package/src/table/View.mjs

@@ -1,4 +1,5 @@
 import Component from '../component/Base.mjs';
+import NeoArray  from '../util/Array.mjs';
 import VDomUtil  from '../util/VDom.mjs';
 
 /**
@@ -35,6 +36,10 @@ class View extends Component {
          * @member {Object} recordVnodeMap={}
          */
         recordVnodeMap: {},
+        /**
+         * @member {String} selectedRecordField='annotations.selected'
+         */
+        selectedRecordField: 'annotations.selected',
         /**
          * @member {Neo.data.Store|null} store=null
          */
@@ -86,7 +91,7 @@ class View extends Component {
             cellCls     = ['neo-table-cell'],
             colspan     = record[me.colspanField],
             {dataField} = column,
-            fieldValue  = record[dataField],
+            fieldValue  = Neo.ns(dataField, false, record),
             hasStore    = tableContainer.store?.model, // todo: remove as soon as all tables use stores (examples table)
             {vdom}      = me,
             cellConfig, rendererOutput;
@@ -189,6 +194,10 @@ class View extends Component {
 
             trCls = me.getTrClass(record, i);
 
+            if (selectedRows && Neo.ns(me.selectedRecordField, false, record)) {
+                NeoArray.add(selectedRows, id)
+            }
+
             if (selectedRows?.includes(id)) {
                 trCls.push('neo-selected');
 
@@ -432,11 +441,12 @@ class View extends Component {
      * @param {Object} opts.record
      */
     onStoreRecordChange(opts) {
-        let me             = this,
-            fieldNames     = opts.fields.map(field => field.name),
-            needsUpdate    = false,
-            tableContainer = me.parent,
-            {vdom}         = me,
+        let me               = this,
+            fieldNames       = opts.fields.map(field => field.name),
+            needsUpdate      = false,
+            tableContainer   = me.parent,
+            {selectionModel} = tableContainer,
+            {vdom}           = me,
             cellId, cellNode, column, index, scope;
 
         if (fieldNames.includes(me.colspanField)) {
@@ -444,17 +454,23 @@ class View extends Component {
             me.createViewData(me.store.items)
         } else {
             opts.fields.forEach(field => {
-                cellId   = me.getCellId(opts.record, field.name);
-                cellNode = VDomUtil.findVdomChild(vdom, cellId);
+                if (field.name === me.selectedRecordField) {
+                    if (selectionModel.ntype === 'selection-table-rowmodel') {
+                        selectionModel[!field.value && selectionModel.singleSelect ? 'deselect' : 'select'](me.getRowId(opts.record))
+                    }
+                } else {
+                    cellId   = me.getCellId(opts.record, field.name);
+                    cellNode = VDomUtil.findVdomChild(vdom, cellId);
 
-                // the vdom might not exist yet => nothing to do in this case
-                if (cellNode?.vdom) {
-                    column      = me.getColumn(field.name);
-                    index       = cellNode.index;
-                    needsUpdate = true;
-                    scope       = column.rendererScope || tableContainer;
+                    // the vdom might not exist yet => nothing to do in this case
+                    if (cellNode?.vdom) {
+                        column      = me.getColumn(field.name);
+                        index       = cellNode.index;
+                        needsUpdate = true;
+                        scope       = column.rendererScope || tableContainer;
 
-                    cellNode.parentNode.cn[index] = me.applyRendererOutput({cellId, column, record: opts.record, index, tableContainer})
+                        cellNode.parentNode.cn[index] = me.applyRendererOutput({cellId, column, record: opts.record, index, tableContainer})
+                    }
                 }
             })
         }

package/src/table/header/Button.mjs

@@ -1,6 +1,7 @@
-import BaseButton from '../../button/Base.mjs';
-import NeoArray   from '../../util/Array.mjs';
-import TextField  from '../../form/field/Text.mjs';
+import BaseButton        from '../../button/Base.mjs';
+import NeoArray          from '../../util/Array.mjs';
+import TextField         from '../../form/field/Text.mjs';
+import {resolveCallback} from '../../util/Function.mjs';
 
 /**
  * @class Neo.table.header.Button
@@ -75,6 +76,10 @@ class Button extends BaseButton {
          * @protected
          */
         isSorted_: null,
+        /**
+         * @member {Function|String|null} renderer_='cellRenderer'
+         */
+        renderer_: 'cellRenderer',
         /**
          * Scope to execute the column renderer.
          * Defaults to the matching table.Container
@@ -261,7 +266,31 @@ class Button extends BaseButton {
      * @protected
      */
     beforeSetCellAlign(value, oldValue) {
-        return this.beforeSetEnumValue(value, oldValue, 'cellAlign', 'cellAlignValues');
+        return this.beforeSetEnumValue(value, oldValue, 'cellAlign', 'cellAlignValues')
+    }
+
+    /**
+     * Triggered before the renderer config gets changed
+     * @param {Function|String|null} value
+     * @param {Function|String|null} oldValue
+     * @protected
+     */
+    beforeSetRenderer(value, oldValue) {
+        return resolveCallback(value, this).fn
+    }
+
+    /**
+     * @param {Object} data
+     * @param {Neo.button.Base} data.column
+     * @param {String} data.dataField
+     * @param {Number} data.index
+     * @param {Object} data.record
+     * @param {Neo.table.Container} data.tableContainer
+     * @param {Number|String} data.value
+     * @returns {*}
+     */
+    cellRenderer(data) {
+        return data.value
     }
 
     /**
@@ -461,20 +490,6 @@ class Button extends BaseButton {
         me.cls       = cls;
         me._isSorted = null
     }
-
-    /**
-     * @param {Object} data
-     * @param {Neo.button.Base} data.column
-     * @param {String} data.dataField
-     * @param {Number} data.index
-     * @param {Object} data.record
-     * @param {Neo.table.Container} data.tableContainer
-     * @param {Number|String} data.value
-     * @returns {*}
-     */
-    renderer(data) {
-        return data.value
-    }
 }
 
 export default Neo.setupClass(Button);