neo.mjs 5.12.5 → 5.13.0

package/apps/ServiceWorker.mjs

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

package/examples/ServiceWorker.mjs

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

package/examples/button/base/MainContainer.mjs

@@ -197,7 +197,35 @@ class MainContainer extends ConfigurationViewport {
             }, {
                 handler: data => console.log('menu item 3 click =>', data),
                 iconCls: 'fa fa-play',
-                text   : 'Item 3'
+                text   : 'Item 3',
+
+                items: [{
+                    handler: data => console.log('menu item 4 click =>', data),
+                    iconCls: 'fa fa-home',
+                    text   : 'Item 4'
+                }, {
+                    handler: data => console.log('menu item 5 click =>', data),
+                    iconCls: 'fa fa-user',
+                    text   : 'Item 5'
+                }, {
+                    handler: data => console.log('menu item 6 click =>', data),
+                    iconCls: 'fa fa-play',
+                    text   : 'Item 6',
+
+                    items: [{
+                        handler: data => console.log('menu item 7 click =>', data),
+                        iconCls: 'fa fa-home',
+                        text   : 'Item 7'
+                    }, {
+                        handler: data => console.log('menu item 8 click =>', data),
+                        iconCls: 'fa fa-user',
+                        text   : 'Item 8'
+                    }, {
+                        handler: data => console.log('menu item 9 click =>', data),
+                        iconCls: 'fa fa-play',
+                        text   : 'Item 9'
+                    }]
+                }]
             }]
 
             /*tooltips: [{

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "5.12.5",
+    "version": "5.13.0",
     "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.5'
+     * @default '5.13.0'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '5.12.5'
+    version: '5.13.0'
 };
 
 Object.assign(DefaultConfig, {

package/src/button/Base.mjs

@@ -272,7 +272,7 @@ class Base extends Component {
     afterSetPressed(value, oldValue) {
         let cls = this.cls;
 
-        NeoArray[value === true ? 'add' : 'remove'](cls, 'pressed');
+        NeoArray.toggle(cls, 'pressed', value === true);
         this.cls = cls;
     }
 
@@ -284,18 +284,16 @@ class Base extends Component {
      */
     afterSetText(value, oldValue) {
         let me       = this,
+            isEmpty  = !value || value === '',
             vdomRoot = me.getVdomRoot(),
             textNode = vdomRoot.cn[1];
 
-        if (!value || value === '') {
-            NeoArray.add(me._cls,      'no-text');
-            NeoArray.add(vdomRoot.cls, 'no-text');
-            textNode.removeDom = true;
-        } else {
-            NeoArray.remove(me._cls,      'no-text');
-            NeoArray.remove(vdomRoot.cls, 'no-text');
-            textNode.removeDom = false;
-            textNode.innerHTML = value;
+        NeoArray.toggle(me._cls,      'no-text', isEmpty);
+        NeoArray.toggle(vdomRoot.cls, 'no-text', isEmpty);
+        textNode.removeDom = isEmpty;
+
+        if (!isEmpty) {
+            textNode.innerHTML = value
         }
 
         me.update()
@@ -400,7 +398,7 @@ class Base extends Component {
      * @protected
      */
     beforeSetIconPosition(value, oldValue) {
-        return this.beforeSetEnumValue(value, oldValue, 'iconPosition');
+        return this.beforeSetEnumValue(value, oldValue, 'iconPosition')
     }
 
     /**
@@ -490,23 +488,21 @@ class Base extends Component {
                 rippleWrapper.removeDom = true;
                 me.update()
             }
-        }, rippleEffectDuration);
+        }, rippleEffectDuration)
     }
 
     /**
      *
      */
-    toggleMenu() {
+    async toggleMenu() {
         let menuList = this.menuList,
             hidden   = !menuList.hidden;
 
         menuList.hidden = hidden;
 
         if (!hidden) {
-            setTimeout(() => {
-                console.log('focus'); // todo: does not activate the key nav
-                menuList.focus()
-            }, 500)
+            await Neo.timeout(50);
+            menuList.focus()
         }
     }
 }

package/src/component/Base.mjs

@@ -1828,6 +1828,7 @@ class Base extends CoreBase {
 
         me.vdom.removeDom = true;
 
+        me._hidden = true; // silent update
         me.mounted = false;
 
         Neo.currentWorker.promiseMessage('main', {

package/src/main/addon/ScrollSync.mjs

@@ -43,7 +43,7 @@ class ScrollSync extends Base {
     /**
      * @param {Object} config
      */
-    construct(config = {}) {
+    construct(config) {
         super.construct(config);
 
         document.addEventListener('scroll', this.onDocumentScroll.bind(this), true)

package/src/menu/List.mjs

@@ -39,6 +39,11 @@ class List extends BaseList {
          * @protected
          */
         focusTimeoutId: null,
+        /**
+         * Hides a floating list on leaf item click, in case it has a parentComponent
+         * @member {Boolean} hideOnLeafItemClick=true
+         */
+        hideOnLeafItemClick: true,
         /**
          * Optionally pass menu.Store data directly
          * @member {Object[]|null} items_=null
@@ -109,11 +114,6 @@ class List extends BaseList {
      * @member {Neo.component.Base|null} parentComponent=null
      */
     parentComponent = null
-    /**
-     * If the menu is floating, it will anchor itself to the parentRect
-     * @member {Object|null} parentRect=null
-     */
-    parentRect = null
 
     /**
      * Triggered after the floating config got changed
@@ -154,7 +154,6 @@ class List extends BaseList {
             if (me.isRoot) {
                 if (!value) {
                     me.focusTimeoutId = setTimeout(() => {
-                        console.log('unmount'); // todo: does not hide a top-level floating menu
                         me[me.floating ? 'unmount' : 'hideSubMenu']();
                     }, 20);
                 } else {
@@ -177,23 +176,31 @@ class List extends BaseList {
     afterSetMounted(value, oldValue) {
         super.afterSetMounted(value, oldValue);
 
-        let me       = this,
-            parentId = me.parentComponent?.id;
+        let me           = this,
+            id           = me.id,
+            parentId     = me.parentComponent?.id;
 
-        if (value && parentId) {
-            Neo.main.addon.ScrollSync.register({
-                sourceId: parentId,
-                targetId: me.id
-            });
+        if (parentId) {
+            if (value) {
+                Neo.main.addon.ScrollSync.register({
+                    sourceId: parentId,
+                    targetId: id
+                });
 
-            me.getDomRect([me.id, parentId]).then(rects => {
-                let style = me.style || {};
+                !me.parentMenu && me.getDomRect([id, parentId]).then(rects => {
+                    let style = me.style || {};
 
-                style.left = `${rects[1].right - rects[0].width}px`;
-                style.top  = `${rects[1].bottom + 1}px`;
+                    style.left = `${rects[1].right - rects[0].width}px`;
+                    style.top  = `${rects[1].bottom + 1}px`;
 
-                me.style = style
-            })
+                    me.style = style
+                })
+            } else if (oldValue !== undefined) {
+                Neo.main.addon.ScrollSync.unregister({
+                    sourceId: parentId,
+                    targetId: id
+                })
+            }
         }
     }
 
@@ -310,7 +317,22 @@ class List extends BaseList {
      * @param {Object[]} data.oldPath
      */
     onFocusLeave(data) {
-        this.menuFocus = false
+        let insideParent = false,
+            parentId     = this.parentComponent?.id,
+            item;
+
+        if (parentId) {
+            for (item of data.oldPath) {
+                if (item.id === parentId) {
+                    insideParent = true;
+                    break;
+                }
+            }
+        }
+
+        if (!insideParent) {
+            this.menuFocus = false
+        }
     }
 
     /**
@@ -320,7 +342,13 @@ class List extends BaseList {
     onItemClick(node, data) {
         super.onItemClick(node, data);
 
-        data.record.handler?.call(this, data)
+        let me = this;
+
+        data.record.handler?.call(me, data);
+
+        if (me.hideOnLeafItemClick && !data.record.items) {
+            me.unmount()
+        }
     }
 
     /**
@@ -365,17 +393,18 @@ class List extends BaseList {
                 subMenu.setSilent({style: menuStyle})
             } else {
                 subMenuMap[subMenuMapId] = subMenu = Neo.create({
-                    module      : List,
-                    appName     : me.appName,
-                    displayField: me.displayField,
-                    floating    : true,
-                    items       : record.items,
-                    isRoot      : false,
-                    parentId    : Neo.apps[me.appName].mainView.id,
-                    parentIndex : store.indexOf(record),
-                    parentMenu  : me,
+                    module         : List,
+                    appName        : me.appName,
+                    displayField   : me.displayField,
+                    floating       : true,
+                    items          : record.items,
+                    isRoot         : false,
+                    parentComponent: me.parentComponent,
+                    parentId       : Neo.apps[me.appName].mainView.id,
+                    parentIndex    : store.indexOf(record),
+                    parentMenu     : me,
                     style,
-                    zIndex      : me.zIndex + 1
+                    zIndex         : me.zIndex + 1
                 })
             }
 

package/src/table/View.mjs

@@ -345,7 +345,7 @@ class View extends Component {
             cellNode = VDomUtil.findVdomChild(vdom, cellId);
 
             // the vdom might not exist yet => nothing to do in this case
-            if (cellNode.vdom) {
+            if (cellNode?.vdom) {
                 column      = me.getColumn(field.name);
                 index       = cellNode.index;
                 needsUpdate = true;