neo.mjs 10.0.0-alpha.4 → 10.0.0-beta.1

package/src/table/Container.mjs

@@ -3,7 +3,7 @@ import ClassSystemUtil from '../util/ClassSystem.mjs';
 import CssUtil         from '../util/Css.mjs';
 import NeoArray        from '../util/Array.mjs';
 import Store           from '../data/Store.mjs';
-import View            from './View.mjs';
+import TableBody       from './Body.mjs';
 import * as header     from './header/_export.mjs';
 
 /**
@@ -26,6 +26,16 @@ class Container extends BaseContainer {
          * @member {String[]} baseCls=['neo-table-container']
          */
         baseCls: ['neo-table-container'],
+        /**
+         * Configs for Neo.table.Body
+         * @member {Object|null} [bodyConfig=null]
+         */
+        bodyConfig: null,
+        /**
+         * @member {String|null} bodyId_=null
+         * @protected
+         */
+        bodyId_: null,
         /**
          * true uses table.plugin.CellEditing
          * @member {Boolean} cellEditing_=false
@@ -75,16 +85,6 @@ class Container extends BaseContainer {
          * @member {Boolean} useCustomScrollbars_=true
          */
         useCustomScrollbars_: true,
-        /**
-         * Configs for Neo.table.View
-         * @member {Object|null} [viewConfig=null]
-         */
-        viewConfig: null,
-        /**
-         * @member {String|null} viewId_=null
-         * @protected
-         */
-        viewId_: null,
         /**
          * @member {Array|null} items=null
          * @protected
@@ -100,19 +100,19 @@ class Container extends BaseContainer {
     }
 
     /**
-     * Convenience method to access the Neo.table.header.Toolbar
-     * @returns {Neo.table.header.Toolbar|null}
+     * Convenience method to access the Neo.table.Body
+     * @returns {Neo.table.Body|null}
      */
