neo.mjs 5.12.6 → 5.13.1

package/apps/ServiceWorker.mjs

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

package/examples/ServiceWorker.mjs

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

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

package/src/component/wrapper/GoogleMaps.mjs

@@ -31,11 +31,17 @@ class GoogleMaps extends Base {
         markerStore_: {
             model: {
                 fields: [{
+                    name: 'anchorPoint',
+                    type: 'Object'
+                }, {
+                    name: 'icon',
+                    type: 'String'
+                }, {
                     name: 'id',
                     type: 'String'
                 }, {
-                    name: 'icon',
-                    type: 'Object'
+                    name: 'label',
+                    type: 'String'
                 }, {
                     name: 'position',
                     type: 'Object'
@@ -104,7 +110,10 @@ class GoogleMaps extends Base {
 
     /**
      * @param {Object} data
+     * @param {Object} [data.anchorPoint] x & y
+     * @param {String} [data.icon]
      * @param {String} data.id
+     * @param {String} [data.label]
      * @param {String} data.mapId
      * @param {Object} data.position
      * @param {String} [data.title]
@@ -184,9 +193,9 @@ class GoogleMaps extends Base {
             setTimeout(() => {
                 Neo.main.addon.GoogleMaps.create(opts).then(() => {
                     me.mapCreated = true;
-                    me.onComponentMounted();
-                });
-            }, 50);
+                    me.onComponentMounted()
+                })
+            }, 50)
         }
     }
 
@@ -222,7 +231,7 @@ class GoogleMaps extends Base {
     beforeSetMarkerStore(value, oldValue) {
         oldValue?.destroy();
 
-        return ClassSystemUtil.beforeSetInstance(value, Store, this.markerStoreConfig);
+        return ClassSystemUtil.beforeSetInstance(value, Store, this.markerStoreConfig)
     }
 
     /**
@@ -231,7 +240,7 @@ class GoogleMaps extends Base {
      */
     destroy(updateParentVdom=false, silent=false) {
         this.removeMap();
-        super.destroy(updateParentVdom, silent);
+        super.destroy(updateParentVdom, silent)
     }
 
     /**
@@ -254,14 +263,14 @@ class GoogleMaps extends Base {
      * @param {Object} data
      */
     onMapZoomChange(data) {
-        this.zoom = data.value;
+        this.zoom = data.value
     }
 
     /**
      * @param {Object} record
      */
     onMarkerClick(record) {
-        console.log('onMarkerClick', record);
+        console.log('onMarkerClick', record)
     }
 
     /**

package/src/controller/Component.mjs

@@ -1,7 +1,5 @@
-import Base             from './Base.mjs';
-import ComponentManager from '../manager/Component.mjs';
-import DomEventManager  from '../manager/DomEvent.mjs';
-import Logger           from '../util/Logger.mjs';
+import Base   from './Base.mjs';
+import Logger from '../util/Logger.mjs';
 
 /**
  * @class Neo.controller.Component
@@ -121,7 +119,7 @@ class Component extends Base {
             component = me.component.down({reference: name});
 
             if (component) {
-                me.references[name] = component;
+                me.references[name] = component
             }
         }
 
@@ -139,11 +137,16 @@ class Component extends Base {
      */
     parseConfig(component=this.component) {
         let me        = this,
+            handler   = component.handler,
             listeners = component.listeners,
             reference = component.reference,
             validator = component.validator,
             eventHandler, handlerScope;
 
+        if (handler && typeof handler === 'string') {
+            component.handler = me.getHandlerScope(handler)[handler].bind(component.handlerScope || me)
+        }
+
         if (listeners) {
             Object.entries(listeners).forEach(([key, value]) => {
                 if (key !== 'scope' && key !== 'delegate') {
@@ -152,10 +155,10 @@ class Component extends Base {
                         handlerScope = me.getHandlerScope(eventHandler);
 
                         if (!handlerScope) {
-                            Logger.logError('Unknown event handler for', eventHandler, component);
+                            Logger.logError('Unknown event handler for', eventHandler, component)
                         } else {
                             listeners[key] = {};
-                            listeners[key].fn = handlerScope[eventHandler].bind(handlerScope);
+                            listeners[key].fn = handlerScope[eventHandler].bind(handlerScope)
                         }
                     } else {
                         value.forEach(listener => {
@@ -164,9 +167,9 @@ class Component extends Base {
                                 handlerScope = me.getHandlerScope(eventHandler);
 
                                 if (!handlerScope) {
-                                    Logger.logError('Unknown event handler for', eventHandler, component);
+                                    Logger.logError('Unknown event handler for', eventHandler, component)
                                 } else {
-                                    listener.fn = handlerScope[eventHandler].bind(handlerScope);
+                                    listener.fn = handlerScope[eventHandler].bind(handlerScope)
                                 }
                             }
                         });
@@ -179,14 +182,14 @@ class Component extends Base {
             handlerScope = me.getHandlerScope(validator);
 
             if (!handlerScope) {
-                Logger.logError('Unknown validator for', component.id, component);
+                Logger.logError('Unknown validator for', component.id, component)
             } else {
-                component.validator = handlerScope[validator].bind(handlerScope);
+                component.validator = handlerScope[validator].bind(handlerScope)
             }
         }
 
         if (reference) {
-            me.references[reference] = component;
+            me.references[reference] = component
         }
     }
 
@@ -214,9 +217,9 @@ class Component extends Base {
                             scope = me.getHandlerScope(eventHandler);
 
                             if (!scope) {
-                                Logger.logError('Unknown domEvent handler for', eventHandler, component);
+                                Logger.logError('Unknown domEvent handler for', eventHandler, component)
                             } else {
-                                domListener[key] = scope[eventHandler].bind(scope);
+                                domListener[key] = scope[eventHandler].bind(scope)
                             }
                         }
                     }

package/src/main/addon/GoogleMaps.mjs

@@ -67,7 +67,10 @@ class GoogleMaps extends Base {
 
     /**
      * @param {Object} data
+     * @param {Object} [data.anchorPoint] x & y
+     * @param {String} [data.icon]
      * @param {String} data.id
+     * @param {String} [data.label]
      * @param {String} data.mapId
      * @param {Object} data.position
      * @param {String} [data.title]
@@ -88,6 +91,8 @@ class GoogleMaps extends Base {
             Neo.ns(`${mapId}`, true, me.markers);
 
             me.markers[mapId][data.id] = marker = new google.maps.Marker({
+                icon    : data.icon,
+                label   : data.label,
                 map     : me.maps[mapId],
                 neoId   : data.id, // custom property
                 neoMapId: mapId,   // custom property

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

@@ -176,9 +176,9 @@ class List extends BaseList {
     afterSetMounted(value, oldValue) {
         super.afterSetMounted(value, oldValue);
 
-        let me       = this,
-            id       = me.id,
-            parentId = me.parentComponent?.id;
+        let me           = this,
+            id           = me.id,
+            parentId     = me.parentComponent?.id;
 
         if (parentId) {
             if (value) {
@@ -187,7 +187,7 @@ class List extends BaseList {
                     targetId: id
                 });
 
-                me.getDomRect([id, parentId]).then(rects => {
+                !me.parentMenu && me.getDomRect([id, parentId]).then(rects => {
                     let style = me.style || {};
 
                     style.left = `${rects[1].right - rects[0].width}px`;
@@ -393,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
                 })
             }