neo.mjs 4.4.11 → 4.4.13

package/examples/component/wrapper/googleMaps/MainContainer.mjs

@@ -21,11 +21,19 @@ class MainContainer extends Viewport {
             flex     : 1,
             reference: 'google-maps-component',
 
+            listeners: {
+                zoomChange: 'onMapZoomChance'
+            },
+
             markerStoreConfig: {
                 data: [{
                     id      : '1',
-                    position: {lat: -34.397, lng: 150.644},
+                    position: {lat: -33.397, lng: 150.644},
                     title   : 'Hello neo'
+                }, {
+                    id      : '2',
+                    position: {lat: -34.397, lng: 150.644},
+                    title   : 'Hello Max'
                 }]
             }
         }, {
@@ -46,6 +54,7 @@ class MainContainer extends Viewport {
                 listeners           : {change: 'onZoomFieldChange'},
                 minValue            : 0,
                 maxValue            : 10,
+                reference           : 'zoom-field',
                 style               : {marginLeft: '10px'},
                 value               : 8,
                 width               : 100
@@ -56,7 +65,7 @@ class MainContainer extends Viewport {
                 iconCls: 'fa-solid fa-trash',
                 mode   : 'hide',
                 style  : {marginLeft: '10px'},
-                text   : 'Hide marker'
+                text   : 'Hide marker 1'
             }]
         }]
     }}

package/examples/component/wrapper/googleMaps/MainContainerController.mjs

@@ -20,6 +20,13 @@ class MainContainerController extends ComponentController {
         this.getReference('google-maps-component').panTo({lat: 37.655, lng: -122.4175})
     }
 
+    /**
+     * @param {Object} data
+     */
+    onMapZoomChance(data) {
+        this.getReference('zoom-field').value = data.value;
+    }
+
     /**
      * @param {Object} data
      */