-    get headerToolbar() {
-        return Neo.getComponent(this.headerToolbarId) || Neo.get(this.headerToolbarId)
+    get body() {
+        return Neo.getComponent(this.bodyId) || Neo.get(this.bodyId)
     }
 
     /**
-     * Convenience method to access the Neo.table.View
-     * @returns {Neo.table.View|null}
+     * Convenience method to access the Neo.table.header.Toolbar
+     * @returns {Neo.table.header.Toolbar|null}
      */
-    get view() {
-        return Neo.getComponent(this.viewId) || Neo.get(this.viewId)
+    get headerToolbar() {
+        return Neo.getComponent(this.headerToolbarId) || Neo.get(this.headerToolbarId)
     }
 
     /**
@@ -123,8 +123,8 @@ class Container extends BaseContainer {
 
         let me = this;
 
+        me.bodyId          = Neo.getId('table-body');
         me.headerToolbarId = Neo.getId('table-header-toolbar');
-        me.viewId          = Neo.getId('table-view');
 
         me.items = [{
             module           : header.Toolbar,
@@ -133,11 +133,11 @@ class Container extends BaseContainer {
             sortable         : me.sortable,
             ...me.headerToolbarConfig
         }, {
-            module     : View,
+            module     : TableBody,
             containerId: me.id,
-            id         : me.viewId,
+            id         : me.bodyId,
             store      : me.store,
-            ...me.viewConfig
+            ...me.bodyConfig
         }];
 
         me.vdom.id = me.getWrapperId();
@@ -184,7 +184,7 @@ class Container extends BaseContainer {
                 headerToolbar.createItems()
             }
 
-            me.view?.createViewData()
+            me.body?.createViewData()
         }
     }
 
@@ -229,9 +229,9 @@ class Container extends BaseContainer {
         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
+        // in case we dynamically change the store, the body needs to get the new reference
+        if (me.body) {
+            me.body.store = value
         }
     }
 
@@ -270,6 +270,16 @@ class Container extends BaseContainer {
         me.scrollbarsCssApplied = true
     }
 
+    /**
+     * Triggered before the bodyId config gets changed.
+     * @param {String} value
+     * @param {String} oldValue
+     * @protected
+     */
+    beforeSetBodyId(value, oldValue) {
+        return value || oldValue
+    }
+
     /**
      * Triggered before the columns config gets changed.
      * @param {Object[]} value
@@ -308,16 +318,6 @@ class Container extends BaseContainer {
         return value
     }
 
-    /**
-     * Triggered before the viewId config gets changed.
-     * @param {String} value
-     * @param {String} oldValue
-     * @protected
-     */
-    beforeSetViewId(value, oldValue) {
-        return value || oldValue
-    }
-
     /**
      * In case you want to update multiple existing records in parallel,
      * using this method is faster than updating each record one by one.
@@ -325,19 +325,19 @@ class Container extends BaseContainer {
      * @param {Object[]} records
      */
     bulkUpdateRecords(records) {
-        let {store, view} = this,
+        let {body, store} = this,
             {keyProperty} = store;
 
-        if (view) {
-            view.silentVdomUpdate = true;
+        if (body) {
+            body.silentVdomUpdate = true;
 
             records.forEach(item => {
                 store.get(item[keyProperty])?.set(item)
             });
 
-            view.silentVdomUpdate = false;
+            body.silentVdomUpdate = false;
 
-            view.update()
+            body.update()
         }
     }
 
@@ -426,7 +426,7 @@ class Container extends BaseContainer {
 
         me.store.sort(opts);
         me.removeSortingCss(opts.property);
-        opts.direction && me.view.onStoreLoad()
+        opts.direction && me.body.onStoreLoad()
     }
 
     /**

package/src/table/_export.mjs

@@ -1,5 +1,5 @@
 import * as header from './header/_export.mjs';
+import Body        from './Body.mjs';
 import Container   from './Container.mjs';
-import View        from './View.mjs';
 
-export {header, Container, View};
+export {header, Body, Container};

package/src/table/plugin/CellEditing.mjs

@@ -69,7 +69,7 @@ class CellEditing extends Plugin {
             me.onSelectionModelChange({value: selectionModel})
         }
 
-        owner.view.keys.add({
+        owner.body.keys.add({
             Enter: 'onTableKeyDown',
             Space: 'onTableKeyDown',
             scope: me
@@ -109,9 +109,9 @@ class CellEditing extends Plugin {
 
         let me                  = this,
             {appName, windowId} = me,
-            {view}              = me.owner,
-            cellId              = view.getCellId(record, dataField),
-            cellNode            = VdomUtil.find(view.vdom, cellId).vdom,
+            {body}              = me.owner,
+            cellId              = body.getCellId(record, dataField),
+            cellNode            = VdomUtil.find(body.vdom, cellId).vdom,
             column              = me.owner.headerToolbar.getColumn(dataField),
             editor              = me.editors[dataField],
             value               = record[dataField],
@@ -133,7 +133,7 @@ class CellEditing extends Plugin {
                 cls      : me.editorCls,
                 dataField,
                 hideLabel: true,
-                parentId : view.id,
+                parentId : body.id,
                 record,
                 value,
                 windowId,
@@ -163,9 +163,9 @@ class CellEditing extends Plugin {
         cellNode.cn = [editor.createVdomReference()];
         delete cellNode.html;
 
-        view.updateDepth = -1;
+        body.updateDepth = -1;
 
-        await view.promiseUpdate();
+        await body.promiseUpdate();
 
         await me.timeout(30);
 
@@ -175,13 +175,13 @@ class CellEditing extends Plugin {
     /**
      *
      * @param {Object} data
-     * @param {Object} data.data
-     * @param {String} data.dataField
-     * @param {Object} data.record
-     * @param {Neo.table.View} data.view
+     * @param {Neo.table.Body} data.body
+     * @param {Object}         data.data
+     * @param {String}         data.dataField
+     * @param {Object}         data.record
      * @returns {Promise<void>}
      */
-    async onCellDoubleClick({data, dataField, record, view}) {
+    async onCellDoubleClick({body, data, dataField, record}) {
         await this.mountEditor(record, dataField)
     }
 
@@ -262,12 +262,12 @@ class CellEditing extends Plugin {
     async onTableKeyDown(data) {
         let me       = this,
             {target} = data,
-            {view}   = me.owner,
+            {body}   = me.owner,
             dataField, record;
 
         if (!me.mountedEditor && target.cls?.includes('neo-selected')) {
-            dataField = view.getCellDataField(target.id);
-            record    = view.getRecord(target.id);
+            dataField = body.getCellDataField(target.id);
+            record    = body.getRecord(target.id);
 
             await me.mountEditor(record, dataField)
         }
@@ -328,13 +328,13 @@ class CellEditing extends Plugin {
 
         let me       = this,
             record   = me.mountedEditor.record,
-            {view}   = me.owner,
-            rowIndex = view.store.indexOf(record);
+            {body}   = me.owner,
+            rowIndex = body.store.indexOf(record);
 
         me.mountedEditor = null;
 
-        view.getVdomRoot().cn[rowIndex] = view.createRow({record, rowIndex});
-        await view.promiseUpdate()
+        body.getVdomRoot().cn[rowIndex] = body.createRow({record, rowIndex});
+        await body.promiseUpdate()
     }
 }
 

package/src/util/Style.mjs

@@ -36,19 +36,15 @@ class Style extends Base {
             return null
         } else if (!oldStyle) {
             return Neo.clone(newStyle)
-        } else if (!newStyle) {
-            Object.keys(oldStyle).forEach(function(style) {
-                styles[style] = null
-            });
         } else {
-            Object.keys(newStyle).forEach(style => {
+            newStyle && Object.keys(newStyle).forEach(style => {
                 if (!oldStyle.hasOwnProperty(style) || oldStyle[style] !== newStyle[style]) {
                     styles[style] = newStyle[style]
                 }
             });
 
             Object.keys(oldStyle).forEach(style => {
-                if (!newStyle.hasOwnProperty(style)) {
+                if (!newStyle  || !newStyle.hasOwnProperty(style)) {
                     styles[style] = null
                 }
             });

package/src/vdom/Helper.mjs

@@ -38,23 +38,20 @@ class Helper extends Base {
     }
 
     /**
-     * @param {Object} config
+     * @returns {Promise<void>}
      */
-    construct(config) {
-        super.construct(config);
+    async initAsync() {
+        super.initAsync();
 
         let me = this;
 
-        // Ensure Neo.currentWorker is defined before attaching listeners
-        Promise.resolve().then(async () => {
-            // Subscribe to global Neo.config changes for dynamic renderer switching.
-            Neo.currentWorker.on({
-                neoConfigChange: me.onNeoConfigChange,
-                scope          : me
-            });
+        // Subscribe to global Neo.config changes for dynamic renderer switching.
+        Neo.currentWorker.on({
+            neoConfigChange: me.onNeoConfigChange,
+            scope          : me
+        });
 
-            await me.importUtil()
-        })
+        await me.importUtil()
     }
 
     /**
@@ -107,7 +104,7 @@ class Helper extends Base {
                         Object.entries(value).forEach(([key, value]) => {
                             const
                                 oldValue    = oldVnode.attributes[key],
-                                hasOldValue = Object.hasOwn(oldVnode.attributes, 'key');
+                                hasOldValue = Object.hasOwn(oldVnode.attributes, key);
 
                             // If the attribute has an old value AND the value hasn't changed, skip.
                             if (hasOldValue && oldValue === value) {

package/src/worker/App.mjs

@@ -46,11 +46,6 @@ class App extends Base {
         singleton: true
     }
 
-    /**
-     * @member {Object|null} data=null
-     * @protected
-     */
-    data = null
     /**
      * @member {Boolean} isUsingStateProviders=false
      * @protected
@@ -388,23 +383,16 @@ class App extends Base {
      * @param {Object} data
      */
     onLoadApplication(data) {
-        let me       = this,
-            {config} = Neo,
-            app, path;
-
-        if (data) {
-            me.data = data;
-            config.resourcesPath = data.resourcesPath
-        }
-
-        path = me.data.path;
+        let me        = this,
+            {config}  = Neo,
+            {appPath} = config;
 
         if (config.environment !== 'development') {
-            path = path.startsWith('/') ? path.substring(1) : path
+            appPath = appPath.startsWith('/') ? appPath.substring(1) : appPath
         }
 
-        me.importApp(path).then(module => {
-            app = module.onStart();
+        me.importApp(appPath).then(module => {
+            module.onStart();
 
             // short delay to ensure Component Controllers are ready
             config.hash && me.timeout(5).then(() => {

package/src/worker/Base.mjs

@@ -4,7 +4,7 @@ import Message            from './Message.mjs';
 import RemoteMethodAccess from './mixin/RemoteMethodAccess.mjs';
 
 /**
- * The abstract base class for the App, Data & VDom worker
+ * The abstract base class for e.g. the App, Data & VDom worker
  * @class Neo.worker.Base
  * @extends Neo.core.Base
  * @abstract

package/src/worker/Manager.mjs

@@ -270,14 +270,10 @@ class Manager extends Base {
     }
 
     /**
-     * @param {String} path
+     *
      */
-    loadApplication(path) {
-        this.sendMessage('app', {
-            action       : 'loadApplication',
-            path,
-            resourcesPath: NeoConfig.resourcesPath
-        })
+    loadApplication() {
+        this.sendMessage('app', {action: 'loadApplication' })
     }
 
     /**
@@ -291,7 +287,7 @@ class Manager extends Base {
         if (me.constructedThreads === me.activeWorkers) {
             // better safe than sorry => all remotes need to be registered
             NeoConfig.appPath && me.timeout(NeoConfig.loadApplicationDelay).then(() => {
-                me.loadApplication(NeoConfig.appPath)
+                me.loadApplication()
             })
         }
     }

package/src/worker/mixin/RemoteMethodAccess.mjs

@@ -96,7 +96,7 @@ class RemoteMethodAccess extends Base {
             out = method.call(pkg, msg.data)
         }
 
-        if (out instanceof Promise) {
+        if (Neo.isPromise(out)) {
             out
                 /*
                  * Intended logic: