neo.mjs 5.12.2 → 5.12.4

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='5.12.2'
+         * @member {String} version='5.12.4'
          */
-        version: '5.12.2'
+        version: '5.12.4'
     }
 
     /**

package/examples/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='5.12.2'
+         * @member {String} version='5.12.4'
          */
-        version: '5.12.2'
+        version: '5.12.4'
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "5.12.2",
+    "version": "5.12.4",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {

package/src/DefaultConfig.mjs

@@ -236,12 +236,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '5.12.2'
+     * @default '5.12.4'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '5.12.2'
+    version: '5.12.4'
 };
 
 Object.assign(DefaultConfig, {

package/src/button/Base.mjs

@@ -139,6 +139,20 @@ class Base extends Component {
      */
     #rippleTimeoutId = null
 
+    /**
+     * @param {Object} config
+     */
+    construct(config) {
+        super.construct(config);
+
+        let me = this;
+
+        me.addDomListeners({
+            click: me.onClick,
+            scope: me
+        })
+    }
+
     /**
      * Triggered after the badgePosition config got changed
      * @param {String} value
@@ -173,26 +187,6 @@ class Base extends Component {
         this.update();
     }
 
-    /**
-     * Triggered after the handler config got changed
-     * @param {String} value
-     * @param {String} oldValue
-     * @protected
-     */
-    afterSetHandler(value, oldValue) {
-        let me = this;
-
-        value && me.addDomListeners({
-            click: value,
-            scope: me.handlerScope || me
-        });
-
-        me.menu && me.addDomListeners({
-            click: me.toggleMenu,
-            scope: me
-        })
-    }
-
     /**
      * Triggered after the iconCls config got changed
      * @param {String} value
@@ -312,21 +306,6 @@ class Base extends Component {
         this.cls = cls;
     }
 
-    /**
-     * Triggered after the route config got changed
-     * @param {String} value
-     * @param {String} oldValue
-     * @protected
-     */
-    afterSetRoute(value, oldValue) {
-        let me = this;
-
-        value && me.addDomListeners({
-            click: me.changeRoute,
-            scope: me
-        })
-    }
-
     /**
      * Triggered after the text config got changed
      * @param {String|null} value
@@ -349,7 +328,7 @@ class Base extends Component {
             textNode.innerHTML = value;
         }
 
-        me.update();
+        me.update()
     }
 
     /**
@@ -369,7 +348,7 @@ class Base extends Component {
             vdomRoot.tag = 'button';
         }
 
-        this.update();
+        this.update()
     }
 
     /**
@@ -379,19 +358,9 @@ class Base extends Component {
      * @protected
      */
     afterSetUseRippleEffect(value, oldValue) {
-        let me            = this,
-            listener      = {click: me.showRipple, scope: me},
-            rippleWrapper = me.getRippleWrapper();
-
-        if (!value && oldValue) {
-            me.removeDomListeners(listener);
-        } else if (value) {
-            me.addDomListeners(listener);
-        }
-
-        // setting the config to false should end running ripple animations
-        rippleWrapper.removeDom = true;
-        me.update();
+        // setting the config to false ends running ripple animations
+        this.getRippleWrapper().removeDom = true;
+        this.update()
     }
 
     /**
@@ -410,7 +379,7 @@ class Base extends Component {
             delete vdomRoot.target;
         }
 
-        me.update();
+        me.update()
     }
 
     /**
@@ -425,7 +394,7 @@ class Base extends Component {
             return iconCls.join(' ');
         }
 
-        return iconCls;
+        return iconCls
     }
 
     /**
@@ -436,7 +405,7 @@ class Base extends Component {
      * @protected
      */
     beforeSetBadgePosition(value, oldValue) {
-        return this.beforeSetEnumValue(value, oldValue, 'badgePosition');
+        return this.beforeSetEnumValue(value, oldValue, 'badgePosition')
     }
 
     /**
@@ -451,7 +420,7 @@ class Base extends Component {
             value = value.split(' ').filter(Boolean);
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -471,9 +440,9 @@ class Base extends Component {
         let me = this;
 
         if (me.editRoute) {
-            Neo.Main.editRoute(me.route);
+            Neo.Main.editRoute(me.route)
         } else {
-            Neo.Main.setRoute({value: me.route});
+            Neo.Main.setRoute({value: me.route})
         }
     }
 
@@ -482,7 +451,7 @@ class Base extends Component {
      * @returns {Object}
      */
     getBadgeNode() {
-        return this.getVdomRoot().cn[2];
+        return this.getVdomRoot().cn[2]
     }
 
     /**
@@ -490,7 +459,7 @@ class Base extends Component {
      * @returns {Object}
      */
     getIconNode() {
-        return this.getVdomRoot().cn[0];
+        return this.getVdomRoot().cn[0]
     }
 
     /**
@@ -498,7 +467,20 @@ class Base extends Component {
      * @returns {Object}
      */
     getRippleWrapper() {
-        return this.getVdomRoot().cn[3];
+        return this.getVdomRoot().cn[3]
+    }
+
+    /**
+     * @param {Object} data
+     */
+    onClick(data) {
+        let me = this;
+
+        me.handler?.call(me.handlerScope || me, data);
+
+        me.menu            && me.toggleMenu();
+        me.route           && me.changeRoute();
+        me.useRippleEffect && me.showRipple(data)
     }
 
     /**
@@ -536,7 +518,7 @@ class Base extends Component {
                 me.#rippleTimeoutId = null;
 
                 rippleWrapper.removeDom = true;
-                me.update();
+                me.update()
             }
         }, rippleEffectDuration);
     }

package/src/component/Base.mjs

@@ -1963,7 +1963,12 @@ class Base extends CoreBase {
                 opts.appName = me.appName;
             }
 
-            Neo.vdom.Helper.update(opts).then(data => {
+            Neo.vdom.Helper.update(opts).catch(err => {
+                console.log('Error attempting to update component dom', err, me);
+                me.isVdomUpdating = false;
+
+                reject?.();
+            }).then(data => {
                 // console.log('Component vnode updated', data);
                 me.vnode          = data.vnode;
                 me.isVdomUpdating = false;
@@ -1987,12 +1992,7 @@ class Base extends CoreBase {
                         me.vdom = me.vdom;
                     }
                 }
-            }).catch(err => {
-                console.log('Error attempting to update component dom', err, me);
-                me.isVdomUpdating = false;
-
-                reject?.();
-            });
+            })
         }
     }
 }

package/src/core/Base.mjs

@@ -24,7 +24,9 @@ class Base {
     static observable = false
     /**
      * Keep the overwritten methods
-     * @type {Object}
+     * @member {Object} overwrittenMethods={}
+     * @protected
+     * @static
      */
     static overwrittenMethods = {}
     /**
@@ -116,7 +118,7 @@ class Base {
             value     : true
         });
 
-        me.remote && setTimeout(me.initRemote.bind(me), 1);
+        me.remote && setTimeout(me.initRemote.bind(me), 1)
     }
 
     /**
@@ -133,9 +135,9 @@ class Base {
 
         if (oldValue) {
             if (hasManager) {
-                Neo.manager.Instance.unregister(oldValue);
+                Neo.manager.Instance.unregister(oldValue)
             } else {
-                delete Neo.idMap[oldValue];
+                delete Neo.idMap[oldValue]
             }
         }
 
@@ -143,7 +145,7 @@ class Base {
             Neo.manager.Instance.register(me);
         } else {
             Neo.idMap = Neo.idMap || {};
-            Neo.idMap[me.id] = me;
+            Neo.idMap[me.id] = me
         }
     }
 
@@ -169,8 +171,9 @@ class Base {
                     }
                 }
             }
+
             // Apply configs to prototype
-            overwrites && Object.assign(cfg, overwrites);
+            overwrites && Object.assign(cfg, overwrites)
         }
     }
 
@@ -187,10 +190,10 @@ class Base {
 
         if (!values.includes(value)) {
             console.error(`Supported values for ${name} are: ${values.join(', ')}`, this);
-            return oldValue;
+            return oldValue
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -217,7 +220,7 @@ class Base {
             regex      = Base.methodNameRegex,
             methodName = stack.match(regex)[1];
 
-        this.__proto__.constructor.overwrittenMethods[methodName].call(this, ...args);
+        this.__proto__.constructor.overwrittenMethods[methodName].call(this, ...args)
     }
 
     /**
@@ -238,14 +241,14 @@ class Base {
         let me = this;
 
         if (Base.instanceManagerAvailable === true) {
-            Neo.manager.Instance.unregister(me);
+            Neo.manager.Instance.unregister(me)
         } else if (Neo.idMap) {
-            delete Neo.idMap[me.id];
+            delete Neo.idMap[me.id]
         }
 
         Object.keys(me).forEach(key => {
             if (Object.getOwnPropertyDescriptor(me, key).writable) {
-                delete me[key];
+                delete me[key]
             }
         })
     }
@@ -299,7 +302,7 @@ class Base {
             listenerId;
 
         if (!me.singleton) {
-            throw new Error('Remote method access is only functional for Singleton classes ' + className);
+            throw new Error('Remote method access is only functional for Singleton classes ' + className)
         }
 
         if (!Neo.config.unitTestMode && Neo.isObject(remote)) {
@@ -325,11 +328,11 @@ class Base {
             ctor = me.constructor;
 
         if (!ctor.config) {
-            throw new Error('Neo.applyClassConfig has not been run on ' + me.className);
+            throw new Error('Neo.applyClassConfig has not been run on ' + me.className)
         }
 
         if (!preventOriginalConfig) {
-            me.originalConfig = Neo.clone(config, true, true);
+            me.originalConfig = Neo.clone(config, true, true)
         }
 
         return {...ctor.config, ...config}
@@ -364,7 +367,7 @@ class Base {
 
         if (items) {
             if (!Array.isArray(items)) {
-                items = [items];
+                items = [items]
             }
 
             items.forEach(item => {
@@ -377,16 +380,16 @@ class Base {
                         ns      = Neo.ns(nsArray, false, me);
 
                         if (ns[nsKey] === undefined) {
-                            console.error('The used @config does not exist:', nsKey, nsArray.join('.'));
+                            console.error('The used @config does not exist:', nsKey, nsArray.join('.'))
                         } else {
                             symbolNs = Neo.ns(nsArray, false, me[configSymbol]);
 
                             // The config might not be processed yet, especially for configs
                             // not ending with an underscore, so we need to check the configSymbol first.
                             if (symbolNs && Object.hasOwn(symbolNs, nsKey)) {
-                                item[key] = symbolNs[nsKey];
+                                item[key] = symbolNs[nsKey]
                             } else {
-                                item[key] = ns[nsKey];
+                                item[key] = ns[nsKey]
                             }
                         }
                     }
@@ -414,7 +417,7 @@ class Base {
                 me[keys[0]] = me[configSymbol][keys[0]];
             }
 
-            // there is a delete call inside the config getter as well (Neo.mjs => autoGenerateGetSet())
+            // there is a delete-call inside the config getter as well (Neo.mjs => autoGenerateGetSet())
             // we need to keep this one for configs, which do not use getters (no trailing underscore)
             delete me[configSymbol][keys[0]];
 
@@ -439,7 +442,7 @@ class Base {
                     methods
                 })
             }
-        });
+        })
     }
 
     /**
@@ -455,7 +458,7 @@ class Base {
         // finish this one first before dropping new values into the configSymbol.
         // see: https://github.com/neomjs/neo/issues/2201
         if (me[forceAssignConfigs] !== true && Object.keys(me[configSymbol]).length > 0) {
-            me.processConfigs();
+            me.processConfigs()
         }
 
         Object.assign(me[configSymbol], values);
@@ -476,11 +479,11 @@ class Base {
         Object.entries(config).forEach(([key, value]) => {
             if (!configNames.hasOwnProperty(key) && !Neo.hasPropertySetter(me, key)) {
                 me[key] = value;
-                delete config[key];
+                delete config[key]
             }
         })
 
-        return config;
+        return config
     }
 
     /**

package/src/selection/menu/ListModel.mjs

@@ -28,7 +28,7 @@ class ListModel extends BaseListModel {
         if (parentMenu) {
             view.hideSubMenu();
             view.selectionModel.deselectAll();
-            parentMenu.selectionModel.selectAt(view.parentIndex);
+            parentMenu.selectionModel.selectAt(view.parentIndex)
         }
     }
 
@@ -39,7 +39,7 @@ class ListModel extends BaseListModel {
         let activeSubMenu = this.view.activeSubMenu;
 
         if (activeSubMenu) {
-            activeSubMenu.selectionModel.selectAt(0);
+            activeSubMenu.selectionModel.selectAt(0)
         }
     }
 }

package/src/table/View.mjs

@@ -59,7 +59,7 @@ class View extends Component {
             i          = 0,
             vdom       = me.vdom,
             cellCls, cellId, config, column, dockLeftMargin, dockRightMargin, id, index, j, rendererOutput,
-            record, rendererType, rendererValue, selectedRows, trCls;
+            record, rendererValue, selectedRows, trCls;
 
         me.recordVnodeMap = {}; // remove old data
 
@@ -111,10 +111,13 @@ class View extends Component {
                     value    : rendererValue
                 });
 
-                cellCls      = ['neo-table-cell'];
-                rendererType = Neo.typeOf(rendererOutput);
+                if (!rendererOutput) {
+                    rendererOutput = ''
+                }
+
+                cellCls = ['neo-table-cell'];
 
-                switch (rendererType) {
+                switch (Neo.typeOf(rendererOutput)) {
                     case 'Object': {
                         if (rendererOutput.cls && rendererOutput.html) {
                             cellCls.push(...rendererOutput.cls);
@@ -123,6 +126,7 @@ class View extends Component {
                         }
                         break;
                     }
+                    case 'Number':
                     case 'String': {
                         rendererOutput = {
                             cls : cellCls,
@@ -151,7 +155,7 @@ class View extends Component {
                     tabIndex: '-1'
                 };
 
-                if (rendererType === 'String') {
+                if (Neo.typeOf(rendererOutput) === 'Object') {
                     config.innerHTML = rendererOutput.html  || ''
                 } else {
                     config.cn = rendererOutput

package/src/util/VDom.mjs

@@ -347,12 +347,11 @@ class VDom extends Base {
      */
     static syncVdomIds(vnode, vdom) {
         if (vnode && vdom) {
-            let childNodes = vdom.childNodes || vdom.cn,
+            let childNodes = vdom.cn,
                 cn, i, len;
 
             if (vnode.id && vnode.id !== vdom.id) {
                 vdom.id = vnode.id;
-                // console.log('vdom id set to', vnode.id);
             }
 
             if (childNodes) {
@@ -362,7 +361,7 @@ class VDom extends Base {
 
                 for (; i < len; i++) {
                     if (vnode.childNodes) {
-                        VDom.syncVdomIds(vnode.childNodes[i], cn[i]);
+                        VDom.syncVdomIds(vnode.childNodes[i], cn[i])
                     }
                 }
             }