@@ -31,7 +38,7 @@ class MainContainerController extends ComponentController {
             button.set({
                 iconCls: 'fa fa-location-dot',
                 mode   : 'show',
-                text   : 'Show marker'
+                text   : 'Show marker 1'
             });
 
             map.hideMarker('1')
@@ -39,7 +46,7 @@ class MainContainerController extends ComponentController {
             button.set({
                 iconCls: 'fa-solid fa-trash',
                 mode   : 'hide',
-                text   : 'Hide marker'
+                text   : 'Hide marker 1'
             });
 
             map.showMarker('1')

package/package.json

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

package/src/component/wrapper/GoogleMaps.mjs

@@ -7,6 +7,36 @@ import Store           from '../../data/Store.mjs';
  * @extends Neo.component.Base
  */
 class GoogleMaps extends Base {
+    /**
+     * false hides the default fullscreen control
+     * @member {Boolean} fullscreenControl=true
+     */
+    fullscreenControl = true
+    /**
+     * @member {Object} markerStoreConfig=null
+     */
+    markerStoreConfig = null
+    /**
+     * Pass any options to the map instance which are not explicitly defined here
+     * @member {Object} mapOptions={}
+     */
+    mapOptions = {}
+    /**
+     * null => the maximum zoom from the current map type is used instead
+     * @member {Number|null} maxZoom=null
+     */
+    maxZoom = null
+    /**
+     null => the minimum zoom from the current map type is used instead
+     * @member {Number|null} minZoom=null
+     */
+    minZoom = null
+    /**
+     * false hides the default zoom control
+     * @member {Boolean} zoomControl=true
+     */
+    zoomControl = true
+
     static getConfig() {return {
         /**
          * @member {String} className='Neo.component.wrapper.GoogleMaps'
@@ -18,11 +48,6 @@ class GoogleMaps extends Base {
          * @member {Object} center_={lat: -34.397, lng: 150.644}
          */
         center_: {lat: -34.397, lng: 150.644},
-        /**
-         * false hides the default fullscreen control
-         * @member {Boolean} fullscreenControl=true
-         */
-        fullscreenControl: true,
         /**
          * Prefer to use markerStoreConfig instead.
          * @member {Neo.data.Store|Object} markerStore_
@@ -42,31 +67,28 @@ class GoogleMaps extends Base {
                 }]
             }
         },
-        /**
-         * @member {Object} markerStoreConfig: null
-         */
-        markerStoreConfig: null,
-        /**
-         * null => the maximum zoom from the current map type is used instead
-         * @member {Number|null} maxZoom=null
-         */
-        maxZoom: null,
-        /**
-         null => the minimum zoom from the current map type is used instead
-         * @member {Number|null} minZoom=null
-         */
-        minZoom: null,
         /**
          * @member {Number} zoom_=8
          */
-        zoom_: 8,
-        /**
-         * false hides the default zoom control
-         * @member {Boolean} zoomControl=true
-         */
-        zoomControl: true
+        zoom_: 8
     }}
 
+    /**
+     * @param {Object} config
+     */
+    construct(config) {
+        super.construct(config);
+
+        let me = this;
+
+        me.addDomListeners({
+            googleMapZoomChange: me.onMapZoomChange,
+            googleMarkerClick  : me.parseMarkerClick,
+            local              : false,
+            scope              : me
+        })
+    }
+
     /**
      * @param {Object} data
      * @param {String} data.id
@@ -137,6 +159,7 @@ class GoogleMaps extends Base {
                 center           : me.center,
                 fullscreenControl: me.fullscreenControl,
                 id               : me.id,
+                mapOptions       : me.mapOptions,
                 maxZoom          : me.maxZoom,
                 minZoom          : me.minZoom,
                 zoom             : me.zoom,
@@ -159,9 +182,16 @@ class GoogleMaps extends Base {
      */
     afterSetZoom(value, oldValue) {
         if (oldValue !== undefined) {
+            let me = this;
+
             Neo.main.addon.GoogleMaps.setZoom({
-                appName: this.appName,
-                id     : this.id,
+                appName: me.appName,
+                id     : me.id,
+                value
+            });
+
+            me.fire('zoomChange', {
+                id: me.id,
                 value
             })
         }
@@ -204,6 +234,20 @@ class GoogleMaps extends Base {
      */
     onComponentMounted() {}
 
+    /**
+     * @param {Object} data
+     */
+    onMapZoomChange(data) {
+        this.zoom = data.value;
+    }
+
+    /**
+     * @param {Object} record
+     */
+    onMarkerClick(record) {
+        console.log('onMarkerClick', record);
+    }
+
     /**
      *
      */
@@ -232,6 +276,23 @@ class GoogleMaps extends Base {
         })
     }
 
+    /**
+     * Internal function. Use onMarkerClick() or the markerClick event instead
+     * @param {Object} data
+     * @protected
+     */
+    parseMarkerClick(data) {
+        let me     = this,
+            record = me.markerStore.get(data.id);
+
+        me.onMarkerClick(record);
+
+        me.fire('markerClick', {
+            id: me.id,
+            record
+        })
+    }
+
     /**
      *
      */

package/src/main/addon/GoogleMaps.mjs

@@ -1,5 +1,6 @@
 import Base       from '../../core/Base.mjs';
 import DomAccess  from '../DomAccess.mjs';
+import DomEvents  from '../DomEvents.mjs';
 import Observable from '../../core/Observable.mjs';
 
 /**
@@ -8,20 +9,21 @@ import Observable from '../../core/Observable.mjs';
  * @singleton
  */
 class GoogleMaps extends Base {
+    /**
+     * @member {Object} maps={}
+     */
+    maps = {}
+    /**
+     * @member {Object} markers={}
+     */
+    markers = {}
+
     static getConfig() {return {
         /**
          * @member {String} className='Neo.main.addon.GoogleMaps'
          * @protected
          */
         className: 'Neo.main.addon.GoogleMaps',
-        /**
-         * @member {Object} maps={}
-         */
-        maps: {},
-        /**
-         * @member {Object} markers={}
-         */
-        markers: {},
         /**
          * @member {Neo.core.Base[]} mixins=[Observable]
          */
@@ -66,23 +68,29 @@ class GoogleMaps extends Base {
      * @param {String} [data.title]
      */
     addMarker(data) {
-        let me = this;
+        let me    = this,
+            mapId = data.mapId,
+            listenerId, marker;
 
-        if (!me.maps[data.mapId]) {
-            let listenerId = me.on('mapCreated', mapId => {
-                if (data.mapId === mapId) {
+        if (!me.maps[mapId]) {
+            listenerId = me.on('mapCreated', id => {
+                if (mapId === id) {
                     me.un(listenerId);
                     me.addMarker(data);
                 }
             })
         } else {
-            Neo.ns(`${data.mapId}`, true, me.markers);
+            Neo.ns(`${mapId}`, true, me.markers);
 
-            me.markers[data.mapId][data.id] = new google.maps.Marker({
+            me.markers[mapId][data.id] = marker = new google.maps.Marker({
+                map     : me.maps[mapId],
+                neoId   : data.id, // custom property
+                neoMapId: mapId,   // custom property
                 position: data.position,
-                map     : me.maps[data.mapId],
                 title   : data.title,
             });
+
+            marker.addListener('click', me.onMarkerClick.bind(me, marker));
         }
     }
 
@@ -91,24 +99,30 @@ class GoogleMaps extends Base {
      * @param {Object} data.center
      * @param {Boolean} data.fullscreenControl
      * @param {String} data.id
+     * @param {Object} data.mapOptions // Pass any options which are not explicitly defined here
      * @param {Number} data.maxZoom
      * @param {Number} data.minZoom
      * @param {Number} data.zoom
      * @param {Boolean} data.zoomControl
      */
     create(data) {
-        let me = this;
+        let me = this,
+            id = data.id,
+            map;
 
-        me.maps[data.id] = new google.maps.Map(DomAccess.getElement(data.id), {
+        me.maps[id] = map = new google.maps.Map(DomAccess.getElement(id), {
             center           : data.center,
             fullscreenControl: data.fullscreenControl,
             maxZoom          : data.maxZoom,
             minZoom          : data.minZoom,
             zoom             : data.zoom,
-            zoomControl      : data.zoomControl
+            zoomControl      : data.zoomControl,
+            ...data.mapOptions
         });
 
-        me.fire('mapCreated', data.id);
+        map.addListener('zoom_changed', me.onMapZoomChange.bind(me, map, id));
+
+        me.fire('mapCreated', id);
     }
 
     /**
@@ -131,6 +145,35 @@ class GoogleMaps extends Base {
         })
     }
 
+    /**
+     * @param {google.maps.Map} map
+     * @param {String} mapId
+     */
+    onMapZoomChange(map, mapId){
+        DomEvents.sendMessageToApp({
+            id   : mapId,
+            path : [{cls: [], id: mapId}],
+            type : 'googleMapZoomChange',
+            value: map.zoom
+        })
+    }
+
+    /**
+     * @param {google.maps.Marker} marker
+     * @param {Object} event
+     * @param {Object} event.domEvent
+     */
+    onMarkerClick(marker, event) {
+        // in theory, we could parse and pass the entire DOM event.
+        // feel free to open a feature request ticket, in case you need more data into the app worker.
+
+        DomEvents.sendMessageToApp({
+            id  : marker.neoId,
+            path: [{cls: [], id: marker.neoMapId}],
+            type: 'googleMarkerClick'
+        })
+    }
+
     /**
      * @param data
      * @param {String} data.mapId